Skip to content

Commit

Permalink
Merge branch 'hot-meteor-wallet' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@naturexie
naturexie committed Feb 24, 2025
2 parents 2ae0b9c + e0092ee commit 42ee30e
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 15 deletions.
2 changes: 2 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
"@near-wallet-selector/core": "8.9.10",
"@near-wallet-selector/ethereum-wallets": "^8.9.13",
"@near-wallet-selector/here-wallet": "^8.9.7",
"@near-wallet-selector/hot-wallet": "^8.10.0",
"@near-wallet-selector/ledger": "^8.9.7",
"@near-wallet-selector/meteor-wallet": "8.5.4",
"@near-wallet-selector/meteor-wallet-app": "^8.10.0",
"@near-wallet-selector/mintbase-wallet": "^8.9.7",
"@near-wallet-selector/modal-ui": "^8.9.7",
"@near-wallet-selector/my-near-wallet": "^8.9.7",
Expand Down
6 changes: 6 additions & 0 deletions utils/wallet-selector-compat.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import BN from "bn.js";
import { map, distinctUntilChanged } from "rxjs";
import { setupKeypom } from "@keypom/selector";
import { setupOKXWallet } from "@near-wallet-selector/okx-wallet";
import { setupHotWallet } from "@near-wallet-selector/hot-wallet";
import { setupMeteorWalletApp } from "@near-wallet-selector/meteor-wallet-app";
import { setupBTCWallet } from "btc-wallet";
// @ts-nocheck
import type { Config } from "@wagmi/core";
Expand Down Expand Up @@ -201,6 +203,10 @@ export const getWalletSelector = async ({ onAccountChange }: GetWalletSelectorAr
deprecated: false,
}),
setupCoin98Wallet(),
setupHotWallet(),
setupMeteorWalletApp({
contractId: LOGIC_CONTRACT_NAME,
}),
],
network: {
networkId: defaultNetwork,
Expand Down
100 changes: 85 additions & 15 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1689,6 +1689,21 @@
sha1 "^1.1.1"
uuid4 "2.0.3"

"@hot-wallet/[email protected]":
version "1.0.8"
resolved "https://registry.yarnpkg.com/@hot-wallet/sdk/-/sdk-1.0.8.tgz#52b959af64363f7fc30b2b0300cb2dc5763ecc3d"
integrity sha512-HPS/y8NNhT9mUw1xLYQUlENn1F8NULqNYAiy25idGGreGJUbSEiHmCPVed7MSJbxEAli+b4GnhbNmirfhA12og==
dependencies:
"@near-js/crypto" "^1.4.0"
"@near-js/utils" "^1.0.0"
"@near-wallet-selector/core" "^8.9.13"
"@solana/wallet-adapter-base" "^0.9.23"
"@solana/web3.js" "^1.95.0"
borsh "^2.0.0"
js-sha256 "^0.11.0"
sha1 "^1.1.1"
uuid4 "^2.0.3"

"@humanwhocodes/config-array@^0.10.5":
version "0.10.5"
resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz"
Expand Down Expand Up @@ -2703,7 +2718,7 @@
lru_map "0.4.1"
near-abi "0.1.1"

"@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/crypto@^1.2.0":
"@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/crypto@^1.2.0", "@near-js/crypto@^1.4.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@near-js/crypto/-/crypto-1.3.0.tgz#ddcfc2a1dc2ad9ac30df5f7ebd36d3408ac379bf"
integrity sha512-BIKO6v+rbYCzzrjsSV4KgClVgRiPluIXQ89B4ozIG8RjjBe/7IPFYF9tIxsXUyLzPFhISzeNQkL09ksHHmnymg==
Expand Down Expand Up @@ -2945,7 +2960,7 @@
resolved "https://registry.yarnpkg.com/@near-js/types/-/types-0.3.1.tgz#35f2649f85881d72fc231a16142e1f0e3b0e8377"
integrity sha512-8qIA7ynAEAuVFNAQc0cqz2xRbfyJH3PaAG5J2MgPPhD18lu/tCGd6pzYg45hjhtiJJRFDRjh/FUWKS+ZiIIxUw==

"@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/utils@^0.0.5", "@near-js/utils@^1.0.1":
"@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/[email protected]", "@near-js/utils@^0.0.5", "@near-js/utils@^1.0.0", "@near-js/utils@^1.0.1":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@near-js/utils/-/utils-0.0.5.tgz#7c7f80140c039535b04ec48ed84b9681407ea57a"
integrity sha512-0YnPruP6xZc/scIAX7E3GrTrFMNAyB9bFZOoOdA60GPzHwTTfpXsdozZvsQN4LvfFuiCDN1OEhwx7EtJh43DRw==
Expand Down Expand Up @@ -2995,6 +3010,16 @@
dependencies:
rxjs "^7.8.0"

"@near-wallet-selector/[email protected]", "@near-wallet-selector/core@^8.9.13":
version "8.10.0"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.10.0.tgz#b9c061ef550c6741d53193e4f6bbba904ae61cea"
integrity sha512-zh1xz9Hza85hxQHUHJb+w5GhH+qjQBp+iHejuMkgOVjmFsUNwWV3RhGA9WUM1CXQTplYhuJ1oRbRV5MKL1K58Q==
dependencies:
borsh "1.0.0"
events "3.3.0"
js-sha256 "0.9.0"
rxjs "7.8.1"

"@near-wallet-selector/[email protected]":
version "7.9.3"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-7.9.3.tgz#5a51b72064c9e018c0f0eb97db06b70cd58b8358"
Expand Down Expand Up @@ -3074,16 +3099,6 @@
js-sha256 "0.9.0"
rxjs "7.8.1"

"@near-wallet-selector/core@^8.9.13":
version "8.10.0"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/core/-/core-8.10.0.tgz#b9c061ef550c6741d53193e4f6bbba904ae61cea"
integrity sha512-zh1xz9Hza85hxQHUHJb+w5GhH+qjQBp+iHejuMkgOVjmFsUNwWV3RhGA9WUM1CXQTplYhuJ1oRbRV5MKL1K58Q==
dependencies:
borsh "1.0.0"
events "3.3.0"
js-sha256 "0.9.0"
rxjs "7.8.1"

"@near-wallet-selector/ethereum-wallets@^8.9.13":
version "8.9.13"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/ethereum-wallets/-/ethereum-wallets-8.9.13.tgz#c4338b59cfefaa6fe768a260da6edfd9df04616d"
Expand All @@ -3104,6 +3119,14 @@
"@near-wallet-selector/core" "8.9.7"
bn.js "5.2.1"

"@near-wallet-selector/hot-wallet@^8.10.0":
version "8.10.0"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/hot-wallet/-/hot-wallet-8.10.0.tgz#090da885d4503287ffecf8f1837bab714dbace06"
integrity sha512-92ib0ADc283WGZkotxfUui391i/o3h2LIVZZwUuZHGAYDWfWQ+oA9kEmkjhkL+rP8niPM3vCNSIkPM2h6P5E/w==
dependencies:
"@hot-wallet/sdk" "1.0.8"
"@near-wallet-selector/core" "8.10.0"

"@near-wallet-selector/ledger@^8.9.7":
version "8.9.7"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/ledger/-/ledger-8.9.7.tgz#94aeeec93ee8931cb2f85369c913eb180514c041"
Expand All @@ -3117,6 +3140,13 @@
is-mobile "4.0.0"
ts-essentials "7.0.3"

"@near-wallet-selector/meteor-wallet-app@^8.10.0":
version "8.10.0"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/meteor-wallet-app/-/meteor-wallet-app-8.10.0.tgz#5a43426c72c738aa4b151df3adb3146179bbaac2"
integrity sha512-2kuia/k8/xOCvf8JnTrpaLxzULI77dikUJQUkqQFABxGy7uHMk2eDFcPf99s+lElfHuvrnauHK5XTV5kD2xmoA==
dependencies:
"@near-wallet-selector/core" "8.10.0"

"@near-wallet-selector/[email protected]":
version "8.5.4"
resolved "https://registry.yarnpkg.com/@near-wallet-selector/meteor-wallet/-/meteor-wallet-8.5.4.tgz#426026022352750bcefaa2aeef5388d4b7b7c623"
Expand Down Expand Up @@ -4450,7 +4480,25 @@
dependencies:
buffer "~6.0.3"

"@solana/web3.js@^1.73.0":
"@solana/wallet-adapter-base@^0.9.23":
version "0.9.23"
resolved "https://registry.yarnpkg.com/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.23.tgz#3b17c28afd44e173f44f658bf9700fd637e12a11"
integrity sha512-apqMuYwFp1jFi55NxDfvXUX2x1T0Zh07MxhZ/nCCTGys5raSfYUh82zen2BLv8BSDj/JxZ2P/s7jrQZGrX8uAw==
dependencies:
"@solana/wallet-standard-features" "^1.1.0"
"@wallet-standard/base" "^1.0.1"
"@wallet-standard/features" "^1.0.3"
eventemitter3 "^4.0.7"

"@solana/wallet-standard-features@^1.1.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@solana/wallet-standard-features/-/wallet-standard-features-1.3.0.tgz#c489eca9d0c78f97084b4af6ca8ad8c1ca197de5"
integrity sha512-ZhpZtD+4VArf6RPitsVExvgkF+nGghd1rzPjd97GmBximpnt1rsUxMOEyoIEuH3XBxPyNB6Us7ha7RHWQR+abg==
dependencies:
"@wallet-standard/base" "^1.1.0"
"@wallet-standard/features" "^1.1.0"

"@solana/web3.js@^1.73.0", "@solana/web3.js@^1.95.0":
version "1.98.0"
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.98.0.tgz#21ecfe8198c10831df6f0cfde7f68370d0405917"
integrity sha512-nz3Q5OeyGFpFCR+erX2f6JPt3sKhzhYcSycBCSPkWjzSVDh/Rr1FqTVMRe58FKO16/ivTUcuJjeS5MyBvpkbzA==
Expand Down Expand Up @@ -5360,6 +5408,18 @@
mipd "0.0.7"
zustand "4.4.1"

"@wallet-standard/base@^1.0.1", "@wallet-standard/base@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@wallet-standard/base/-/base-1.1.0.tgz#214093c0597a1e724ee6dbacd84191dfec62bb33"
integrity sha512-DJDQhjKmSNVLKWItoKThJS+CsJQjR9AOBOirBVT1F9YpRyC9oYHE+ZnSf8y8bxUphtKqdQMPVQ2mHohYdRvDVQ==

"@wallet-standard/features@^1.0.3", "@wallet-standard/features@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@wallet-standard/features/-/features-1.1.0.tgz#f256d7b18940c8d134f66164330db358a8f5200e"
integrity sha512-hiEivWNztx73s+7iLxsuD1sOJ28xtRix58W7Xnz4XzzA/pF0+aicnWgjOdA10doVDEDZdUuZCIIqG96SFNlDUg==
dependencies:
"@wallet-standard/base" "^1.1.0"

"@walletconnect/[email protected]":
version "2.1.4"
resolved "https://registry.npmjs.org/@walletconnect/core/-/core-2.1.4.tgz"
Expand Down Expand Up @@ -6709,6 +6769,11 @@ borsh@^0.6.0:
bs58 "^4.0.0"
text-encoding-utf-8 "^1.0.2"

borsh@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/borsh/-/borsh-2.0.0.tgz#042a9f109565caac3c6a21297cd8c0ae8db3149d"
integrity sha512-kc9+BgR3zz9+cjbwM8ODoUB4fs3X3I5A/HtX7LZKxCLaMrEeDFoBpnhZY//DTS1VZBSs6S5v46RZRbZjRFspEg==

bowser@^2.9.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
Expand Down Expand Up @@ -8802,7 +8867,7 @@ [email protected], eventemitter3@^5.0.1:
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==

eventemitter3@^4.0.1:
eventemitter3@^4.0.1, eventemitter3@^4.0.7:
version "4.0.7"
resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
Expand Down Expand Up @@ -10764,6 +10829,11 @@ [email protected], js-sha256@^0.9.0:
resolved "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==

js-sha256@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576"
integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q==

[email protected]:
version "0.8.0"
resolved "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz"
Expand Down Expand Up @@ -15442,7 +15512,7 @@ utility-types@^3.10.0:
resolved "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b"
integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==

[email protected]:
[email protected], uuid4@^2.0.3:
version "2.0.3"
resolved "https://registry.npmjs.org/uuid4/-/uuid4-2.0.3.tgz"
integrity sha512-CTpAkEVXMNJl2ojgtpLXHgz23dh8z81u6/HEPiQFOvBc/c2pde6TVHmH4uwY0d/GLF3tb7+VDAj4+2eJaQSdZQ==
Expand Down

0 comments on commit 42ee30e

Please sign in to comment.