Skip to content

Commit f7ca952

Browse files
gtsonevvgtsonevv
authoredDec 13, 2024
Merge pull request #1269 from near/dev
v8.9.15 Release (dev → main)
2 parents a63530c + b67dbba commit f7ca952

File tree

39 files changed

+108
-234
lines changed

39 files changed

+108
-234
lines changed
 

‎package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "near-wallet-selector",
3-
"version": "8.9.14",
3+
"version": "8.9.15",
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",
@@ -101,15 +101,14 @@
101101
"@near-snap/sdk": "0.6.0",
102102
"@noble/ciphers": "0.5.3",
103103
"@noble/hashes": "1.4.0",
104-
"@peersyst/near-mobile-signer": "1.1.0",
104+
"@peersyst/near-mobile-signer": "1.1.1",
105105
"@ramper/near": "0.0.30",
106106
"@tanstack/react-query": "5.24.8",
107107
"@walletconnect/modal": "2.6.2",
108108
"@walletconnect/sign-client": "2.13.0",
109109
"@web3modal/wagmi": "5.0.6",
110-
"better-sqlite3": "11.3.0",
111110
"big.js": "6.2.2",
112-
"borsh": "0.7.0",
111+
"borsh": "1.0.0",
113112
"browserify-fs": "1.0.0",
114113
"bs58": "5.0.0",
115114
"buffer": "6.0.3",
@@ -223,4 +222,4 @@
223222
"webpack": "5.75.0",
224223
"webpack-merge": "5.8.0"
225224
}
226-
}
225+
}

‎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.14",
3+
"version": "8.9.15",
44
"description": "This is the Export Selector UI package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

‎packages/arepa-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/arepa-wallet",
3-
"version": "8.9.14",
3+
"version": "8.9.15",
44
"description": "Arepa Wallet 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.14",
3+
"version": "8.9.15",
44
"description": "Bitget wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

‎packages/bitte-wallet/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/bitte-wallet",
3-
"version": "8.9.14",
3+
"version": "8.9.15",
44
"description": "Bitte 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.14",
3+
"version": "8.9.15",
44
"description": "Coin 98 wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

‎packages/core/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@near-wallet-selector/core",
3-
"version": "8.9.14",
3+
"version": "8.9.15",
44
"description": "This is the core package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",
@@ -20,7 +20,6 @@
2020
},
2121
"homepage": "https://github.com/near/wallet-selector/tree/main/packages/core",
2222
"peerDependencies": {
23-
"near-api-js": "4.0.3",
24-
"@near-js/providers": "latest"
23+
"near-api-js": "4.0.3"
2524
}
26-
}
25+
}

‎packages/core/src/lib/helpers/verify-signature/payload.ts

+10-21
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { SignMessageParams } from "../../wallet";
2+
import type { Schema } from "borsh";
23
import { serialize } from "borsh";
34

45
export class Payload {
@@ -21,27 +22,15 @@ export class Payload {
2122
}
2223
}
2324

24-
export const payloadSchema = new Map([
25-
[
26-
Payload,
27-
{
28-
kind: "struct",
29-
fields: [
30-
["tag", "u32"],
31-
["message", "string"],
32-
["nonce", [32]],
33-
["recipient", "string"],
34-
[
35-
"callbackUrl",
36-
{
37-
kind: "option",
38-
type: "string",
39-
},
40-
],
41-
],
42-
},
43-
],
44-
]);
25+
export const payloadSchema: Schema = {
26+
struct: {
27+
tag: "u32",
28+
message: "string",
29+
nonce: { array: { type: "u8", len: 32 } },
30+
recipient: "string",
31+
callbackUrl: { option: "string" },
32+
},
33+
};
4534

4635
export const serializeNep413 = (
4736
signMessageParams: SignMessageParams

‎packages/core/src/lib/options.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe("getNetworkPreset", () => {
1111
nodeUrl: "https://rpc.mainnet.near.org",
1212
helperUrl: "https://helper.mainnet.near.org",
1313
explorerUrl: "https://nearblocks.io",
14-
indexerUrl: "https://api.kitwallet.app",
14+
indexerUrl: "https://api.fastnear.com/v0",
1515
});
1616
});
1717

@@ -29,7 +29,7 @@ describe("getNetworkPreset", () => {
2929
nodeUrl: "https://rpc1.mainnet.near.org",
3030
helperUrl: "https://helper.mainnet.near.org",
3131
explorerUrl: "https://nearblocks.io",
32-
indexerUrl: "https://api.kitwallet.app",
32+
indexerUrl: "https://api.fastnear.com/v0",
3333
});
3434
});
3535

@@ -42,7 +42,7 @@ describe("getNetworkPreset", () => {
4242
nodeUrl: "https://rpc.testnet.near.org",
4343
helperUrl: "https://helper.testnet.near.org",
4444
explorerUrl: "https://testnet.nearblocks.io",
45-
indexerUrl: "https://testnet-api.kitwallet.app",
45+
indexerUrl: "https://test.api.fastnear.com/v0",
4646
});
4747
});
4848

@@ -60,7 +60,7 @@ describe("getNetworkPreset", () => {
6060
nodeUrl: "https://rpc1.testnet.near.org",
6161
helperUrl: "https://helper.testnet.near.org",
6262
explorerUrl: "https://testnet.nearblocks.io",
63-
indexerUrl: "https://testnet-api.kitwallet.app",
63+
indexerUrl: "https://test.api.fastnear.com/v0",
6464
});
6565
});
6666
});

‎packages/core/src/lib/options.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ export const getNetworkPreset = (
1313
nodeUrl: fallbackRpcUrls?.[0] || "https://rpc.mainnet.near.org",
1414
helperUrl: "https://helper.mainnet.near.org",
1515
explorerUrl: "https://nearblocks.io",
16-
indexerUrl: "https://api.kitwallet.app",
16+
indexerUrl: "https://api.fastnear.com/v0",
1717
};
1818
case "testnet":
1919
return {
2020
networkId,
2121
nodeUrl: fallbackRpcUrls?.[0] || "https://rpc.testnet.near.org",
2222
helperUrl: "https://helper.testnet.near.org",
2323
explorerUrl: "https://testnet.nearblocks.io",
24-
indexerUrl: "https://testnet-api.kitwallet.app",
24+
indexerUrl: "https://test.api.fastnear.com/v0",
2525
};
2626
default:
2727
throw Error(`Failed to find config for: '${networkId}'`);

‎packages/core/src/lib/wallet-selector.spec.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { setupWalletSelector } from "./wallet-selector";
2-
import { FailoverRpcProvider } from "@near-js/providers";
32
import { getNetworkPreset } from "./options";
4-
import { JsonRpcProvider } from "near-api-js/lib/providers";
3+
import {
4+
JsonRpcProvider,
5+
FailoverRpcProvider,
6+
} from "near-api-js/lib/providers";
57
import type { Network } from "./options.types";
68
import type { Store } from "./store.types";
79
import type { WalletModuleFactory } from "./wallet";
@@ -52,8 +54,8 @@ jest.mock("./store", () => {
5254
};
5355
});
5456

55-
jest.mock("@near-js/providers", () => {
56-
const originalModule = jest.requireActual("@near-js/providers");
57+
jest.mock("near-api-js/lib/providers", () => {
58+
const originalModule = jest.requireActual("near-api-js/lib/providers");
5759
return {
5860
...originalModule,
5961
FailoverRpcProvider: jest.fn(),

‎packages/ethereum-wallets/package.json

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

‎packages/ethereum-wallets/src/lib/index.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ const EthereumWallets: WalletBehaviourFactory<
317317
options.network.networkId,
318318
devMode ? address + "." + devModeAccount : address
319319
);
320-
if (!keyPair) {
320+
if (!keyPair && !skipSignInAccessKey) {
321321
try {
322322
wagmiCore!.disconnect(wagmiConfig);
323323
} catch (error) {
@@ -591,6 +591,7 @@ const EthereumWallets: WalletBehaviourFactory<
591591
for (const [index, tx] of txs.entries()) {
592592
let txHash;
593593
let txError: string | null = null;
594+
let showDetails = false;
594595
while (!txHash) {
595596
try {
596597
await (() => {
@@ -599,13 +600,18 @@ const EthereumWallets: WalletBehaviourFactory<
599600
selectedIndex: index,
600601
ethTxHashes,
601602
error: txError,
603+
showDetails,
604+
onShowDetails: (state: boolean) => {
605+
showDetails = state;
606+
},
602607
onConfirm: async () => {
603608
try {
604609
txError = null;
605610
renderTxs({
606611
selectedIndex: index,
607612
ethTxHashes,
608613
error: txError,
614+
showDetails,
609615
});
610616
txHash = await executeTransaction({
611617
tx,

‎packages/ethereum-wallets/src/lib/modal.ts

+20
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,15 @@ export function createTxModal({
9898
selectedIndex,
9999
ethTxHashes,
100100
error,
101+
showDetails,
102+
onShowDetails,
101103
onConfirm,
102104
}: {
103105
selectedIndex: number;
104106
ethTxHashes: Array<string>;
105107
error?: string | null;
108+
onShowDetails?: (state: boolean) => void;
109+
showDetails?: boolean;
106110
onConfirm?: () => void;
107111
}) => {
108112
const container = document.querySelector(
@@ -339,6 +343,16 @@ export function createTxModal({
339343
".ethereum-wallet-txs-details"
340344
) as HTMLElement | null;
341345

346+
if (detailsContainer && toggleButton) {
347+
if (showDetails) {
348+
detailsContainer.style.display = "block";
349+
toggleButton.textContent = "Hide details";
350+
} else {
351+
detailsContainer.style.display = "none";
352+
toggleButton.textContent = "Show details";
353+
}
354+
}
355+
342356
toggleButton?.addEventListener("click", () => {
343357
if (!detailsContainer || !toggleButton) {
344358
return;
@@ -350,9 +364,15 @@ export function createTxModal({
350364
) {
351365
detailsContainer.style.display = "block";
352366
toggleButton.textContent = "Hide details";
367+
if (onShowDetails) {
368+
onShowDetails(true);
369+
}
353370
} else {
354371
detailsContainer.style.display = "none";
355372
toggleButton.textContent = "Show details";
373+
if (onShowDetails) {
374+
onShowDetails(false);
375+
}
356376
}
357377
});
358378
};

‎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.14",
3+
"version": "8.9.15",
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.14",
3+
"version": "8.9.15",
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.14",
3+
"version": "8.9.15",
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.14",
3+
"version": "8.9.15",
44
"description": "Meteor wallet package for NEAR Wallet Selector.",
55
"keywords": [
66
"near",

‎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.14",
3+
"version": "8.9.15",
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.14",
3+
"version": "8.9.15",
44
"description": "Modal UI package for NEAR wallet Selector",
55
"keywords": [
66
"near",

‎packages/modal-ui-js/src/lib/render-modal.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,19 @@ const getAccountIds = async (publicKey: string): Promise<Array<string>> => {
2929
return [];
3030
}
3131

32-
const response = await fetch(
33-
`${modalState.selector.options.network.indexerUrl}/publicKey/ed25519:${publicKey}/accounts`
34-
);
32+
const url = `${modalState.selector.options.network.indexerUrl}/public_key/ed25519:${publicKey}`;
33+
const response = await fetch(url);
3534

3635
if (!response.ok) {
37-
throw new Error("Failed to get account id from public key");
36+
throw new Error("Failed to get account ID from public key");
3837
}
3938

40-
const accountIds = await response.json();
39+
const jsonResponse: { account_ids: Array<string>; public_key: string } =
40+
await response.json();
4141

42-
if (!Array.isArray(accountIds) || !accountIds.length) {
43-
return [];
44-
}
42+
const { account_ids: accountIds } = jsonResponse;
4543

46-
return accountIds;
44+
return Array.isArray(accountIds) ? accountIds : [];
4745
};
4846

4947
export const resolveAccounts = async (

‎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.14",
3+
"version": "8.9.15",
44
"description": "Modal UI package for NEAR wallet Selector",
55
"keywords": [
66
"near",

0 commit comments

Comments
 (0)