Merge branch 'main' of github.com:near/wallet-selector into ledger/fe…

…at/sign-message
Peersyst · Dec 19, 2024 · 7a315f9 · 7a315f9
2 parents 8c48c13 + f7ca952
commit 7a315f9
Show file tree

Hide file tree

Showing 34 changed files with 78 additions and 204 deletions.
diff --git a/.github/workflows/add-to-devtools.yml b/.github/workflows/add-to-devtools.yml
@@ -0,0 +1,22 @@
+name: 'Add to DevTools Project'
+
+on:
+  issues:
+    types:
+      - opened
+      - reopened
+  pull_request:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  add-to-project:
+    name: Add issue/PR to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          # add to DevTools Project #156
+          project-url: https://github.com/orgs/near/projects/156
+          github-token: ${{ secrets.GH_TOKEN }}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "near-wallet-selector",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem",
   "keywords": [
     "near",
@@ -107,9 +107,8 @@
     "@walletconnect/modal": "2.6.2",
     "@walletconnect/sign-client": "2.13.0",
     "@web3modal/wagmi": "5.0.6",
-    "better-sqlite3": "11.3.0",
     "big.js": "6.2.2",
-    "borsh": "0.7.0",
+    "borsh": "1.0.0",
     "browserify-fs": "1.0.0",
     "bs58": "5.0.0",
     "buffer": "6.0.3",
@@ -223,4 +222,4 @@
     "webpack": "5.75.0",
     "webpack-merge": "5.8.0"
   }
-}
+}
diff --git a/packages/account-export/package.json b/packages/account-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/account-export",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "This is the Export Selector UI package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/arepa-wallet/package.json b/packages/arepa-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/arepa-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Arepa Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/bitget-wallet/package.json b/packages/bitget-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/bitget-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Bitget wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/bitte-wallet/package.json b/packages/bitte-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/bitte-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Bitte wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/coin98-wallet/package.json b/packages/coin98-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/coin98-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Coin 98 wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/core",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "This is the core package for NEAR Wallet Selector.",
   "keywords": [
     "near",
@@ -20,7 +20,6 @@
   },
   "homepage": "https://github.com/near/wallet-selector/tree/main/packages/core",
   "peerDependencies": {
-    "near-api-js": "4.0.3",
-    "@near-js/providers": "latest"
+    "near-api-js": "4.0.3"
   }
-}
+}
diff --git a/packages/core/src/lib/helpers/verify-signature/payload.ts b/packages/core/src/lib/helpers/verify-signature/payload.ts
@@ -1,4 +1,5 @@
 import type { SignMessageParams } from "../../wallet";
+import type { Schema } from "borsh";
 import { serialize } from "borsh";
 
 export class Payload {
@@ -21,27 +22,15 @@ export class Payload {
   }
 }
 
-export const payloadSchema = new Map([
-  [
-    Payload,
-    {
-      kind: "struct",
-      fields: [
-        ["tag", "u32"],
-        ["message", "string"],
-        ["nonce", [32]],
-        ["recipient", "string"],
-        [
-          "callbackUrl",
-          {
-            kind: "option",
-            type: "string",
-          },
-        ],
-      ],
-    },
-  ],
-]);
+export const payloadSchema: Schema = {
+  struct: {
+    tag: "u32",
+    message: "string",
+    nonce: { array: { type: "u8", len: 32 } },
+    recipient: "string",
+    callbackUrl: { option: "string" },
+  },
+};
 
 export const serializeNep413 = (
   signMessageParams: SignMessageParams

diff --git a/packages/core/src/lib/wallet-selector.spec.ts b/packages/core/src/lib/wallet-selector.spec.ts
@@ -1,7 +1,9 @@
 import { setupWalletSelector } from "./wallet-selector";
-import { FailoverRpcProvider } from "@near-js/providers";
 import { getNetworkPreset } from "./options";
-import { JsonRpcProvider } from "near-api-js/lib/providers";
+import {
+  JsonRpcProvider,
+  FailoverRpcProvider,
+} from "near-api-js/lib/providers";
 import type { Network } from "./options.types";
 import type { Store } from "./store.types";
 import type { WalletModuleFactory } from "./wallet";
@@ -52,8 +54,8 @@ jest.mock("./store", () => {
   };
 });
 
-jest.mock("@near-js/providers", () => {
-  const originalModule = jest.requireActual("@near-js/providers");
+jest.mock("near-api-js/lib/providers", () => {
+  const originalModule = jest.requireActual("near-api-js/lib/providers");
   return {
     ...originalModule,
     FailoverRpcProvider: jest.fn(),

diff --git a/packages/ethereum-wallets/package.json b/packages/ethereum-wallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/ethereum-wallets",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Ethereum wallets package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/here-wallet/package.json b/packages/here-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/here-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Here wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/ledger",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Ledger package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/math-wallet/package.json b/packages/math-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/math-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Math wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/meteor-wallet/package.json b/packages/meteor-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/meteor-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Meteor wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/mintbase-wallet/package.json b/packages/mintbase-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/mintbase-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Mintbase wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/modal-ui-js/package.json b/packages/modal-ui-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/modal-ui-js",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/modal-ui/package.json b/packages/modal-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/modal-ui",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/my-near-wallet/package.json b/packages/my-near-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/my-near-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "My Near Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/narwallets/package.json b/packages/narwallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/narwallets",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "This is the Narwallets package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/near-mobile-wallet/package.json b/packages/near-mobile-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/near-mobile-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "NEAR Mobile wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/near-snap/package.json b/packages/near-snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/near-snap",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Metamask snap to interact with Near dapps.",
   "keywords": [
     "near",

diff --git a/packages/nearfi/package.json b/packages/nearfi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/nearfi",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Nearfi package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/neth/package.json b/packages/neth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/neth",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Control NEAR accounts with ETH accounts",
   "author": "mattlockyer",
   "keywords": [

diff --git a/packages/nightly/package.json b/packages/nightly/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/nightly",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Nightly wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/okx-wallet/package.json b/packages/okx-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/okx-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "OKX Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/ramper-wallet/package.json b/packages/ramper-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/ramper-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Ramper wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/sender/package.json b/packages/sender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/sender",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Sender wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/wallet-connect/package.json b/packages/wallet-connect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/wallet-connect",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Wallet Connect package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/wallet-utils/package.json b/packages/wallet-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/wallet-utils",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Wallet utils package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/welldone-wallet/package.json b/packages/welldone-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/welldone-wallet",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "Welldone wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/xdefi/package.json b/packages/xdefi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/xdefi",
-  "version": "8.9.14",
+  "version": "8.9.15",
   "description": "This is the XDEFI package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -21,12 +21,6 @@
     "baseUrl": ".",
     "strictPropertyInitialization": false,
     "paths": {
-      "@near-js/types": [
-        "node_modules/@near-js/types"
-      ],
-      "@near-js/keystores": [
-        "node_modules/@near-js/keystores"
-      ],
       "@near-wallet-selector/account-export": [
         "packages/account-export/src/index.ts"
       ],