@funkit/core 0.9.0 → 0.10.1
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/actions/AccessControl.d.ts +6 -6
- package/dist/src/actions/AccessControl.js +19 -15
- 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 +4 -4
- package/dist/src/actions/Bridge.js +10 -6
- package/dist/src/actions/Bridge.js.map +1 -1
- package/dist/src/actions/FirstClassActions.d.ts +6 -6
- package/dist/src/actions/FirstClassActions.js +25 -23
- 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 +3 -3
- package/dist/src/actions/LimitOrder.js +16 -13
- 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 +37 -35
- package/dist/src/actions/Swap.js.map +1 -1
- package/dist/src/actions/Token.d.ts +3 -3
- package/dist/src/actions/Token.js +33 -23
- 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 +124 -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 -2
- package/dist/src/apis/GroupApis.js +3 -3
- 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 -1
- package/dist/src/apis/PaymasterApis.js +2 -2
- 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 +1 -1
- package/dist/src/apis/TurnkeyApis.js +3 -3
- package/dist/src/apis/TurnkeyApis.js.map +1 -1
- package/dist/src/apis/UserApis.d.ts +2 -2
- package/dist/src/apis/UserApis.js +10 -7
- package/dist/src/apis/UserApis.js.map +1 -1
- package/dist/src/apis/index.d.ts +13 -11
- package/dist/src/apis/index.js +3 -1
- package/dist/src/apis/index.js.map +1 -1
- package/dist/src/apis/types.d.ts +75 -3
- 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 +43 -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 +105 -17
- package/dist/src/common/constants.js +160 -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 +4 -4
- package/dist/src/data/Token.js +9 -9
- 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 +4 -4
- package/dist/src/sponsors/GaslessSponsor.js +18 -15
- package/dist/src/sponsors/GaslessSponsor.js.map +1 -1
- package/dist/src/sponsors/Sponsor.d.ts +5 -5
- package/dist/src/sponsors/Sponsor.js +12 -11
- package/dist/src/sponsors/Sponsor.js.map +1 -1
- package/dist/src/sponsors/TokenSponsor.d.ts +7 -7
- package/dist/src/sponsors/TokenSponsor.js +75 -68
- 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 -1
- package/dist/src/utils/AuthUtils.js +4 -4
- 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 +7 -0
- package/dist/src/utils/CheckoutUtils.js +28 -0
- package/dist/src/utils/CheckoutUtils.js.map +1 -0
- package/dist/src/utils/GroupUtils.d.ts +3 -3
- package/dist/src/utils/GroupUtils.js +8 -8
- package/dist/src/utils/GroupUtils.js.map +1 -1
- 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 +42 -33
- 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 +77 -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 +15 -9
- package/dist/src/viem/ContractInterface.js.map +1 -1
- package/dist/src/viem/Converter.d.ts +823 -1107
- package/dist/src/viem/Converter.js +11 -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 +133 -89
- 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 +13 -5
|
@@ -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,10 +49,12 @@ 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;
|
|
@@ -53,17 +62,20 @@ async function gasCalculation(txid, chain) {
|
|
|
53
62
|
// @ts-ignore
|
|
54
63
|
// eslint-disable-next-line
|
|
55
64
|
const opFeeUSD = opFee * BigInt(chainPrice);
|
|
56
|
-
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
|
+
};
|
|
57
70
|
}
|
|
58
71
|
exports.gasCalculation = gasCalculation;
|
|
59
|
-
const PRICE_URL =
|
|
72
|
+
const PRICE_URL = 'https://min-api.cryptocompare.com/data/price';
|
|
60
73
|
async function getPriceData(chainCurrency) {
|
|
61
|
-
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', '', {});
|
|
62
75
|
return data.USD;
|
|
63
76
|
}
|
|
64
77
|
const stringify = (object) => {
|
|
65
|
-
return JSON.stringify(object, (_, value) => (typeof value ===
|
|
66
|
-
);
|
|
78
|
+
return JSON.stringify(object, (_, value) => (typeof value === 'bigint' ? (0, viem_1.toHex)(value) : value));
|
|
67
79
|
};
|
|
68
80
|
exports.stringify = stringify;
|
|
69
81
|
const objectify = (op) => {
|
|
@@ -78,91 +90,91 @@ const DefaultGasOverheads = {
|
|
|
78
90
|
zeroByte: 4,
|
|
79
91
|
nonZeroByte: 16,
|
|
80
92
|
bundleSize: 1,
|
|
81
|
-
sigSize: 65
|
|
93
|
+
sigSize: 65,
|
|
82
94
|
};
|
|
83
95
|
const UserOpType = {
|
|
84
96
|
components: [
|
|
85
|
-
{ internalType:
|
|
86
|
-
{ internalType:
|
|
87
|
-
{ internalType:
|
|
88
|
-
{ internalType:
|
|
89
|
-
{ 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' },
|
|
90
102
|
{
|
|
91
|
-
internalType:
|
|
92
|
-
name:
|
|
93
|
-
type:
|
|
103
|
+
internalType: 'uint256',
|
|
104
|
+
name: 'verificationGasLimit',
|
|
105
|
+
type: 'uint256',
|
|
94
106
|
},
|
|
95
107
|
{
|
|
96
|
-
internalType:
|
|
97
|
-
name:
|
|
98
|
-
type:
|
|
108
|
+
internalType: 'uint256',
|
|
109
|
+
name: 'preVerificationGas',
|
|
110
|
+
type: 'uint256',
|
|
99
111
|
},
|
|
100
|
-
{ internalType:
|
|
112
|
+
{ internalType: 'uint256', name: 'maxFeePerGas', type: 'uint256' },
|
|
101
113
|
{
|
|
102
|
-
internalType:
|
|
103
|
-
name:
|
|
104
|
-
type:
|
|
114
|
+
internalType: 'uint256',
|
|
115
|
+
name: 'maxPriorityFeePerGas',
|
|
116
|
+
type: 'uint256',
|
|
105
117
|
},
|
|
106
|
-
{ internalType:
|
|
107
|
-
{ internalType:
|
|
118
|
+
{ internalType: 'bytes', name: 'paymasterAndData', type: 'bytes' },
|
|
119
|
+
{ internalType: 'bytes', name: 'signature', type: 'bytes' },
|
|
108
120
|
],
|
|
109
|
-
internalType:
|
|
110
|
-
name:
|
|
111
|
-
type:
|
|
121
|
+
internalType: 'struct UserOperation',
|
|
122
|
+
name: 'userOp',
|
|
123
|
+
type: 'tuple',
|
|
112
124
|
};
|
|
113
125
|
const userOpTypeSig = {
|
|
114
126
|
components: [
|
|
115
127
|
{
|
|
116
|
-
type:
|
|
117
|
-
name:
|
|
128
|
+
type: 'address',
|
|
129
|
+
name: 'sender',
|
|
118
130
|
},
|
|
119
131
|
{
|
|
120
|
-
type:
|
|
121
|
-
name:
|
|
132
|
+
type: 'uint256',
|
|
133
|
+
name: 'nonce',
|
|
122
134
|
},
|
|
123
135
|
{
|
|
124
|
-
type:
|
|
125
|
-
name:
|
|
136
|
+
type: 'bytes',
|
|
137
|
+
name: 'initCode',
|
|
126
138
|
},
|
|
127
139
|
{
|
|
128
|
-
type:
|
|
129
|
-
name:
|
|
140
|
+
type: 'bytes',
|
|
141
|
+
name: 'callData',
|
|
130
142
|
},
|
|
131
143
|
{
|
|
132
|
-
type:
|
|
133
|
-
name:
|
|
144
|
+
type: 'uint256',
|
|
145
|
+
name: 'callGasLimit',
|
|
134
146
|
},
|
|
135
147
|
{
|
|
136
|
-
type:
|
|
137
|
-
name:
|
|
148
|
+
type: 'uint256',
|
|
149
|
+
name: 'verificationGasLimit',
|
|
138
150
|
},
|
|
139
151
|
{
|
|
140
|
-
type:
|
|
141
|
-
name:
|
|
152
|
+
type: 'uint256',
|
|
153
|
+
name: 'preVerificationGas',
|
|
142
154
|
},
|
|
143
155
|
{
|
|
144
|
-
type:
|
|
145
|
-
name:
|
|
156
|
+
type: 'uint256',
|
|
157
|
+
name: 'maxFeePerGas',
|
|
146
158
|
},
|
|
147
159
|
{
|
|
148
|
-
type:
|
|
149
|
-
name:
|
|
160
|
+
type: 'uint256',
|
|
161
|
+
name: 'maxPriorityFeePerGas',
|
|
150
162
|
},
|
|
151
163
|
{
|
|
152
|
-
type:
|
|
153
|
-
name:
|
|
164
|
+
type: 'bytes',
|
|
165
|
+
name: 'paymasterAndData',
|
|
154
166
|
},
|
|
155
167
|
{
|
|
156
|
-
type:
|
|
157
|
-
name:
|
|
158
|
-
}
|
|
168
|
+
type: 'bytes',
|
|
169
|
+
name: 'signature',
|
|
170
|
+
},
|
|
159
171
|
],
|
|
160
|
-
name:
|
|
161
|
-
type:
|
|
172
|
+
name: 'userOp',
|
|
173
|
+
type: 'tuple',
|
|
162
174
|
};
|
|
163
175
|
async function getOpHash(chain, userOp) {
|
|
164
|
-
const entryPointAddress = await chain.getAddress(
|
|
165
|
-
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);
|
|
166
178
|
}
|
|
167
179
|
exports.getOpHash = getOpHash;
|
|
168
180
|
//# sourceMappingURL=UserOpUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserOpUtils.js","sourceRoot":"","sources":["../../../src/utils/UserOpUtils.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"UserOpUtils.js","sourceRoot":"","sources":["../../../src/utils/UserOpUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,22 +4,26 @@ exports.getSigHash = exports.formatAbiParams = exports.formatAbiItem = void 0;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
// Copied from viem
|
|
6
6
|
function formatAbiItem(abiItem, { includeName = false } = {}) {
|
|
7
|
-
if (abiItem.type !==
|
|
7
|
+
if (abiItem.type !== 'function' &&
|
|
8
|
+
abiItem.type !== 'event' &&
|
|
9
|
+
abiItem.type !== 'error')
|
|
8
10
|
throw new Error(`InvalidDefinitionTypeError: ${abiItem.type}`);
|
|
9
11
|
return `${abiItem.name}(${formatAbiParams(abiItem.inputs, { includeName })})`;
|
|
10
12
|
}
|
|
11
13
|
exports.formatAbiItem = formatAbiItem;
|
|
12
14
|
function formatAbiParams(params, { includeName = false } = {}) {
|
|
13
15
|
if (!params)
|
|
14
|
-
return
|
|
15
|
-
return params
|
|
16
|
+
return '';
|
|
17
|
+
return params
|
|
18
|
+
.map((param) => formatAbiParam(param, { includeName }))
|
|
19
|
+
.join(includeName ? ', ' : ',');
|
|
16
20
|
}
|
|
17
21
|
exports.formatAbiParams = formatAbiParams;
|
|
18
22
|
function formatAbiParam(param, { includeName }) {
|
|
19
|
-
if (param.type.startsWith(
|
|
20
|
-
return `(${formatAbiParams(param.components, { includeName })})${param.type.slice(
|
|
23
|
+
if (param.type.startsWith('tuple')) {
|
|
24
|
+
return `(${formatAbiParams(param.components, { includeName })})${param.type.slice('tuple'.length)}`;
|
|
21
25
|
}
|
|
22
|
-
return param.type + (includeName && param.name ? ` ${param.name}` :
|
|
26
|
+
return param.type + (includeName && param.name ? ` ${param.name}` : '');
|
|
23
27
|
}
|
|
24
28
|
const getSigHash = (abi, functionName) => {
|
|
25
29
|
const abiItem = (0, viem_1.getAbiItem)({ abi, name: functionName });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViemUtils.js","sourceRoot":"","sources":["../../../src/utils/ViemUtils.ts"],"names":[],"mappings":";;;AACA,+BAA+D;AAE/D,mBAAmB;AACnB,SAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"ViemUtils.js","sourceRoot":"","sources":["../../../src/utils/ViemUtils.ts"],"names":[],"mappings":";;;AACA,+BAA+D;AAE/D,mBAAmB;AACnB,SAAgB,aAAa,CAC3B,OAAgB,EAChB,EAAE,WAAW,GAAG,KAAK,KAAgC,EAAE;IAEvD,IACE,OAAO,CAAC,IAAI,KAAK,UAAU;QAC3B,OAAO,CAAC,IAAI,KAAK,OAAO;QACxB,OAAO,CAAC,IAAI,KAAK,OAAO;QAExB,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IAEhE,OAAO,GAAG,OAAO,CAAC,IAAI,IAAI,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,GAAG,CAAA;AAC/E,CAAC;AAZD,sCAYC;AAED,SAAgB,eAAe,CAC7B,MAA2C,EAC3C,EAAE,WAAW,GAAG,KAAK,KAAgC,EAAE;IAEvD,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IACtB,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SACtD,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AACnC,CAAC;AARD,0CAQC;AAED,SAAS,cAAc,CACrB,KAAmB,EACnB,EAAE,WAAW,EAA4B;IAEzC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACnC,OAAO,IAAI,eAAe,CACvB,KAAmD,CAAC,UAAU,EAC/D,EAAE,WAAW,EAAE,CAChB,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAA;IACzC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AACzE,CAAC;AAEM,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,YAAoB,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAG,IAAA,iBAAU,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IACvD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IACzC,OAAO,IAAA,0BAAmB,EAAC,UAAU,CAAC,CAAA;AACxC,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Address, Hex } from
|
|
2
|
-
import { Chain, Operation, Signature, UserOperation } from
|
|
1
|
+
import { Address, Hex } from 'viem';
|
|
2
|
+
import { Chain, Operation, Signature, UserOperation } from '../data';
|
|
3
3
|
export declare const generateRandomBytes32: () => Hex;
|
|
4
4
|
export declare const generateRandomWalletUniqueId: () => Hex;
|
|
5
5
|
export declare const generateRandomGroupId: () => Hex;
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.isSignatureMissing = exports.isGroupOperation = exports.isWalletInitOp = exports.getWalletAddress = exports.generateRandomNonce = exports.generateRandomNonceKey = exports.generateRuleId = exports.generateRoleId = exports.generateRandomGroupId = exports.generateRandomWalletUniqueId = exports.generateRandomBytes32 = void 0;
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
5
|
const viem_1 = require("viem");
|
|
6
|
-
const ChainUtils_1 = require("./ChainUtils");
|
|
7
6
|
const common_1 = require("../common");
|
|
8
7
|
const data_1 = require("../data");
|
|
8
|
+
const ChainUtils_1 = require("./ChainUtils");
|
|
9
9
|
const generateRandomBytes32 = () => {
|
|
10
10
|
return (0, viem_1.keccak256)((0, viem_1.toBytes)((0, uuid_1.v4)()));
|
|
11
11
|
};
|
|
@@ -37,12 +37,12 @@ const generateRandomNonce = () => {
|
|
|
37
37
|
exports.generateRandomNonce = generateRandomNonce;
|
|
38
38
|
const getWalletAddress = async (chain, walletUniqueId) => {
|
|
39
39
|
const data = (0, data_1.encodeLoginData)({ salt: walletUniqueId });
|
|
40
|
-
const factoryAddress = await chain.getAddress(
|
|
41
|
-
return await common_1.FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress,
|
|
40
|
+
const factoryAddress = await chain.getAddress('factoryAddress');
|
|
41
|
+
return await common_1.FACTORY_CONTRACT_INTERFACE.readFromChain(factoryAddress, 'getAddress', [data], chain);
|
|
42
42
|
};
|
|
43
43
|
exports.getWalletAddress = getWalletAddress;
|
|
44
44
|
const isWalletInitOp = (userOp) => {
|
|
45
|
-
return userOp.initCode !==
|
|
45
|
+
return userOp.initCode !== '0x';
|
|
46
46
|
};
|
|
47
47
|
exports.isWalletInitOp = isWalletInitOp;
|
|
48
48
|
const isGroupOperation = (operation) => {
|
|
@@ -58,7 +58,8 @@ const isSignatureMissing = (userId, signatures) => {
|
|
|
58
58
|
}
|
|
59
59
|
let sigMissing = true;
|
|
60
60
|
for (const signature of signatures) {
|
|
61
|
-
if ((0, viem_1.pad)(signature.userId.toLowerCase(), { size: 32 }) ===
|
|
61
|
+
if ((0, viem_1.pad)(signature.userId.toLowerCase(), { size: 32 }) ===
|
|
62
|
+
(0, viem_1.pad)(userId.toLowerCase(), { size: 32 })) {
|
|
62
63
|
sigMissing = false;
|
|
63
64
|
break;
|
|
64
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletUtils.js","sourceRoot":"","sources":["../../../src/utils/WalletUtils.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,+BAA4D;
|
|
1
|
+
{"version":3,"file":"WalletUtils.js","sourceRoot":"","sources":["../../../src/utils/WalletUtils.ts"],"names":[],"mappings":";;;AAAA,+BAAmC;AACnC,+BAA4D;AAE5D,sCAAsD;AACtD,kCAOgB;AAChB,6CAA0C;AAEnC,MAAM,qBAAqB,GAAG,GAAQ,EAAE;IAC7C,OAAO,IAAA,gBAAS,EAAC,IAAA,cAAO,EAAC,IAAA,SAAM,GAAE,CAAC,CAAQ,CAAA;AAC5C,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,4BAA4B,GAAG,GAAQ,EAAE;IACpD,OAAO,IAAA,6BAAqB,GAAE,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,4BAA4B,gCAExC;AAEM,MAAM,qBAAqB,GAAG,GAAQ,EAAE;IAC7C,OAAO,IAAA,6BAAqB,GAAE,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,cAAc,GAAG,GAAQ,EAAE;IACtC,OAAO,IAAA,6BAAqB,GAAE,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAEM,MAAM,cAAc,GAAG,GAAQ,EAAE;IACtC,OAAO,IAAA,6BAAqB,GAAE,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAEM,MAAM,sBAAsB,GAAG,GAAW,EAAE;IACjD,OAAO,MAAM,CAAC,IAAA,wBAAW,EAAC,EAAE,CAAC,CAAC,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,sBAAsB,0BAElC;AAEM,MAAM,mBAAmB,GAAG,GAAW,EAAE;IAC9C,MAAM,SAAS,GAAG,IAAA,8BAAsB,GAAE,CAAA;IAC1C,OAAO,SAAS,IAAI,GAAG,CAAA;AACzB,CAAC,CAAA;AAHY,QAAA,mBAAmB,uBAG/B;AAEM,MAAM,gBAAgB,GAAG,KAAK,EACnC,KAAY,EACZ,cAAmB,EACD,EAAE;IACpB,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;IACtD,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;IAC/D,OAAO,MAAM,mCAA0B,CAAC,aAAa,CACnD,cAAc,EACd,YAAY,EACZ,CAAC,IAAI,CAAC,EACN,KAAK,CACN,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B;AAEM,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAW,EAAE;IAC/D,OAAO,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAA;AACjC,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAEM,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAW,EAAE;IAChE,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,QAAQ,KAAK,eAAQ,CAAC,SAAS,EAAE,CAAC;QACnE,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AALY,QAAA,gBAAgB,oBAK5B;AAEM,MAAM,kBAAkB,GAAG,CAChC,MAAW,EACX,UAAmC,EAC1B,EAAE;IACX,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IACE,IAAA,UAAG,EAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;YACxD,IAAA,UAAG,EAAC,MAAM,CAAC,WAAW,EAAS,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAC9C,CAAC;YACD,UAAU,GAAG,KAAK,CAAA;YAClB,MAAK;QACP,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAlBY,QAAA,kBAAkB,sBAkB9B"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export * from
|
|
6
|
-
export * from
|
|
7
|
-
export * from
|
|
1
|
+
export * from './ApiUtils';
|
|
2
|
+
export * from './AuthUtils';
|
|
3
|
+
export * from './ChainUtils';
|
|
4
|
+
export * from './CheckoutUtils';
|
|
5
|
+
export * from './PaymasterUtils';
|
|
6
|
+
export * from './SwapUtils';
|
|
7
|
+
export * from './UserOpUtils';
|
|
8
|
+
export * from './WalletUtils';
|
package/dist/src/utils/index.js
CHANGED
|
@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./ApiUtils"), exports);
|
|
18
18
|
__exportStar(require("./AuthUtils"), exports);
|
|
19
19
|
__exportStar(require("./ChainUtils"), exports);
|
|
20
|
+
__exportStar(require("./CheckoutUtils"), exports);
|
|
20
21
|
__exportStar(require("./PaymasterUtils"), exports);
|
|
21
22
|
__exportStar(require("./SwapUtils"), exports);
|
|
22
23
|
__exportStar(require("./UserOpUtils"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,8CAA2B;AAC3B,+CAA4B;AAC5B,mDAAgC;AAChC,8CAA2B;AAC3B,gDAA6B;AAC7B,gDAA6B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,8CAA2B;AAC3B,+CAA4B;AAC5B,kDAA+B;AAC/B,mDAAgC;AAChC,8CAA2B;AAC3B,gDAA6B;AAC7B,gDAA6B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Address, Hex, PublicClient } from
|
|
2
|
-
import { TransactionParams } from
|
|
3
|
-
import { Chain } from
|
|
1
|
+
import { Address, Hex, PublicClient } from 'viem';
|
|
2
|
+
import { TransactionParams } from '../common';
|
|
3
|
+
import { Chain } from '../data';
|
|
4
4
|
type ChainReadCall = {
|
|
5
5
|
functionName: string;
|
|
6
6
|
args?: any[];
|
|
@@ -12,7 +12,7 @@ export declare class ContractInterface {
|
|
|
12
12
|
batchReadFromChain(address: Address, chainOrClient: Chain | PublicClient, calls: ChainReadCall[]): Promise<any[]>;
|
|
13
13
|
encodeTransactionParams(address: Address, functionName: string, args: any[], value?: bigint): TransactionParams;
|
|
14
14
|
encodeData(functionName: string, args: any[]): Hex;
|
|
15
|
-
createFilter(address: Address, eventName: any, args: any, chainOrClient: PublicClient | Chain, fromBlock: bigint): Promise<import("viem").CreateContractEventFilterReturnType<any, any, any>>;
|
|
15
|
+
createFilter(address: Address, eventName: any, args: any, chainOrClient: PublicClient | Chain, fromBlock: bigint): Promise<import("viem").CreateContractEventFilterReturnType<any, any, any, undefined, bigint, undefined>>;
|
|
16
16
|
getLog(address: Address, name: string, args: any, chainOrClient: PublicClient | Chain, fromBlock: bigint): Promise<any[]>;
|
|
17
17
|
}
|
|
18
18
|
export declare const parseClient: (chainOrClient: PublicClient | Chain) => Promise<PublicClient>;
|
|
@@ -15,11 +15,17 @@ class ContractInterface {
|
|
|
15
15
|
abi: this.abi,
|
|
16
16
|
address,
|
|
17
17
|
functionName,
|
|
18
|
-
args
|
|
18
|
+
args,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
catch (e) {
|
|
22
|
-
throw new Error(`Error reading from chain: \n ${(0, utils_1.stringify)(e)}
|
|
22
|
+
throw new Error(`Error reading from chain: \n ${(0, utils_1.stringify)(e)}. Info: ${(0, utils_1.stringify)({
|
|
23
|
+
address,
|
|
24
|
+
functionName,
|
|
25
|
+
args,
|
|
26
|
+
chainOrClient,
|
|
27
|
+
client,
|
|
28
|
+
})}`);
|
|
23
29
|
}
|
|
24
30
|
}
|
|
25
31
|
async batchReadFromChain(address, chainOrClient, calls) {
|
|
@@ -32,7 +38,7 @@ class ContractInterface {
|
|
|
32
38
|
const data = (0, viem_1.encodeFunctionData)({
|
|
33
39
|
abi: this.abi,
|
|
34
40
|
functionName,
|
|
35
|
-
args
|
|
41
|
+
args,
|
|
36
42
|
});
|
|
37
43
|
return { to: address, data, value };
|
|
38
44
|
}
|
|
@@ -40,7 +46,7 @@ class ContractInterface {
|
|
|
40
46
|
return (0, viem_1.encodeFunctionData)({
|
|
41
47
|
abi: this.abi,
|
|
42
48
|
functionName,
|
|
43
|
-
args
|
|
49
|
+
args,
|
|
44
50
|
});
|
|
45
51
|
}
|
|
46
52
|
async createFilter(address, eventName, args, chainOrClient, fromBlock) {
|
|
@@ -50,17 +56,17 @@ class ContractInterface {
|
|
|
50
56
|
address,
|
|
51
57
|
eventName,
|
|
52
58
|
args,
|
|
53
|
-
fromBlock
|
|
59
|
+
fromBlock,
|
|
54
60
|
});
|
|
55
61
|
}
|
|
56
62
|
async getLog(address, name, args, chainOrClient, fromBlock) {
|
|
57
63
|
const client = await (0, exports.parseClient)(chainOrClient);
|
|
58
|
-
const event = getItemFromAbi(this.abi, name,
|
|
64
|
+
const event = getItemFromAbi(this.abi, name, 'event');
|
|
59
65
|
return await client.getLogs({
|
|
60
66
|
address,
|
|
61
67
|
event,
|
|
62
68
|
args,
|
|
63
|
-
fromBlock
|
|
69
|
+
fromBlock,
|
|
64
70
|
});
|
|
65
71
|
}
|
|
66
72
|
}
|
|
@@ -70,11 +76,11 @@ const parseClient = async (chainOrClient) => {
|
|
|
70
76
|
const chain = chainOrClient;
|
|
71
77
|
return await chain.getClient();
|
|
72
78
|
}
|
|
73
|
-
else if (typeof chainOrClient.readContract ===
|
|
79
|
+
else if (typeof chainOrClient.readContract === 'function') {
|
|
74
80
|
return chainOrClient;
|
|
75
81
|
}
|
|
76
82
|
else {
|
|
77
|
-
throw new Error(
|
|
83
|
+
throw new Error('No client or chain provided');
|
|
78
84
|
}
|
|
79
85
|
};
|
|
80
86
|
exports.parseClient = parseClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractInterface.js","sourceRoot":"","sources":["../../../src/viem/ContractInterface.ts"],"names":[],"mappings":";;;AAAA,+BAAqE;
|
|
1
|
+
{"version":3,"file":"ContractInterface.js","sourceRoot":"","sources":["../../../src/viem/ContractInterface.ts"],"names":[],"mappings":"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"}
|