Gotez v2.3.19 (#715)

* Gotez v2.3.16 fixes run_operation helper script input encoding

* Missed type alias

* Gotez v2.3.18 adds signature canonization back

* Only list operations allowed under generic request; Gotez-v2.3.19

---------

Co-authored-by: Eugene Zagidullin <eugene@ecadlabs.com>
Co-authored-by: Jev Björsell <jev@ecadlabs.com>

Author: 3 people

cmd/commands/list_ops.go

@@ -44,7 +44,7 @@ func NewListOps(c *Context) *cobra.Command {
 		Use:   "list-ops",
 		Short: "Print possible operation types inside the `generic` request",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			ops := proto.ListOperations()
+			ops := proto.ListGenericOperations()
 			ops = append(ops, proto.ListPseudoOperations()...)
 			slices.Sort(ops)
 			return listOpsTpl.Execute(os.Stdout, ops)

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/certusone/yubihsm-go v0.3.0
 	github.com/ecadlabs/go-pkcs11 v0.3.0
 	github.com/ecadlabs/goblst v1.1.0
-	github.com/ecadlabs/gotez/v2 v2.3.18
+	github.com/ecadlabs/gotez/v2 v2.3.19
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/go-playground/validator/v10 v10.30.1
 	github.com/google/tink/go v1.7.0

go.sum

@@ -73,8 +73,8 @@ github.com/ecadlabs/go-pkcs11 v0.3.0 h1:AsLURdNoZn0YocumJFloWXIlx1f2SDw4eTx4nPMa
 github.com/ecadlabs/go-pkcs11 v0.3.0/go.mod h1:PwAVBY0muwp6quQFmSDcB5Ekl4TjGG7cEQQwY9KpNVc=
 github.com/ecadlabs/goblst v1.1.0 h1:U0JzRxIbtv1OsefUqfXNJ1HLzPMSaHY8aOeIQggUe9U=
 github.com/ecadlabs/goblst v1.1.0/go.mod h1:s67gqaOol9o6fguh+evH75X5uQniOhv1HG/EU8xPLPY=
-github.com/ecadlabs/gotez/v2 v2.3.18 h1:pYgm6CBF5FG59uja6fZ2xa09lV5Jp9n6CcJVwJVFxyQ=
-github.com/ecadlabs/gotez/v2 v2.3.18/go.mod h1:tgp2C5U1fgdniQwl//Jp5ejSB2suySXixD+a4GbK2s8=
+github.com/ecadlabs/gotez/v2 v2.3.19 h1:ZydIDEz94aGxLaX3OLWuE9j4K1sd5epKXSVJvELncgo=
+github.com/ecadlabs/gotez/v2 v2.3.19/go.mod h1:tgp2C5U1fgdniQwl//Jp5ejSB2suySXixD+a4GbK2s8=
 github.com/ecadlabs/pretty v0.0.0-20230412124801-f948fc689a04 h1:7WdblGykGxtGGtchW4kzTaJJO8Fm+JKhLzhttOOWr9k=
 github.com/ecadlabs/pretty v0.0.0-20230412124801-f948fc689a04/go.mod h1:VApUlocsLMpp4hUXHxTTIlosebnwo0BM6e1hy78qTPM=
 github.com/enceve/crypto v0.0.0-20160707101852-34d48bb93815 h1:D22EM5TeYZJp43hGDx6dUng8mvtyYbB9BnE3+BmJR1Q=

pkg/signatory/request/request_test.go

@@ -121,7 +121,7 @@ func TestSignRequest(t *testing.T) {
 					0xeb, 0xa4, 0xcb, 0xf2, 0x92, 0x78, 0xc2, 0xc1, 0x4, 0x47, 0xa6, 0x84, 0xe3, 0xaa,
 					0x14, 0x36, 0x85,
 				},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Transaction{
 						ManagerOperation: latest.ManagerOperation{
 							Source: &tz.Ed25519PublicKeyHash{
@@ -165,7 +165,7 @@ func TestSignRequest(t *testing.T) {
 					0xeb, 0xa4, 0xcb, 0xf2, 0x92, 0x78, 0xc2, 0xc1, 0x4, 0x47, 0xa6, 0x84, 0xe3, 0xaa,
 					0x14, 0x36, 0x85,
 				},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Transaction{
 						ManagerOperation: latest.ManagerOperation{
 							Source: &tz.Ed25519PublicKeyHash{

pkg/signatory/signatory.go

@@ -698,7 +698,7 @@ func checkRequestKind(allowedKinds []string) error {
 }
 
 func checkOperationKind(allowedKinds []string) error {
-	avilKinds := append(proto.ListOperations(), proto.ListPseudoOperations()...)
+	avilKinds := append(proto.ListGenericOperations(), proto.ListPseudoOperations()...)
 	for _, kind := range allowedKinds {
 		if !slices.Contains(avilKinds, kind) {
 			return fmt.Errorf("invalid operation kind `%s` in `allow.generic` list", kind)

pkg/signatory/signatory_test.go

@@ -323,7 +323,7 @@ func TestPolicy(t *testing.T) {
 			title: "Stake allowed",
 			req: &latest.GenericOperationSignRequest{
 				Branch: &tz.BlockHash{},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Transaction{
 						ManagerOperation: latest.ManagerOperation{
 							Source:       &tz.Ed25519PublicKeyHash{1, 2, 3},
@@ -351,7 +351,7 @@ func TestPolicy(t *testing.T) {
 			title: "ballot allowed",
 			req: &latest.GenericOperationSignRequest{
 				Branch: &tz.BlockHash{},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Ballot{
 						Source:   &tz.Ed25519PublicKeyHash{1, 2, 3},
 						Period:   0,
@@ -370,7 +370,7 @@ func TestPolicy(t *testing.T) {
 			title: "ballot nay allowed",
 			req: &latest.GenericOperationSignRequest{
 				Branch: &tz.BlockHash{},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Ballot{
 						Source:   &tz.Ed25519PublicKeyHash{1, 2, 3},
 						Period:   0,
@@ -389,7 +389,7 @@ func TestPolicy(t *testing.T) {
 			title: "ballot yay not allowed",
 			req: &latest.GenericOperationSignRequest{
 				Branch: &tz.BlockHash{},
-				Contents: []latest.OperationContents{
+				Contents: []latest.GenericOperationSignRequestOperationContents{
 					&latest.Ballot{
 						Source:   &tz.Ed25519PublicKeyHash{1, 2, 3},
 						Period:   0,