thirdweb 5.87.4 → 5.88.0
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/client/client.js +2 -1
- package/dist/cjs/client/client.js.map +1 -1
- package/dist/cjs/contract/deployment/zksync/zkDeployContract.js +4 -2
- package/dist/cjs/contract/deployment/zksync/zkDeployContract.js.map +1 -1
- package/dist/cjs/pay/buyWithCrypto/getQuote.js +1 -24
- package/dist/cjs/pay/buyWithCrypto/getQuote.js.map +1 -1
- package/dist/cjs/pay/buyWithCrypto/getTransfer.js +1 -13
- package/dist/cjs/pay/buyWithCrypto/getTransfer.js.map +1 -1
- package/dist/cjs/pay/buyWithFiat/getQuote.js.map +1 -1
- package/dist/cjs/pay/utils/commonTypes.js +2 -0
- package/dist/cjs/pay/utils/commonTypes.js.map +1 -1
- package/dist/cjs/react/core/utils/storage.js +2 -1
- package/dist/cjs/react/core/utils/storage.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +50 -200
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js +111 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.js +30 -2
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.js +24 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js +2 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +18 -6
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js +37 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.js +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js +165 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js.map +1 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +33 -6
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/nativeToken.js +8 -0
- package/dist/cjs/react/web/ui/ConnectWallet/screens/nativeToken.js.map +1 -1
- package/dist/cjs/react/web/utils/errors.js +16 -0
- package/dist/cjs/react/web/utils/errors.js.map +1 -0
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/smart/index.js +27 -0
- package/dist/cjs/wallets/smart/index.js.map +1 -1
- package/dist/cjs/wallets/smart/types.js.map +1 -1
- package/dist/esm/client/client.js +2 -1
- package/dist/esm/client/client.js.map +1 -1
- package/dist/esm/contract/deployment/zksync/zkDeployContract.js +4 -2
- package/dist/esm/contract/deployment/zksync/zkDeployContract.js.map +1 -1
- package/dist/esm/pay/buyWithCrypto/getQuote.js +1 -24
- package/dist/esm/pay/buyWithCrypto/getQuote.js.map +1 -1
- package/dist/esm/pay/buyWithCrypto/getTransfer.js +1 -13
- package/dist/esm/pay/buyWithCrypto/getTransfer.js.map +1 -1
- package/dist/esm/pay/buyWithFiat/getQuote.js.map +1 -1
- package/dist/esm/pay/utils/commonTypes.js +1 -1
- package/dist/esm/pay/utils/commonTypes.js.map +1 -1
- package/dist/esm/react/core/utils/storage.js +1 -0
- package/dist/esm/react/core/utils/storage.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +50 -200
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js +108 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.js +30 -2
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.js +21 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js +2 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +18 -6
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js +34 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.js +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js +162 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.js.map +1 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js +33 -6
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/nativeToken.js +7 -0
- package/dist/esm/react/web/ui/ConnectWallet/screens/nativeToken.js.map +1 -1
- package/dist/esm/react/web/utils/errors.js +12 -0
- package/dist/esm/react/web/utils/errors.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/smart/index.js +27 -0
- package/dist/esm/wallets/smart/index.js.map +1 -1
- package/dist/esm/wallets/smart/types.js.map +1 -1
- package/dist/types/client/client.d.ts.map +1 -1
- package/dist/types/contract/deployment/zksync/zkDeployContract.d.ts.map +1 -1
- package/dist/types/pay/buyWithCrypto/getQuote.d.ts +2 -2
- package/dist/types/pay/buyWithCrypto/getQuote.d.ts.map +1 -1
- package/dist/types/pay/buyWithCrypto/getTransfer.d.ts +2 -2
- package/dist/types/pay/buyWithCrypto/getTransfer.d.ts.map +1 -1
- package/dist/types/pay/buyWithFiat/getQuote.d.ts +4 -0
- package/dist/types/pay/buyWithFiat/getQuote.d.ts.map +1 -1
- package/dist/types/pay/utils/commonTypes.d.ts +2 -1
- package/dist/types/pay/utils/commonTypes.d.ts.map +1 -1
- package/dist/types/react/core/utils/storage.d.ts +1 -0
- package/dist/types/react/core/utils/storage.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.d.ts +25 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.d.ts +9 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/types.d.ts +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/types.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.d.ts +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.d.ts +11 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.d.ts +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.d.ts +31 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.d.ts.map +1 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/nativeToken.d.ts +2 -0
- package/dist/types/react/web/ui/ConnectWallet/screens/nativeToken.d.ts.map +1 -1
- package/dist/types/react/web/ui/components/text.d.ts +1 -1
- package/dist/types/react/web/ui/components/text.d.ts.map +1 -1
- package/dist/types/react/web/utils/errors.d.ts +14 -0
- package/dist/types/react/web/utils/errors.d.ts.map +1 -0
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/smart/index.d.ts.map +1 -1
- package/dist/types/wallets/smart/types.d.ts +5 -0
- package/dist/types/wallets/smart/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/client/client.test.ts +2 -2
- package/src/client/client.ts +2 -1
- package/src/contract/deployment/zksync/zkDeployContract.ts +5 -2
- package/src/pay/buyWithCrypto/getQuote.ts +2 -27
- package/src/pay/buyWithCrypto/getTransfer.ts +2 -14
- package/src/pay/buyWithFiat/getQuote.ts +5 -0
- package/src/pay/utils/commonTypes.ts +3 -1
- package/src/react/core/utils/storage.ts +1 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +70 -531
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatScreenContent.tsx +307 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/PostOnRampSwap.tsx +33 -1
- package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/Providers.tsx +57 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/main/types.ts +1 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx +12 -2
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx +21 -6
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/FiatValue.tsx +51 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapFlow.tsx +2 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx +353 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx +43 -6
- package/src/react/web/ui/ConnectWallet/screens/nativeToken.ts +8 -0
- package/src/react/web/ui/components/text.tsx +1 -1
- package/src/react/web/utils/errors.ts +22 -0
- package/src/version.ts +1 -1
- package/src/wallets/smart/index.ts +28 -0
- package/src/wallets/smart/smart-wallet-integration.test.ts +25 -0
- package/src/wallets/smart/types.ts +5 -0
@@ -0,0 +1,165 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.SwapScreenContent = SwapScreenContent;
|
4
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
5
|
+
const react_query_1 = require("@tanstack/react-query");
|
6
|
+
const react_1 = require("react");
|
7
|
+
const utils_js_1 = require("../../../../../../../chains/utils.js");
|
8
|
+
const addresses_js_1 = require("../../../../../../../constants/addresses.js");
|
9
|
+
const contract_js_1 = require("../../../../../../../contract/contract.js");
|
10
|
+
const allowance_js_1 = require("../../../../../../../extensions/erc20/__generated__/IERC20/read/allowance.js");
|
11
|
+
const formatNumber_js_1 = require("../../../../../../../utils/formatNumber.js");
|
12
|
+
const useWalletBalance_js_1 = require("../../../../../../core/hooks/others/useWalletBalance.js");
|
13
|
+
const useBuyWithCryptoQuote_js_1 = require("../../../../../../core/hooks/pay/useBuyWithCryptoQuote.js");
|
14
|
+
const errors_js_1 = require("../../../../../utils/errors.js");
|
15
|
+
const Drawer_js_1 = require("../../../../components/Drawer.js");
|
16
|
+
const Spacer_js_1 = require("../../../../components/Spacer.js");
|
17
|
+
const Spinner_js_1 = require("../../../../components/Spinner.js");
|
18
|
+
const SwitchNetwork_js_1 = require("../../../../components/SwitchNetwork.js");
|
19
|
+
const basic_js_1 = require("../../../../components/basic.js");
|
20
|
+
const buttons_js_1 = require("../../../../components/buttons.js");
|
21
|
+
const text_js_1 = require("../../../../components/text.js");
|
22
|
+
const TokenSymbol_js_1 = require("../../../../components/token/TokenSymbol.js");
|
23
|
+
const nativeToken_js_1 = require("../../nativeToken.js");
|
24
|
+
const EstimatedTimeAndFees_js_1 = require("../EstimatedTimeAndFees.js");
|
25
|
+
const Fees_js_1 = require("./Fees.js");
|
26
|
+
const PayWithCrypto_js_1 = require("./PayWithCrypto.js");
|
27
|
+
function SwapScreenContent(props) {
|
28
|
+
const { setScreen, payer, client, toChain, tokenAmount, toToken, fromChain, fromToken, payOptions, disableTokenSelection, } = props;
|
29
|
+
const defaultRecipientAddress = props.payOptions?.paymentInfo?.sellerAddress;
|
30
|
+
const receiverAddress = defaultRecipientAddress || props.activeAccount.address;
|
31
|
+
const { drawerRef, drawerOverlayRef, isOpen, setIsOpen } = (0, Drawer_js_1.useDrawer)();
|
32
|
+
const [drawerScreen, setDrawerScreen] = (0, react_1.useState)("fees");
|
33
|
+
const fromTokenBalanceQuery = (0, useWalletBalance_js_1.useWalletBalance)({
|
34
|
+
address: payer.account.address,
|
35
|
+
chain: fromChain,
|
36
|
+
tokenAddress: (0, nativeToken_js_1.isNativeToken)(fromToken) ? undefined : fromToken.address,
|
37
|
+
client,
|
38
|
+
});
|
39
|
+
const fromTokenId = (0, nativeToken_js_1.isNativeToken)(fromToken)
|
40
|
+
? addresses_js_1.NATIVE_TOKEN_ADDRESS
|
41
|
+
: fromToken.address.toLowerCase();
|
42
|
+
const toTokenId = (0, nativeToken_js_1.isNativeToken)(toToken)
|
43
|
+
? addresses_js_1.NATIVE_TOKEN_ADDRESS
|
44
|
+
: toToken.address.toLowerCase();
|
45
|
+
const swapRequired = !!tokenAmount &&
|
46
|
+
!(fromChain.id === toChain.id && fromTokenId === toTokenId);
|
47
|
+
const quoteParams = swapRequired
|
48
|
+
? {
|
49
|
+
// wallets
|
50
|
+
fromAddress: payer.account.address,
|
51
|
+
toAddress: receiverAddress,
|
52
|
+
// from
|
53
|
+
fromChainId: fromChain.id,
|
54
|
+
fromTokenAddress: (0, nativeToken_js_1.isNativeToken)(fromToken)
|
55
|
+
? addresses_js_1.NATIVE_TOKEN_ADDRESS
|
56
|
+
: fromToken.address,
|
57
|
+
// to
|
58
|
+
toChainId: toChain.id,
|
59
|
+
toTokenAddress: (0, nativeToken_js_1.isNativeToken)(toToken)
|
60
|
+
? addresses_js_1.NATIVE_TOKEN_ADDRESS
|
61
|
+
: toToken.address,
|
62
|
+
toAmount: tokenAmount,
|
63
|
+
client,
|
64
|
+
purchaseData: payOptions.purchaseData,
|
65
|
+
}
|
66
|
+
: undefined;
|
67
|
+
const quoteQuery = (0, useBuyWithCryptoQuote_js_1.useBuyWithCryptoQuote)(quoteParams, {
|
68
|
+
// refetch every 30 seconds
|
69
|
+
staleTime: 30 * 1000,
|
70
|
+
refetchInterval: 30 * 1000,
|
71
|
+
gcTime: 30 * 1000,
|
72
|
+
});
|
73
|
+
const allowanceQuery = (0, react_query_1.useQuery)({
|
74
|
+
queryKey: [
|
75
|
+
"allowance",
|
76
|
+
payer.account.address,
|
77
|
+
quoteQuery.data?.approvalData,
|
78
|
+
],
|
79
|
+
queryFn: () => {
|
80
|
+
if (!quoteQuery.data?.approvalData) {
|
81
|
+
return null;
|
82
|
+
}
|
83
|
+
return (0, allowance_js_1.allowance)({
|
84
|
+
contract: (0, contract_js_1.getContract)({
|
85
|
+
client: props.client,
|
86
|
+
address: quoteQuery.data.swapDetails.fromToken.tokenAddress,
|
87
|
+
chain: (0, utils_js_1.getCachedChain)(quoteQuery.data.swapDetails.fromToken.chainId),
|
88
|
+
}),
|
89
|
+
spender: quoteQuery.data.approvalData.spenderAddress,
|
90
|
+
owner: props.payer.account.address,
|
91
|
+
});
|
92
|
+
},
|
93
|
+
enabled: !!quoteQuery.data?.approvalData,
|
94
|
+
refetchOnMount: true,
|
95
|
+
});
|
96
|
+
const sourceTokenAmount = swapRequired
|
97
|
+
? quoteQuery.data?.swapDetails.fromAmount
|
98
|
+
: tokenAmount;
|
99
|
+
const isNotEnoughBalance = !!sourceTokenAmount &&
|
100
|
+
!!fromTokenBalanceQuery.data &&
|
101
|
+
Number(fromTokenBalanceQuery.data.displayValue) < Number(sourceTokenAmount);
|
102
|
+
const disableContinue = (swapRequired && !quoteQuery.data) ||
|
103
|
+
isNotEnoughBalance ||
|
104
|
+
allowanceQuery.isLoading;
|
105
|
+
const switchChainRequired = props.payer.wallet.getChain()?.id !== fromChain.id;
|
106
|
+
const errorMsg = !quoteQuery.isLoading && quoteQuery.error
|
107
|
+
? (0, errors_js_1.getErrorMessage)(quoteQuery.error)
|
108
|
+
: undefined;
|
109
|
+
function showSwapFlow() {
|
110
|
+
if ((props.payOptions.mode === "direct_payment" ||
|
111
|
+
props.payOptions.mode === "fund_wallet") &&
|
112
|
+
!isNotEnoughBalance &&
|
113
|
+
!swapRequired) {
|
114
|
+
// same currency, just direct transfer
|
115
|
+
setScreen({
|
116
|
+
id: "transfer-flow",
|
117
|
+
});
|
118
|
+
}
|
119
|
+
else if (props.payOptions.mode === "transaction" &&
|
120
|
+
!isNotEnoughBalance &&
|
121
|
+
!swapRequired) {
|
122
|
+
if (payer.account.address !== receiverAddress) {
|
123
|
+
// needs transfer from another wallet before executing the transaction
|
124
|
+
setScreen({
|
125
|
+
id: "transfer-flow",
|
126
|
+
});
|
127
|
+
}
|
128
|
+
else {
|
129
|
+
// has enough balance to just do the transaction directly
|
130
|
+
props.onDone();
|
131
|
+
}
|
132
|
+
return;
|
133
|
+
}
|
134
|
+
if (!quoteQuery.data) {
|
135
|
+
return;
|
136
|
+
}
|
137
|
+
setScreen({
|
138
|
+
id: "swap-flow",
|
139
|
+
quote: quoteQuery.data,
|
140
|
+
approvalAmount: allowanceQuery.data ?? undefined,
|
141
|
+
});
|
142
|
+
}
|
143
|
+
function showFees() {
|
144
|
+
if (!quoteQuery.data) {
|
145
|
+
return;
|
146
|
+
}
|
147
|
+
setIsOpen(true);
|
148
|
+
setDrawerScreen("fees");
|
149
|
+
}
|
150
|
+
return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { flex: "column", gap: "md", animate: "fadein", children: [isOpen && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Drawer_js_1.DrawerOverlay, { ref: drawerOverlayRef }), (0, jsx_runtime_1.jsx)(Drawer_js_1.Drawer, { ref: drawerRef, close: () => setIsOpen(false), children: drawerScreen === "fees" && quoteQuery.data && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { size: "lg", color: "primaryText", children: "Fees" }), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "lg" }), (0, jsx_runtime_1.jsx)(Fees_js_1.SwapFees, { quote: quoteQuery.data })] })) })] })), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(PayWithCrypto_js_1.PayWithCryptoQuoteInfo, { value: sourceTokenAmount || "", chain: fromChain, token: fromToken, isLoading: quoteQuery.isLoading && !sourceTokenAmount, client: client, freezeChainAndTokenSelection: disableTokenSelection, payerAccount: props.payer.account, swapRequired: swapRequired }), swapRequired && ((0, jsx_runtime_1.jsx)(EstimatedTimeAndFees_js_1.EstimatedTimeAndFees, { quoteIsLoading: quoteQuery.isLoading, estimatedSeconds: quoteQuery.data?.swapDetails.estimated.durationSeconds, onViewFees: showFees })), (0, jsx_runtime_1.jsx)(Spacer_js_1.Spacer, { y: "md" })] }), errorMsg && ((0, jsx_runtime_1.jsx)("div", { children: errorMsg.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsxs)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: ["Minimum amount is", " ", (0, formatNumber_js_1.formatNumber)(Number(errorMsg.data.minimumAmountEth), 6), " ", (0, jsx_runtime_1.jsx)(TokenSymbol_js_1.TokenSymbol, { token: toToken, chain: toChain, size: "sm", inline: true, color: "danger" })] })) : ((0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: errorMsg.message || errors_js_1.defaultMessage })) })), !errorMsg && isNotEnoughBalance && ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: "Not enough funds." }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "danger", size: "sm", center: true, multiline: true, children: "Try a different wallet or token." })] })), errorMsg?.data?.minimumAmountEth ? ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: "accent", fullWidth: true, onClick: () => {
|
151
|
+
props.setTokenAmount((0, formatNumber_js_1.formatNumber)(Number(errorMsg.data?.minimumAmountEth), 6).toString());
|
152
|
+
props.setHasEditedAmount(true);
|
153
|
+
}, children: "Set Minimum" })) : switchChainRequired &&
|
154
|
+
!quoteQuery.isLoading &&
|
155
|
+
!allowanceQuery.isLoading &&
|
156
|
+
!isNotEnoughBalance &&
|
157
|
+
!quoteQuery.error ? ((0, jsx_runtime_1.jsx)(SwitchNetwork_js_1.SwitchNetworkButton, { variant: "accent", fullWidth: true, switchChain: async () => {
|
158
|
+
await props.payer.wallet.switchChain(fromChain);
|
159
|
+
} })) : ((0, jsx_runtime_1.jsx)(buttons_js_1.Button, { variant: disableContinue ? "outline" : "accent", fullWidth: true, "data-disabled": disableContinue, disabled: disableContinue, onClick: async () => {
|
160
|
+
if (!disableContinue) {
|
161
|
+
showSwapFlow();
|
162
|
+
}
|
163
|
+
}, gap: "xs", children: quoteQuery.isLoading ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Getting price quote", (0, jsx_runtime_1.jsx)(Spinner_js_1.Spinner, { size: "sm", color: "accentText" })] })) : ("Continue") }))] }));
|
164
|
+
}
|
165
|
+
//# sourceMappingURL=SwapScreenContent.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"SwapScreenContent.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx"],"names":[],"mappings":"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"}
|
@@ -4,8 +4,11 @@ exports.TransferConfirmationScreen = TransferConfirmationScreen;
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
5
5
|
const react_icons_1 = require("@radix-ui/react-icons");
|
6
6
|
const react_1 = require("react");
|
7
|
+
const utils_js_1 = require("../../../../../../../chains/utils.js");
|
7
8
|
const addresses_js_1 = require("../../../../../../../constants/addresses.js");
|
8
9
|
const contract_js_1 = require("../../../../../../../contract/contract.js");
|
10
|
+
const allowance_js_1 = require("../../../../../../../extensions/erc20/__generated__/IERC20/read/allowance.js");
|
11
|
+
const approve_js_1 = require("../../../../../../../extensions/erc20/write/approve.js");
|
9
12
|
const transfer_js_1 = require("../../../../../../../extensions/erc20/write/transfer.js");
|
10
13
|
const getTransfer_js_1 = require("../../../../../../../pay/buyWithCrypto/getTransfer.js");
|
11
14
|
const send_and_confirm_transaction_js_1 = require("../../../../../../../transaction/actions/send-and-confirm-transaction.js");
|
@@ -88,13 +91,37 @@ function TransferConfirmationScreen(props) {
|
|
88
91
|
amount: tokenAmount,
|
89
92
|
purchaseData: payOptions?.purchaseData,
|
90
93
|
});
|
91
|
-
if (transferResponse.
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
94
|
+
if (transferResponse.approvalData) {
|
95
|
+
// check allowance
|
96
|
+
const prevAllowance = await (0, allowance_js_1.allowance)({
|
97
|
+
contract: (0, contract_js_1.getContract)({
|
98
|
+
client: client,
|
99
|
+
address: transferResponse.approvalData.tokenAddress,
|
100
|
+
chain: (0, utils_js_1.getCachedChain)(transferResponse.approvalData.chainId),
|
101
|
+
}),
|
102
|
+
spender: transferResponse.approvalData
|
103
|
+
.spenderAddress,
|
104
|
+
owner: payer.account.address,
|
97
105
|
});
|
106
|
+
if (prevAllowance <
|
107
|
+
BigInt(transferResponse.approvalData.amountWei)) {
|
108
|
+
setStep("approve");
|
109
|
+
const transaction = (0, approve_js_1.approve)({
|
110
|
+
contract: (0, contract_js_1.getContract)({
|
111
|
+
client: client,
|
112
|
+
address: transferResponse.approvalData.tokenAddress,
|
113
|
+
chain: (0, utils_js_1.getCachedChain)(transferResponse.approvalData.chainId),
|
114
|
+
}),
|
115
|
+
spender: transferResponse.approvalData
|
116
|
+
.spenderAddress,
|
117
|
+
amountWei: BigInt(transferResponse.approvalData.amountWei),
|
118
|
+
});
|
119
|
+
// approve the transfer
|
120
|
+
await (0, send_and_confirm_transaction_js_1.sendAndConfirmTransaction)({
|
121
|
+
account: props.payer.account,
|
122
|
+
transaction,
|
123
|
+
});
|
124
|
+
}
|
98
125
|
}
|
99
126
|
setStep("transfer");
|
100
127
|
// execute the transfer
|
package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"TransferConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"TransferConfirmationScreen.js","sourceRoot":"","sources":["../../../../../../../../../src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx"],"names":[],"mappings":"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"}
|
@@ -2,7 +2,9 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.NATIVE_TOKEN = void 0;
|
4
4
|
exports.isNativeToken = isNativeToken;
|
5
|
+
exports.getTokenAddress = getTokenAddress;
|
5
6
|
const addresses_js_1 = require("../../../../../constants/addresses.js");
|
7
|
+
const address_js_1 = require("../../../../../utils/address.js");
|
6
8
|
exports.NATIVE_TOKEN = { nativeToken: true };
|
7
9
|
/**
|
8
10
|
* @internal
|
@@ -11,4 +13,10 @@ function isNativeToken(token) {
|
|
11
13
|
return ("nativeToken" in token ||
|
12
14
|
token.address?.toLowerCase() === addresses_js_1.NATIVE_TOKEN_ADDRESS.toLowerCase());
|
13
15
|
}
|
16
|
+
function getTokenAddress(token) {
|
17
|
+
if (isNativeToken(token)) {
|
18
|
+
return addresses_js_1.NATIVE_TOKEN_ADDRESS;
|
19
|
+
}
|
20
|
+
return (0, address_js_1.getAddress)(token.address);
|
21
|
+
}
|
14
22
|
//# sourceMappingURL=nativeToken.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"nativeToken.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/nativeToken.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"nativeToken.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/nativeToken.ts"],"names":[],"mappings":";;;AAWA,sCAOC;AAED,0CAKC;AAzBD,wEAA6E;AAC7E,gEAA2E;AAK9D,QAAA,YAAY,GAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAE/D;;GAEG;AACH,SAAgB,aAAa,CAC3B,KAAuC;IAEvC,OAAO,CACL,aAAa,IAAI,KAAK;QACtB,KAAK,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,mCAAoB,CAAC,WAAW,EAAE,CACpE,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,KAA8B;IAC5D,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,mCAAoB,CAAC;IAC9B,CAAC;IACD,OAAO,IAAA,uBAAU,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC"}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.defaultMessage = void 0;
|
4
|
+
exports.getErrorMessage = getErrorMessage;
|
5
|
+
exports.defaultMessage = "Unable to get price quote";
|
6
|
+
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
7
|
+
function getErrorMessage(err) {
|
8
|
+
if (typeof err.error === "object" && err.error.code) {
|
9
|
+
return err.error;
|
10
|
+
}
|
11
|
+
return {
|
12
|
+
code: "UNABLE_TO_GET_PRICE_QUOTE",
|
13
|
+
message: exports.defaultMessage,
|
14
|
+
};
|
15
|
+
}
|
16
|
+
//# sourceMappingURL=errors.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../../src/react/web/utils/errors.ts"],"names":[],"mappings":";;;AAaA,0CAQC;AAVY,QAAA,cAAc,GAAG,2BAA2B,CAAC;AAC1D,4DAA4D;AAC5D,SAAgB,eAAe,CAAC,GAAQ;IACtC,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACpD,OAAO,GAAG,CAAC,KAAK,CAAC;IACnB,CAAC;IACD,OAAO;QACL,IAAI,EAAE,2BAA2B;QACjC,OAAO,EAAE,sBAAc;KACxB,CAAC;AACJ,CAAC"}
|
package/dist/cjs/version.js
CHANGED
@@ -8,11 +8,15 @@ const utils_js_1 = require("../../chains/utils.js");
|
|
8
8
|
const contract_js_1 = require("../../contract/contract.js");
|
9
9
|
const allowance_js_1 = require("../../extensions/erc20/__generated__/IERC20/read/allowance.js");
|
10
10
|
const approve_js_1 = require("../../extensions/erc20/write/approve.js");
|
11
|
+
const isActiveSigner_js_1 = require("../../extensions/erc4337/__generated__/IAccountPermissions/read/isActiveSigner.js");
|
12
|
+
const addSessionKey_js_1 = require("../../extensions/erc4337/account/addSessionKey.js");
|
13
|
+
const send_transaction_js_1 = require("../../transaction/actions/send-transaction.js");
|
11
14
|
const to_serializable_transaction_js_1 = require("../../transaction/actions/to-serializable-transaction.js");
|
12
15
|
const send_eip712_transaction_js_1 = require("../../transaction/actions/zksync/send-eip712-transaction.js");
|
13
16
|
const read_contract_js_1 = require("../../transaction/read-contract.js");
|
14
17
|
const address_js_1 = require("../../utils/address.js");
|
15
18
|
const isZkSyncChain_js_1 = require("../../utils/any-evm/zksync/isZkSyncChain.js");
|
19
|
+
const is_contract_deployed_js_1 = require("../../utils/bytecode/is-contract-deployed.js");
|
16
20
|
const resolve_promised_value_js_1 = require("../../utils/promise/resolve-promised-value.js");
|
17
21
|
const parse_typed_data_js_1 = require("../../utils/signatures/helpers/parse-typed-data.js");
|
18
22
|
const types_js_1 = require("../../utils/types.js");
|
@@ -103,6 +107,29 @@ async function connectSmartAccount(connectionOptions, creationOptions) {
|
|
103
107
|
});
|
104
108
|
adminAccountToSmartAccountMap.set(personalAccount, account);
|
105
109
|
smartAccountToAdminAccountMap.set(account, personalAccount);
|
110
|
+
if (options.sessionKey) {
|
111
|
+
let hasSessionKey = false;
|
112
|
+
// check if already added
|
113
|
+
const accountDeployed = await (0, is_contract_deployed_js_1.isContractDeployed)(accountContract);
|
114
|
+
if (accountDeployed) {
|
115
|
+
hasSessionKey = await (0, isActiveSigner_js_1.isActiveSigner)({
|
116
|
+
contract: accountContract,
|
117
|
+
signer: options.sessionKey.address,
|
118
|
+
});
|
119
|
+
}
|
120
|
+
if (!hasSessionKey) {
|
121
|
+
const transaction = (0, addSessionKey_js_1.addSessionKey)({
|
122
|
+
account: personalAccount,
|
123
|
+
contract: accountContract,
|
124
|
+
permissions: options.sessionKey.permissions,
|
125
|
+
sessionKeyAddress: options.sessionKey.address,
|
126
|
+
});
|
127
|
+
await (0, send_transaction_js_1.sendTransaction)({
|
128
|
+
account: account,
|
129
|
+
transaction,
|
130
|
+
});
|
131
|
+
}
|
132
|
+
}
|
106
133
|
return [account, chain];
|
107
134
|
}
|
108
135
|
/**
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":";;AA6OA,gEA4CC;AA5CD,SAAgB,0BAA0B,CACxC,gBAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG;QACd,GAAG,kBAAkB;QACrB,eAAe,EAAE,kBAAkB,CAAC,eAAe;QACnD,WAAW,EAAE,kBAAkB,CAAC,WAAW;YACzC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACxC,CAAC,CAAC,IAAI;QACR,eAAe,EAAE,kBAAkB,CAAC,eAAe;YACjD,CAAC,CAAC,kBAAkB,CAAC,eAAe;YACpC,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACjC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,IAAI;QACR,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QACxD,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,MAAM,EAAE,kBAAkB,CAAC,MAAM;QACjC,IAAI,EAAE,kBAAkB,CAAC,IAAI;KACR,CAAC;IAExB,IAAI,kBAAkB,CAAC,YAAY;QACjC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,CAAC,WAAW;QAChC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG;QACpB,GAAG,gBAAgB;QACnB,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;KACd,CAAC;IAC1B,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
@@ -41,7 +41,8 @@ export function createThirdwebClient(options) {
|
|
41
41
|
}
|
42
42
|
}
|
43
43
|
else {
|
44
|
-
|
44
|
+
// always PREFER the clientId if provided, only compute it from the secretKey if we don't have a clientId passed explicitly
|
45
|
+
realClientId = clientId ?? computeClientIdFromSecretKey(secretKey);
|
45
46
|
}
|
46
47
|
}
|
47
48
|
// only path we get here is if we have no secretKey and no clientId
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAuE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAoC;IAEpC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,YAAY,GAAuB,QAAQ,CAAC;IAEhD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACrB,mEAAmE;YACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,4BAA4B,CAAC,SAAS,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAuE/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAoC;IAEpC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,YAAY,GAAuB,QAAQ,CAAC;IAEhD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACrB,mEAAmE;YACnE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,2HAA2H;YAC3H,YAAY,GAAG,QAAQ,IAAI,4BAA4B,CAAC,SAAS,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,YAAY;QACtB,SAAS;KACD,CAAC;AACb,CAAC"}
|
@@ -5,18 +5,20 @@ import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and
|
|
5
5
|
import { prepareTransaction } from "../../../transaction/prepare-transaction.js";
|
6
6
|
import { normalizeFunctionParams } from "../../../utils/abi/normalizeFunctionParams.js";
|
7
7
|
import { CONTRACT_DEPLOYER_ADDRESS } from "../../../utils/any-evm/zksync/constants.js";
|
8
|
+
import { ensureBytecodePrefix } from "../../../utils/bytecode/prefix.js";
|
8
9
|
import { zkDeployContractDeterministic } from "./zkDeployDeterministic.js";
|
9
10
|
/**
|
10
11
|
* @internal
|
11
12
|
*/
|
12
13
|
export async function zkDeployContract(options) {
|
14
|
+
const bytecode = ensureBytecodePrefix(options.bytecode);
|
13
15
|
if (options.salt !== undefined) {
|
14
16
|
// if a salt is provided, use the deterministic deployer
|
15
17
|
return zkDeployContractDeterministic(options);
|
16
18
|
}
|
17
19
|
const data = encodeDeployData({
|
18
20
|
abi: options.abi,
|
19
|
-
bytecode
|
21
|
+
bytecode,
|
20
22
|
deploymentType: options.deploymentType ?? "create",
|
21
23
|
args: normalizeFunctionParams(options.abi.find((abi) => abi.type === "constructor"), options.params),
|
22
24
|
});
|
@@ -28,7 +30,7 @@ export async function zkDeployContract(options) {
|
|
28
30
|
to: CONTRACT_DEPLOYER_ADDRESS,
|
29
31
|
data,
|
30
32
|
eip712: {
|
31
|
-
factoryDeps: [
|
33
|
+
factoryDeps: [bytecode],
|
32
34
|
// TODO (zksync): allow passing in a paymaster
|
33
35
|
},
|
34
36
|
}),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"zkDeployContract.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sFAAsF,CAAC;AAC7H,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;
|
1
|
+
{"version":3,"file":"zkDeployContract.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/zksync/zkDeployContract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sFAAsF,CAAC;AAC7H,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAE3E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAMC;IAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,wDAAwD;QACxD,OAAO,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,IAAI,GAAG,gBAAgB,CAAC;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ;QACR,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,QAAQ;QAClD,IAAI,EAAE,uBAAuB,CAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,EACrD,OAAO,CAAC,MAAM,CACf;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAAC;QAC9C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,kBAAkB,CAAC;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,EAAE,EAAE,yBAAyB;YAC7B,IAAI;YACJ,MAAM,EAAE;gBACN,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACvB,8CAA8C;aAC/C;SACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,cAAc,CAAC;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,MAAM,EAAE,CAAC,qBAAqB,EAAE,CAAC;KAClC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC;IAExD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
@@ -1,7 +1,4 @@
|
|
1
1
|
import { getCachedChain } from "../../chains/utils.js";
|
2
|
-
import { getContract } from "../../contract/contract.js";
|
3
|
-
import { allowance } from "../../extensions/erc20/__generated__/IERC20/read/allowance.js";
|
4
|
-
import { approve } from "../../extensions/erc20/write/approve.js";
|
5
2
|
import { getClientFetch } from "../../utils/fetch.js";
|
6
3
|
import { stringify } from "../../utils/json.js";
|
7
4
|
import { getPayBuyWithCryptoQuoteEndpoint } from "../utils/definitions.js";
|
@@ -67,26 +64,6 @@ export async function getBuyWithCryptoQuote(params) {
|
|
67
64
|
.result;
|
68
65
|
// check if the fromAddress already has approval for the given amount
|
69
66
|
const approvalData = data.approval;
|
70
|
-
let approval = undefined;
|
71
|
-
if (approvalData) {
|
72
|
-
const contract = getContract({
|
73
|
-
client: params.client,
|
74
|
-
address: approvalData.tokenAddress,
|
75
|
-
chain: getCachedChain(approvalData.chainId),
|
76
|
-
});
|
77
|
-
const approvedAmount = await allowance({
|
78
|
-
contract,
|
79
|
-
spender: approvalData.spenderAddress,
|
80
|
-
owner: params.fromAddress,
|
81
|
-
});
|
82
|
-
if (approvedAmount < BigInt(approvalData.amountWei)) {
|
83
|
-
approval = approve({
|
84
|
-
contract,
|
85
|
-
spender: approvalData.spenderAddress,
|
86
|
-
amountWei: BigInt(approvalData.amountWei),
|
87
|
-
});
|
88
|
-
}
|
89
|
-
}
|
90
67
|
const swapRoute = {
|
91
68
|
transactionRequest: {
|
92
69
|
chain: getCachedChain(data.transactionRequest.chainId),
|
@@ -97,7 +74,7 @@ export async function getBuyWithCryptoQuote(params) {
|
|
97
74
|
gas: BigInt(data.transactionRequest.gasLimit),
|
98
75
|
gasPrice: undefined, // ignore gas price returned by the quote, we handle it ourselves
|
99
76
|
},
|
100
|
-
|
77
|
+
approvalData,
|
101
78
|
swapDetails: {
|
102
79
|
fromAddress: data.fromAddress,
|
103
80
|
toAddress: data.toAddress,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getQuote.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
1
|
+
{"version":3,"file":"getQuote.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getQuote.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,4 @@
|
|
1
1
|
import { getCachedChain } from "../../chains/utils.js";
|
2
|
-
import { getContract } from "../../contract/contract.js";
|
3
|
-
import { approve } from "../../extensions/erc20/write/approve.js";
|
4
2
|
import { getClientFetch } from "../../utils/fetch.js";
|
5
3
|
import { stringify } from "../../utils/json.js";
|
6
4
|
import { getPayBuyWithCryptoTransferEndpoint } from "../utils/definitions.js";
|
@@ -65,17 +63,7 @@ export async function getBuyWithCryptoTransfer(params) {
|
|
65
63
|
value: BigInt(data.transactionRequest.value),
|
66
64
|
gas: BigInt(data.transactionRequest.gasLimit),
|
67
65
|
},
|
68
|
-
|
69
|
-
? approve({
|
70
|
-
contract: getContract({
|
71
|
-
client: params.client,
|
72
|
-
address: data.approval.tokenAddress,
|
73
|
-
chain: getCachedChain(data.approval.chainId),
|
74
|
-
}),
|
75
|
-
spender: data.approval.spenderAddress,
|
76
|
-
amountWei: BigInt(data.approval.amountWei),
|
77
|
-
})
|
78
|
-
: undefined,
|
66
|
+
approvalData: data.approval,
|
79
67
|
fromAddress: data.fromAddress,
|
80
68
|
toAddress: data.toAddress,
|
81
69
|
paymentToken: data.paymentToken,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
1
|
+
{"version":3,"file":"getTransfer.js","sourceRoot":"","sources":["../../../../src/pay/buyWithCrypto/getTransfer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,mCAAmC,EAAE,MAAM,yBAAyB,CAAC;AAqF9E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAsC;IAEtC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,mCAAmC,EAAE,EAAE;YACxE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,SAAS,CAAC;gBACd,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,IAAI,QAAQ,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBACpC,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,GAAkC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAE3E,MAAM,QAAQ,GAA0B;YACtC,kBAAkB,EAAE;gBAClB,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACtD,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAY;gBAC1C,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAa;gBACzC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;gBAC5C,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;aAC9C;YACD,YAAY,EAAE,IAAI,CAAC,QAAQ;YAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,wBAAwB,EAAE,IAAI,CAAC,wBAAwB;YACvD,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|