thirdweb 5.105.19-nightly-8260af3a9258595b53f021a64a1e015791d33949-20250724000414 → 5.105.20
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/pay/buyWithCrypto/getQuote.js +8 -8
- package/dist/cjs/pay/buyWithCrypto/getQuote.js.map +1 -1
- package/dist/cjs/pay/buyWithCrypto/getTransfer.js +4 -4
- package/dist/cjs/pay/buyWithCrypto/getTransfer.js.map +1 -1
- package/dist/cjs/pay/buyWithFiat/getQuote.js +3 -3
- package/dist/cjs/pay/buyWithFiat/getQuote.js.map +1 -1
- package/dist/cjs/react/core/hooks/usePaymentMethods.js +2 -2
- package/dist/cjs/react/core/hooks/usePaymentMethods.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/signing.js +26 -95
- package/dist/cjs/wallets/smart/lib/signing.js.map +1 -1
- package/dist/esm/pay/buyWithCrypto/getQuote.js +8 -8
- package/dist/esm/pay/buyWithCrypto/getQuote.js.map +1 -1
- package/dist/esm/pay/buyWithCrypto/getTransfer.js +4 -4
- package/dist/esm/pay/buyWithCrypto/getTransfer.js.map +1 -1
- package/dist/esm/pay/buyWithFiat/getQuote.js +3 -3
- package/dist/esm/pay/buyWithFiat/getQuote.js.map +1 -1
- package/dist/esm/react/core/hooks/usePaymentMethods.js +2 -2
- package/dist/esm/react/core/hooks/usePaymentMethods.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/smart/lib/signing.js +27 -96
- package/dist/esm/wallets/smart/lib/signing.js.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/signing.d.ts +2 -3
- package/dist/types/wallets/smart/lib/signing.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/pay/buyWithCrypto/getQuote.ts +8 -8
- package/src/pay/buyWithCrypto/getTransfer.ts +4 -4
- package/src/pay/buyWithFiat/getQuote.ts +3 -3
- package/src/react/core/hooks/usePaymentMethods.ts +2 -2
- package/src/version.ts +1 -1
- package/src/wallets/smart/lib/signing.ts +34 -121
- package/src/wallets/smart/smart-wallet-integration.test.ts +1 -76
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC;AAC3B,OAAO,KAAK,eAAe,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AA6EnE;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAsC;IAEtC,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,WAAW,CAAC;YAChC,OAAO,EAAE,MAAM,CAAC,YAAY;YAC5B,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;QACH,MAAM,aAAa,GACjB,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,oBAAoB;YAC1D,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,QAAQ,CAAC;gBACb,QAAQ,EAAE,aAAa;aACxB,CAAC,CAAC;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;YACnC,MAAM;YACN,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,SAAS;YAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QAED,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAC/C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,UAAU,CACjC,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAElC,IAAI,YAA2C,CAAC;QAChD,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,eAAe,CAAC,IAAI,CAAC;gBACvC,mDAAmD;aACpD,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,eAAe,CAAC,UAAU,CAClD,WAAW,EACX,UAAU,CAAC,IAAI,CAChB,CAAC;YACF,YAAY,GAAG;gBACb,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE;gBAC5B,OAAO,EAAE,SAAS,CAAC,WAAW,CAAC,OAAO;gBACtC,cAAc,EAAE,OAAO;gBACvB,YAAY,EAAE,SAAS,CAAC,WAAW,CAAC,OAAO;aAC5C,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;QAC5E,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAA0B;YACtC,YAAY;YACZ,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,wBAAwB,EAAE,CAAC;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE;gBACZ,MAAM,EAAE,KAAK,CAAC,MAAM,CAClB,KAAK,CAAC,YAAY,EAClB,SAAS,CAAC,WAAW,CAAC,QAAQ,CAC/B,CAAC,QAAQ,EAAE;gBACZ,cAAc,EACZ,MAAM,CACJ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CACjE;oBACD,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,7 @@ export async function getBuyWithFiatQuote(params) {
|
|
|
114
114
|
chainId: token.chainId,
|
|
115
115
|
decimals: token.decimals,
|
|
116
116
|
name: token.name,
|
|
117
|
-
priceUSDCents: Math.round((token.prices
|
|
117
|
+
priceUSDCents: Math.round((token.prices.USD || 0) * 100),
|
|
118
118
|
symbol: token.symbol,
|
|
119
119
|
tokenAddress: token.address,
|
|
120
120
|
});
|
|
@@ -137,7 +137,7 @@ export async function getBuyWithFiatQuote(params) {
|
|
|
137
137
|
// Build info objects
|
|
138
138
|
const onRampTokenObject = {
|
|
139
139
|
amount: onRampTokenAmount,
|
|
140
|
-
amountUSDCents: Math.round(Number(onRampTokenAmount) * (onRampTokenRaw.prices
|
|
140
|
+
amountUSDCents: Math.round(Number(onRampTokenAmount) * (onRampTokenRaw.prices.USD || 0) * 100),
|
|
141
141
|
amountWei: onRampTokenAmountWei.toString(),
|
|
142
142
|
token: tokenToPayTokenInfo(onRampTokenRaw),
|
|
143
143
|
};
|
|
@@ -147,7 +147,7 @@ export async function getBuyWithFiatQuote(params) {
|
|
|
147
147
|
const routingAmount = toTokens(routingAmountWei, routingTokenRaw.decimals);
|
|
148
148
|
routingTokenObject = {
|
|
149
149
|
amount: routingAmount,
|
|
150
|
-
amountUSDCents: Math.round(Number(routingAmount) * (routingTokenRaw.prices
|
|
150
|
+
amountUSDCents: Math.round(Number(routingAmount) * (routingTokenRaw.prices.USD || 0) * 100),
|
|
151
151
|
amountWei: routingAmountWei.toString(),
|
|
152
152
|
token: tokenToPayTokenInfo(routingTokenRaw),
|
|
153
153
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithFiat/getQuote.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithFiat/getQuote.ts"],"names":[],"mappings":"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"}
|
|
@@ -170,9 +170,9 @@ export function usePaymentMethods(options) {
|
|
|
170
170
|
// Sort by dollar balance descending
|
|
171
171
|
validOwnedTokens.sort((a, b) => {
|
|
172
172
|
const aDollarBalance = Number.parseFloat(toTokens(a.balance, a.originToken.decimals)) *
|
|
173
|
-
(a.originToken.prices
|
|
173
|
+
(a.originToken.prices.USD || 0);
|
|
174
174
|
const bDollarBalance = Number.parseFloat(toTokens(b.balance, b.originToken.decimals)) *
|
|
175
|
-
(b.originToken.prices
|
|
175
|
+
(b.originToken.prices.USD || 0);
|
|
176
176
|
return bDollarBalance - aDollarBalance;
|
|
177
177
|
});
|
|
178
178
|
const suitableOriginTokens = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaymentMethods.js","sourceRoot":"","sources":["../../../../../src/react/core/hooks/usePaymentMethods.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"usePaymentMethods.js","sourceRoot":"","sources":["../../../../../src/react/core/hooks/usePaymentMethods.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.105.
|
|
1
|
+
export const version = "5.105.20";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,UAAU,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { serializeErc6492Signature } from "../../../auth/serialize-erc6492-signature.js";
|
|
2
|
-
import { verifyEip1271Signature
|
|
3
|
-
import { getContract, } from "../../../contract/contract.js";
|
|
2
|
+
import { verifyEip1271Signature } from "../../../auth/verify-hash.js";
|
|
4
3
|
import { encode } from "../../../transaction/actions/encode.js";
|
|
5
|
-
import { readContract } from "../../../transaction/read-contract.js";
|
|
6
4
|
import { encodeAbiParameters } from "../../../utils/abi/encodeAbiParameters.js";
|
|
7
5
|
import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
|
|
8
6
|
import { hashMessage } from "../../../utils/hashing/hashMessage.js";
|
|
@@ -16,29 +14,19 @@ import { prepareCreateAccount } from "./calls.js";
|
|
|
16
14
|
*/
|
|
17
15
|
export async function smartAccountSignMessage({ accountContract, factoryContract, options, message, }) {
|
|
18
16
|
const originalMsgHash = hashMessage(message);
|
|
19
|
-
const is712Factory = await checkFor712Factory({
|
|
20
|
-
accountContract,
|
|
21
|
-
factoryContract,
|
|
22
|
-
originalMsgHash,
|
|
23
|
-
});
|
|
24
17
|
let sig;
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
sig = await options.personalAccount.signMessage({ message });
|
|
41
|
-
}
|
|
18
|
+
const wrappedMessageHash = encodeAbiParameters([{ type: "bytes32" }], [originalMsgHash]);
|
|
19
|
+
sig = await options.personalAccount.signTypedData({
|
|
20
|
+
domain: {
|
|
21
|
+
chainId: options.chain.id,
|
|
22
|
+
name: "Account",
|
|
23
|
+
verifyingContract: accountContract.address,
|
|
24
|
+
version: "1",
|
|
25
|
+
},
|
|
26
|
+
message: { message: wrappedMessageHash },
|
|
27
|
+
primaryType: "AccountMessage",
|
|
28
|
+
types: { AccountMessage: [{ name: "message", type: "bytes" }] },
|
|
29
|
+
});
|
|
42
30
|
const isDeployed = await isContractDeployed(accountContract);
|
|
43
31
|
if (isDeployed) {
|
|
44
32
|
const isValid = await verifyEip1271Signature({
|
|
@@ -67,18 +55,7 @@ export async function smartAccountSignMessage({ accountContract, factoryContract
|
|
|
67
55
|
data: initCode,
|
|
68
56
|
signature: sig,
|
|
69
57
|
});
|
|
70
|
-
|
|
71
|
-
const isValid = await verifyHash({
|
|
72
|
-
address: accountContract.address,
|
|
73
|
-
chain: accountContract.chain,
|
|
74
|
-
client: accountContract.client,
|
|
75
|
-
hash: originalMsgHash,
|
|
76
|
-
signature: erc6492Sig,
|
|
77
|
-
});
|
|
78
|
-
if (isValid) {
|
|
79
|
-
return erc6492Sig;
|
|
80
|
-
}
|
|
81
|
-
throw new Error("Unable to verify ERC-6492 signature after signing.");
|
|
58
|
+
return erc6492Sig;
|
|
82
59
|
}
|
|
83
60
|
}
|
|
84
61
|
export async function smartAccountSignTypedData({ accountContract, factoryContract, options, typedData, }) {
|
|
@@ -89,30 +66,19 @@ export async function smartAccountSignTypedData({ accountContract, factoryContra
|
|
|
89
66
|
return options.personalAccount.signTypedData(typedData);
|
|
90
67
|
}
|
|
91
68
|
const originalMsgHash = hashTypedData(typedData);
|
|
92
|
-
// check if the account contract supports EIP721 domain separator based signing
|
|
93
|
-
const is712Factory = await checkFor712Factory({
|
|
94
|
-
accountContract,
|
|
95
|
-
factoryContract,
|
|
96
|
-
originalMsgHash,
|
|
97
|
-
});
|
|
98
69
|
let sig;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
});
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
sig = await options.personalAccount.signTypedData(typedData);
|
|
115
|
-
}
|
|
70
|
+
const wrappedMessageHash = encodeAbiParameters([{ type: "bytes32" }], [originalMsgHash]);
|
|
71
|
+
sig = await options.personalAccount.signTypedData({
|
|
72
|
+
domain: {
|
|
73
|
+
chainId: options.chain.id,
|
|
74
|
+
name: "Account",
|
|
75
|
+
verifyingContract: accountContract.address,
|
|
76
|
+
version: "1",
|
|
77
|
+
},
|
|
78
|
+
message: { message: wrappedMessageHash },
|
|
79
|
+
primaryType: "AccountMessage",
|
|
80
|
+
types: { AccountMessage: [{ name: "message", type: "bytes" }] },
|
|
81
|
+
});
|
|
116
82
|
const isDeployed = await isContractDeployed(accountContract);
|
|
117
83
|
if (isDeployed) {
|
|
118
84
|
const isValid = await verifyEip1271Signature({
|
|
@@ -141,18 +107,7 @@ export async function smartAccountSignTypedData({ accountContract, factoryContra
|
|
|
141
107
|
data: initCode,
|
|
142
108
|
signature: sig,
|
|
143
109
|
});
|
|
144
|
-
|
|
145
|
-
const isValid = await verifyHash({
|
|
146
|
-
address: accountContract.address,
|
|
147
|
-
chain: accountContract.chain,
|
|
148
|
-
client: accountContract.client,
|
|
149
|
-
hash: originalMsgHash,
|
|
150
|
-
signature: erc6492Sig,
|
|
151
|
-
});
|
|
152
|
-
if (isValid) {
|
|
153
|
-
return erc6492Sig;
|
|
154
|
-
}
|
|
155
|
-
throw new Error("Unable to verify signature on smart account, please make sure the admin wallet has permissions and the signature is valid.");
|
|
110
|
+
return erc6492Sig;
|
|
156
111
|
}
|
|
157
112
|
}
|
|
158
113
|
export async function confirmContractDeployment(args) {
|
|
@@ -169,30 +124,6 @@ export async function confirmContractDeployment(args) {
|
|
|
169
124
|
isDeployed = await isContractDeployed(accountContract);
|
|
170
125
|
}
|
|
171
126
|
}
|
|
172
|
-
async function checkFor712Factory({ factoryContract, accountContract, originalMsgHash, }) {
|
|
173
|
-
try {
|
|
174
|
-
const implementationAccount = await readContract({
|
|
175
|
-
contract: factoryContract,
|
|
176
|
-
method: "function accountImplementation() public view returns (address)",
|
|
177
|
-
});
|
|
178
|
-
// check if the account contract supports EIP721 domain separator or modular based signing
|
|
179
|
-
const is712Factory = await readContract({
|
|
180
|
-
contract: getContract({
|
|
181
|
-
address: implementationAccount,
|
|
182
|
-
chain: accountContract.chain,
|
|
183
|
-
client: accountContract.client,
|
|
184
|
-
}),
|
|
185
|
-
method: "function getMessageHash(bytes32 _hash) public view returns (bytes32)",
|
|
186
|
-
params: [originalMsgHash],
|
|
187
|
-
})
|
|
188
|
-
.then((res) => res !== "0x")
|
|
189
|
-
.catch(() => false);
|
|
190
|
-
return is712Factory;
|
|
191
|
-
}
|
|
192
|
-
catch {
|
|
193
|
-
return false;
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
127
|
/**
|
|
197
128
|
* Deployes a smart account via a dummy transaction. If the account is already deployed, this will do nothing.
|
|
198
129
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signing.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/signing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,
|
|
1
|
+
{"version":3,"file":"signing.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/signing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAItE,OAAO,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAIxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAC5C,eAAe,EACf,eAAe,EACf,OAAO,EACP,OAAO,GAMR;IACC,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI,GAAkB,CAAC;IACvB,MAAM,kBAAkB,GAAG,mBAAmB,CAC5C,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EACrB,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC;QAChD,MAAM,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YACzB,IAAI,EAAE,SAAS;YACf,iBAAiB,EAAE,eAAe,CAAC,OAAO;YAC1C,OAAO,EAAE,GAAG;SACb;QACD,OAAO,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;QACxC,WAAW,EAAE,gBAAgB;QAC7B,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;KAChE,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC;YAC3C,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE,eAAe;YACrB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC;YACpC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,WAAW;YAC3C,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,OAAO;YAC7C,qBAAqB,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa;YACvD,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,yBAAyB,CAAC;YAC3C,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAG7C,EACA,eAAe,EACf,eAAe,EACf,OAAO,EACP,SAAS,GAMV;IACC,MAAM,uBAAuB,GAEzB,SAAS,CAAC,MACX,EAAE,iBAAiB,EAAE,WAAW,EAAE;QACnC,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;IAEzC,IAAI,uBAAuB,EAAE,CAAC;QAC5B,0GAA0G;QAC1G,OAAO,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;IAEjD,IAAI,GAAkB,CAAC;IACvB,MAAM,kBAAkB,GAAG,mBAAmB,CAC5C,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EACrB,CAAC,eAAe,CAAC,CAClB,CAAC;IACF,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC;QAChD,MAAM,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YACzB,IAAI,EAAE,SAAS;YACf,iBAAiB,EAAE,eAAe,CAAC,OAAO;YAC1C,OAAO,EAAE,GAAG;SACb;QACD,OAAO,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;QACxC,WAAW,EAAE,gBAAgB;QAC7B,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;KAChE,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC;YAC3C,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE,eAAe;YACrB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC;YACpC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,WAAW;YAC3C,YAAY,EAAE,OAAO,CAAC,eAAe,CAAC,OAAO;YAC7C,qBAAqB,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa;YACvD,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,yBAAyB,CAAC;YAC3C,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,IAE/C;IACC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,oBAAoB;IAC3C,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,iDAAiD,CAClD,CAAC;IACF,IAAI,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC3D,OAAO,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,IAKxC;IACC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAC9D,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IAED,MAAM,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtE,MAAM,CAAC,kDAAkD,CAAC;QAC1D,MAAM,CAAC,6CAA6C,CAAC;KACtD,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,kBAAkB,CAAC;QACjC,KAAK,EAAE,KAAK;QACZ,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,MAAM;QACX,EAAE,EAAE,eAAe,CAAC,OAAO;QAC3B,KAAK,EAAE,EAAE,EAAE,sCAAsC;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;QACzC,OAAO,EAAE,YAAY;QACrB,WAAW,EAAE,OAAO;KACrB,CAAC,CAAC;IAEH,MAAM,yBAAyB,CAAC;QAC9B,eAAe;KAChB,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const version = "5.105.
|
|
1
|
+
export declare const version = "5.105.20";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,aAAa,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type * as ox__TypedData from "ox/TypedData";
|
|
2
2
|
import type { Chain } from "../../../chains/types.js";
|
|
3
3
|
import type { ThirdwebClient } from "../../../client/client.js";
|
|
4
|
-
import {
|
|
5
|
-
import type { Hex } from "../../../utils/encoding/hex.js";
|
|
4
|
+
import type { ThirdwebContract } from "../../../contract/contract.js";
|
|
6
5
|
import type { SignableMessage } from "../../../utils/types.js";
|
|
7
6
|
import type { Account } from "../../../wallets/interfaces/wallet.js";
|
|
8
7
|
import type { SmartAccountOptions } from "../types.js";
|
|
@@ -56,7 +55,7 @@ export declare function deploySmartAccount(args: {
|
|
|
56
55
|
client: ThirdwebClient;
|
|
57
56
|
accountContract: ThirdwebContract;
|
|
58
57
|
}): Promise<{
|
|
59
|
-
readonly transactionHash: Hex;
|
|
58
|
+
readonly transactionHash: import("../../../exports/thirdweb.js").Hex;
|
|
60
59
|
client: ThirdwebClient;
|
|
61
60
|
chain: Chain;
|
|
62
61
|
maxBlocksWaitTime?: number | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signing.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/signing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,aAAa,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"signing.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/signing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,aAAa,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAMtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,eAAe,EACf,eAAe,EACf,OAAO,EACP,OAAO,GACR,EAAE;IACD,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,OAAO,EAAE,eAAe,CAAC;CAC1B,0BAmDA;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,CAAC,SAAS,SAAS,aAAa,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzE,WAAW,SAAS,MAAM,SAAS,GAAG,cAAc,GAAG,MAAM,SAAS,EACtE,EACA,eAAe,EACf,eAAe,EACf,OAAO,EACP,SAAS,GACV,EAAE;IACD,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;CAC7D,0BA6DA;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,eAAe,EAAE,gBAAgB,CAAC;CACnC,iBAiBA;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,EAAE,gBAAgB,CAAC;CACnC;;;;;eA4BA"}
|
package/package.json
CHANGED
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"uqr": "0.1.2",
|
|
39
39
|
"viem": "2.28.1",
|
|
40
40
|
"zod": "3.25.75",
|
|
41
|
-
"@thirdweb-dev/
|
|
42
|
-
"@thirdweb-dev/
|
|
41
|
+
"@thirdweb-dev/engine": "3.2.1",
|
|
42
|
+
"@thirdweb-dev/insight": "1.1.0"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@aws-sdk/client-kms": "3.592.0",
|
|
@@ -375,7 +375,7 @@
|
|
|
375
375
|
}
|
|
376
376
|
},
|
|
377
377
|
"typings": "./dist/types/exports/thirdweb.d.ts",
|
|
378
|
-
"version": "5.105.
|
|
378
|
+
"version": "5.105.20",
|
|
379
379
|
"scripts": {
|
|
380
380
|
"bench": "vitest -c ./test/vitest.config.ts bench",
|
|
381
381
|
"bench:compare": "bun run ./benchmarks/run.ts",
|
|
@@ -300,14 +300,14 @@ export async function getBuyWithCryptoQuote(
|
|
|
300
300
|
Number(
|
|
301
301
|
Value.format(quote.originAmount, firstStep.originToken.decimals),
|
|
302
302
|
) *
|
|
303
|
-
(firstStep.originToken.prices
|
|
303
|
+
(firstStep.originToken.prices.USD || 0) *
|
|
304
304
|
100,
|
|
305
305
|
amountWei: quote.originAmount.toString(),
|
|
306
306
|
token: {
|
|
307
307
|
chainId: firstStep.originToken.chainId,
|
|
308
308
|
decimals: firstStep.originToken.decimals,
|
|
309
309
|
name: firstStep.originToken.name,
|
|
310
|
-
priceUSDCents: (firstStep.originToken.prices
|
|
310
|
+
priceUSDCents: (firstStep.originToken.prices.USD || 0) * 100,
|
|
311
311
|
symbol: firstStep.originToken.symbol,
|
|
312
312
|
tokenAddress: firstStep.originToken.address,
|
|
313
313
|
},
|
|
@@ -323,7 +323,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
323
323
|
chainId: firstStep.originToken.chainId,
|
|
324
324
|
decimals: firstStep.originToken.decimals,
|
|
325
325
|
name: firstStep.originToken.name,
|
|
326
|
-
priceUSDCents: (firstStep.originToken.prices
|
|
326
|
+
priceUSDCents: (firstStep.originToken.prices.USD || 0) * 100,
|
|
327
327
|
symbol: firstStep.originToken.symbol,
|
|
328
328
|
tokenAddress: firstStep.originToken.address,
|
|
329
329
|
},
|
|
@@ -337,7 +337,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
337
337
|
Number(
|
|
338
338
|
Value.format(quote.originAmount, firstStep.originToken.decimals),
|
|
339
339
|
) *
|
|
340
|
-
(firstStep.originToken.prices
|
|
340
|
+
(firstStep.originToken.prices.USD || 0) *
|
|
341
341
|
100,
|
|
342
342
|
gasCostUSDCents: 0,
|
|
343
343
|
slippageBPS: 0,
|
|
@@ -348,7 +348,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
348
348
|
firstStep.destinationToken.decimals,
|
|
349
349
|
),
|
|
350
350
|
) *
|
|
351
|
-
(firstStep.destinationToken.prices
|
|
351
|
+
(firstStep.destinationToken.prices.USD || 0) *
|
|
352
352
|
100,
|
|
353
353
|
toAmountUSDCents:
|
|
354
354
|
Number(
|
|
@@ -357,7 +357,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
357
357
|
firstStep.destinationToken.decimals,
|
|
358
358
|
),
|
|
359
359
|
) *
|
|
360
|
-
(firstStep.destinationToken.prices
|
|
360
|
+
(firstStep.destinationToken.prices.USD || 0) *
|
|
361
361
|
100,
|
|
362
362
|
},
|
|
363
363
|
fromAddress: quote.intent.sender,
|
|
@@ -372,7 +372,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
372
372
|
chainId: firstStep.originToken.chainId,
|
|
373
373
|
decimals: firstStep.originToken.decimals,
|
|
374
374
|
name: firstStep.originToken.name,
|
|
375
|
-
priceUSDCents: (firstStep.originToken.prices
|
|
375
|
+
priceUSDCents: (firstStep.originToken.prices.USD || 0) * 100,
|
|
376
376
|
symbol: firstStep.originToken.symbol,
|
|
377
377
|
tokenAddress: firstStep.originToken.address,
|
|
378
378
|
},
|
|
@@ -395,7 +395,7 @@ export async function getBuyWithCryptoQuote(
|
|
|
395
395
|
chainId: firstStep.destinationToken.chainId,
|
|
396
396
|
decimals: firstStep.destinationToken.decimals,
|
|
397
397
|
name: firstStep.destinationToken.name,
|
|
398
|
-
priceUSDCents: (firstStep.destinationToken.prices
|
|
398
|
+
priceUSDCents: (firstStep.destinationToken.prices.USD || 0) * 100,
|
|
399
399
|
symbol: firstStep.destinationToken.symbol,
|
|
400
400
|
tokenAddress: firstStep.destinationToken.address,
|
|
401
401
|
},
|
|
@@ -198,14 +198,14 @@ export async function getBuyWithCryptoTransfer(
|
|
|
198
198
|
Number(
|
|
199
199
|
Value.format(quote.originAmount, firstStep.originToken.decimals),
|
|
200
200
|
) *
|
|
201
|
-
(firstStep.originToken.prices
|
|
201
|
+
(firstStep.originToken.prices.USD || 0) *
|
|
202
202
|
100,
|
|
203
203
|
amountWei: quote.originAmount.toString(),
|
|
204
204
|
token: {
|
|
205
205
|
chainId: firstStep.originToken.chainId,
|
|
206
206
|
decimals: firstStep.originToken.decimals,
|
|
207
207
|
name: firstStep.originToken.name,
|
|
208
|
-
priceUSDCents: (firstStep.originToken.prices
|
|
208
|
+
priceUSDCents: (firstStep.originToken.prices.USD || 0) * 100,
|
|
209
209
|
symbol: firstStep.originToken.symbol,
|
|
210
210
|
tokenAddress: firstStep.originToken.address,
|
|
211
211
|
},
|
|
@@ -226,7 +226,7 @@ export async function getBuyWithCryptoTransfer(
|
|
|
226
226
|
firstStep.originToken.decimals,
|
|
227
227
|
),
|
|
228
228
|
) *
|
|
229
|
-
(firstStep.originToken.prices
|
|
229
|
+
(firstStep.originToken.prices.USD || 0) *
|
|
230
230
|
100
|
|
231
231
|
: 0,
|
|
232
232
|
amountWei:
|
|
@@ -237,7 +237,7 @@ export async function getBuyWithCryptoTransfer(
|
|
|
237
237
|
chainId: firstStep.originToken.chainId,
|
|
238
238
|
decimals: firstStep.originToken.decimals,
|
|
239
239
|
name: firstStep.originToken.name,
|
|
240
|
-
priceUSDCents: (firstStep.originToken.prices
|
|
240
|
+
priceUSDCents: (firstStep.originToken.prices.USD || 0) * 100,
|
|
241
241
|
symbol: firstStep.originToken.symbol,
|
|
242
242
|
tokenAddress: firstStep.originToken.address,
|
|
243
243
|
},
|
|
@@ -372,7 +372,7 @@ export async function getBuyWithFiatQuote(
|
|
|
372
372
|
chainId: token.chainId,
|
|
373
373
|
decimals: token.decimals,
|
|
374
374
|
name: token.name,
|
|
375
|
-
priceUSDCents: Math.round((token.prices
|
|
375
|
+
priceUSDCents: Math.round((token.prices.USD || 0) * 100),
|
|
376
376
|
symbol: token.symbol,
|
|
377
377
|
tokenAddress: token.address,
|
|
378
378
|
});
|
|
@@ -408,7 +408,7 @@ export async function getBuyWithFiatQuote(
|
|
|
408
408
|
const onRampTokenObject = {
|
|
409
409
|
amount: onRampTokenAmount,
|
|
410
410
|
amountUSDCents: Math.round(
|
|
411
|
-
Number(onRampTokenAmount) * (onRampTokenRaw.prices
|
|
411
|
+
Number(onRampTokenAmount) * (onRampTokenRaw.prices.USD || 0) * 100,
|
|
412
412
|
),
|
|
413
413
|
amountWei: onRampTokenAmountWei.toString(),
|
|
414
414
|
token: tokenToPayTokenInfo(onRampTokenRaw),
|
|
@@ -434,7 +434,7 @@ export async function getBuyWithFiatQuote(
|
|
|
434
434
|
routingTokenObject = {
|
|
435
435
|
amount: routingAmount,
|
|
436
436
|
amountUSDCents: Math.round(
|
|
437
|
-
Number(routingAmount) * (routingTokenRaw.prices
|
|
437
|
+
Number(routingAmount) * (routingTokenRaw.prices.USD || 0) * 100,
|
|
438
438
|
),
|
|
439
439
|
amountWei: routingAmountWei.toString(),
|
|
440
440
|
token: tokenToPayTokenInfo(routingTokenRaw),
|
|
@@ -240,10 +240,10 @@ export function usePaymentMethods(options: {
|
|
|
240
240
|
validOwnedTokens.sort((a, b) => {
|
|
241
241
|
const aDollarBalance =
|
|
242
242
|
Number.parseFloat(toTokens(a.balance, a.originToken.decimals)) *
|
|
243
|
-
(a.originToken.prices
|
|
243
|
+
(a.originToken.prices.USD || 0);
|
|
244
244
|
const bDollarBalance =
|
|
245
245
|
Number.parseFloat(toTokens(b.balance, b.originToken.decimals)) *
|
|
246
|
-
(b.originToken.prices
|
|
246
|
+
(b.originToken.prices.USD || 0);
|
|
247
247
|
return bDollarBalance - aDollarBalance;
|
|
248
248
|
});
|
|
249
249
|
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const version = "5.105.
|
|
1
|
+
export const version = "5.105.20";
|