@funkit/core 0.8.6 → 0.10.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/fetch-polyfill.js.map +1 -1
- package/dist/index.d.ts +12 -12
- package/dist/src/abis/CheckoutPaymaster.json +1 -0
- package/dist/src/abis/EstimationPaymaster.json +1 -1
- package/dist/src/abis/UniswapV3LimitOrder.json +1 -1
- package/dist/src/actions/AccessControl.d.ts +6 -6
- package/dist/src/actions/AccessControl.js +23 -16
- package/dist/src/actions/AccessControl.js.map +1 -1
- package/dist/src/actions/BatchActions.d.ts +2 -2
- package/dist/src/actions/BatchActions.js +2 -2
- package/dist/src/actions/BatchActions.js.map +1 -1
- package/dist/src/actions/Bridge.d.ts +5 -4
- package/dist/src/actions/Bridge.js +13 -9
- package/dist/src/actions/Bridge.js.map +1 -1
- package/dist/src/actions/FirstClassActions.d.ts +8 -6
- package/dist/src/actions/FirstClassActions.js +44 -69
- package/dist/src/actions/FirstClassActions.js.map +1 -1
- package/dist/src/actions/Group.d.ts +3 -3
- package/dist/src/actions/Group.js +6 -14
- package/dist/src/actions/Group.js.map +1 -1
- package/dist/src/actions/LimitOrder.d.ts +4 -4
- package/dist/src/actions/LimitOrder.js +21 -19
- package/dist/src/actions/LimitOrder.js.map +1 -1
- package/dist/src/actions/Stake.d.ts +3 -3
- package/dist/src/actions/Stake.js +31 -44
- package/dist/src/actions/Stake.js.map +1 -1
- package/dist/src/actions/Swap.d.ts +4 -4
- package/dist/src/actions/Swap.js +43 -41
- package/dist/src/actions/Swap.js.map +1 -1
- package/dist/src/actions/Token.d.ts +6 -6
- package/dist/src/actions/Token.js +46 -33
- package/dist/src/actions/Token.js.map +1 -1
- package/dist/src/actions/index.d.ts +7 -7
- package/dist/src/actions/types.d.ts +4 -4
- package/dist/src/actions/types.js +2 -2
- package/dist/src/actions/types.js.map +1 -1
- package/dist/src/apis/AccessControlApis.d.ts +1 -1
- package/dist/src/apis/AccessControlApis.js +7 -3
- package/dist/src/apis/AccessControlApis.js.map +1 -1
- package/dist/src/apis/AssetApis.d.ts +10 -0
- package/dist/src/apis/AssetApis.js +11 -1
- package/dist/src/apis/AssetApis.js.map +1 -1
- package/dist/src/apis/BridgeApis.d.ts +1 -1
- package/dist/src/apis/BridgeApis.js +13 -13
- package/dist/src/apis/BridgeApis.js.map +1 -1
- package/dist/src/apis/CheckoutApis.d.ts +43 -0
- package/dist/src/apis/CheckoutApis.js +116 -0
- package/dist/src/apis/CheckoutApis.js.map +1 -0
- package/dist/src/apis/ContractApis.js +1 -1
- package/dist/src/apis/ContractApis.js.map +1 -1
- package/dist/src/apis/FaucetApis.js.map +1 -1
- package/dist/src/apis/GroupApis.d.ts +2 -6
- package/dist/src/apis/GroupApis.js +4 -29
- package/dist/src/apis/GroupApis.js.map +1 -1
- package/dist/src/apis/InfoApis.d.ts +1 -1
- package/dist/src/apis/InfoApis.js +9 -7
- package/dist/src/apis/InfoApis.js.map +1 -1
- package/dist/src/apis/ListenerApis.d.ts +1 -1
- package/dist/src/apis/ListenerApis.js +6 -6
- package/dist/src/apis/ListenerApis.js.map +1 -1
- package/dist/src/apis/MeshApis.d.ts +87 -0
- package/dist/src/apis/MeshApis.js +213 -0
- package/dist/src/apis/MeshApis.js.map +1 -0
- package/dist/src/apis/NFTApis.js.map +1 -1
- package/dist/src/apis/OnOffRampApis.d.ts +2 -0
- package/dist/src/apis/OnOffRampApis.js +24 -5
- package/dist/src/apis/OnOffRampApis.js.map +1 -1
- package/dist/src/apis/OnOffRampUtils.js +2 -2
- package/dist/src/apis/OnOffRampUtils.js.map +1 -1
- package/dist/src/apis/OperationApis.d.ts +4 -4
- package/dist/src/apis/OperationApis.js +21 -12
- package/dist/src/apis/OperationApis.js.map +1 -1
- package/dist/src/apis/PaymasterApis.d.ts +1 -6
- package/dist/src/apis/PaymasterApis.js +3 -70
- package/dist/src/apis/PaymasterApis.js.map +1 -1
- package/dist/src/apis/SwapApis.d.ts +2 -2
- package/dist/src/apis/SwapApis.js +6 -6
- package/dist/src/apis/SwapApis.js.map +1 -1
- package/dist/src/apis/TurnkeyApis.d.ts +3 -0
- package/dist/src/apis/TurnkeyApis.js +19 -0
- package/dist/src/apis/TurnkeyApis.js.map +1 -0
- package/dist/src/apis/UserApis.d.ts +2 -5
- package/dist/src/apis/UserApis.js +11 -22
- package/dist/src/apis/UserApis.js.map +1 -1
- package/dist/src/apis/index.d.ts +13 -10
- package/dist/src/apis/index.js +4 -1
- package/dist/src/apis/index.js.map +1 -1
- package/dist/src/apis/types.d.ts +79 -7
- package/dist/src/apis/types.js +16 -0
- package/dist/src/apis/types.js.map +1 -1
- package/dist/src/auth/Auth.d.ts +6 -6
- package/dist/src/auth/Auth.js +48 -46
- package/dist/src/auth/Auth.js.map +1 -1
- package/dist/src/auth/SessionKeyAuth.d.ts +5 -5
- package/dist/src/auth/SessionKeyAuth.js +29 -24
- package/dist/src/auth/SessionKeyAuth.js.map +1 -1
- package/dist/src/auth/index.d.ts +2 -2
- package/dist/src/auth/types.d.ts +1 -1
- package/dist/src/common/constants.d.ts +111 -17
- package/dist/src/common/constants.js +158 -85
- package/dist/src/common/constants.js.map +1 -1
- package/dist/src/common/index.d.ts +2 -2
- package/dist/src/common/types.d.ts +2 -2
- package/dist/src/config/Config.d.ts +1 -1
- package/dist/src/config/Config.js +10 -4
- package/dist/src/config/Config.js.map +1 -1
- package/dist/src/config/index.d.ts +2 -2
- package/dist/src/config/types.d.ts +4 -2
- package/dist/src/data/Chain.d.ts +4 -4
- package/dist/src/data/Chain.js +38 -27
- package/dist/src/data/Chain.js.map +1 -1
- package/dist/src/data/NFT.d.ts +3 -3
- package/dist/src/data/NFT.js +11 -11
- package/dist/src/data/NFT.js.map +1 -1
- package/dist/src/data/Operation.d.ts +5 -5
- package/dist/src/data/Operation.js +12 -10
- package/dist/src/data/Operation.js.map +1 -1
- package/dist/src/data/SolidityData.d.ts +3 -3
- package/dist/src/data/SolidityData.js +37 -17
- package/dist/src/data/SolidityData.js.map +1 -1
- package/dist/src/data/Token.d.ts +21 -20
- package/dist/src/data/Token.js +49 -51
- package/dist/src/data/Token.js.map +1 -1
- package/dist/src/data/index.d.ts +6 -6
- package/dist/src/data/index.js +2 -2
- package/dist/src/data/index.js.map +1 -1
- package/dist/src/data/types.d.ts +2 -2
- package/dist/src/data/types.js +3 -3
- package/dist/src/data/types.js.map +1 -1
- package/dist/src/errors/BaseError.js +4 -3
- package/dist/src/errors/BaseError.js.map +1 -1
- package/dist/src/errors/ClientError.d.ts +1 -1
- package/dist/src/errors/ClientError.js +3 -3
- package/dist/src/errors/ClientError.js.map +1 -1
- package/dist/src/errors/ServerError.d.ts +1 -1
- package/dist/src/errors/ServerError.js.map +1 -1
- package/dist/src/errors/index.d.ts +4 -4
- package/dist/src/errors/types.d.ts +2 -1
- package/dist/src/errors/types.js +4 -3
- package/dist/src/errors/types.js.map +1 -1
- package/dist/src/sponsors/CheckoutSponsor.d.ts +23 -0
- package/dist/src/sponsors/CheckoutSponsor.js +65 -0
- package/dist/src/sponsors/CheckoutSponsor.js.map +1 -0
- package/dist/src/sponsors/GaslessSponsor.d.ts +6 -6
- package/dist/src/sponsors/GaslessSponsor.js +20 -32
- package/dist/src/sponsors/GaslessSponsor.js.map +1 -1
- package/dist/src/sponsors/Sponsor.d.ts +15 -15
- package/dist/src/sponsors/Sponsor.js +24 -40
- package/dist/src/sponsors/Sponsor.js.map +1 -1
- package/dist/src/sponsors/TokenSponsor.d.ts +15 -15
- package/dist/src/sponsors/TokenSponsor.js +118 -135
- package/dist/src/sponsors/TokenSponsor.js.map +1 -1
- package/dist/src/sponsors/index.d.ts +4 -3
- package/dist/src/sponsors/index.js +2 -1
- package/dist/src/sponsors/index.js.map +1 -1
- package/dist/src/sponsors/types.d.ts +2 -1
- package/dist/src/sponsors/types.js +2 -1
- package/dist/src/sponsors/types.js.map +1 -1
- package/dist/src/utils/ApiUtils.js +21 -19
- package/dist/src/utils/ApiUtils.js.map +1 -1
- package/dist/src/utils/AuthUtils.d.ts +1 -2
- package/dist/src/utils/AuthUtils.js +7 -25
- package/dist/src/utils/AuthUtils.js.map +1 -1
- package/dist/src/utils/ChainUtils.d.ts +5 -5
- package/dist/src/utils/ChainUtils.js +35 -20
- package/dist/src/utils/ChainUtils.js.map +1 -1
- package/dist/src/utils/CheckoutUtils.d.ts +6 -0
- package/dist/src/utils/CheckoutUtils.js +24 -0
- package/dist/src/utils/CheckoutUtils.js.map +1 -0
- package/dist/src/utils/GroupUtils.d.ts +4 -0
- package/dist/src/utils/GroupUtils.js +30 -0
- package/dist/src/utils/GroupUtils.js.map +1 -0
- package/dist/src/utils/MerkleUtils.d.ts +1 -1
- package/dist/src/utils/MerkleUtils.js +5 -5
- package/dist/src/utils/MerkleUtils.js.map +1 -1
- package/dist/src/utils/PaymasterUtils.d.ts +3 -3
- package/dist/src/utils/PaymasterUtils.js +6 -2
- package/dist/src/utils/PaymasterUtils.js.map +1 -1
- package/dist/src/utils/SwapUtils.d.ts +2 -2
- package/dist/src/utils/SwapUtils.js +43 -34
- package/dist/src/utils/SwapUtils.js.map +1 -1
- package/dist/src/utils/TypeUtils.js.map +1 -1
- package/dist/src/utils/UserOpUtils.d.ts +2 -2
- package/dist/src/utils/UserOpUtils.js +79 -65
- package/dist/src/utils/UserOpUtils.js.map +1 -1
- package/dist/src/utils/ViemUtils.d.ts +2 -2
- package/dist/src/utils/ViemUtils.js +10 -6
- package/dist/src/utils/ViemUtils.js.map +1 -1
- package/dist/src/utils/WalletUtils.d.ts +2 -2
- package/dist/src/utils/WalletUtils.js +6 -5
- package/dist/src/utils/WalletUtils.js.map +1 -1
- package/dist/src/utils/index.d.ts +8 -7
- package/dist/src/utils/index.js +1 -0
- package/dist/src/utils/index.js.map +1 -1
- package/dist/src/viem/ContractInterface.d.ts +4 -4
- package/dist/src/viem/ContractInterface.js +8 -8
- package/dist/src/viem/ContractInterface.js.map +1 -1
- package/dist/src/viem/Converter.d.ts +823 -1107
- package/dist/src/viem/Converter.js +13 -11
- package/dist/src/viem/Converter.js.map +1 -1
- package/dist/src/viem/index.d.ts +2 -2
- package/dist/src/wallet/FunWallet.d.ts +8 -8
- package/dist/src/wallet/FunWallet.js +141 -97
- package/dist/src/wallet/FunWallet.js.map +1 -1
- package/dist/src/wallet/index.d.ts +2 -2
- package/dist/src/wallet/types.d.ts +1 -1
- package/package.json +15 -8
|
@@ -6,7 +6,7 @@ const viem_1 = require("viem");
|
|
|
6
6
|
const createMerkleHashes = (list) => {
|
|
7
7
|
list = list.map((data) => (0, viem_1.keccak256)(data));
|
|
8
8
|
const treeSize = 2 ** Math.ceil(Math.log2(list.length)) * 2;
|
|
9
|
-
const buffer = new Array(treeSize).fill(
|
|
9
|
+
const buffer = new Array(treeSize).fill('0x');
|
|
10
10
|
(0, exports.arrayCopy)(buffer, list, treeSize / 2);
|
|
11
11
|
for (let i = treeSize / 2 - list.length; i > 0; i--) {
|
|
12
12
|
buffer[buffer.length - i] = list[list.length - 1];
|
|
@@ -32,13 +32,13 @@ const getSibling = (index) => {
|
|
|
32
32
|
};
|
|
33
33
|
exports.getSibling = getSibling;
|
|
34
34
|
const getHash = (list, i) => {
|
|
35
|
-
if (list[i] ===
|
|
35
|
+
if (list[i] === '0x') {
|
|
36
36
|
if ((0, exports.getRight)(i) < list.length) {
|
|
37
37
|
const left = (0, exports.getHash)(list, (0, exports.getLeft)(i));
|
|
38
38
|
const right = (0, exports.getHash)(list, (0, exports.getRight)(i));
|
|
39
39
|
return (0, exports.getHashPair)(left, right);
|
|
40
40
|
}
|
|
41
|
-
throw new Error(
|
|
41
|
+
throw new Error('Invalid tree');
|
|
42
42
|
}
|
|
43
43
|
return list[i];
|
|
44
44
|
};
|
|
@@ -59,7 +59,7 @@ exports.arrayCopy = arrayCopy;
|
|
|
59
59
|
const getPathForItem = (list, item) => {
|
|
60
60
|
let index = list.indexOf((0, viem_1.keccak256)(item));
|
|
61
61
|
if (index === -1) {
|
|
62
|
-
throw new Error(
|
|
62
|
+
throw new Error('Item not found');
|
|
63
63
|
}
|
|
64
64
|
const path = [];
|
|
65
65
|
while (index > 1) {
|
|
@@ -90,7 +90,7 @@ class MerkleTree {
|
|
|
90
90
|
}
|
|
91
91
|
getRootHash() {
|
|
92
92
|
if (this.tree.length === 0) {
|
|
93
|
-
return (0, viem_1.padHex)(
|
|
93
|
+
return (0, viem_1.padHex)('0x1', { size: 32 });
|
|
94
94
|
}
|
|
95
95
|
return this.tree[1];
|
|
96
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MerkleUtils.js","sourceRoot":"","sources":["../../../src/utils/MerkleUtils.ts"],"names":[],"mappings":";;;AAAA,+BAAqD;AAErD,6BAA6B;AAEtB,MAAM,kBAAkB,GAAG,CAAC,IAAW,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"MerkleUtils.js","sourceRoot":"","sources":["../../../src/utils/MerkleUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { EnvOption } from
|
|
2
|
-
import { PaymasterType } from
|
|
3
|
-
export declare const getPaymasterType: (txOptions: EnvOption) => PaymasterType.GaslessSponsor | PaymasterType.TokenSponsor;
|
|
1
|
+
import { EnvOption } from '../config';
|
|
2
|
+
import { PaymasterType } from '../sponsors/types';
|
|
3
|
+
export declare const getPaymasterType: (txOptions: EnvOption) => PaymasterType.GaslessSponsor | PaymasterType.TokenSponsor | PaymasterType.CheckoutSponsor;
|
|
@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPaymasterType = void 0;
|
|
4
4
|
const types_1 = require("../sponsors/types");
|
|
5
5
|
const getPaymasterType = (txOptions) => {
|
|
6
|
-
if (txOptions.gasSponsor?.
|
|
6
|
+
if (txOptions.gasSponsor?.useCheckoutSponsor) {
|
|
7
|
+
return types_1.PaymasterType.CheckoutSponsor;
|
|
8
|
+
}
|
|
9
|
+
else if (txOptions.gasSponsor?.sponsorAddress &&
|
|
10
|
+
txOptions.gasSponsor?.token) {
|
|
7
11
|
return types_1.PaymasterType.TokenSponsor;
|
|
8
12
|
}
|
|
9
13
|
else if (txOptions.gasSponsor?.sponsorAddress) {
|
|
10
14
|
return types_1.PaymasterType.GaslessSponsor;
|
|
11
15
|
}
|
|
12
16
|
else {
|
|
13
|
-
throw Error(
|
|
17
|
+
throw Error('Invalid paymaster type');
|
|
14
18
|
}
|
|
15
19
|
};
|
|
16
20
|
exports.getPaymasterType = getPaymasterType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymasterUtils.js","sourceRoot":"","sources":["../../../src/utils/PaymasterUtils.ts"],"names":[],"mappings":";;;AACA,6CAAiD;AAE1C,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"PaymasterUtils.js","sourceRoot":"","sources":["../../../src/utils/PaymasterUtils.ts"],"names":[],"mappings":";;;AACA,6CAAiD;AAE1C,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAE,EAAE;IACvD,IAAI,SAAS,CAAC,UAAU,EAAE,kBAAkB,EAAE,CAAC;QAC7C,OAAO,qBAAa,CAAC,eAAe,CAAA;IACtC,CAAC;SAAM,IACL,SAAS,CAAC,UAAU,EAAE,cAAc;QACpC,SAAS,CAAC,UAAU,EAAE,KAAK,EAC3B,CAAC;QACD,OAAO,qBAAa,CAAC,YAAY,CAAA;IACnC,CAAC;SAAM,IAAI,SAAS,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC;QAChD,OAAO,qBAAa,CAAC,cAAc,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAA;IACvC,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,gBAAgB,oBAa5B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Address, PublicClient } from
|
|
2
|
-
import { UniswapPoolFeeOptions } from
|
|
1
|
+
import { Address, PublicClient } from 'viem';
|
|
2
|
+
import { UniswapPoolFeeOptions } from '../actions';
|
|
3
3
|
export declare function fromReadableAmount(amount: number, decimals: number): bigint;
|
|
4
4
|
type SwapParamsUtils = {
|
|
5
5
|
tokenInAddress: Address;
|
|
@@ -8,7 +8,7 @@ const viem_1 = require("viem");
|
|
|
8
8
|
const apis_1 = require("../apis");
|
|
9
9
|
const common_1 = require("../common");
|
|
10
10
|
function fromReadableAmount(amount, decimals) {
|
|
11
|
-
return (0, viem_1.parseUnits)(
|
|
11
|
+
return (0, viem_1.parseUnits)(amount.toFixed(20), decimals);
|
|
12
12
|
}
|
|
13
13
|
exports.fromReadableAmount = fromReadableAmount;
|
|
14
14
|
class SwapToken {
|
|
@@ -16,12 +16,13 @@ class SwapToken {
|
|
|
16
16
|
this.client = client;
|
|
17
17
|
this.version = version;
|
|
18
18
|
if (version === 3) {
|
|
19
|
-
if (quoterContractAddr !== undefined &&
|
|
19
|
+
if (quoterContractAddr !== undefined &&
|
|
20
|
+
poolFactoryContractAddr !== undefined) {
|
|
20
21
|
this.quoterContractAddr = quoterContractAddr;
|
|
21
22
|
this.poolFactoryContractAddr = poolFactoryContractAddr;
|
|
22
23
|
}
|
|
23
24
|
else {
|
|
24
|
-
throw new Error(
|
|
25
|
+
throw new Error('quoterContractAddr and poolFactoryContractAddr must be provided');
|
|
25
26
|
}
|
|
26
27
|
}
|
|
27
28
|
else if (version === 2) {
|
|
@@ -30,52 +31,52 @@ class SwapToken {
|
|
|
30
31
|
this.v2router = v2router;
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
33
|
-
throw new Error(
|
|
34
|
+
throw new Error('v2quoter and v2Factory must be provided');
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
else {
|
|
37
|
-
throw new Error(
|
|
38
|
+
throw new Error('Invalid version');
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
async getOutputQuote(route, token0, amountIn) {
|
|
41
42
|
const { calldata } = await v3_sdk_1.SwapQuoter.quoteCallParameters(route, sdk_core_1.CurrencyAmount.fromRawAmount(token0, fromReadableAmount(amountIn, token0.decimals).toString()), sdk_core_1.TradeType.EXACT_INPUT, {
|
|
42
|
-
useQuoterV2: true
|
|
43
|
+
useQuoterV2: true,
|
|
43
44
|
});
|
|
44
45
|
const quoteCallReturnData = await this.client.call({
|
|
45
46
|
to: this.quoterContractAddr,
|
|
46
|
-
data: calldata
|
|
47
|
+
data: calldata,
|
|
47
48
|
});
|
|
48
49
|
if (!quoteCallReturnData.data) {
|
|
49
|
-
throw new Error(
|
|
50
|
+
throw new Error('No data returned from quote call');
|
|
50
51
|
}
|
|
51
|
-
return (0, viem_1.decodeAbiParameters)([{ name:
|
|
52
|
+
return (0, viem_1.decodeAbiParameters)([{ name: 'return', type: 'uint256' }], quoteCallReturnData.data)[0];
|
|
52
53
|
}
|
|
53
54
|
async getPoolInfo(tokenIn, tokenOut, poolFee) {
|
|
54
55
|
const currentPoolAddress = (0, v3_sdk_1.computePoolAddress)({
|
|
55
56
|
factoryAddress: this.poolFactoryContractAddr,
|
|
56
57
|
tokenA: tokenIn,
|
|
57
58
|
tokenB: tokenOut,
|
|
58
|
-
fee: poolFee
|
|
59
|
+
fee: poolFee,
|
|
59
60
|
});
|
|
60
61
|
const [token0, token1, fee, tickSpacing, liquidity, slot0] = await common_1.POOL_CONTRACT_INTERFACE.batchReadFromChain(currentPoolAddress, this.client, [
|
|
61
62
|
{
|
|
62
|
-
functionName:
|
|
63
|
+
functionName: 'token0',
|
|
63
64
|
},
|
|
64
65
|
{
|
|
65
|
-
functionName:
|
|
66
|
+
functionName: 'token1',
|
|
66
67
|
},
|
|
67
68
|
{
|
|
68
|
-
functionName:
|
|
69
|
+
functionName: 'fee',
|
|
69
70
|
},
|
|
70
71
|
{
|
|
71
|
-
functionName:
|
|
72
|
+
functionName: 'tickSpacing',
|
|
72
73
|
},
|
|
73
74
|
{
|
|
74
|
-
functionName:
|
|
75
|
+
functionName: 'liquidity',
|
|
75
76
|
},
|
|
76
77
|
{
|
|
77
|
-
functionName:
|
|
78
|
-
}
|
|
78
|
+
functionName: 'slot0',
|
|
79
|
+
},
|
|
79
80
|
]);
|
|
80
81
|
return {
|
|
81
82
|
token0,
|
|
@@ -84,11 +85,11 @@ class SwapToken {
|
|
|
84
85
|
tickSpacing,
|
|
85
86
|
liquidity,
|
|
86
87
|
sqrtPriceX96: slot0[0],
|
|
87
|
-
tick: slot0[1]
|
|
88
|
+
tick: slot0[1],
|
|
88
89
|
};
|
|
89
90
|
}
|
|
90
91
|
async getTokenDecimals(tokenAddr) {
|
|
91
|
-
return await common_1.ERC20_CONTRACT_INTERFACE.readFromChain(tokenAddr,
|
|
92
|
+
return await common_1.ERC20_CONTRACT_INTERFACE.readFromChain(tokenAddr, 'decimals', [], this.client);
|
|
92
93
|
}
|
|
93
94
|
async createTrade(amountIn, tokenIn, tokenOut, poolFee) {
|
|
94
95
|
const poolInfo = await this.getPoolInfo(tokenIn, tokenOut, poolFee);
|
|
@@ -100,7 +101,7 @@ class SwapToken {
|
|
|
100
101
|
route: swapRoute,
|
|
101
102
|
inputAmount: sdk_core_1.CurrencyAmount.fromRawAmount(tokenIn, tokenInAmount),
|
|
102
103
|
outputAmount: sdk_core_1.CurrencyAmount.fromRawAmount(tokenOut, sdk_1.JSBI.BigInt(amountOut.toString())),
|
|
103
|
-
tradeType: sdk_core_1.TradeType.EXACT_INPUT
|
|
104
|
+
tradeType: sdk_core_1.TradeType.EXACT_INPUT,
|
|
104
105
|
});
|
|
105
106
|
return { uncheckedTrade, tokenInAmount };
|
|
106
107
|
}
|
|
@@ -114,21 +115,21 @@ class SwapToken {
|
|
|
114
115
|
route: swapRoute,
|
|
115
116
|
inputAmount: sdk_core_1.CurrencyAmount.fromRawAmount(tokenIn, tokenInAmount),
|
|
116
117
|
outputAmount: sdk_core_1.CurrencyAmount.fromRawAmount(tokenOut, sdk_1.JSBI.BigInt(amountOut.toString())),
|
|
117
|
-
tradeType: sdk_core_1.TradeType.EXACT_INPUT
|
|
118
|
+
tradeType: sdk_core_1.TradeType.EXACT_INPUT,
|
|
118
119
|
});
|
|
119
120
|
return { uncheckedTrade, tokenInAmount };
|
|
120
121
|
}
|
|
121
122
|
executeTrade(trade, routerAddr, walletAddress, slippage = 5000, percentDec = 10000) {
|
|
122
123
|
const options = {
|
|
123
|
-
slippageTolerance: new sdk_core_1.Percent(slippage, percentDec),
|
|
124
|
-
deadline: Date.now() + 1800,
|
|
125
|
-
recipient: walletAddress
|
|
124
|
+
slippageTolerance: new sdk_core_1.Percent(slippage, percentDec), // 50 bips, or 0.50%
|
|
125
|
+
deadline: Date.now() + 1800, // 20 minutes from the current Unix time
|
|
126
|
+
recipient: walletAddress,
|
|
126
127
|
};
|
|
127
128
|
const { calldata, value } = v3_sdk_1.SwapRouter.swapCallParameters(trade, options);
|
|
128
129
|
return {
|
|
129
130
|
data: calldata,
|
|
130
131
|
to: routerAddr,
|
|
131
|
-
value
|
|
132
|
+
value,
|
|
132
133
|
};
|
|
133
134
|
}
|
|
134
135
|
}
|
|
@@ -136,11 +137,11 @@ const fees = {
|
|
|
136
137
|
lowest: v3_sdk_1.FeeAmount.LOWEST,
|
|
137
138
|
low: v3_sdk_1.FeeAmount.LOW,
|
|
138
139
|
medium: v3_sdk_1.FeeAmount.MEDIUM,
|
|
139
|
-
high: v3_sdk_1.FeeAmount.HIGH
|
|
140
|
+
high: v3_sdk_1.FeeAmount.HIGH,
|
|
140
141
|
};
|
|
141
142
|
async function swapExec(client, uniswapAddrs, swapParams, chainId) {
|
|
142
143
|
const { univ3quoter, univ3factory, univ3router } = uniswapAddrs;
|
|
143
|
-
const { tokenInAddress, tokenOutAddress, amountIn, recipient, percentDecimal, slippage, poolFee } = swapParams;
|
|
144
|
+
const { tokenInAddress, tokenOutAddress, amountIn, recipient, percentDecimal, slippage, poolFee, } = swapParams;
|
|
144
145
|
const _poolFee = fees[poolFee];
|
|
145
146
|
const swapper = new SwapToken(client, 3, univ3quoter, univ3factory);
|
|
146
147
|
const tokenInDecimal = await swapper.getTokenDecimals(tokenInAddress);
|
|
@@ -157,27 +158,35 @@ async function swapExecV2(client, uniswapAddrs, swapParams, chainId) {
|
|
|
157
158
|
const { tokenInAddress, tokenOutAddress, amountIn, recipient } = swapParams;
|
|
158
159
|
const swapper = new SwapToken(client, 2, undefined, undefined, router, factory);
|
|
159
160
|
const tokenInDecimal = await swapper.getTokenDecimals(tokenInAddress);
|
|
160
|
-
const wethAddr = await (0, apis_1.getTokenInfo)(
|
|
161
|
+
const wethAddr = await (0, apis_1.getTokenInfo)('weth', chainId.toString());
|
|
161
162
|
let swapTxData;
|
|
162
163
|
if (wethAddr === tokenOutAddress) {
|
|
163
|
-
swapTxData = common_1.UNISWAPV2ROUTER02_INTERFACE.encodeTransactionParams(router,
|
|
164
|
+
swapTxData = common_1.UNISWAPV2ROUTER02_INTERFACE.encodeTransactionParams(router, 'swapExactTokensForETH', [
|
|
164
165
|
fromReadableAmount(amountIn, tokenInDecimal).toString(),
|
|
165
166
|
0,
|
|
166
167
|
[tokenInAddress, tokenOutAddress],
|
|
167
168
|
recipient,
|
|
168
|
-
Date.now() + 180000 // Long enough to rarely fail
|
|
169
|
+
Date.now() + 180000, // Long enough to rarely fail
|
|
169
170
|
]);
|
|
170
|
-
return {
|
|
171
|
+
return {
|
|
172
|
+
data: swapTxData.data,
|
|
173
|
+
to: swapTxData.to,
|
|
174
|
+
amount: fromReadableAmount(amountIn, tokenInDecimal).toString(),
|
|
175
|
+
};
|
|
171
176
|
}
|
|
172
177
|
else {
|
|
173
|
-
swapTxData = common_1.UNISWAPV2ROUTER02_INTERFACE.encodeTransactionParams(router,
|
|
178
|
+
swapTxData = common_1.UNISWAPV2ROUTER02_INTERFACE.encodeTransactionParams(router, 'swapExactTokensForTokens', [
|
|
174
179
|
fromReadableAmount(amountIn, tokenInDecimal).toString(),
|
|
175
180
|
0,
|
|
176
181
|
[tokenInAddress, tokenOutAddress],
|
|
177
182
|
recipient,
|
|
178
|
-
Date.now() + 180000 // Long enough to rarely fail
|
|
183
|
+
Date.now() + 180000, // Long enough to rarely fail
|
|
179
184
|
]);
|
|
180
|
-
return {
|
|
185
|
+
return {
|
|
186
|
+
data: swapTxData.data,
|
|
187
|
+
to: swapTxData.to,
|
|
188
|
+
amount: fromReadableAmount(amountIn, tokenInDecimal).toString(),
|
|
189
|
+
};
|
|
181
190
|
}
|
|
182
191
|
}
|
|
183
192
|
exports.swapExecV2 = swapExecV2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwapUtils.js","sourceRoot":"","sources":["../../../src/utils/SwapUtils.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"SwapUtils.js","sourceRoot":"","sources":["../../../src/utils/SwapUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeUtils.js","sourceRoot":"","sources":["../../../src/utils/TypeUtils.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;
|
|
1
|
+
{"version":3,"file":"TypeUtils.js","sourceRoot":"","sources":["../../../src/utils/TypeUtils.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,sCAA0C;AAEnC,MAAM,SAAS,GAAG,CAAC,KAAa,EAAW,EAAE;IAClD,IAAI,CAAC,IAAA,YAAK,EAAC,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,KAAK,uBAAc,CAAA;AACxC,CAAC,CAAA;AALY,QAAA,SAAS,aAKrB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Hex } from
|
|
2
|
-
import { Chain, UserOperation } from
|
|
1
|
+
import { Hex } from 'viem';
|
|
2
|
+
import { Chain, UserOperation } from '../data';
|
|
3
3
|
export declare const calcPreVerificationGas: (userOp: UserOperation) => bigint;
|
|
4
4
|
export declare const getPromiseFromOp: (op: UserOperation) => Promise<any>;
|
|
5
5
|
export declare function gasCalculation(txid: string, chain: Chain): Promise<{
|
|
@@ -2,34 +2,41 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getOpHash = exports.objectify = exports.stringify = exports.gasCalculation = exports.getPromiseFromOp = exports.calcPreVerificationGas = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
-
const ApiUtils_1 = require("./ApiUtils");
|
|
6
5
|
const common_1 = require("../common");
|
|
6
|
+
const ApiUtils_1 = require("./ApiUtils");
|
|
7
7
|
const calcPreVerificationGas = (userOp) => {
|
|
8
8
|
const ov = DefaultGasOverheads;
|
|
9
9
|
const p = Object.assign({
|
|
10
10
|
preVerificationGas: 28000,
|
|
11
|
-
signature: (0, viem_1.toHex)(Buffer.alloc(ov.sigSize, 1))
|
|
11
|
+
signature: (0, viem_1.toHex)(Buffer.alloc(ov.sigSize, 1)),
|
|
12
12
|
}, userOp);
|
|
13
13
|
const packed = (0, viem_1.toBytes)(packUserOp(p, false));
|
|
14
|
-
const callDataCost = packed
|
|
15
|
-
|
|
14
|
+
const callDataCost = packed
|
|
15
|
+
.map((x) => (x === 0 ? ov.zeroByte : ov.nonZeroByte))
|
|
16
|
+
.reduce((sum, x) => sum + x);
|
|
17
|
+
const ret = Math.round(callDataCost +
|
|
18
|
+
ov.fixed / ov.bundleSize +
|
|
19
|
+
ov.perUserOp +
|
|
20
|
+
ov.perUserOpWord * packed.length);
|
|
16
21
|
return BigInt(ret);
|
|
17
22
|
};
|
|
18
23
|
exports.calcPreVerificationGas = calcPreVerificationGas;
|
|
19
24
|
function encode(typevalues, forSignature) {
|
|
20
|
-
const types = typevalues.map((typevalue) =>
|
|
21
|
-
const values = typevalues.map((typevalue) => typevalue.type ===
|
|
25
|
+
const types = typevalues.map((typevalue) => typevalue.type === 'bytes' && forSignature ? 'bytes32' : typevalue.type);
|
|
26
|
+
const values = typevalues.map((typevalue) => typevalue.type === 'bytes' && forSignature
|
|
27
|
+
? (0, viem_1.keccak256)(typevalue.val)
|
|
28
|
+
: typevalue.val);
|
|
22
29
|
return (0, viem_1.encodeAbiParameters)(types, values);
|
|
23
30
|
}
|
|
24
31
|
function packUserOp(op, forSignature = true) {
|
|
25
32
|
if (forSignature) {
|
|
26
|
-
let encoded = (0, viem_1.encodeAbiParameters)([userOpTypeSig], [{ ...op, signature:
|
|
27
|
-
encoded = (
|
|
33
|
+
let encoded = (0, viem_1.encodeAbiParameters)([userOpTypeSig], [{ ...op, signature: '0x' }]);
|
|
34
|
+
encoded = ('0x' + encoded.slice(66, encoded.length - 64));
|
|
28
35
|
return encoded;
|
|
29
36
|
}
|
|
30
37
|
const typevalues = UserOpType.components.map((c) => ({
|
|
31
38
|
type: c.type,
|
|
32
|
-
val: op[c.name]
|
|
39
|
+
val: op[c.name],
|
|
33
40
|
}));
|
|
34
41
|
return encode(typevalues, forSignature);
|
|
35
42
|
}
|
|
@@ -42,26 +49,33 @@ const getPromiseFromOp = async (op) => {
|
|
|
42
49
|
};
|
|
43
50
|
exports.getPromiseFromOp = getPromiseFromOp;
|
|
44
51
|
async function gasCalculation(txid, chain) {
|
|
45
|
-
if (!txid || txid ===
|
|
46
|
-
return { gasUsed:
|
|
52
|
+
if (!txid || txid === '0x')
|
|
53
|
+
return { gasUsed: '-1', opFee: '-1', opFeeUSD: '-1' };
|
|
47
54
|
const provider = await chain.getClient();
|
|
48
|
-
const txReceipt = await provider.waitForTransactionReceipt({
|
|
55
|
+
const txReceipt = await provider.waitForTransactionReceipt({
|
|
56
|
+
hash: txid,
|
|
57
|
+
});
|
|
49
58
|
const gasUsed = txReceipt.gasUsed;
|
|
50
59
|
const gasPrice = txReceipt.effectiveGasPrice;
|
|
51
60
|
const opFee = gasUsed * gasPrice;
|
|
52
61
|
const chainPrice = BigInt(Math.ceil((await getPriceData(await chain.getCurrency())) * 100));
|
|
62
|
+
// @ts-ignore
|
|
63
|
+
// eslint-disable-next-line
|
|
53
64
|
const opFeeUSD = opFee * BigInt(chainPrice);
|
|
54
|
-
return {
|
|
65
|
+
return {
|
|
66
|
+
gasUsed: gasUsed.toString(),
|
|
67
|
+
opFee: (0, viem_1.formatUnits)(opFee, 18).toString(),
|
|
68
|
+
opFeeUSD: (0, viem_1.formatUnits)(opFeeUSD, 20).toString(),
|
|
69
|
+
};
|
|
55
70
|
}
|
|
56
71
|
exports.gasCalculation = gasCalculation;
|
|
57
|
-
const PRICE_URL =
|
|
72
|
+
const PRICE_URL = 'https://min-api.cryptocompare.com/data/price';
|
|
58
73
|
async function getPriceData(chainCurrency) {
|
|
59
|
-
const data = await (0, ApiUtils_1.sendRequest)(`${PRICE_URL}?fsym=${chainCurrency}&tsyms=USD`,
|
|
74
|
+
const data = await (0, ApiUtils_1.sendRequest)(`${PRICE_URL}?fsym=${chainCurrency}&tsyms=USD`, 'GET', '', {});
|
|
60
75
|
return data.USD;
|
|
61
76
|
}
|
|
62
77
|
const stringify = (object) => {
|
|
63
|
-
return JSON.stringify(object, (_, value) => (typeof value ===
|
|
64
|
-
);
|
|
78
|
+
return JSON.stringify(object, (_, value) => (typeof value === 'bigint' ? (0, viem_1.toHex)(value) : value));
|
|
65
79
|
};
|
|
66
80
|
exports.stringify = stringify;
|
|
67
81
|
const objectify = (op) => {
|
|
@@ -76,91 +90,91 @@ const DefaultGasOverheads = {
|
|
|
76
90
|
zeroByte: 4,
|
|
77
91
|
nonZeroByte: 16,
|
|
78
92
|
bundleSize: 1,
|
|
79
|
-
sigSize: 65
|
|
93
|
+
sigSize: 65,
|
|
80
94
|
};
|
|
81
95
|
const UserOpType = {
|
|
82
96
|
components: [
|
|
83
|
-
{ internalType:
|
|
84
|
-
{ internalType:
|
|
85
|
-
{ internalType:
|
|
86
|
-
{ internalType:
|
|
87
|
-
{ internalType:
|
|
97
|
+
{ internalType: 'address', name: 'sender', type: 'address' },
|
|
98
|
+
{ internalType: 'uint256', name: 'nonce', type: 'uint256' },
|
|
99
|
+
{ internalType: 'bytes', name: 'initCode', type: 'bytes' },
|
|
100
|
+
{ internalType: 'bytes', name: 'callData', type: 'bytes' },
|
|
101
|
+
{ internalType: 'uint256', name: 'callGasLimit', type: 'uint256' },
|
|
88
102
|
{
|
|
89
|
-
internalType:
|
|
90
|
-
name:
|
|
91
|
-
type:
|
|
103
|
+
internalType: 'uint256',
|
|
104
|
+
name: 'verificationGasLimit',
|
|
105
|
+
type: 'uint256',
|
|
92
106
|
},
|
|
93
107
|
{
|
|
94
|
-
internalType:
|
|
95
|
-
name:
|
|
96
|
-
type:
|
|
108
|
+
internalType: 'uint256',
|
|
109
|
+
name: 'preVerificationGas',
|
|
110
|
+
type: 'uint256',
|
|
97
111
|
},
|
|
98
|
-
{ internalType:
|
|
112
|
+
{ internalType: 'uint256', name: 'maxFeePerGas', type: 'uint256' },
|
|
99
113
|
{
|
|
100
|
-
internalType:
|
|
101
|
-
name:
|
|
102
|
-
type:
|
|
114
|
+
internalType: 'uint256',
|
|
115
|
+
name: 'maxPriorityFeePerGas',
|
|
116
|
+
type: 'uint256',
|
|
103
117
|
},
|
|
104
|
-
{ internalType:
|
|
105
|
-
{ internalType:
|
|
118
|
+
{ internalType: 'bytes', name: 'paymasterAndData', type: 'bytes' },
|
|
119
|
+
{ internalType: 'bytes', name: 'signature', type: 'bytes' },
|
|
106
120
|
],
|
|
107
|
-
internalType:
|
|
108
|
-
name:
|
|
109
|
-
type:
|
|
121
|
+
internalType: 'struct UserOperation',
|
|
122
|
+
name: 'userOp',
|
|
123
|
+
type: 'tuple',
|
|
110
124
|
};
|
|
111
125
|
const userOpTypeSig = {
|
|
112
126
|
components: [
|
|
113
127
|
{
|
|
114
|
-
type:
|
|
115
|
-
name:
|
|
128
|
+
type: 'address',
|
|
129
|
+
name: 'sender',
|
|
116
130
|
},
|
|
117
131
|
{
|
|
118
|
-
type:
|
|
119
|
-
name:
|
|
132
|
+
type: 'uint256',
|
|
133
|
+
name: 'nonce',
|
|
120
134
|
},
|
|
121
135
|
{
|
|
122
|
-
type:
|
|
123
|
-
name:
|
|
136
|
+
type: 'bytes',
|
|
137
|
+
name: 'initCode',
|
|
124
138
|
},
|
|
125
139
|
{
|
|
126
|
-
type:
|
|
127
|
-
name:
|
|
140
|
+
type: 'bytes',
|
|
141
|
+
name: 'callData',
|
|
128
142
|
},
|
|
129
143
|
{
|
|
130
|
-
type:
|
|
131
|
-
name:
|
|
144
|
+
type: 'uint256',
|
|
145
|
+
name: 'callGasLimit',
|
|
132
146
|
},
|
|
133
147
|
{
|
|
134
|
-
type:
|
|
135
|
-
name:
|
|
148
|
+
type: 'uint256',
|
|
149
|
+
name: 'verificationGasLimit',
|
|
136
150
|
},
|
|
137
151
|
{
|
|
138
|
-
type:
|
|
139
|
-
name:
|
|
152
|
+
type: 'uint256',
|
|
153
|
+
name: 'preVerificationGas',
|
|
140
154
|
},
|
|
141
155
|
{
|
|
142
|
-
type:
|
|
143
|
-
name:
|
|
156
|
+
type: 'uint256',
|
|
157
|
+
name: 'maxFeePerGas',
|
|
144
158
|
},
|
|
145
159
|
{
|
|
146
|
-
type:
|
|
147
|
-
name:
|
|
160
|
+
type: 'uint256',
|
|
161
|
+
name: 'maxPriorityFeePerGas',
|
|
148
162
|
},
|
|
149
163
|
{
|
|
150
|
-
type:
|
|
151
|
-
name:
|
|
164
|
+
type: 'bytes',
|
|
165
|
+
name: 'paymasterAndData',
|
|
152
166
|
},
|
|
153
167
|
{
|
|
154
|
-
type:
|
|
155
|
-
name:
|
|
156
|
-
}
|
|
168
|
+
type: 'bytes',
|
|
169
|
+
name: 'signature',
|
|
170
|
+
},
|
|
157
171
|
],
|
|
158
|
-
name:
|
|
159
|
-
type:
|
|
172
|
+
name: 'userOp',
|
|
173
|
+
type: 'tuple',
|
|
160
174
|
};
|
|
161
175
|
async function getOpHash(chain, userOp) {
|
|
162
|
-
const entryPointAddress = await chain.getAddress(
|
|
163
|
-
return await common_1.ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(entryPointAddress,
|
|
176
|
+
const entryPointAddress = await chain.getAddress('entryPointAddress');
|
|
177
|
+
return await common_1.ENTRYPOINT_CONTRACT_INTERFACE.readFromChain(entryPointAddress, 'getUserOpHash', [userOp], chain);
|
|
164
178
|
}
|
|
165
179
|
exports.getOpHash = getOpHash;
|
|
166
180
|
//# sourceMappingURL=UserOpUtils.js.map
|