Skip to content

Commit 41cb54b

Browse files
Merge pull request #1056 from near/dev
v8.9.2 Release (dev -> main)
2 parents 5ce101e + 6959d92 commit 41cb54b

File tree

31 files changed

+73
-61
lines changed

31 files changed

+73
-61
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ npm-debug.log
3737
yarn-error.log
3838
testem.log
3939
/typings
40+
.nx
4041

4142
# System Files
4243
.DS_Store

nx.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"runner": "nx-cloud",
1414
"options": {
1515
"cacheableOperations": ["build", "lint", "test", "e2e"],
16-
"accessToken": "NzY1ODVkMGItMTVlNC00MzQxLWJkYmQtZGFkNzY0YmFmODA3fHJlYWQtd3JpdGU="
16+
"accessToken": "ZjI3YmQzNmItNGFlYy00OTEzLWI4MTItZTU1MGQ3NzRhZTJhfHJlYWQ="
1717
}
1818
}
1919
},

package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "near-wallet-selector",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"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",
55
"keywords": [
66
"near",
@@ -91,14 +91,14 @@
9191
"@ledgerhq/hw-transport": "6.27.1",
9292
"@ledgerhq/hw-transport-webhid": "6.27.1",
9393
"@metamask/detect-provider": "^2.0.0",
94-
"@meteorwallet/sdk": "^1.0.5",
94+
"@meteorwallet/sdk": "^1.0.9",
9595
"@mintbase-js/wallet": "0.5.0-beta.6",
9696
"@near-snap/sdk": "^0.6.0",
9797
"@peersyst/near-mobile-signer": "^1.0.10",
9898
"@ramper/near": "^0.0.30",
9999
"@walletconnect/modal": "^2.6.2",
100100
"@walletconnect/sign-client": "2.10.6",
101-
"better-sqlite3": "^9.1.1",
101+
"better-sqlite3": "^9.2.2",
102102
"big.js": "^6.1.1",
103103
"bn.js": "^5.2.0",
104104
"borsh": "^0.7.0",
@@ -163,8 +163,8 @@
163163
"@testing-library/jest-dom": "^5.16.1",
164164
"@testing-library/react": "13.4.0",
165165
"@testing-library/react-hooks": "^7.0.2",
166-
"@types/big.js": "^6.2.1",
167-
"@types/bn.js": "^5.1.1",
166+
"@types/big.js": "^6.2.2",
167+
"@types/bn.js": "^5.1.5",
168168
"@types/gh-pages": "^5.0.0",
169169
"@types/jest": "29.4.4",
170170
"@types/node": "18.11.9",
@@ -188,7 +188,7 @@
188188
"eslint-plugin-prettier": "^4.2.1",
189189
"eslint-plugin-react": "7.31.11",
190190
"eslint-plugin-react-hooks": "4.6.0",
191-
"gh-pages": "^6.0.0",
191+
"gh-pages": "^6.1.0",
192192
"jest": "29.4.3",
193193
"jest-environment-jsdom": "28.1.3",
194194
"jest-mock-extended": "^2.0.6",

packages/account-export/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/account-export",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "This is the Export Selector UI package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/bitget-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/bitget-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Bitget wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/coin98-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/coin98-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Coin 98 wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/core",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "This is the core package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/here-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/here-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Here wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/ledger/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/ledger",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Ledger package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/math-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/math-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Math wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/meteor-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/meteor-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Meteor wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,15 @@ const createMeteorWalletInjected: WalletBehaviourFactory<
8585
});
8686
}
8787

88-
return getAccounts();
88+
const accounts = await getAccounts();
89+
90+
logger.log("MeteorWallet:signIn", {
91+
contractId,
92+
methodNames,
93+
account: accounts[0],
94+
});
95+
96+
return accounts;
8997
},
9098

9199
async signOut() {

packages/mintbase-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/mintbase-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Mintbase wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/modal-ui-js/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/modal-ui-js",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Modal UI package for NEAR wallet Selector",
55
"keywords": [
66
"near",

packages/modal-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/modal-ui",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Modal UI package for NEAR wallet Selector",
55
"keywords": [
66
"near",

packages/my-near-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/my-near-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "My Near Wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/narwallets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/narwallets",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "This is the Narwallets package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/near-mobile-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/near-mobile-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "NEAR Mobile wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/near-snap/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/near-snap",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Metamask snap to interact with Near dapps.",
55
"keywords": [
66
"near",

packages/near-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/near-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Near Wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/nearfi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/nearfi",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Nearfi package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/neth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/neth",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Control NEAR accounts with ETH accounts",
55
"author": "mattlockyer",
66
"keywords": [

packages/nightly/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/nightly",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Nightly wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/ramper-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/ramper-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Ramper wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/sender/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/sender",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Sender wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/wallet-connect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/wallet-connect",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Wallet Connect package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/wallet-connect/src/lib/wallet-connect-client.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
class WalletConnectClient {
1111
private client: Client;
1212
private emitter: EventEmitterService<WalletEvents>;
13+
private modal: WalletConnectModal;
1314

1415
async init(opts: SignClientTypes.Options) {
1516
this.client = await Client.init(opts);
@@ -47,23 +48,25 @@ class WalletConnectClient {
4748
projectId: string,
4849
chainId: string
4950
) {
50-
const walletConnectModal = new WalletConnectModal({
51-
projectId,
52-
chains: [chainId],
53-
explorerExcludedWalletIds: "ALL",
54-
});
51+
if (!this.modal) {
52+
this.modal = new WalletConnectModal({
53+
projectId,
54+
chains: [chainId],
55+
explorerExcludedWalletIds: "ALL",
56+
});
57+
}
5558

5659
return new Promise<SessionTypes.Struct>((resolve, reject) => {
5760
this.client
5861
.connect(params)
5962
.then(({ uri, approval }) => {
6063
if (uri) {
6164
if (qrCodeModal) {
62-
walletConnectModal.openModal({
65+
this.modal.openModal({
6366
uri,
6467
standaloneChains: [chainId],
6568
});
66-
walletConnectModal.subscribeModal(({ open }) => {
69+
this.modal.subscribeModal(({ open }) => {
6770
if (!open) {
6871
reject(new Error("User cancelled pairing"));
6972
}
@@ -76,7 +79,7 @@ class WalletConnectClient {
7679
approval()
7780
.then(resolve)
7881
.catch(reject)
79-
.finally(() => walletConnectModal.closeModal());
82+
.finally(() => this.modal.closeModal());
8083
})
8184
.catch(reject);
8285
});

packages/wallet-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/wallet-utils",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Wallet utils package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/welldone-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/welldone-wallet",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "Welldone wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

packages/xdefi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/xdefi",
3-
"version": "8.9.1",
3+
"version": "8.9.2",
44
"description": "This is the XDEFI package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

yarn.lock

+20-20
Original file line numberDiff line numberDiff line change
@@ -3455,10 +3455,10 @@
34553455
resolved "https://registry.yarnpkg.com/@metamask/detect-provider/-/detect-provider-2.0.0.tgz#4bc2795e5e6f7d8b84b2e845058d2f222c99917d"
34563456
integrity sha512-sFpN+TX13E9fdBDh9lvQeZdJn4qYoRb/6QF2oZZK/Pn559IhCFacPMU1rMuqyXoFQF3JSJfii2l98B87QDPeCQ==
34573457

3458-
"@meteorwallet/sdk@^1.0.5":
3459-
version "1.0.5"
3460-
resolved "https://registry.yarnpkg.com/@meteorwallet/sdk/-/sdk-1.0.5.tgz#1a878bc1357b8818cc3240a44709a6fe9971c3e1"
3461-
integrity sha512-2HT3F6O8lMvj1STD/ir09R43jPLlRVFPoR8dD+qsASUe73ZJumX8r3Uef4g9waAjKZza5B7wmi4XpamFaKrlkg==
3458+
"@meteorwallet/sdk@^1.0.9":
3459+
version "1.0.9"
3460+
resolved "https://registry.yarnpkg.com/@meteorwallet/sdk/-/sdk-1.0.9.tgz#d10d41ca81a81673379ba43a9ddf2d23b1b4503a"
3461+
integrity sha512-frJM+rwmx18MCVsfHn0O8oaJfB41BqaXW6cyhZ3EtMw3b87DUJyfSuJi9K0HQl7oGG0+wvMZOKRBVVcMiZzoDg==
34623462
dependencies:
34633463
borsh "^0.7.0"
34643464
nanoid "3.3.6"
@@ -6245,15 +6245,15 @@
62456245
dependencies:
62466246
"@babel/types" "^7.3.0"
62476247

6248-
"@types/big.js@^6.2.1":
6249-
version "6.2.1"
6250-
resolved "https://registry.yarnpkg.com/@types/big.js/-/big.js-6.2.1.tgz#0e5eda9b8ffe33e2cc4540fad6e91a4c7255ca88"
6251-
integrity sha512-dKzZVT10m3ELZgYIShPJ+3Os/E1s3aDQS+wr1ne7VCLU/8hc/R+z/+gkm9WabxSkV9E8wJhTl5wC+0fD9nitsw==
6248+
"@types/big.js@^6.2.2":
6249+
version "6.2.2"
6250+
resolved "https://registry.yarnpkg.com/@types/big.js/-/big.js-6.2.2.tgz#69422ec9ef59df1330ccfde2106d9e1159a083c3"
6251+
integrity sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA==
62526252

6253-
"@types/bn.js@^5.1.1":
6254-
version "5.1.1"
6255-
resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682"
6256-
integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==
6253+
"@types/bn.js@^5.1.5":
6254+
version "5.1.5"
6255+
resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0"
6256+
integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A==
62576257
dependencies:
62586258
"@types/node" "*"
62596259

@@ -8267,10 +8267,10 @@ before-after-hook@^2.2.0:
82678267
resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
82688268
integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
82698269

8270-
better-sqlite3@^9.1.1:
8271-
version "9.1.1"
8272-
resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-9.1.1.tgz#f139b180a08ed396e660a0601a46ceefd78b832c"
8273-
integrity sha512-FhW7bS7cXwkB2SFnPJrSGPmQerVSCzwBgmQ1cIRcYKxLsyiKjljzCbyEqqhYXo5TTBqt5BISiBj2YE2Sy2ynaA==
8270+
better-sqlite3@^9.2.2:
8271+
version "9.2.2"
8272+
resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-9.2.2.tgz#3ce1ed24f327ed8c9b0c39b825cdc2341aeb249f"
8273+
integrity sha512-qwjWB46il0lsDkeB4rSRI96HyDQr8sxeu1MkBVLMrwusq1KRu4Bpt1TMI+8zIJkDUtZ3umjAkaEjIlokZKWCQw==
82748274
dependencies:
82758275
bindings "^1.5.0"
82768276
prebuild-install "^7.1.1"
@@ -12244,10 +12244,10 @@ getpass@^0.1.1:
1224412244
dependencies:
1224512245
assert-plus "^1.0.0"
1224612246

12247-
gh-pages@^6.0.0:
12248-
version "6.0.0"
12249-
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-6.0.0.tgz#3bb46ea13dc7cee306662db0d3f02bf05635cdc1"
12250-
integrity sha512-FXZWJRsvP/fK2HJGY+Di6FRNHvqFF6gOIELaopDjXXgjeOYSNURcuYwEO/6bwuq6koP5Lnkvnr5GViXzuOB89g==
12247+
gh-pages@^6.1.0:
12248+
version "6.1.0"
12249+
resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-6.1.0.tgz#e842426edf8bc19f1209ac6ba7af10cda35383ea"
12250+
integrity sha512-MdXigvqN3I66Y+tAZsQJMzpBWQOI1snD6BYuECmP+GEdryYMMOQvzn4AConk/+qNg/XIuQhB1xNGrl3Rmj1iow==
1225112251
dependencies:
1225212252
async "^3.2.4"
1225312253
commander "^11.0.0"

0 commit comments

Comments
 (0)