Merge branch 'dev' into main

near · Feb 6, 2025 · d2c47d5 · d2c47d5
2 parents a580b38 + f11258a
commit d2c47d5
Show file tree

Hide file tree

Showing 158 changed files with 14,740 additions and 8,554 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,7 +14,6 @@ updates:
       - dependency-name: "@walletconnect/sign-client"
       - dependency-name: "better-sqlite3"
       - dependency-name: "big.js"
-      - dependency-name: "bn.js"
       - dependency-name: "buffer"
       - dependency-name: "copy-to-clipboard"
       - dependency-name: "is-mobile"
@@ -26,7 +25,6 @@ updates:
       - dependency-name: "rxjs"
       - dependency-name: "tslib"
       - dependency-name: "@types/big.js"
-      - dependency-name: "@types/bn.js"
       - dependency-name: "@types/gh-pages"
       - dependency-name: "@types/qrcode"
       - dependency-name: "@types/w3c-web-hid"

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/.gitignore b/.gitignore
@@ -10,7 +10,7 @@
 /out-tsc
 
 # dependencies
-/node_modules
+node_modules
 
 # IDEs and editors
 /.idea
@@ -44,7 +44,7 @@ testem.log
 Thumbs.db
 
 .angular
-.npmrc
+package-lock.json
 
 # Next.js
 .next
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+save-exact=true
+legacy-peer-deps=true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,8 +2,7 @@
   "eslint.format.enable": true,
   "prettier.enable": false,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint":
-    true
+    "source.fixAll.eslint": "explicit"
   },
   "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+save-exact true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,7 +33,14 @@ Build and deploy angular example
 yarn nx build angular # build the angular example
 yarn nx deploy angular # deploys angular example to gh-pages
 ```
+# Submitting a PR
+The initial comment has instructions. For your PR to be considered, you must select a template, include details, and make the appropriate selections from the checkboxes provided.
 
+1. Select the preview tab.
+2. Select the applicable template. This replaces the comment with the correct placeholder text.
+
+![Submit PR Step 1](https://github.com/near/wallet-selector/blob/main/images/submit_PR_step_1.png)
+![Submit PR Step 2](https://github.com/near/wallet-selector/blob/main/images/submit_PR_step_2.png)
 
 # Branching
 

diff --git a/README.md b/README.md
@@ -2,25 +2,29 @@
 
 NEAR Wallet Selector makes it easy for users to interact with your dApp by providing an abstraction over various wallets within the NEAR ecosystem:
 
-- [My NEAR Wallet](https://www.npmjs.com/package/@near-wallet-selector/my-near-wallet) - Browser wallet.
-- [Mintbase Wallet](https://www.npmjs.com/package/@near-wallet-selector/mintbase-wallet) - Browser wallet.
+- [Bitget Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitget-wallet) - Injected wallet.
+- [Bitte Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitte-wallet) - Browser wallet.
+- [Coin98 Wallet](https://www.npmjs.com/package/@near-wallet-selector/coin98-wallet) - Injected wallet.
+- [Ethereum wallets](https://www.npmjs.com/package/@near-wallet-selector/ethereum-wallets) - Injected wallet.
+- [Here Wallet](https://www.npmjs.com/package/@near-wallet-selector/here-wallet) - Mobile wallet.
 - [Ledger](https://www.npmjs.com/package/@near-wallet-selector/ledger) - Hardware wallet.
-- [Sender](https://www.npmjs.com/package/@near-wallet-selector/sender) - Injected wallet.
 - [Math Wallet](https://www.npmjs.com/package/@near-wallet-selector/math-wallet) - Injected wallet.
-- [Nightly](https://www.npmjs.com/package/@near-wallet-selector/nightly) - Injected wallet.
-- [Meteor Wallet](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet) - Injected wallet.
 - [Metamask Snap](https://www.npmjs.com/package/@near-wallet-selector/near-snap) - Injected wallet.
+- [Meteor Wallet](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet) - Injected wallet.
+- [Meteor Wallet App](https://www.npmjs.com/package/@near-wallet-selector/meteor-wallet-app) - Instant link wallet.
+- [Mintbase Wallet](https://www.npmjs.com/package/@near-wallet-selector/mintbase-wallet) - Browser wallet.
+- [My NEAR Wallet](https://www.npmjs.com/package/@near-wallet-selector/my-near-wallet) - Browser wallet.
 - [Narwallets](https://www.npmjs.com/package/@near-wallet-selector/narwallets) - Injected wallet.
-- [WELLDONE Wallet](https://www.npmjs.com/package/@near-wallet-selector/welldone-wallet) - Injected wallet.
-- [Coin98 Wallet](https://www.npmjs.com/package/@near-wallet-selector/coin98-wallet) - Injected wallet.
+- [Near Mobile Wallet](https://www.npmjs.com/package/@near-wallet-selector/near-mobile-wallet) - Mobile Wallet.
+- [NearFi Wallet](https://www.npmjs.com/package/@near-wallet-selector/nearfi) - Mobile wallet.
 - [Neth](https://www.npmjs.com/package/@near-wallet-selector/neth) - Injected wallet.
-- [XDEFI Wallet](https://www.npmjs.com/package/@near-wallet-selector/xdefi) - Injected wallet.
+- [Nightly](https://www.npmjs.com/package/@near-wallet-selector/nightly) - Injected wallet.
+- [OKX Wallet](https://www.npmjs.com/package/@near-wallet-selector/okx-wallet) - Injected wallet.
 - [Ramper Wallet](https://www.npmjs.com/package/@near-wallet-selector/ramper-wallet) - Injected wallet.
-- [Bitget Wallet](https://www.npmjs.com/package/@near-wallet-selector/bitget-wallet) - Injected wallet.
-- [Here Wallet](https://www.npmjs.com/package/@near-wallet-selector/here-wallet) - Mobile wallet.
-- [NearFi Wallet](https://www.npmjs.com/package/@near-wallet-selector/nearfi) - Mobile wallet.
-- [Near Mobile Wallet](https://www.npmjs.com/package/@near-wallet-selector/near-mobile-wallet) - Mobile Wallet.
+- [Sender](https://www.npmjs.com/package/@near-wallet-selector/sender) - Injected wallet.
 - [WalletConnect](https://www.npmjs.com/package/@near-wallet-selector/wallet-connect) - Bridge wallet.
+- [WELLDONE Wallet](https://www.npmjs.com/package/@near-wallet-selector/welldone-wallet) - Injected wallet.
+- [XDEFI Wallet](https://www.npmjs.com/package/@near-wallet-selector/xdefi) - Injected wallet.
 
 ## Preview
 
@@ -61,6 +65,8 @@ yarn add \
   @near-wallet-selector/math-wallet \
   @near-wallet-selector/nightly \
   @near-wallet-selector/meteor-wallet \
+  @near-wallet-selector/meteor-wallet-app \
+  @near-wallet-selector/okx-wallet \
   @near-wallet-selector/narwallets \
   @near-wallet-selector/welldone-wallet \
   @near-wallet-selector/near-snap \
@@ -71,7 +77,11 @@ yarn add \
   @near-wallet-selector/xdefi \
   @near-wallet-selector/ramper-wallet \
   @near-wallet-selector/near-mobile-wallet  \
-  @near-wallet-selector/mintbase-wallet
+  @near-wallet-selector/bitget-wallet \
+  @near-wallet-selector/mintbase-wallet \
+  @near-wallet-selector/bitte-wallet \
+  @near-wallet-selector/ethereum-wallets
+
 
 # Using NPM.
 npm install \
@@ -83,6 +93,8 @@ npm install \
   @near-wallet-selector/math-wallet \
   @near-wallet-selector/nightly \
   @near-wallet-selector/meteor-wallet \
+  @near-wallet-selector/meteor-wallet-app \
+  @near-wallet-selector/okx-wallet \
   @near-wallet-selector/narwallets \
   @near-wallet-selector/welldone-wallet \
   @near-wallet-selector/near-snap \
@@ -93,7 +105,10 @@ npm install \
   @near-wallet-selector/xdefi \
   @near-wallet-selector/ramper-wallet \
   @near-wallet-selector/near-mobile-wallet \
-  @near-wallet-selector/mintbase-wallet
+  @near-wallet-selector/bitget-wallet \
+  @near-wallet-selector/mintbase-wallet \
+  @near-wallet-selector/bitte-wallet \
+  @near-wallet-selector/ethereum-wallets
 ```
 
 Optionally, you can install our [`modal-ui`](https://www.npmjs.com/package/@near-wallet-selector/modal-ui) or [`modal-ui-js`](https://www.npmjs.com/package/@near-wallet-selector/modal-ui-js) package for a pre-built interface that wraps the `core` API and presents the supported wallets:
@@ -119,9 +134,10 @@ import { setupNearSnap } from "@near-wallet-selector/near-snap";
 import { setupMathWallet } from "@near-wallet-selector/math-wallet";
 import { setupNightly } from "@near-wallet-selector/nightly";
 import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
+import { setupMeteorWalletApp } from "@near-wallet-selector/meteor-wallet-app";
+import { setupOkxWallet } from "@near-wallet-selector/okx-wallet";
 import { setupNarwallets } from "@near-wallet-selector/narwallets";
 import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
-import { setupNearSnap } from "@near-wallet-selector/near-snap";
 import { setupLedger } from "@near-wallet-selector/ledger";
 import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupNearFi } from "@near-wallet-selector/nearfi";
@@ -131,6 +147,8 @@ import { setupXDEFI } from "@near-wallet-selector/xdefi";
 import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
 import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet"; 
 import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet"; 
+import { setupBitteWallet } from "@near-wallet-selector/bitte-wallet";
+import { setupEthereumWallets } from "@near-wallet-selector/ethereum-wallets";
 
 const selector = await setupWalletSelector({
   network: "testnet",
@@ -142,7 +160,9 @@ const selector = await setupWalletSelector({
     setupMathWallet(),
     setupNightly(),
     setupMeteorWallet(),
+    setupMeteorWalletApp({ contractId: "guest-book.testnet" }),
     setupNearSnap(),
+    setupOkxWallet(),
     setupNarwallets(),
     setupWelldoneWallet(),
     setupLedger(),
@@ -165,7 +185,14 @@ const selector = await setupWalletSelector({
           walletUrl: "https://wallet.mintbase.xyz",
           callbackUrl: "https://www.mywebsite.com",
           deprecated: false,
-      }),
+    }),
+    setupBitteWallet({
+        networkId: "mainnet",
+        walletUrl: "https://wallet.bitte.ai",
+        callbackUrl: "https://www.mywebsite.com",
+        deprecated: false,
+    }),
+    setupEthereumWallets({ wagmiConfig, web3Modal }),
   ],
 });
 

diff --git a/examples/angular/project.json b/examples/angular/project.json
@@ -108,6 +108,11 @@
             "glob": "**/*",
             "input": "packages/okx-wallet/assets/",
             "output": "assets/"
+          },
+          {
+            "glob": "**/*",
+            "input": "packages/ethereum-wallets/assets/",
+            "output": "assets/"
           }
         ],
         "styles": ["examples/angular/src/styles.scss"],
@@ -120,7 +125,7 @@
             {
               "type": "initial",
               "maximumWarning": "500kb",
-              "maximumError": "5mb"
+              "maximumError": "6mb"
             },
             {
               "type": "anyComponentStyle",

diff --git a/examples/angular/src/app/components/content/content.component.ts b/examples/angular/src/app/components/content/content.component.ts
@@ -25,7 +25,6 @@ import { WalletSelectorModal } from "@near-wallet-selector/modal-ui-js";
 import { CONTRACT_ID } from "../../../constants";
 import { WalletSelector } from "@near-wallet-selector/core";
 import type { GetAccountBalanceProps } from "../../interfaces/account-balance";
-import BN from "bn.js";
 
 const SUGGESTED_DONATION = "0";
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -67,8 +66,8 @@ export class ContentComponent implements OnInit, OnDestroy {
         finality: "final",
         account_id: accountId,
       });
-      const bn = new BN(amount);
-      return { hasBalance: !bn.isZero() };
+      const bn = BigInt(amount);
+      return { hasBalance: bn !== BigInt(0) };
     } catch {
       return { hasBalance: false };
     }

diff --git a/examples/angular/src/app/pages/wallet-selector-export/wallet-selector-export.component.ts b/examples/angular/src/app/pages/wallet-selector-export/wallet-selector-export.component.ts
@@ -8,6 +8,7 @@ import { setupXDEFI } from "@near-wallet-selector/xdefi";
 import { setupMathWallet } from "@near-wallet-selector/math-wallet";
 import { setupNightly } from "@near-wallet-selector/nightly";
 import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
+import { setupMeteorWalletApp } from "@near-wallet-selector/meteor-wallet-app";
 import { setupNarwallets } from "@near-wallet-selector/narwallets";
 import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
 import { setupHereWallet } from "@near-wallet-selector/here-wallet";
@@ -22,6 +23,8 @@ import { setupRamperWallet } from "@near-wallet-selector/ramper-wallet";
 import { setupNearMobileWallet } from "@near-wallet-selector/near-mobile-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
 import { setupMintbaseWallet } from "@near-wallet-selector/mintbase-wallet";
+import { setupBitteWallet } from "@near-wallet-selector/bitte-wallet";
+import { CONTRACT_ID } from "../../../constants";
 
 declare global {
   interface Window {
@@ -61,6 +64,7 @@ export class WalletSelectorExportComponent implements OnInit {
         setupMathWallet(),
         setupNightly(),
         setupMeteorWallet(),
+        setupMeteorWalletApp({ contractId: CONTRACT_ID }),
         setupNarwallets(),
         setupWelldoneWallet(),
         setupHereWallet(),
@@ -80,7 +84,8 @@ export class WalletSelectorExportComponent implements OnInit {
         }),
         setupRamperWallet(),
         setupNearMobileWallet(),
-        setupMintbaseWallet({ contractId: "guest-book.testnet" }),
+        setupMintbaseWallet({ contractId: CONTRACT_ID }),
+        setupBitteWallet({ contractId: CONTRACT_ID }),
       ],
     });
     /**