thirdweb 5.108.4-nightly-2c84ac408999dbff007733f76c8f0f13818258b5-20250928000351 → 5.108.5-nightly-ce9220ea00e5a58bf3f6997733b4b69df981cba8-20250930000345
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/auth/verify-typed-data.js +18 -0
- package/dist/cjs/auth/verify-typed-data.js.map +1 -1
- package/dist/cjs/react/web/ui/Bridge/swap-widget/select-token-ui.js +9 -5
- package/dist/cjs/react/web/ui/Bridge/swap-widget/select-token-ui.js.map +1 -1
- package/dist/cjs/react/web/ui/Bridge/swap-widget/use-tokens.js +4 -2
- package/dist/cjs/react/web/ui/Bridge/swap-widget/use-tokens.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/x402/common.js +60 -4
- package/dist/cjs/x402/common.js.map +1 -1
- package/dist/cjs/x402/facilitator.js +12 -4
- package/dist/cjs/x402/facilitator.js.map +1 -1
- package/dist/cjs/x402/fetchWithPayment.js +4 -4
- package/dist/cjs/x402/fetchWithPayment.js.map +1 -1
- package/dist/cjs/x402/schemas.js +29 -1
- package/dist/cjs/x402/schemas.js.map +1 -1
- package/dist/cjs/x402/types.js.map +1 -1
- package/dist/esm/auth/verify-typed-data.js +18 -0
- package/dist/esm/auth/verify-typed-data.js.map +1 -1
- package/dist/esm/react/web/ui/Bridge/swap-widget/select-token-ui.js +9 -5
- package/dist/esm/react/web/ui/Bridge/swap-widget/select-token-ui.js.map +1 -1
- package/dist/esm/react/web/ui/Bridge/swap-widget/use-tokens.js +4 -2
- package/dist/esm/react/web/ui/Bridge/swap-widget/use-tokens.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/x402/common.js +60 -4
- package/dist/esm/x402/common.js.map +1 -1
- package/dist/esm/x402/facilitator.js +12 -4
- package/dist/esm/x402/facilitator.js.map +1 -1
- package/dist/esm/x402/fetchWithPayment.js +4 -4
- package/dist/esm/x402/fetchWithPayment.js.map +1 -1
- package/dist/esm/x402/schemas.js +29 -1
- package/dist/esm/x402/schemas.js.map +1 -1
- package/dist/esm/x402/types.js.map +1 -1
- package/dist/scripts/bridge-widget.js +84 -84
- package/dist/types/auth/verify-typed-data.d.ts +2 -2
- package/dist/types/auth/verify-typed-data.d.ts.map +1 -1
- package/dist/types/react/web/ui/Bridge/swap-widget/select-token-ui.d.ts.map +1 -1
- package/dist/types/react/web/ui/Bridge/swap-widget/use-tokens.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/x402/common.d.ts.map +1 -1
- package/dist/types/x402/facilitator.d.ts +7 -3
- package/dist/types/x402/facilitator.d.ts.map +1 -1
- package/dist/types/x402/fetchWithPayment.d.ts.map +1 -1
- package/dist/types/x402/schemas.d.ts +248 -0
- package/dist/types/x402/schemas.d.ts.map +1 -1
- package/dist/types/x402/types.d.ts +6 -4
- package/dist/types/x402/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/auth/verify-typed-data.ts +20 -2
- package/src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx +9 -5
- package/src/react/web/ui/Bridge/swap-widget/use-tokens.ts +5 -2
- package/src/version.ts +1 -1
- package/src/x402/common.ts +87 -8
- package/src/x402/facilitator.ts +26 -7
- package/src/x402/fetchWithPayment.ts +8 -4
- package/src/x402/schemas.ts +39 -0
- package/src/x402/types.ts +10 -3
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.verifyTypedData = verifyTypedData;
|
|
4
|
+
const ox__Secp256k1 = require("ox/Secp256k1");
|
|
5
|
+
const ox__Signature = require("ox/Signature");
|
|
4
6
|
const ox__TypedData = require("ox/TypedData");
|
|
7
|
+
const hex_js_1 = require("../utils/encoding/hex.js");
|
|
5
8
|
const verify_hash_js_1 = require("./verify-hash.js");
|
|
6
9
|
/**
|
|
7
10
|
* Verify am [EIP-712](https://eips.ethereum.org/EIPS/eip-712) typed data signature. This function is interoperable with all wallet types (smart accounts or EOAs).
|
|
@@ -68,6 +71,21 @@ async function verifyTypedData({ address, signature, client, chain, accountFacto
|
|
|
68
71
|
primaryType,
|
|
69
72
|
types,
|
|
70
73
|
});
|
|
74
|
+
if (!(0, hex_js_1.isHex)(signature)) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
const recoveredAddress = ox__Secp256k1.recoverAddress({
|
|
79
|
+
payload: messageHash,
|
|
80
|
+
signature: ox__Signature.fromHex(signature),
|
|
81
|
+
});
|
|
82
|
+
if (recoveredAddress.toLowerCase() === address.toLowerCase()) {
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
// no-op, we skip to contract signature check
|
|
88
|
+
}
|
|
71
89
|
return (0, verify_hash_js_1.verifyHash)({
|
|
72
90
|
accountFactory,
|
|
73
91
|
address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-typed-data.js","sourceRoot":"","sources":["../../../src/auth/verify-typed-data.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"verify-typed-data.js","sourceRoot":"","sources":["../../../src/auth/verify-typed-data.ts"],"names":[],"mappings":";;AAoFA,0CA6CC;AAjID,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAG9C,qDAA2D;AAE3D,qDAAqE;AAmBrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACI,KAAK,UAAU,eAAe,CAGnC,EACA,OAAO,EACP,SAAS,EACT,MAAM,EACN,KAAK,EACL,cAAc,EACd,OAAO,EACP,MAAM,EACN,WAAW,EACX,KAAK,GACyC;IAC9C,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,CAAC;QAC/C,MAAM;QACN,OAAO;QACP,WAAW;QACX,KAAK;KACiB,CAAC,CAAC;IAE1B,IAAI,CAAC,IAAA,cAAK,EAAC,SAAS,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,aAAa,CAAC,cAAc,CAAC;YACpD,OAAO,EAAE,WAAW;YACpB,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC;SAC5C,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,6CAA6C;IAC/C,CAAC;IACD,OAAO,IAAA,2BAAU,EAAC;QAChB,cAAc;QACd,OAAO;QACP,KAAK;QACL,MAAM;QACN,IAAI,EAAE,WAAW;QACjB,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -16,6 +16,7 @@ const Spacer_js_1 = require("../../components/Spacer.js");
|
|
|
16
16
|
const Spinner_js_1 = require("../../components/Spinner.js");
|
|
17
17
|
const text_js_1 = require("../../components/text.js");
|
|
18
18
|
const elements_js_1 = require("../../design-system/elements.js");
|
|
19
|
+
const useDebouncedValue_js_1 = require("../../hooks/useDebouncedValue.js");
|
|
19
20
|
const useisMobile_js_1 = require("../../hooks/useisMobile.js");
|
|
20
21
|
const SearchInput_js_1 = require("./SearchInput.js");
|
|
21
22
|
const SelectChainButton_js_1 = require("./SelectChainButton.js");
|
|
@@ -32,6 +33,7 @@ function getDefaultSelectedChain(chains, activeChainId) {
|
|
|
32
33
|
function SelectToken(props) {
|
|
33
34
|
const chainQuery = (0, use_bridge_chains_js_1.useBridgeChains)(props.client);
|
|
34
35
|
const [search, setSearch] = (0, react_1.useState)("");
|
|
36
|
+
const debouncedSearch = (0, useDebouncedValue_js_1.useDebouncedValue)(search, 500);
|
|
35
37
|
const [limit, setLimit] = (0, react_1.useState)(1000);
|
|
36
38
|
const [_selectedChain, setSelectedChain] = (0, react_1.useState)(undefined);
|
|
37
39
|
const selectedChain = _selectedChain ||
|
|
@@ -43,7 +45,7 @@ function SelectToken(props) {
|
|
|
43
45
|
const tokensQuery = (0, use_tokens_js_1.useTokens)({
|
|
44
46
|
client: props.client,
|
|
45
47
|
chainId: selectedChain?.chainId,
|
|
46
|
-
search,
|
|
48
|
+
search: debouncedSearch,
|
|
47
49
|
limit,
|
|
48
50
|
offset: 0,
|
|
49
51
|
});
|
|
@@ -57,11 +59,13 @@ function SelectToken(props) {
|
|
|
57
59
|
});
|
|
58
60
|
const filteredOwnedTokens = (0, react_1.useMemo)(() => {
|
|
59
61
|
return ownedTokensQuery.data?.tokens?.filter((token) => {
|
|
60
|
-
return (token.symbol.toLowerCase().includes(
|
|
61
|
-
token.name.toLowerCase().includes(
|
|
62
|
-
token.token_address
|
|
62
|
+
return (token.symbol.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
|
|
63
|
+
token.name.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
|
|
64
|
+
token.token_address
|
|
65
|
+
.toLowerCase()
|
|
66
|
+
.includes(debouncedSearch.toLowerCase()));
|
|
63
67
|
});
|
|
64
|
-
}, [ownedTokensQuery.data?.tokens,
|
|
68
|
+
}, [ownedTokensQuery.data?.tokens, debouncedSearch]);
|
|
65
69
|
const isFetching = tokensQuery.isFetching || ownedTokensQuery.isFetching;
|
|
66
70
|
return ((0, jsx_runtime_1.jsx)(SelectTokenUI, { ...props, ownedTokens: filteredOwnedTokens || [], allTokens: tokensQuery.data || [], isFetching: isFetching, selectedChain: selectedChain, setSelectedChain: setSelectedChain, search: search, setSearch: setSearch, selectedToken: props.selectedToken, setSelectedToken: props.setSelectedToken, showMore: tokensQuery.data?.length === limit
|
|
67
71
|
? () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select-token-ui.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"select-token-ui.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/select-token-ui.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ function useTokens(options) {
|
|
|
10
10
|
return (0, react_query_1.useQuery)({
|
|
11
11
|
queryKey: ["tokens", options],
|
|
12
12
|
enabled: !!options.chainId,
|
|
13
|
+
retry: false,
|
|
13
14
|
queryFn: () => {
|
|
14
15
|
if (!options.chainId) {
|
|
15
16
|
throw new Error("Chain ID is required");
|
|
@@ -23,8 +24,8 @@ function useTokens(options) {
|
|
|
23
24
|
offset: options.offset,
|
|
24
25
|
limit: options.limit,
|
|
25
26
|
includePrices: false,
|
|
26
|
-
|
|
27
|
-
tokenAddress: isSearchAddress ? options.search : undefined,
|
|
27
|
+
query: options.search && !isSearchAddress ? options.search : undefined,
|
|
28
|
+
tokenAddress: options.search && isSearchAddress ? options.search : undefined,
|
|
28
29
|
});
|
|
29
30
|
},
|
|
30
31
|
});
|
|
@@ -62,6 +63,7 @@ function useTokenBalances(options) {
|
|
|
62
63
|
return json.result;
|
|
63
64
|
},
|
|
64
65
|
refetchOnMount: false,
|
|
66
|
+
retry: false,
|
|
65
67
|
refetchOnWindowFocus: false,
|
|
66
68
|
});
|
|
67
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-tokens.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/use-tokens.ts"],"names":[],"mappings":";;AAOA,
|
|
1
|
+
{"version":3,"file":"use-tokens.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/Bridge/swap-widget/use-tokens.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.108.
|
|
4
|
+
exports.version = "5.108.5-nightly-ce9220ea00e5a58bf3f6997733b4b69df981cba8-20250930000345";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
package/dist/cjs/x402/common.js
CHANGED
|
@@ -10,6 +10,7 @@ const contract_js_1 = require("../contract/contract.js");
|
|
|
10
10
|
const permit_js_1 = require("../extensions/erc20/__generated__/IERC20Permit/write/permit.js");
|
|
11
11
|
const transferWithAuthorization_js_1 = require("../extensions/erc20/__generated__/USDC/write/transferWithAuthorization.js");
|
|
12
12
|
const address_js_1 = require("../utils/address.js");
|
|
13
|
+
const units_js_1 = require("../utils/units.js");
|
|
13
14
|
const encode_js_1 = require("./encode.js");
|
|
14
15
|
const schemas_js_1 = require("./schemas.js");
|
|
15
16
|
const types_js_1 = require("./types.js");
|
|
@@ -161,12 +162,30 @@ async function processPriceToAtomicAmount(price, chainId, facilitator) {
|
|
|
161
162
|
};
|
|
162
163
|
}
|
|
163
164
|
asset = defaultAsset;
|
|
164
|
-
maxAmountRequired = (parsedUsdAmount
|
|
165
|
+
maxAmountRequired = (0, units_js_1.toUnits)(parsedUsdAmount.toString(), defaultAsset.decimals).toString();
|
|
165
166
|
}
|
|
166
167
|
else {
|
|
167
168
|
// Token amount in atomic units
|
|
168
169
|
maxAmountRequired = price.amount;
|
|
169
|
-
|
|
170
|
+
const tokenExtras = await getOrDetectTokenExtras({
|
|
171
|
+
facilitator,
|
|
172
|
+
partialAsset: price.asset,
|
|
173
|
+
chainId,
|
|
174
|
+
});
|
|
175
|
+
if (!tokenExtras) {
|
|
176
|
+
return {
|
|
177
|
+
error: `Unable to find token information for ${price.asset.address} on chain ${chainId}. Please specify the asset decimals and eip712 information in the asset options.`,
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
asset = {
|
|
181
|
+
address: price.asset.address,
|
|
182
|
+
decimals: tokenExtras.decimals,
|
|
183
|
+
eip712: {
|
|
184
|
+
name: tokenExtras.name,
|
|
185
|
+
version: tokenExtras.version,
|
|
186
|
+
primaryType: tokenExtras.primaryType,
|
|
187
|
+
},
|
|
188
|
+
};
|
|
170
189
|
}
|
|
171
190
|
return {
|
|
172
191
|
maxAmountRequired,
|
|
@@ -176,8 +195,7 @@ async function processPriceToAtomicAmount(price, chainId, facilitator) {
|
|
|
176
195
|
async function getDefaultAsset(chainId, facilitator) {
|
|
177
196
|
const supportedAssets = await facilitator.supported();
|
|
178
197
|
const matchingAsset = supportedAssets.kinds.find((supported) => supported.network === `eip155:${chainId}`);
|
|
179
|
-
const assetConfig = matchingAsset?.extra
|
|
180
|
-
?.defaultAsset;
|
|
198
|
+
const assetConfig = matchingAsset?.extra?.defaultAsset;
|
|
181
199
|
return assetConfig;
|
|
182
200
|
}
|
|
183
201
|
async function getSupportedSignatureType(args) {
|
|
@@ -208,4 +226,42 @@ async function getSupportedSignatureType(args) {
|
|
|
208
226
|
}
|
|
209
227
|
return undefined;
|
|
210
228
|
}
|
|
229
|
+
async function getOrDetectTokenExtras(args) {
|
|
230
|
+
const { facilitator, partialAsset, chainId } = args;
|
|
231
|
+
if (partialAsset.eip712?.name &&
|
|
232
|
+
partialAsset.eip712?.version &&
|
|
233
|
+
partialAsset.decimals !== undefined) {
|
|
234
|
+
return {
|
|
235
|
+
name: partialAsset.eip712.name,
|
|
236
|
+
version: partialAsset.eip712.version,
|
|
237
|
+
decimals: partialAsset.decimals,
|
|
238
|
+
primaryType: partialAsset.eip712.primaryType,
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
// read from facilitator
|
|
242
|
+
const response = await facilitator
|
|
243
|
+
.supported({
|
|
244
|
+
chainId,
|
|
245
|
+
tokenAddress: partialAsset.address,
|
|
246
|
+
})
|
|
247
|
+
.catch(() => {
|
|
248
|
+
return {
|
|
249
|
+
kinds: [],
|
|
250
|
+
};
|
|
251
|
+
});
|
|
252
|
+
const exactScheme = response.kinds?.find((kind) => kind.scheme === "exact");
|
|
253
|
+
if (!exactScheme) {
|
|
254
|
+
return undefined;
|
|
255
|
+
}
|
|
256
|
+
const supportedAsset = exactScheme.extra?.supportedAssets?.find((asset) => asset.address.toLowerCase() === partialAsset.address.toLowerCase());
|
|
257
|
+
if (!supportedAsset) {
|
|
258
|
+
return undefined;
|
|
259
|
+
}
|
|
260
|
+
return {
|
|
261
|
+
name: supportedAsset.eip712.name,
|
|
262
|
+
version: supportedAsset.eip712.version,
|
|
263
|
+
decimals: supportedAsset.decimals,
|
|
264
|
+
primaryType: supportedAsset.eip712.primaryType,
|
|
265
|
+
};
|
|
266
|
+
}
|
|
211
267
|
//# sourceMappingURL=common.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/x402/common.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/x402/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,6 +122,7 @@ function facilitator(config) {
|
|
|
122
122
|
x402Version: payload.x402Version,
|
|
123
123
|
paymentPayload: payload,
|
|
124
124
|
paymentRequirements: paymentRequirements,
|
|
125
|
+
...(config.waitUtil ? { waitUtil: config.waitUtil } : {}),
|
|
125
126
|
}),
|
|
126
127
|
});
|
|
127
128
|
if (res.status !== 200) {
|
|
@@ -136,21 +137,28 @@ function facilitator(config) {
|
|
|
136
137
|
*
|
|
137
138
|
* @returns A promise that resolves to the supported payment kinds
|
|
138
139
|
*/
|
|
139
|
-
async supported() {
|
|
140
|
+
async supported(filters) {
|
|
140
141
|
const url = config.baseUrl ?? DEFAULT_BASE_URL;
|
|
141
142
|
return (0, withCache_js_1.withCache)(async () => {
|
|
142
143
|
let headers = { "Content-Type": "application/json" };
|
|
143
144
|
const authHeaders = await facilitator.createAuthHeaders();
|
|
144
145
|
headers = { ...headers, ...authHeaders.supported };
|
|
145
|
-
const
|
|
146
|
+
const supportedUrl = new URL(`${url}/supported`);
|
|
147
|
+
if (filters?.chainId) {
|
|
148
|
+
supportedUrl.searchParams.set("chainId", filters.chainId.toString());
|
|
149
|
+
}
|
|
150
|
+
if (filters?.tokenAddress) {
|
|
151
|
+
supportedUrl.searchParams.set("tokenAddress", filters.tokenAddress);
|
|
152
|
+
}
|
|
153
|
+
const res = await fetch(supportedUrl.toString(), { headers });
|
|
146
154
|
if (res.status !== 200) {
|
|
147
155
|
throw new Error(`Failed to get supported payment kinds: ${res.statusText}`);
|
|
148
156
|
}
|
|
149
157
|
const data = await res.json();
|
|
150
158
|
return data;
|
|
151
159
|
}, {
|
|
152
|
-
cacheKey: `supported-payment-kinds-${url}`,
|
|
153
|
-
cacheTime: 1000 * 60 * 60 *
|
|
160
|
+
cacheKey: `supported-payment-kinds-${url}-${filters?.chainId}-${filters?.tokenAddress}2`,
|
|
161
|
+
cacheTime: 1000 * 60 * 60 * 1, // 1 hour
|
|
154
162
|
});
|
|
155
163
|
},
|
|
156
164
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facilitator.js","sourceRoot":"","sources":["../../../src/x402/facilitator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"facilitator.js","sourceRoot":"","sources":["../../../src/x402/facilitator.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1 * 10 **
|
|
|
50
50
|
if (response.status !== 402) {
|
|
51
51
|
return response;
|
|
52
52
|
}
|
|
53
|
-
const { x402Version, accepts } = (await response.json());
|
|
53
|
+
const { x402Version, accepts, error } = (await response.json());
|
|
54
54
|
const parsedPaymentRequirements = accepts
|
|
55
55
|
.map((x) => schemas_js_1.RequestedPaymentRequirementsSchema.parse(x))
|
|
56
56
|
.filter((x) => x.scheme === "exact"); // TODO (402): accept other schemes
|
|
@@ -60,6 +60,9 @@ function wrapFetchWithPayment(fetch, client, wallet, maxValue = BigInt(1 * 10 **
|
|
|
60
60
|
throw new Error("Wallet not connected. Please connect your wallet to continue.");
|
|
61
61
|
}
|
|
62
62
|
const selectedPaymentRequirements = defaultPaymentRequirementsSelector(parsedPaymentRequirements, chain.id, "exact");
|
|
63
|
+
if (!selectedPaymentRequirements) {
|
|
64
|
+
throw new Error(`No suitable payment requirements found for chain ${chain.id}. ${error}`);
|
|
65
|
+
}
|
|
63
66
|
if (BigInt(selectedPaymentRequirements.maxAmountRequired) > maxValue) {
|
|
64
67
|
throw new Error(`Payment amount exceeds maximum allowed (currently set to ${maxValue} in base units)`);
|
|
65
68
|
}
|
|
@@ -104,9 +107,6 @@ function defaultPaymentRequirementsSelector(paymentRequirements, chainId, scheme
|
|
|
104
107
|
// if no matching payment requirements, use the first payment requirement
|
|
105
108
|
// and switch the wallet to that chain
|
|
106
109
|
const firstPaymentRequirement = paymentRequirements.find((x) => x.scheme === scheme);
|
|
107
|
-
if (!firstPaymentRequirement) {
|
|
108
|
-
throw new Error("No suitable payment requirements found");
|
|
109
|
-
}
|
|
110
110
|
return firstPaymentRequirement;
|
|
111
111
|
}
|
|
112
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":";;AAkDA,
|
|
1
|
+
{"version":3,"file":"fetchWithPayment.js","sourceRoot":"","sources":["../../../src/x402/fetchWithPayment.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/x402/schemas.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RequestedPaymentRequirementsSchema = exports.RequestedPaymentPayloadSchema = void 0;
|
|
3
|
+
exports.FacilitatorSupportedAssetSchema = exports.SupportedSignatureTypeSchema = exports.RequestedPaymentRequirementsSchema = exports.RequestedPaymentPayloadSchema = void 0;
|
|
4
4
|
exports.networkToChainId = networkToChainId;
|
|
5
5
|
const types_1 = require("x402/types");
|
|
6
6
|
const zod_1 = require("zod");
|
|
@@ -27,6 +27,34 @@ exports.RequestedPaymentRequirementsSchema = types_1.PaymentRequirementsSchema.e
|
|
|
27
27
|
const FacilitatorSettleResponseSchema = types_1.SettleResponseSchema.extend({
|
|
28
28
|
network: FacilitatorNetworkSchema,
|
|
29
29
|
});
|
|
30
|
+
exports.SupportedSignatureTypeSchema = zod_1.z.enum([
|
|
31
|
+
"TransferWithAuthorization",
|
|
32
|
+
"Permit",
|
|
33
|
+
]);
|
|
34
|
+
exports.FacilitatorSupportedAssetSchema = zod_1.z.object({
|
|
35
|
+
address: zod_1.z.string(),
|
|
36
|
+
decimals: zod_1.z.number(),
|
|
37
|
+
eip712: zod_1.z.object({
|
|
38
|
+
name: zod_1.z.string(),
|
|
39
|
+
version: zod_1.z.string(),
|
|
40
|
+
primaryType: exports.SupportedSignatureTypeSchema,
|
|
41
|
+
}),
|
|
42
|
+
});
|
|
43
|
+
const FacilitatorSupportedResponseSchema = types_1.SupportedPaymentKindsResponseSchema.extend({
|
|
44
|
+
kinds: zod_1.z.array(zod_1.z.object({
|
|
45
|
+
x402Version: zod_1.z.literal(1),
|
|
46
|
+
scheme: zod_1.z.literal("exact"),
|
|
47
|
+
network: FacilitatorNetworkSchema,
|
|
48
|
+
extra: zod_1.z
|
|
49
|
+
.object({
|
|
50
|
+
defaultAsset: exports.FacilitatorSupportedAssetSchema.optional(),
|
|
51
|
+
supportedAssets: zod_1.z
|
|
52
|
+
.array(exports.FacilitatorSupportedAssetSchema)
|
|
53
|
+
.optional(),
|
|
54
|
+
})
|
|
55
|
+
.optional(),
|
|
56
|
+
})),
|
|
57
|
+
}).describe("Supported payment kinds for this facilitator");
|
|
30
58
|
function networkToChainId(network) {
|
|
31
59
|
if (typeof network === "object") {
|
|
32
60
|
return network.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/x402/schemas.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/x402/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/x402/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/x402/types.ts"],"names":[],"mappings":";;;AAea,QAAA,WAAW,GAAG,CAAC,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import * as ox__Secp256k1 from "ox/Secp256k1";
|
|
2
|
+
import * as ox__Signature from "ox/Signature";
|
|
1
3
|
import * as ox__TypedData from "ox/TypedData";
|
|
4
|
+
import { isHex } from "../utils/encoding/hex.js";
|
|
2
5
|
import { verifyHash } from "./verify-hash.js";
|
|
3
6
|
/**
|
|
4
7
|
* Verify am [EIP-712](https://eips.ethereum.org/EIPS/eip-712) typed data signature. This function is interoperable with all wallet types (smart accounts or EOAs).
|
|
@@ -65,6 +68,21 @@ export async function verifyTypedData({ address, signature, client, chain, accou
|
|
|
65
68
|
primaryType,
|
|
66
69
|
types,
|
|
67
70
|
});
|
|
71
|
+
if (!isHex(signature)) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
try {
|
|
75
|
+
const recoveredAddress = ox__Secp256k1.recoverAddress({
|
|
76
|
+
payload: messageHash,
|
|
77
|
+
signature: ox__Signature.fromHex(signature),
|
|
78
|
+
});
|
|
79
|
+
if (recoveredAddress.toLowerCase() === address.toLowerCase()) {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
// no-op, we skip to contract signature check
|
|
85
|
+
}
|
|
68
86
|
return verifyHash({
|
|
69
87
|
accountFactory,
|
|
70
88
|
address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-typed-data.js","sourceRoot":"","sources":["../../../src/auth/verify-typed-data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verify-typed-data.js","sourceRoot":"","sources":["../../../src/auth/verify-typed-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,aAAa,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,aAAa,MAAM,cAAc,CAAC;AAG9C,OAAO,EAAY,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAyB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAmBrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAGnC,EACA,OAAO,EACP,SAAS,EACT,MAAM,EACN,KAAK,EACL,cAAc,EACd,OAAO,EACP,MAAM,EACN,WAAW,EACX,KAAK,GACyC;IAC9C,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,CAAC;QAC/C,MAAM;QACN,OAAO;QACP,WAAW;QACX,KAAK;KACiB,CAAC,CAAC;IAE1B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,aAAa,CAAC,cAAc,CAAC;YACpD,OAAO,EAAE,WAAW;YACpB,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC;SAC5C,CAAC,CAAC;QAEH,IAAI,gBAAgB,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,6CAA6C;IAC/C,CAAC;IACD,OAAO,UAAU,CAAC;QAChB,cAAc;QACd,OAAO;QACP,KAAK;QACL,MAAM;QACN,IAAI,EAAE,WAAW;QACjB,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -13,6 +13,7 @@ import { Spacer } from "../../components/Spacer.js";
|
|
|
13
13
|
import { Spinner } from "../../components/Spinner.js";
|
|
14
14
|
import { Text } from "../../components/text.js";
|
|
15
15
|
import { StyledDiv } from "../../design-system/elements.js";
|
|
16
|
+
import { useDebouncedValue } from "../../hooks/useDebouncedValue.js";
|
|
16
17
|
import { useIsMobile } from "../../hooks/useisMobile.js";
|
|
17
18
|
import { SearchInput } from "./SearchInput.js";
|
|
18
19
|
import { SelectChainButton } from "./SelectChainButton.js";
|
|
@@ -29,6 +30,7 @@ function getDefaultSelectedChain(chains, activeChainId) {
|
|
|
29
30
|
export function SelectToken(props) {
|
|
30
31
|
const chainQuery = useBridgeChains(props.client);
|
|
31
32
|
const [search, setSearch] = useState("");
|
|
33
|
+
const debouncedSearch = useDebouncedValue(search, 500);
|
|
32
34
|
const [limit, setLimit] = useState(1000);
|
|
33
35
|
const [_selectedChain, setSelectedChain] = useState(undefined);
|
|
34
36
|
const selectedChain = _selectedChain ||
|
|
@@ -40,7 +42,7 @@ export function SelectToken(props) {
|
|
|
40
42
|
const tokensQuery = useTokens({
|
|
41
43
|
client: props.client,
|
|
42
44
|
chainId: selectedChain?.chainId,
|
|
43
|
-
search,
|
|
45
|
+
search: debouncedSearch,
|
|
44
46
|
limit,
|
|
45
47
|
offset: 0,
|
|
46
48
|
});
|
|
@@ -54,11 +56,13 @@ export function SelectToken(props) {
|
|
|
54
56
|
});
|
|
55
57
|
const filteredOwnedTokens = useMemo(() => {
|
|
56
58
|
return ownedTokensQuery.data?.tokens?.filter((token) => {
|
|
57
|
-
return (token.symbol.toLowerCase().includes(
|
|
58
|
-
token.name.toLowerCase().includes(
|
|
59
|
-
token.token_address
|
|
59
|
+
return (token.symbol.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
|
|
60
|
+
token.name.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
|
|
61
|
+
token.token_address
|
|
62
|
+
.toLowerCase()
|
|
63
|
+
.includes(debouncedSearch.toLowerCase()));
|
|
60
64
|
});
|
|
61
|
-
}, [ownedTokensQuery.data?.tokens,
|
|
65
|
+
}, [ownedTokensQuery.data?.tokens, debouncedSearch]);
|
|
62
66
|
const isFetching = tokensQuery.isFetching || ownedTokensQuery.isFetching;
|
|
63
67
|
return (_jsx(SelectTokenUI, { ...props, ownedTokens: filteredOwnedTokens || [], allTokens: tokensQuery.data || [], isFetching: isFetching, selectedChain: selectedChain, setSelectedChain: setSelectedChain, search: search, setSearch: setSearch, selectedToken: props.selectedToken, setSelectedToken: props.setSelectedToken, showMore: tokensQuery.data?.length === limit
|
|
64
68
|
? () => {
|