Nialexsan/account resolve grpc fix (#1798)

* fix duplicated signs

* add fix to changeset

Author: nialexsan

.changeset/wet-chicken-unite.md

@@ -2,6 +2,7 @@
 "@onflow/fcl": patch
 "@onflow/sdk": patch
 "@onflow/transport-http": patch
+"@onflow/transport-grpc": patch
 ---
 
 Fixed duplicate signatures when sending transaction

packages/transport-grpc/src/send-transaction.js

@@ -71,7 +71,15 @@ export async function sendTransaction(ix, context = {}, opts = {}) {
         sig.setAddress(addressBuffer(sansPrefix(acct.addr), context))
         sig.setKeyId(acct.keyId)
         sig.setSignature(hexBuffer(acct.signature, context))
-        tx.addPayloadSignatures(sig)
+
+        const isSignatureExist = tx.getPayloadSignaturesList().some(
+          existingSignature => existingSignature.getAddress().toString() === sig.getAddress().toString()
+            && existingSignature.getKeyId() === sig.getKeyId()
+            && existingSignature.getSignature().toString() === sig.getSignature().toString()
+        )
+        if (!isSignatureExist) {
+          tx.addPayloadSignatures(sig)
+        }
       }
     } catch (error) {
       console.error("Trouble applying payload signature", {acct, ix})

packages/transport-grpc/src/send-transaction.test.js

@@ -117,4 +117,107 @@ describe("Transaction", () => {
 
     expect(response.transactionId).toBe(returnedTransactionId)
   })
+
+  test("SendTransaction with duplicated payer", async () => {
+    const unaryMock = jest.fn()
+
+    const returnedTransactionId = "a1b2c3"
+
+    unaryMock.mockReturnValue({
+      getId_asU8: () => hexStrToUInt8Array("a1b2c3"),
+    })
+
+    const built = await build([
+      transaction`cadence transaction`,
+      proposer({
+        addr: "abc",
+        keyId: 1,
+        sequenceNum: 123,
+        signingFunction: () => ({
+          addr: "abc",
+          keyId: 1,
+          signature: "abc123",
+        }),
+        resolve: null,
+        role: {
+          proposer: true,
+          authorizer: false,
+          payer: false,
+          param: false,
+        },
+      }),
+      payer({
+        addr: "def",
+        keyId: 1,
+        sequenceNum: 123,
+        signingFunction: () => ({
+          addr: "def",
+          keyId: 1,
+          signature: "def456",
+        }),
+        resolve: null,
+        role: {
+          proposer: false,
+          authorizer: false,
+          payer: true,
+          param: false,
+        },
+      }),
+      authorizations([
+        {
+          addr: "abc",
+          keyId: 1,
+          sequenceNum: 123,
+          signingFunction: () => ({
+            addr: "abc",
+            keyId: 1,
+            signature: "abc123",
+          }),
+          resolve: null,
+          role: {
+            proposer: false,
+            authorizer: true,
+            payer: false,
+            param: false,
+          },
+        },
+      ]),
+      ref("aaaa"),
+      voucherIntercept(async voucher => {
+        voucherToTxId(voucher)
+      }),
+    ])
+
+    const resolved = await resolve(built)
+
+    const response = await sendTransaction(
+      resolved,
+      {
+        response: responseADT,
+        Buffer,
+      },
+      {
+        unary: unaryMock,
+        node: "localhost:3000",
+      }
+    )
+
+    expect(unaryMock.mock.calls.length).toEqual(1)
+
+    const unaryMockArgs = unaryMock.mock.calls[0]
+
+    expect(unaryMockArgs.length).toEqual(4)
+
+    const unaryType = unaryMock.mock.calls[0][1]
+
+    expect(unaryType).toEqual(AccessAPI.SendTransaction)
+
+    const unaryMockRequest = unaryMock.mock.calls[0][2]
+
+    expect(unaryMockRequest).not.toBeUndefined()
+
+    expect(response.transactionId).toBe(returnedTransactionId)
+
+    expect(unaryMockRequest.getTransaction().getPayloadSignaturesList()).toHaveLength(1)
+  })
 })