Merge pull request #294 from near/sign-transactions-fixes

fix: `signTransactions` Improvements
near · May 20, 2022 · c76fc49 · c76fc49
2 parents 6e3f10c + 05ebfda
commit c76fc49
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/packages/ledger/src/lib/ledger.ts b/packages/ledger/src/lib/ledger.ts
@@ -264,12 +264,7 @@ const Ledger: WalletBehaviourFactory<HardwareWallet> = async ({
       await connectLedgerDevice();
 
       const signedTransactions = await signTransactions(
-        transformTransactions([
-          {
-            receiverId,
-            actions,
-          },
-        ]),
+        transformTransactions([{ signerId, receiverId, actions }]),
         signer,
         options.network
       );

diff --git a/packages/math-wallet/src/lib/math-wallet.ts b/packages/math-wallet/src/lib/math-wallet.ts
@@ -132,12 +132,7 @@ const MathWallet: WalletBehaviourFactory<InjectedWallet> = async ({
       }
 
       const signedTransactions = await signTransactions(
-        transformTransactions([
-          {
-            receiverId,
-            actions,
-          },
-        ]),
+        transformTransactions([{ signerId, receiverId, actions }]),
         _state.wallet.signer,
         options.network
       );

diff --git a/packages/wallet-utils/src/lib/sign-transactions.ts b/packages/wallet-utils/src/lib/sign-transactions.ts
@@ -20,17 +20,18 @@ export const signTransactions = async (
   const signedTransactions: Array<nearTransactions.SignedTransaction> = [];
 
   for (let i = 0; i < transactions.length; i++) {
-    const publicKey = (
-      await signer.getPublicKey(transactions[i].signerId, network.nodeUrl)
-    ).toString();
+    const publicKey = await signer.getPublicKey(
+      transactions[i].signerId,
+      network.networkId
+    );
 
     const [block, accessKey] = await Promise.all([
       provider.block({ finality: "final" }),
       provider.query<AccessKeyView>({
         request_type: "view_access_key",
         finality: "final",
         account_id: transactions[i].signerId,
-        public_key: publicKey,
+        public_key: publicKey.toString(),
       }),
     ]);
 
@@ -40,7 +41,7 @@ export const signTransactions = async (
 
     const transaction = nearTransactions.createTransaction(
       transactions[i].signerId,
-      utils.PublicKey.from(publicKey),
+      utils.PublicKey.from(publicKey.toString()),
       transactions[i].receiverId,
       accessKey.nonce + i + 1,
       actions,
@@ -50,7 +51,8 @@ export const signTransactions = async (
     const response = await nearTransactions.signTransaction(
       transaction,
       signer,
-      transactions[i].signerId
+      transactions[i].signerId,
+      network.networkId
     );
 
     signedTransactions.push(response[1]);