fixed authorizer types in a transaction that it is keyed to the addre…

…ss of an authorizer
bjartek · Feb 28, 2024 · 4958357 · 4958357
1 parent debbac8
commit 4958357
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/npm_module.go b/npm_module.go
@@ -28,7 +28,7 @@ type OverflowSolution struct {
 	Warnings []string `json:"warnings"`
 }
 
-type OverflowAuthorizers map[string][]string
+type OverflowAuthorizers [][]string
 
 // a type containing information about parameter types and orders
 type OverflowDeclarationInfo struct {
@@ -192,7 +192,7 @@ func paramsAndAuthorizers(code []byte) (*ast.ParameterList, OverflowAuthorizers)
 			prepareParams := txd.Prepare.FunctionDeclaration.ParameterList
 			if prepareParams != nil {
 				for _, parg := range txd.Prepare.FunctionDeclaration.ParameterList.ParametersByIdentifier() {
-					name := parg.Identifier.Identifier
+					// name := parg.Identifier.Identifier
 					ta := parg.TypeAnnotation
 					if ta != nil {
 						rt, ok := ta.Type.(*ast.ReferenceType)
@@ -205,7 +205,7 @@ func paramsAndAuthorizers(code []byte) (*ast.ParameterList, OverflowAuthorizers)
 									entitlements = append(entitlements, entitlement.Identifier.Identifier)
 								}
 							}
-							authorizers[name] = entitlements
+							authorizers = append(authorizers, entitlements)
 						}
 					}
 				}

diff --git a/testdata/TestParseConfig/parse_and_filter.golden b/testdata/TestParseConfig/parse_and_filter.golden
@@ -7,17 +7,17 @@
 		},
 		"create_nft_collection": {
 			Parameters:     map[string]string{},
-			Authorizers:    overflow.OverflowAuthorizers{"acct": []string{"Storage"}},
+			Authorizers:    overflow.OverflowAuthorizers{[]string{"Storage"}},
 			ParameterOrder: []string{},
 		},
 		"emulatorFoo": {
 			Parameters:     map[string]string{"test": "String"},
-			Authorizers:    overflow.OverflowAuthorizers{"acct": []string{"BorrowValue"}},
+			Authorizers:    overflow.OverflowAuthorizers{[]string{"BorrowValue"}},
 			ParameterOrder: []string{"test"},
 		},
 		"mainnetFoo": {
 			Parameters:     map[string]string{"test": "String"},
-			Authorizers:    overflow.OverflowAuthorizers{"acct": []string{}},
+			Authorizers:    overflow.OverflowAuthorizers{[]string{}},
 			ParameterOrder: []string{"test"},
 		},
 		"mainnetaTransaction": {
@@ -35,7 +35,7 @@
 				"amount":    "UFix64",
 				"recipient": "Address",
 			},
-			Authorizers: overflow.OverflowAuthorizers{"signer": []string{"BorrowValue"}},
+			Authorizers: overflow.OverflowAuthorizers{[]string{"BorrowValue"}},
 			ParameterOrder: []string{
 				"recipient",
 				"amount",
@@ -44,14 +44,14 @@
 		"signWithMultipleAccounts": {
 			Parameters: map[string]string{"test": "String"},
 			Authorizers: overflow.OverflowAuthorizers{
-				"account2": []string{},
-				"acct":     []string{},
+				[]string{},
+				[]string{},
 			},
 			ParameterOrder: []string{"test"},
 		},
 		"testnetFoo": {
 			Parameters:     map[string]string{"test": "String"},
-			Authorizers:    overflow.OverflowAuthorizers{"acct": []string{"Storage"}},
+			Authorizers:    overflow.OverflowAuthorizers{[]string{"Storage"}},
 			ParameterOrder: []string{"test"},
 		},
 		"zTransaction": {

diff --git a/transaction.go b/transaction.go
@@ -35,7 +35,7 @@ type Argument struct {
 
 type OverflowTransaction struct {
 	Error            error
-	AuthorizerTypes  OverflowAuthorizers
+	AuthorizerTypes  map[string][]string
 	Stakeholders     map[string][]string
 	Payer            string
 	Id               string
@@ -100,11 +100,14 @@ func (o *OverflowState) CreateOverflowTransaction(blockId string, transactionRes
 		status = fmt.Sprintf("%s failed getting imports", status)
 	}
 
+	authorizerTypes := map[string][]string{}
+
 	authorizers := []string{}
-	for _, authorizer := range transaction.Authorizers {
+	for i, authorizer := range transaction.Authorizers {
 		auth := fmt.Sprintf("0x%s", authorizer.Hex())
 		authorizers = append(authorizers, auth)
 		standardStakeholders[auth] = []string{"authorizer"}
+		authorizerTypes[auth] = argInfo.Authorizers[i]
 	}
 
 	payerRoles, ok := standardStakeholders[fmt.Sprintf("0x%s", transaction.Payer.Hex())]
@@ -148,7 +151,7 @@ func (o *OverflowState) CreateOverflowTransaction(blockId string, transactionRes
 		GasUsed:          uint64(gas),
 		ExecutionEffort:  executionEffort,
 		Authorizers:      authorizers,
-		AuthorizerTypes:  argInfo.Authorizers,
+		AuthorizerTypes:  authorizerTypes,
 	}, nil
 }
 

diff --git a/transaction_integration_test.go b/transaction_integration_test.go
@@ -40,7 +40,7 @@ func TestTransactionIntegration(t *testing.T) {
 		oTx, err := o.GetOverflowTransactionById(context.Background(), result.Transaction.ID())
 		require.NoError(t, err)
 
-		assert.Equal(t, []string{"BorrowValue"}, oTx.AuthorizerTypes["signer"])
+		assert.Equal(t, []string{"BorrowValue"}, oTx.AuthorizerTypes["0xf8d6e0586b0a20c7"])
 	})
 
 	t.Run("fail on missing signer", func(t *testing.T) {
@@ -350,7 +350,7 @@ func TestTransactionIntegration(t *testing.T) {
 			WithSigner("first"),
 		).AssertSuccess(t)
 
-		assert.Equal(t, []string{"BorrowValue", "SaveValue"}, res.DeclarationInfo.Authorizers["acct"])
+		assert.Equal(t, []string{"BorrowValue", "SaveValue"}, res.DeclarationInfo.Authorizers[0])
 	})
 
 	bytes, err := o.GetCoverageReport().MarshalJSON()