refactor: Created utils package

package.json

@@ -28,6 +28,7 @@
     "build:near-wallet": "nx run-many --target=build --projects=near-wallet --configuration=production",
     "build:sender": "nx run-many --target=build --projects=sender --configuration=production",
     "build:wallet-connect": "nx run-many --target=build --projects=wallet-connect --configuration=production",
+    "build:wallet-utils": "nx run-many --target=build --projects=wallet-utils --configuration=production",
     "lint": "nx workspace-lint && nx run-many --target=lint --all --parallel",
     "lint:fix": "nx run-many --target=lint --all --fix",
     "serve:react": "nx serve react",

packages/core/src/index.ts

@@ -51,9 +51,9 @@ export {
   AddKeyAction,
   DeleteKeyAction,
   DeleteAccountAction,
+  AddKeyPermission,
 } from "./lib/wallet";
 
 export { FinalExecutionOutcome } from "near-api-js/lib/providers";
 
-export { transformActions } from "./lib/wallet";
 export { waitFor } from "./lib/helpers";

packages/core/src/lib/services/provider/provider.service.spec.ts

@@ -1,4 +1,5 @@
-import { Provider, QueryParams, ViewAccessKeyParams } from "./provider.service";
+import { Provider } from "./provider.service";
+import { QueryParams, ViewAccessKeyParams } from "./provider.service.types";
 import { mock } from "jest-mock-extended";
 import {
   FinalExecutionOutcome,

packages/core/src/lib/wallet/transactions.ts

@@ -1,7 +1,7 @@
+import { Action } from "./transactions.types";
+import { AddKeyPermission } from "./transactions.types";
 import { transactions, utils } from "near-api-js";
-import { BN } from "bn.js";
-
-import { Action, AddKeyPermission } from "./transactions.types";
+import BN from "bn.js";
 
 const getAccessKey = (permission: AddKeyPermission) => {
   if (permission === "FullAccess") {

packages/ledger/src/lib/ledger.ts

@@ -1,18 +1,16 @@
-import { transactions as nearTransactions, utils } from "near-api-js";
+import { isMobile } from "is-mobile";
 import { TypedError } from "near-api-js/lib/utils/errors";
-import isMobile from "is-mobile";
+import { signTransactions } from "@near-wallet-selector/wallet-utils";
 import {
   WalletModuleFactory,
   WalletBehaviourFactory,
   WalletBehaviourOptions,
   AccountState,
   HardwareWallet,
-  transformActions,
-  Transaction,
-  Optional,
 } from "@near-wallet-selector/core";
 
 import { isLedgerSupported, LedgerClient, Subscription } from "./ledger-client";
+import { Signer, utils } from "near-api-js";
 
 interface AuthData {
   accountId: string;
@@ -60,6 +58,34 @@ const Ledger: WalletBehaviourFactory<HardwareWallet> = async ({
 }) => {
   const _state = setupLedgerState(storage);
 
+  const signer: Signer = {
+    createKey: () => {
+      throw Error("Not implemented");
+    },
+    getPublicKey: async () => {
+      if (!_state.authData) {
+        throw new Error(`${metadata.name} not connected`);
+      }
+
+      return utils.PublicKey.from(_state.authData.publicKey);
+    },
+    signMessage: async (message: Uint8Array) => {
+      if (!_state.authData) {
+        throw new Error(`${metadata.name} not connected`);
+      }
+
+      const signature = await _state.client.sign({
+        data: message,
+        derivationPath: _state.authData.derivationPath,
+      });
+
+      return {
+        signature,
+        publicKey: utils.PublicKey.from(_state.authData.publicKey),
+      };
+    },
+  };
+
   const getAccounts = (
     authData: AuthData | null = _state.authData
   ): Array<AccountState> => {
@@ -146,58 +172,6 @@ const Ledger: WalletBehaviourFactory<HardwareWallet> = async ({
     return accountIds[0];
   };
 
-  const signTransactions = async (
-    transactions: Array<Optional<Transaction, "signerId">>
-  ) => {
-    if (!_state.authData) {
-      throw new Error(`${metadata.name} not connected`);
-    }
-
-    const { accountId, derivationPath, publicKey } = _state.authData;
-
-    const [block, accessKey] = await Promise.all([
-      provider.block({ finality: "final" }),
-      provider.viewAccessKey({ accountId, publicKey }),
-    ]);
-
-    const signedTransactions: Array<nearTransactions.SignedTransaction> = [];
-
-    for (let i = 0; i < transactions.length; i++) {
-      const actions = transformActions(transactions[i].actions);
-
-      const transaction = nearTransactions.createTransaction(
-        accountId,
-        utils.PublicKey.from(publicKey),
-        transactions[i].receiverId,
-        accessKey.nonce + i + 1,
-        actions,
-        utils.serialize.base_decode(block.header.hash)
-      );
-
-      const serializedTx = utils.serialize.serialize(
-        nearTransactions.SCHEMA,
-        transaction
-      );
-
-      const signature = await _state.client.sign({
-        data: serializedTx,
-        derivationPath,
-      });
-
-      const signedTx = new nearTransactions.SignedTransaction({
-        transaction,
-        signature: new nearTransactions.Signature({
-          keyType: transaction.publicKey.keyType,
-          data: signature,
-        }),
-      });
-
-      signedTransactions.push(signedTx);
-    }
-
-    return signedTransactions;
-  };
-
   return {
     async connect({ derivationPath }) {
       const existingAccounts = getAccounts();
@@ -266,14 +240,18 @@ const Ledger: WalletBehaviourFactory<HardwareWallet> = async ({
       // Note: Connection must be triggered by user interaction.
       await connectLedgerDevice();
 
-      const [signedTx] = await signTransactions([
-        {
-          receiverId,
-          actions,
-        },
-      ]);
+      const signedTransactions = await signTransactions(
+        [
+          {
+            receiverId,
+            actions,
+          },
+        ],
+        signer,
+        _state.authData.accountId
+      );
 
-      return provider.sendTransaction(signedTx);
+      return provider.sendTransaction(signedTransactions[0]);
     },
 
     async signAndSendTransactions({ transactions }) {
@@ -286,7 +264,11 @@ const Ledger: WalletBehaviourFactory<HardwareWallet> = async ({
       // Note: Connection must be triggered by user interaction.
       await connectLedgerDevice();
 
-      const signedTransactions = await signTransactions(transactions);
+      const signedTransactions = await signTransactions(
+        transactions,
+        signer,
+        _state.authData.accountId
+      );
 
       return Promise.all(
         signedTransactions.map((signedTx) => provider.sendTransaction(signedTx))

packages/math-wallet/src/lib/math-wallet.ts

@@ -1,15 +1,14 @@
-import { transactions as nearTransactions, utils } from "near-api-js";
-import isMobile from "is-mobile";
+import { isMobile } from "is-mobile";
 import {
   WalletModuleFactory,
   WalletBehaviourFactory,
   InjectedWallet,
   AccountState,
-  transformActions,
   waitFor,
 } from "@near-wallet-selector/core";
 
 import { InjectedMathWallet } from "./injected-math-wallet";
+import { signTransactions } from "@near-wallet-selector/wallet-utils";
 
 declare global {
   interface Window {
@@ -114,33 +113,18 @@ const MathWallet: WalletBehaviourFactory<InjectedWallet> = async ({
         throw new Error("Wallet not connected");
       }
 
-      const { accountId, publicKey } = account;
-      const [block, accessKey] = await Promise.all([
-        provider.block({ finality: "final" }),
-        provider.viewAccessKey({ accountId, publicKey }),
-      ]);
-
-      logger.log("MathWallet:signAndSendTransaction:block", block);
-      logger.log("MathWallet:signAndSendTransaction:accessKey", accessKey);
-
-      const transaction = nearTransactions.createTransaction(
-        accountId,
-        utils.PublicKey.from(publicKey),
-        receiverId,
-        accessKey.nonce + 1,
-        transformActions(actions),
-        utils.serialize.base_decode(block.header.hash)
-      );
-
-      const [hash, signedTx] = await nearTransactions.signTransaction(
-        transaction,
+      const signedTransactions = await signTransactions(
+        [
+          {
+            receiverId,
+            actions,
+          },
+        ],
         _state.wallet.signer,
-        accountId
+        account.accountId
       );
 
-      logger.log("MathWallet:signAndSendTransaction:hash", hash);
-
-      return provider.sendTransaction(signedTx);
+      return provider.sendTransaction(signedTransactions[0]);
     },
 
     async signAndSendTransactions({ transactions }) {
@@ -161,29 +145,11 @@ const MathWallet: WalletBehaviourFactory<InjectedWallet> = async ({
       logger.log("MathWallet:signAndSendTransactions:block", block);
       logger.log("MathWallet:signAndSendTransactions:accessKey", accessKey);
 
-      const signedTransactions: Array<nearTransactions.SignedTransaction> = [];
-      let nonce = accessKey.nonce;
-
-      for (let i = 0; i < transactions.length; i++) {
-        const transaction = nearTransactions.createTransaction(
-          accountId,
-          utils.PublicKey.from(publicKey),
-          transactions[i].receiverId,
-          ++nonce,
-          transformActions(transactions[i].actions),
-          utils.serialize.base_decode(block.header.hash)
-        );
-
-        const [hash, signedTx] = await nearTransactions.signTransaction(
-          transaction,
-          _state.wallet.signer,
-          accountId
-        );
-
-        logger.log("MathWallet:signAndSendTransactions:hash", hash);
-
-        signedTransactions.push(signedTx);
-      }
+      const signedTransactions = await signTransactions(
+        transactions,
+        _state.wallet.signer,
+        accountId
+      );
 
       logger.log(
         "MathWallet:signAndSendTransactions:signedTransactions",

packages/near-wallet/src/lib/near-wallet.ts

@@ -1,14 +1,19 @@
-import { WalletConnection, connect, keyStores, utils } from "near-api-js";
-import * as nearApi from "near-api-js";
+import {
+  WalletConnection,
+  connect,
+  keyStores,
+  transactions as nearTransactions,
+  utils,
+} from "near-api-js";
 import {
   WalletModuleFactory,
   WalletBehaviourFactory,
   BrowserWallet,
   Transaction,
   Optional,
-  transformActions,
   Network,
 } from "@near-wallet-selector/core";
+import { createAction } from "@near-wallet-selector/wallet-utils";
 
 export interface NearWalletParams {
   walletUrl?: string;
@@ -95,10 +100,10 @@ const NearWallet: WalletBehaviourFactory<
 
     return Promise.all(
       transactions.map(async (transaction, index) => {
-        const actions = transformActions(transaction.actions);
+        const actions = createAction(transaction.actions);
         const accessKey = await account.accessKeyForTransaction(
           transaction.receiverId,
-          actions,
+          createAction(transaction.actions),
           localKey
         );
 
@@ -110,7 +115,7 @@ const NearWallet: WalletBehaviourFactory<
 
         const block = await provider.block({ finality: "final" });
 
-        return nearApi.transactions.createTransaction(
+        return nearTransactions.createTransaction(
           account.accountId,
           utils.PublicKey.from(accessKey.public_key),
           transaction.receiverId,
@@ -169,7 +174,7 @@ const NearWallet: WalletBehaviourFactory<
 
       return account["signAndSendTransaction"]({
         receiverId,
-        actions: transformActions(actions),
+        actions: createAction(actions),
       }).then(() => {
         // Suppress response since transactions with deposits won't actually
         // return FinalExecutionOutcome.

packages/sender/src/lib/sender.ts

@@ -1,4 +1,4 @@
-import isMobile from "is-mobile";
+import { isMobile } from "is-mobile";
 import {
   WalletModuleFactory,
   WalletBehaviourFactory,

packages/wallet-utils/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+}

packages/wallet-utils/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

packages/wallet-utils/README.md

@@ -0,0 +1,10 @@
+# @near-wallet-selector/wallet-utils
+
+This is the Wallet Utils package for NEAR Wallet Selector.
+
+## Installation and Usage
+
+
+## License
+
+This repository is distributed under the terms of both the MIT license and the Apache License (Version 2.0).

packages/wallet-utils/jest.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  displayName: "wallet-utils",
+  preset: "../../jest.preset.js",
+  globals: {
+    "ts-jest": {
+      tsconfig: "<rootDir>/tsconfig.spec.json",
+    },
+  },
+  transform: {
+    "^.+\\.[tj]sx?$": "ts-jest",
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx"],
+  coverageDirectory: "../../coverage/packages/wallet-utils",
+};