Merge pull request #695 from near/dev

v7.8.0 Release (dev -> main)
near · Feb 9, 2023 · 7b8c36b · 7b8c36b
2 parents 051478a + 6524fa7
commit 7b8c36b
Show file tree

Hide file tree

Showing 43 changed files with 138 additions and 90 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -166,8 +166,3 @@ Wallets shall checkbox a statement of compliance to be maintained on the wallet
 
 41. Communication between infrastructure elements should be secured to the maximum extent possible.
     Please link to your the statement on your website or GitHub repo showing a statement of compliance. Please put link below (even if it is a placeholder).
-
-
-# Default Wallet List Criteria:
-
-To be included in the default wallet list, a wallet project must have met the Wallet Product Criteria, the Wallet Security Criteria, and completed an audit.
diff --git a/README.md b/README.md
@@ -122,7 +122,6 @@ import { setupWelldoneWallet } from "@near-wallet-selector/welldone-wallet";
 import { setupLedger } from "@near-wallet-selector/ledger";
 import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
-import { setupDefaultWallets } from "@near-wallet-selector/default-wallets";
 import { setupNearFi } from "@near-wallet-selector/nearfi";
 import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
 import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
@@ -133,7 +132,6 @@ import { setupXDEFI } from "@near-wallet-selector/xdefi";
 const selector = await setupWalletSelector({
   network: "testnet",
   modules: [
-    ...(await setupDefaultWallets()),
     setupNearWallet(),
     setupMyNearWallet(),
     setupSender(),

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
@@ -2,7 +2,6 @@ import type { OnInit } from "@angular/core";
 import type { AccountState, WalletSelector } from "@near-wallet-selector/core";
 import { setupWalletSelector } from "@near-wallet-selector/core";
 import type { WalletSelectorModal } from "@near-wallet-selector/account-export";
-import { setupDefaultWallets } from "@near-wallet-selector/default-wallets";
 import { setupNearWallet } from "@near-wallet-selector/near-wallet";
 import { setupSender } from "@near-wallet-selector/sender";
 import { setupXDEFI } from "@near-wallet-selector/xdefi";
@@ -21,6 +20,8 @@ import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
 import { Component } from "@angular/core";
 import { setupExportSelectorModal } from "@near-wallet-selector/account-export";
+import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
+import { setupLedger } from "@near-wallet-selector/ledger";
 
 declare global {
   interface Window {
@@ -52,7 +53,8 @@ export class WalletSelectorExportComponent implements OnInit {
       network: "testnet",
       debug: true,
       modules: [
-        ...(await setupDefaultWallets()),
+        setupMyNearWallet(),
+        setupLedger(),
         setupNearWallet(),
         setupSender(),
         setupXDEFI(),

diff --git a/examples/angular/src/app/pages/wallet-selector/wallet-selector.component.ts b/examples/angular/src/app/pages/wallet-selector/wallet-selector.component.ts
@@ -3,7 +3,6 @@ import type { AccountState, WalletSelector } from "@near-wallet-selector/core";
 import { setupWalletSelector } from "@near-wallet-selector/core";
 import type { WalletSelectorModal } from "@near-wallet-selector/modal-ui-js";
 import { setupModal } from "@near-wallet-selector/modal-ui-js";
-import { setupDefaultWallets } from "@near-wallet-selector/default-wallets";
 import { setupNearWallet } from "@near-wallet-selector/near-wallet";
 import { setupSender } from "@near-wallet-selector/sender";
 import { setupXDEFI } from "@near-wallet-selector/xdefi";
@@ -20,8 +19,10 @@ import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
 import { setupFinerWallet } from "@near-wallet-selector/finer-wallet";
 import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupNightlyConnect } from "@near-wallet-selector/nightly-connect";
-import { CONTRACT_ID } from "../../../constants";
 import { Component } from "@angular/core";
+import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
+import { setupLedger } from "@near-wallet-selector/ledger";
+import { CONTRACT_ID } from "../../../constants";
 
 declare global {
   interface Window {
@@ -53,7 +54,8 @@ export class WalletSelectorComponent implements OnInit {
       network: "testnet",
       debug: true,
       modules: [
-        ...(await setupDefaultWallets()),
+        setupMyNearWallet(),
+        setupLedger(),
         setupNearWallet(),
         setupSender(),
         setupXDEFI(),

diff --git a/examples/react/contexts/WalletSelectorContext.tsx b/examples/react/contexts/WalletSelectorContext.tsx
@@ -1,7 +1,6 @@
 import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
 import type { AccountState, WalletSelector } from "@near-wallet-selector/core";
 import { setupWalletSelector } from "@near-wallet-selector/core";
-import { setupDefaultWallets } from "@near-wallet-selector/default-wallets";
 import { setupHereWallet } from "@near-wallet-selector/here-wallet";
 import { setupMathWallet } from "@near-wallet-selector/math-wallet";
 import { setupMeteorWallet } from "@near-wallet-selector/meteor-wallet";
@@ -23,8 +22,10 @@ import { distinctUntilChanged, map } from "rxjs";
 import { setupNeth } from "@near-wallet-selector/neth";
 import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
 import { setupFinerWallet } from "@near-wallet-selector/finer-wallet";
-import { CONTRACT_ID } from "../constants";
 import { Loading } from "../components/Loading";
+import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
+import { setupLedger } from "@near-wallet-selector/ledger";
+import { CONTRACT_ID } from "../constants";
 
 declare global {
   interface Window {
@@ -55,7 +56,8 @@ export const WalletSelectorContextProvider: React.FC<{
       network: "testnet",
       debug: true,
       modules: [
-        ...(await setupDefaultWallets()),
+        setupMyNearWallet(),
+        setupLedger(),
         setupNearWallet(),
         setupSender(),
         setupMathWallet(),

diff --git a/examples/react/contexts/WalletSelectorExportContext.tsx b/examples/react/contexts/WalletSelectorExportContext.tsx
@@ -5,7 +5,6 @@ import { setupWalletSelector } from "@near-wallet-selector/core";
 import type { WalletSelector, AccountState } from "@near-wallet-selector/core";
 import { setupExportSelectorModal } from "@near-wallet-selector/account-export";
 import type { WalletSelectorModal } from "@near-wallet-selector/account-export";
-import { setupDefaultWallets } from "@near-wallet-selector/default-wallets";
 import { setupNearWallet } from "@near-wallet-selector/near-wallet";
 import { setupHereWallet } from "@near-wallet-selector/here-wallet";
 import { setupSender } from "@near-wallet-selector/sender";
@@ -19,6 +18,8 @@ import { setupWalletConnect } from "@near-wallet-selector/wallet-connect";
 import { setupCoin98Wallet } from "@near-wallet-selector/coin98-wallet";
 import { setupOptoWallet } from "@near-wallet-selector/opto-wallet";
 import { Loading } from "../components/Loading";
+import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
+import { setupLedger } from "@near-wallet-selector/ledger";
 
 declare global {
   interface Window {
@@ -49,7 +50,8 @@ export const ExportAccountSelectorContextProvider: React.FC<{
       network: "testnet",
       debug: true,
       modules: [
-        ...(await setupDefaultWallets()),
+        setupMyNearWallet(),
+        setupLedger(),
         setupNearWallet(),
         setupSender(),
         setupMathWallet(),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "near-wallet-selector",
-  "version": "7.7.0",
+  "version": "7.8.0",
   "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",
@@ -87,10 +87,10 @@
     "@ledgerhq/hw-transport-webhid": "6.27.1",
     "@metamask/detect-provider": "^2.0.0",
     "@meteorwallet/sdk": "^0.6.0",
-    "@nightlylabs/connect-near": "0.0.14",
+    "@nightlylabs/connect-near": "0.0.15",
     "@walletconnect/qrcode-modal": "2.0.0-alpha.20",
     "@walletconnect/sign-client": "2.1.4",
-    "better-sqlite3": "^8.0.0",
+    "better-sqlite3": "^8.0.1",
     "big.js": "^6.1.1",
     "bn.js": "^5.2.0",
     "bs58": "^5.0.0",
@@ -109,7 +109,7 @@
     "react-dom": "18.2.0",
     "react-qr-code": "^2.0.11",
     "regenerator-runtime": "0.13.11",
-    "rxjs": "^7.5.7",
+    "rxjs": "^7.8.0",
     "stream-browserify": "^3.0.0",
     "tslib": "^2.3.0",
     "tweetnacl": "^1.0.3",
@@ -170,7 +170,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "7.30.1",
     "eslint-plugin-react-hooks": "4.6.0",
-    "gh-pages": "^4.0.0",
+    "gh-pages": "^5.0.0",
     "jest": "27.5.1",
     "jest-mock-extended": "^2.0.6",
     "jest-preset-angular": "^12.2.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": "7.7.0",
+  "version": "7.8.0",
   "description": "This is the Export Selector UI 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": "7.7.0",
+  "version": "7.8.0",
   "description": "Coin 98 wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -45,6 +45,7 @@ const selector = await setupWalletSelector({
   - `indexerUrl` (`string`): Custom URL for the Indexer service.
 - `debug` (`boolean?`): Enable internal logging for debugging purposes. Defaults to `false`.
 - `optimizeWalletOrder` (`boolean?`): Enable automatic wallet order. Reorders last signed in wallet on top, then installed wallets over not installed and deprecated wallets.
+- `randomizeWalletOrder` (`boolean?`): Randomize wallets order in the `More` section of the UI.
 - `allowMultipleSelectors` (`boolean?`): Optionally allow creating new instances of wallet selector.
 - `storage` (`StorageService?`): Async storage implementation. Useful when [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) is unavailable. Defaults to `localStorage`.
 - `modules` (`Array<WalletModuleFactory>`): List of wallets to support in your dApp.

diff --git a/packages/core/docs/api/selector.md b/packages/core/docs/api/selector.md
@@ -11,7 +11,7 @@
   - `explorerUrl` (`string`): URL for the NEAR explorer.
 - `debug` (`boolean`): Whether internal logging is enabled.
 - `optimizeWalletOrder` (`boolean`): Whether wallet order optimization is enabled.
-
+- `randomizeWalletOrder` (`boolean`): Weather wallet order randomization is enabled.
 **Description**
 
 Resolved variation of the options passed to `setupWalletSelector`.

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

diff --git a/packages/core/src/lib/options.ts b/packages/core/src/lib/options.ts
@@ -34,6 +34,7 @@ export const resolveOptions = (params: WalletSelectorParams) => {
     network: resolveNetwork(params.network),
     debug: params.debug || false,
     optimizeWalletOrder: params.optimizeWalletOrder === false ? false : true,
+    randomizeWalletOrder: params.randomizeWalletOrder || false,
   };
 
   return {

diff --git a/packages/core/src/lib/options.types.ts b/packages/core/src/lib/options.types.ts
@@ -12,4 +12,5 @@ export interface Options {
   network: Network;
   debug: boolean;
   optimizeWalletOrder: boolean;
+  randomizeWalletOrder: boolean;
 }
diff --git a/packages/core/src/lib/wallet-selector.types.ts b/packages/core/src/lib/wallet-selector.types.ts
@@ -14,6 +14,7 @@ export interface WalletSelectorParams {
   debug?: boolean;
   optimizeWalletOrder?: boolean;
   allowMultipleSelectors?: boolean;
+  randomizeWalletOrder?: boolean;
 }
 
 export type WalletSelectorStore = ReadOnlyStore;

diff --git a/packages/default-wallets/README.md b/packages/default-wallets/README.md
@@ -4,9 +4,7 @@ This is the Default Wallets package for NEAR Wallet Selector.
 
 This is the list of default wallets:
 
-- [My NEAR Wallet](https://www.npmjs.com/package/@near-wallet-selector/my-near-wallet) - Browser wallet.
-- [Ledger](https://www.npmjs.com/package/@near-wallet-selector/ledger) - Hardware wallet.
-
+>**Note**: This package does not contain any wallets by default.
 
 ## Installation and Usage
 

diff --git a/packages/default-wallets/package.json b/packages/default-wallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/default-wallets",
-  "version": "7.7.0",
+  "version": "7.8.0",
   "description": "Default wallets package for NEAR Wallet Selector.",
   "keywords": [
     "near",

diff --git a/packages/default-wallets/src/lib/default-wallets.ts b/packages/default-wallets/src/lib/default-wallets.ts
@@ -1,9 +1,7 @@
-import { setupMyNearWallet } from "@near-wallet-selector/my-near-wallet";
-import { setupLedger } from "@near-wallet-selector/ledger";
 import type { WalletModuleFactory } from "@near-wallet-selector/core";
 
 export const setupDefaultWallets = async (): Promise<
   Array<WalletModuleFactory>
 > => {
-  return [setupMyNearWallet(), setupLedger()];
+  return [];
 };
diff --git a/packages/finer-wallet/package.json b/packages/finer-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@near-wallet-selector/finer-wallet",
-  "version": "7.7.0",
+  "version": "7.8.0",
   "description": "FiNER Wallet 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": "7.7.0",
+  "version": "7.8.0",
   "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": "7.7.0",
+  "version": "7.8.0",
   "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": "7.7.0",
+  "version": "7.8.0",
   "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": "7.7.0",
+  "version": "7.8.0",
   "description": "Meteor 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": "7.7.0",
+  "version": "7.8.0",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/modal-ui-js/src/lib/render-modal.ts b/packages/modal-ui-js/src/lib/render-modal.ts
@@ -288,7 +288,15 @@ export function renderModal() {
       `
     );
     renderOptionsList(".recent-options-list-content", recentlySignedInWallets);
-    renderOptionsList(".more-options-list-content", moreWallets);
+
+    if (modalState.selector.options.randomizeWalletOrder) {
+      renderOptionsList(
+        ".more-options-list-content",
+        moreWallets.sort(() => Math.random() - 0.5)
+      );
+    } else {
+      renderOptionsList(".more-options-list-content", moreWallets);
+    }
   } else {
     document
       .querySelector(".wallet-options-wrapper")

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": "7.7.0",
+  "version": "7.8.0",
   "description": "Modal UI package for NEAR wallet Selector",
   "keywords": [
     "near",

diff --git a/packages/modal-ui/src/lib/components/WalletOptions.tsx b/packages/modal-ui/src/lib/components/WalletOptions.tsx
@@ -61,8 +61,11 @@ export const WalletOptions: React.FC<WalletOptionsProps> = ({
         setRecentModules(recentlySignedInWallets);
         setMoreModules(moreWallets);
       }
-
-      setModules(state.modules);
+      if (selector.options.randomizeWalletOrder) {
+        setModules(state.modules.sort(() => Math.random() - 0.5));
+      } else {
+        setModules(state.modules);
+      }
     });
     return () => subscription.unsubscribe();
     // eslint-disable-next-line react-hooks/exhaustive-deps

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": "7.7.0",
+  "version": "7.8.0",
   "description": "My Near Wallet package for NEAR Wallet Selector.",
   "keywords": [
     "near",