thirdweb 5.60.1-nightly-79c50cb311ffef769b7bdba3006ae67ddf257caf-20241002000323 → 5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322
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/contract/actions/compiler-metadata.js +3 -3
- package/dist/cjs/contract/actions/compiler-metadata.js.map +1 -1
- package/dist/cjs/contract/deployment/publisher.js +0 -2
- package/dist/cjs/contract/deployment/publisher.js.map +1 -1
- package/dist/cjs/contract/deployment/utils/bootstrap.js +7 -3
- package/dist/cjs/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/cjs/extensions/prebuilts/deploy-published.js +13 -7
- package/dist/cjs/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js +6 -1
- package/dist/cjs/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/cjs/utils/any-evm/deploy-metadata.js +29 -21
- package/dist/cjs/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/cjs/utils/any-evm/zksync/isZkSyncChain.js +19 -14
- package/dist/cjs/utils/any-evm/zksync/isZkSyncChain.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/in-app/native/ecosystem.js +1 -0
- package/dist/cjs/wallets/in-app/native/ecosystem.js.map +1 -1
- package/dist/cjs/wallets/in-app/web/ecosystem.js +1 -0
- package/dist/cjs/wallets/in-app/web/ecosystem.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/bundler.js +1 -3
- package/dist/cjs/wallets/smart/lib/bundler.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/constants.js +3 -3
- package/dist/cjs/wallets/smart/lib/constants.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/paymaster.js +1 -3
- package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/userop.js +1 -3
- package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
- package/dist/esm/contract/actions/compiler-metadata.js +3 -3
- package/dist/esm/contract/actions/compiler-metadata.js.map +1 -1
- package/dist/esm/contract/deployment/publisher.js +0 -2
- package/dist/esm/contract/deployment/publisher.js.map +1 -1
- package/dist/esm/contract/deployment/utils/bootstrap.js +7 -3
- package/dist/esm/contract/deployment/utils/bootstrap.js.map +1 -1
- package/dist/esm/extensions/prebuilts/deploy-published.js +13 -7
- package/dist/esm/extensions/prebuilts/deploy-published.js.map +1 -1
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js +6 -1
- package/dist/esm/utils/any-evm/compute-published-contract-deploy-info.js.map +1 -1
- package/dist/esm/utils/any-evm/deploy-metadata.js +28 -21
- package/dist/esm/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/esm/utils/any-evm/zksync/isZkSyncChain.js +19 -14
- package/dist/esm/utils/any-evm/zksync/isZkSyncChain.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/in-app/native/ecosystem.js +1 -0
- package/dist/esm/wallets/in-app/native/ecosystem.js.map +1 -1
- package/dist/esm/wallets/in-app/web/ecosystem.js +1 -0
- package/dist/esm/wallets/in-app/web/ecosystem.js.map +1 -1
- package/dist/esm/wallets/smart/lib/bundler.js +2 -4
- package/dist/esm/wallets/smart/lib/bundler.js.map +1 -1
- package/dist/esm/wallets/smart/lib/constants.js +3 -3
- package/dist/esm/wallets/smart/lib/constants.js.map +1 -1
- package/dist/esm/wallets/smart/lib/paymaster.js +2 -4
- package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
- package/dist/esm/wallets/smart/lib/userop.js +1 -3
- package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
- package/dist/types/contract/actions/compiler-metadata.d.ts +1 -1
- package/dist/types/contract/actions/compiler-metadata.d.ts.map +1 -1
- package/dist/types/contract/deployment/publisher.d.ts +0 -2
- package/dist/types/contract/deployment/publisher.d.ts.map +1 -1
- package/dist/types/contract/deployment/utils/bootstrap.d.ts +1 -2
- package/dist/types/contract/deployment/utils/bootstrap.d.ts.map +1 -1
- package/dist/types/extensions/prebuilts/deploy-published.d.ts +0 -2
- package/dist/types/extensions/prebuilts/deploy-published.d.ts.map +1 -1
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts +1 -1
- package/dist/types/utils/any-evm/compute-published-contract-deploy-info.d.ts.map +1 -1
- package/dist/types/utils/any-evm/deploy-metadata.d.ts +9 -6
- package/dist/types/utils/any-evm/deploy-metadata.d.ts.map +1 -1
- package/dist/types/utils/any-evm/zksync/isZkSyncChain.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/in-app/native/ecosystem.d.ts.map +1 -1
- package/dist/types/wallets/in-app/web/ecosystem.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/bundler.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/constants.d.ts +1 -1
- package/dist/types/wallets/smart/lib/constants.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/contract/actions/compiler-metadata.ts +2 -3
- package/src/contract/deployment/publisher.ts +0 -4
- package/src/contract/deployment/utils/bootstrap.ts +9 -5
- package/src/extensions/prebuilts/deploy-published.ts +14 -10
- package/src/extensions/thirdweb/write/publish.test.ts +0 -1
- package/src/utils/any-evm/compute-published-contract-deploy-info.ts +9 -2
- package/src/utils/any-evm/deploy-metadata.ts +44 -33
- package/src/utils/any-evm/zksync/isZkSyncChain.ts +19 -16
- package/src/version.ts +1 -1
- package/src/wallets/in-app/native/ecosystem.ts +1 -0
- package/src/wallets/in-app/web/ecosystem.ts +1 -0
- package/src/wallets/smart/lib/bundler.ts +1 -7
- package/src/wallets/smart/lib/constants.ts +3 -3
- package/src/wallets/smart/lib/paymaster.ts +1 -4
- package/src/wallets/smart/lib/userop.ts +1 -6
- package/src/wallets/smart/smart-wallet-zksync.test.ts +25 -1
|
@@ -9,10 +9,10 @@ exports.formatCompilerMetadata = formatCompilerMetadata;
|
|
|
9
9
|
*/
|
|
10
10
|
function formatCompilerMetadata(
|
|
11
11
|
// biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
|
|
12
|
-
metadata
|
|
12
|
+
metadata) {
|
|
13
13
|
let meta = metadata;
|
|
14
|
-
if (
|
|
15
|
-
meta = metadata.source_metadata
|
|
14
|
+
if ("source_metadata" in metadata) {
|
|
15
|
+
meta = metadata.source_metadata;
|
|
16
16
|
}
|
|
17
17
|
const compilationTarget = meta.settings.compilationTarget;
|
|
18
18
|
const targets = Object.keys(compilationTarget);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":";;AA6BA,
|
|
1
|
+
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":";;AA6BA,wDAgCC;AAtCD;;;;;GAKG;AACH,SAAgB,sBAAsB;AACpC,8DAA8D;AAC9D,QAAa;IAEb,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,iBAAiB,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,GAAG,QAAQ,CAAC,eAAe,CAAC;IAClC,CAAC;IACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAmC,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QACjC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM;QAClC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;KACnC,CAAC;IACF,MAAM,QAAQ,GAAa;QACzB,GAAG,IAAI,GAAG;QACR,8DAA8D;QAC9D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAE,GAAW,CAAC,OAAO,CAAC,CACpE;KACF,CAAC;IACF,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI;QACJ,QAAQ;QACR,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -25,7 +25,6 @@ async function fetchPublishedContractMetadata(options) {
|
|
|
25
25
|
publisherAddress: options.publisher || THIRDWEB_DEPLOYER,
|
|
26
26
|
contractId: options.contractId,
|
|
27
27
|
version: options.version,
|
|
28
|
-
compilerType: options.compilerType,
|
|
29
28
|
});
|
|
30
29
|
if (!publishedContract.publishMetadataUri) {
|
|
31
30
|
throw new Error(`No published metadata URI found for ${options.contractId}`);
|
|
@@ -33,7 +32,6 @@ async function fetchPublishedContractMetadata(options) {
|
|
|
33
32
|
const data = await (0, deploy_metadata_js_1.fetchDeployMetadata)({
|
|
34
33
|
client: options.client,
|
|
35
34
|
uri: publishedContract.publishMetadataUri,
|
|
36
|
-
compilerType: options.compilerType,
|
|
37
35
|
});
|
|
38
36
|
return data;
|
|
39
37
|
}, { cacheKey, cacheTime: 1000 * 60 * 60 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/contract/deployment/publisher.ts"],"names":[],"mappings":";;;AAqBA,
|
|
1
|
+
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/contract/deployment/publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ exports.deployImplementation = deployImplementation;
|
|
|
6
6
|
exports.getOrDeployInfraContract = getOrDeployInfraContract;
|
|
7
7
|
exports.getOrDeployInfraContractFromMetadata = getOrDeployInfraContractFromMetadata;
|
|
8
8
|
const send_and_confirm_transaction_js_1 = require("../../../transaction/actions/send-and-confirm-transaction.js");
|
|
9
|
+
const deploy_metadata_js_1 = require("../../../utils/any-evm/deploy-metadata.js");
|
|
9
10
|
const isZkSyncChain_js_1 = require("../../../utils/any-evm/zksync/isZkSyncChain.js");
|
|
10
11
|
const contract_js_1 = require("../../contract.js");
|
|
11
12
|
const publisher_js_1 = require("../publisher.js");
|
|
@@ -18,7 +19,7 @@ const infra_js_1 = require("./infra.js");
|
|
|
18
19
|
* @internal
|
|
19
20
|
*/
|
|
20
21
|
async function getOrDeployInfraForPublishedContract(args) {
|
|
21
|
-
const { chain, client, account, contractId, constructorParams, publisher, version,
|
|
22
|
+
const { chain, client, account, contractId, constructorParams, publisher, version, } = args;
|
|
22
23
|
if (await (0, isZkSyncChain_js_1.isZkSyncChain)(chain)) {
|
|
23
24
|
const cloneFactoryContract = await (0, zkDeployCreate2Factory_js_1.zkDeployCreate2Factory)({
|
|
24
25
|
chain,
|
|
@@ -30,14 +31,17 @@ async function getOrDeployInfraForPublishedContract(args) {
|
|
|
30
31
|
contractId,
|
|
31
32
|
publisher,
|
|
32
33
|
version,
|
|
33
|
-
compilerType,
|
|
34
34
|
});
|
|
35
35
|
const implementationContract = await (0, zkDeployDeterministic_js_1.zkDeployContractDeterministic)({
|
|
36
36
|
chain,
|
|
37
37
|
client,
|
|
38
38
|
account,
|
|
39
39
|
abi: compilerMetadata.abi,
|
|
40
|
-
bytecode:
|
|
40
|
+
bytecode: await (0, deploy_metadata_js_1.fetchBytecodeFromCompilerMetadata)({
|
|
41
|
+
compilerMetadata,
|
|
42
|
+
client,
|
|
43
|
+
chain,
|
|
44
|
+
}),
|
|
41
45
|
params: constructorParams,
|
|
42
46
|
});
|
|
43
47
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const resolve_method_js_1 = require("../../transaction/resolve-method.js");
|
|
|
13
13
|
const encodeAbiParameters_js_1 = require("../../utils/abi/encodeAbiParameters.js");
|
|
14
14
|
const normalizeFunctionParams_js_1 = require("../../utils/abi/normalizeFunctionParams.js");
|
|
15
15
|
const address_js_1 = require("../../utils/address.js");
|
|
16
|
+
const deploy_metadata_js_1 = require("../../utils/any-evm/deploy-metadata.js");
|
|
16
17
|
const isZkSyncChain_js_1 = require("../../utils/any-evm/zksync/isZkSyncChain.js");
|
|
17
18
|
const get_required_transactions_js_1 = require("./get-required-transactions.js");
|
|
18
19
|
/**
|
|
@@ -60,13 +61,12 @@ const get_required_transactions_js_1 = require("./get-required-transactions.js")
|
|
|
60
61
|
* @extension DEPLOY
|
|
61
62
|
*/
|
|
62
63
|
async function deployPublishedContract(options) {
|
|
63
|
-
const { client, account, chain, contractId, contractParams, publisher, version, implementationConstructorParams, salt,
|
|
64
|
+
const { client, account, chain, contractId, contractParams, publisher, version, implementationConstructorParams, salt, } = options;
|
|
64
65
|
const deployMetadata = await (0, publisher_js_1.fetchPublishedContractMetadata)({
|
|
65
66
|
client,
|
|
66
67
|
contractId,
|
|
67
68
|
publisher,
|
|
68
69
|
version,
|
|
69
|
-
compilerType,
|
|
70
70
|
});
|
|
71
71
|
return deployContractfromDeployMetadata({
|
|
72
72
|
account,
|
|
@@ -76,14 +76,13 @@ async function deployPublishedContract(options) {
|
|
|
76
76
|
initializeParams: contractParams,
|
|
77
77
|
implementationConstructorParams,
|
|
78
78
|
salt,
|
|
79
|
-
compilerType,
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
81
|
/**
|
|
83
82
|
* @internal
|
|
84
83
|
*/
|
|
85
84
|
async function deployContractfromDeployMetadata(options) {
|
|
86
|
-
const { client, account, chain, initializeParams, deployMetadata, implementationConstructorParams, modules, salt,
|
|
85
|
+
const { client, account, chain, initializeParams, deployMetadata, implementationConstructorParams, modules, salt, } = options;
|
|
87
86
|
switch (deployMetadata?.deployType) {
|
|
88
87
|
case "standard": {
|
|
89
88
|
return directDeploy({
|
|
@@ -111,7 +110,6 @@ async function deployContractfromDeployMetadata(options) {
|
|
|
111
110
|
client,
|
|
112
111
|
})),
|
|
113
112
|
publisher: deployMetadata.publisher,
|
|
114
|
-
compilerType,
|
|
115
113
|
});
|
|
116
114
|
const initializeTransaction = await getInitializeTransaction({
|
|
117
115
|
client,
|
|
@@ -186,7 +184,11 @@ async function directDeploy(options) {
|
|
|
186
184
|
account,
|
|
187
185
|
client,
|
|
188
186
|
chain,
|
|
189
|
-
bytecode:
|
|
187
|
+
bytecode: await (0, deploy_metadata_js_1.fetchBytecodeFromCompilerMetadata)({
|
|
188
|
+
compilerMetadata,
|
|
189
|
+
client,
|
|
190
|
+
chain,
|
|
191
|
+
}),
|
|
190
192
|
abi: compilerMetadata.abi,
|
|
191
193
|
params: contractParams,
|
|
192
194
|
salt,
|
|
@@ -197,7 +199,11 @@ async function directDeploy(options) {
|
|
|
197
199
|
account,
|
|
198
200
|
client,
|
|
199
201
|
chain,
|
|
200
|
-
bytecode:
|
|
202
|
+
bytecode: await (0, deploy_metadata_js_1.fetchBytecodeFromCompilerMetadata)({
|
|
203
|
+
compilerMetadata,
|
|
204
|
+
client,
|
|
205
|
+
chain,
|
|
206
|
+
}),
|
|
201
207
|
abi: compilerMetadata.abi,
|
|
202
208
|
constructorParams: contractParams,
|
|
203
209
|
salt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const create_2_factory_js_1 = require("../../contract/deployment/utils/create-2-
|
|
|
8
8
|
const encodeAbiParameters_js_1 = require("../abi/encodeAbiParameters.js");
|
|
9
9
|
const normalizeFunctionParams_js_1 = require("../abi/normalizeFunctionParams.js");
|
|
10
10
|
const prefix_js_1 = require("../bytecode/prefix.js");
|
|
11
|
+
const deploy_metadata_js_1 = require("./deploy-metadata.js");
|
|
11
12
|
const get_init_bytecode_with_salt_js_1 = require("./get-init-bytecode-with-salt.js");
|
|
12
13
|
/**
|
|
13
14
|
* @internal
|
|
@@ -36,7 +37,11 @@ async function computeDeploymentInfoFromMetadata(args) {
|
|
|
36
37
|
client: args.client,
|
|
37
38
|
chain: args.chain,
|
|
38
39
|
abi: args.contractMetadata.abi,
|
|
39
|
-
bytecode:
|
|
40
|
+
bytecode: await (0, deploy_metadata_js_1.fetchBytecodeFromCompilerMetadata)({
|
|
41
|
+
compilerMetadata: args.contractMetadata,
|
|
42
|
+
client: args.client,
|
|
43
|
+
chain: args.chain,
|
|
44
|
+
}),
|
|
40
45
|
constructorParams: args.constructorParams,
|
|
41
46
|
salt: args.salt,
|
|
42
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":";;AAkBA,kFAuBC;AAKD,8EAmBC;AAED,8EAgCC;AAhGD,yEAAwF;AACxF,6FAAmG;AACnG,0EAAoE;AACpE,kFAA4E;AAC5E,qDAA6D;AAE7D,6DAG8B;AAC9B,qFAA2E;AAE3E;;GAEG;AACI,KAAK,UAAU,mCAAmC,CAAC,IAQzD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACpE,MAAM,gBAAgB,GAAG,MAAM,IAAA,6CAA8B,EAAC;QAC5D,MAAM;QACN,UAAU;QACV,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IACH,OAAO,iCAAiC,CAAC;QACvC,MAAM;QACN,KAAK;QACL,gBAAgB;QAChB,iBAAiB;QACjB,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,iCAAiC,CAAC,IAMvD;IACC,OAAO,iCAAiC,CAAC;QACvC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG;QAC9B,QAAQ,EAAE,MAAM,IAAA,sDAAiC,EAAC;YAChD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QACF,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,IAAI,EAAE,IAAI,CAAC,IAAI;KAChB,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,IAAA,kDAA4B,EAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAE3D,CAAC;IACd,MAAM,WAAW,GAAG,IAAA,4CAAmB,EACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,IAAA,oDAAuB,EAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wDAAuB,EAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.fetchDeployMetadata = fetchDeployMetadata;
|
|
4
|
+
exports.fetchBytecodeFromCompilerMetadata = fetchBytecodeFromCompilerMetadata;
|
|
4
5
|
const compiler_metadata_js_1 = require("../../contract/actions/compiler-metadata.js");
|
|
5
6
|
const download_js_1 = require("../../storage/download.js");
|
|
7
|
+
const withCache_js_1 = require("../promise/withCache.js");
|
|
8
|
+
const isZkSyncChain_js_1 = require("./zksync/isZkSyncChain.js");
|
|
6
9
|
/**
|
|
7
10
|
* Fetches the deployment metadata.
|
|
8
11
|
* @param options - The options for fetching the deploy metadata.
|
|
@@ -10,34 +13,19 @@ const download_js_1 = require("../../storage/download.js");
|
|
|
10
13
|
* @internal
|
|
11
14
|
*/
|
|
12
15
|
async function fetchDeployMetadata(options) {
|
|
13
|
-
const isZksolc = options.compilerType === "zksolc";
|
|
14
16
|
const rawMeta = await (0, download_js_1.download)({
|
|
15
17
|
uri: options.uri,
|
|
16
18
|
client: options.client,
|
|
17
19
|
}).then((r) => r.json());
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
? rawMeta.compilers.zksolc[0].metadataUri
|
|
24
|
-
: rawMeta.metadataUri;
|
|
25
|
-
const bytecodeUri = isZksolc
|
|
26
|
-
? rawMeta.compilers.zksolc[0].bytecodeUri
|
|
27
|
-
: rawMeta.bytecodeUri;
|
|
28
|
-
const [deployBytecode, parsedMeta] = await Promise.all([
|
|
29
|
-
(0, download_js_1.download)({ uri: bytecodeUri, client: options.client }).then((res) => res.text()),
|
|
30
|
-
fetchAndParseCompilerMetadata({
|
|
31
|
-
client: options.client,
|
|
32
|
-
uri: metadataUri,
|
|
33
|
-
compilerType: options.compilerType,
|
|
34
|
-
}),
|
|
35
|
-
]);
|
|
20
|
+
const metadataUri = rawMeta.metadataUri;
|
|
21
|
+
const parsedMeta = await fetchAndParseCompilerMetadata({
|
|
22
|
+
client: options.client,
|
|
23
|
+
uri: metadataUri,
|
|
24
|
+
});
|
|
36
25
|
return {
|
|
37
26
|
...rawMeta,
|
|
38
27
|
...parsedMeta,
|
|
39
28
|
version: rawMeta.version,
|
|
40
|
-
bytecode: deployBytecode,
|
|
41
29
|
name: rawMeta.name,
|
|
42
30
|
};
|
|
43
31
|
}
|
|
@@ -54,7 +42,27 @@ async function fetchAndParseCompilerMetadata(options) {
|
|
|
54
42
|
}
|
|
55
43
|
return {
|
|
56
44
|
...metadata,
|
|
57
|
-
...(0, compiler_metadata_js_1.formatCompilerMetadata)(metadata
|
|
45
|
+
...(0, compiler_metadata_js_1.formatCompilerMetadata)(metadata),
|
|
58
46
|
};
|
|
59
47
|
}
|
|
48
|
+
async function fetchBytecodeFromCompilerMetadata(options) {
|
|
49
|
+
const { compilerMetadata, client, chain } = options;
|
|
50
|
+
return (0, withCache_js_1.withCache)(async () => {
|
|
51
|
+
const isZksolc = await (0, isZkSyncChain_js_1.isZkSyncChain)(chain);
|
|
52
|
+
const bytecodeUri = isZksolc
|
|
53
|
+
? compilerMetadata.compilers?.zksolc[0]?.bytecodeUri
|
|
54
|
+
: compilerMetadata.bytecodeUri;
|
|
55
|
+
if (!bytecodeUri) {
|
|
56
|
+
throw new Error(`No bytecode URI found in compiler metadata for ${compilerMetadata.name} on chain ${chain.name}`);
|
|
57
|
+
}
|
|
58
|
+
const deployBytecode = await (0, download_js_1.download)({
|
|
59
|
+
uri: bytecodeUri,
|
|
60
|
+
client,
|
|
61
|
+
}).then((res) => res.text());
|
|
62
|
+
return deployBytecode;
|
|
63
|
+
}, {
|
|
64
|
+
cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
|
|
65
|
+
cacheTime: 24 * 60 * 60 * 1000,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
60
68
|
//# sourceMappingURL=deploy-metadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/deploy-metadata.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/deploy-metadata.ts"],"names":[],"mappings":";;AAwBA,kDAoBC;AA4BD,8EA8BC;AAnGD,sFAAqF;AACrF,2DAAqD;AAErD,0DAAoD;AAEpD,gEAA0D;AAU1D;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CACvC,OAAmC;IAEnC,MAAM,OAAO,GAAwB,MAAM,IAAA,sBAAQ,EAAC;QAClD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,6BAA6B,CAAC;QACrD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,GAAG,EAAE,WAAW;KACjB,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,OAAO;QACV,GAAG,UAAU;QACb,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,6BAA6B,GAAG,CAAC,GAAG,IAAI,CAAC;AAE/C,KAAK,UAAU,6BAA6B,CAC1C,OAAmC;IAEnC,oEAAoE;IACpE,MAAM,QAAQ,GAAG,MAAM,CACrB,MAAM,IAAA,sBAAQ,EAAC;QACb,GAAG,OAAO;QACV,gBAAgB,EAAE,6BAA6B;KAChD,CAAC,CACH,CAAC,IAAI,EAAE,CAAC;IACT,IACE,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,EAC/D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,8CAA8C,OAAO,CAAC,GAAG,EAAE,CAC5D,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,QAAQ;QACX,GAAG,IAAA,6CAAsB,EAAC,QAAQ,CAAC;KACpC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iCAAiC,CAAC,OAIvD;IACC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO,IAAA,wBAAS,EACd,KAAK,IAAI,EAAE;QACT,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAa,EAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,QAAQ;YAC1B,CAAC,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW;YACpD,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;QAEjC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,kDAAkD,gBAAgB,CAAC,IAAI,aAAa,KAAK,CAAC,IAAI,EAAE,CACjG,CAAC;QACJ,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,IAAA,sBAAQ,EAAC;YACpC,GAAG,EAAE,WAAW;YAChB,MAAM;SACP,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAkB,CAAC,CAAC;QAE7C,OAAO,cAAc,CAAC;IACxB,CAAC,EACD;QACE,QAAQ,EAAE,YAAY,gBAAgB,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE;QACzD,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;KAC/B,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -6,20 +6,25 @@ async function isZkSyncChain(chain) {
|
|
|
6
6
|
if (chain.id === 1337 || chain.id === 31337) {
|
|
7
7
|
return false;
|
|
8
8
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
9
|
+
// check known zksync chain-ids first
|
|
10
|
+
if (chain.id === 324 ||
|
|
11
|
+
chain.id === 300 ||
|
|
12
|
+
chain.id === 302 ||
|
|
13
|
+
chain.id === 11124 ||
|
|
14
|
+
chain.id === 282 || // cronos zkevm testnet
|
|
15
|
+
chain.id === 388 // cronos zkevm mainnet
|
|
16
|
+
) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
// fallback to checking the stack on rpc
|
|
20
|
+
try {
|
|
21
|
+
const stack = await getChainStack(chain.id);
|
|
22
|
+
return stack === "zksync-stack";
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
// If the network check fails, assume it's not a ZkSync chain
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
23
28
|
}
|
|
24
29
|
async function getChainStack(chainId) {
|
|
25
30
|
return (0, withCache_js_1.withCache)(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isZkSyncChain.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/isZkSyncChain.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"isZkSyncChain.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/isZkSyncChain.ts"],"names":[],"mappings":";;AAGA,sCAyBC;AA3BD,6DAAuD;AAEhD,KAAK,UAAU,aAAa,CAAC,KAAY;IAC9C,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,qCAAqC;IACrC,IACE,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,KAAK;QAClB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,uBAAuB;QAC3C,KAAK,CAAC,EAAE,KAAK,GAAG,CAAC,uBAAuB;MACxC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wCAAwC;IACxC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5C,OAAO,KAAK,KAAK,cAAc,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,6DAA6D;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,OAAe;IAC1C,OAAO,IAAA,wBAAS,EACd,KAAK,IAAI,EAAE;QACT,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,WAAW,OAAO,yBAAyB,CAAC,CAAC;QAErE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC,EACD,EAAE,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CACjE,CAAC;AACJ,CAAC"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.version = void 0;
|
|
4
|
-
exports.version = "5.60.1-nightly-
|
|
4
|
+
exports.version = "5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322";
|
|
5
5
|
//# sourceMappingURL=version.js.map
|
|
@@ -70,6 +70,7 @@ function ecosystemWallet(...args) {
|
|
|
70
70
|
...createOptions?.auth,
|
|
71
71
|
options: [], // controlled by ecosystem
|
|
72
72
|
},
|
|
73
|
+
partnerId: createOptions?.partnerId,
|
|
73
74
|
},
|
|
74
75
|
connectorFactory: async (client) => {
|
|
75
76
|
const { InAppNativeConnector } = await Promise.resolve().then(() => require("./native-connector.js"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/native/ecosystem.ts"],"names":[],"mappings":";;AA+DA,
|
|
1
|
+
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/native/ecosystem.ts"],"names":[],"mappings":";;AA+DA,0CA0BC;AAnFD,kEAAkE;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,SAAgB,eAAe,CAC7B,GAAG,IAAyC;IAE5C,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,WAAW;QACf,SAAS,EAAE,aAAa,EAAE,SAAS;KACpC,CAAC;IACF,OAAO,IAAA,kCAAiB,EAAC;QACvB,SAAS;QACT,aAAa,EAAE;YACb,IAAI,EAAE;gBACJ,GAAG,aAAa,EAAE,IAAI;gBACtB,OAAO,EAAE,EAAE,EAAE,0BAA0B;aACxC;YACD,SAAS,EAAE,aAAa,EAAE,SAAS;SACpC;QACD,gBAAgB,EAAE,KAAK,EAAE,MAAsB,EAAE,EAAE;YACjD,MAAM,EAAE,oBAAoB,EAAE,GAAG,2CAAa,uBAAuB,EAAC,CAAC;YACvE,OAAO,IAAI,oBAAoB,CAAC;gBAC9B,MAAM;gBACN,SAAS;gBACT,sDAAsD;aACvD,CAAC,CAAC;QACL,CAAC;KACF,CAA8B,CAAC;AAClC,CAAC"}
|
|
@@ -70,6 +70,7 @@ function ecosystemWallet(...args) {
|
|
|
70
70
|
...createOptions?.auth,
|
|
71
71
|
options: [], // controlled by ecosystem
|
|
72
72
|
},
|
|
73
|
+
partnerId: ecosystem.partnerId,
|
|
73
74
|
},
|
|
74
75
|
connectorFactory: async (client) => {
|
|
75
76
|
const { InAppWebConnector } = await Promise.resolve().then(() => require("./lib/web-connector.js"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/ecosystem.ts"],"names":[],"mappings":";;AA+DA,
|
|
1
|
+
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/ecosystem.ts"],"names":[],"mappings":";;AA+DA,0CAyBC;AAlFD,kEAAkE;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,SAAgB,eAAe,CAC7B,GAAG,IAAyC;IAE5C,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,WAAW;QACf,SAAS,EAAE,aAAa,EAAE,SAAS;KACpC,CAAC;IACF,OAAO,IAAA,kCAAiB,EAAC;QACvB,SAAS;QACT,aAAa,EAAE;YACb,IAAI,EAAE;gBACJ,GAAG,aAAa,EAAE,IAAI;gBACtB,OAAO,EAAE,EAAE,EAAE,0BAA0B;aACxC;YACD,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B;QACD,gBAAgB,EAAE,KAAK,EAAE,MAAsB,EAAE,EAAE;YACjD,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAAa,wBAAwB,EAAC,CAAC;YACrE,OAAO,IAAI,iBAAiB,CAAC;gBAC3B,MAAM;gBACN,SAAS;aACV,CAAC,CAAC;QACL,CAAC;KACF,CAA8B,CAAC;AAClC,CAAC"}
|
|
@@ -204,9 +204,7 @@ async function sendBundlerRequest(args) {
|
|
|
204
204
|
if (constants_js_1.DEBUG) {
|
|
205
205
|
console.debug(`>>> sending ${operation} with payload:`, params);
|
|
206
206
|
}
|
|
207
|
-
const
|
|
208
|
-
const bundlerVersion = entryPointVersion === "v0.6" ? "v1" : "v2";
|
|
209
|
-
const bundlerUrl = options.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(options.chain, bundlerVersion);
|
|
207
|
+
const bundlerUrl = options.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(options.chain);
|
|
210
208
|
const fetchWithHeaders = (0, fetch_js_1.getClientFetch)(options.client);
|
|
211
209
|
const response = await fetchWithHeaders(bundlerUrl, {
|
|
212
210
|
method: "POST",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,12 @@ exports.getDefaultAccountFactory = getDefaultAccountFactory;
|
|
|
25
25
|
/**
|
|
26
26
|
* @internal
|
|
27
27
|
*/
|
|
28
|
-
const getDefaultBundlerUrl = (chain
|
|
28
|
+
const getDefaultBundlerUrl = (chain) => {
|
|
29
29
|
const domain = (0, domains_js_1.getThirdwebDomains)().bundler;
|
|
30
30
|
if (domain.startsWith("localhost:")) {
|
|
31
|
-
return `http://${domain}
|
|
31
|
+
return `http://${domain}/v2?chain=${chain.id}`;
|
|
32
32
|
}
|
|
33
|
-
return `https://${chain.id}.${domain}
|
|
33
|
+
return `https://${chain.id}.${domain}/v2`;
|
|
34
34
|
};
|
|
35
35
|
exports.getDefaultBundlerUrl = getDefaultBundlerUrl;
|
|
36
36
|
const getEntryPointVersion = (address) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,0DAA+D;AAE/D,WAAW;AACE,QAAA,KAAK,GAAG,KAAK,CAAC;AAEd,QAAA,eAAe,GAC1B,sIAAsI,CAAC;AAE5H,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAClC,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAElC,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAC1C,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAE1C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACI,MAAM,wBAAwB,GAAG,CAAC,iBAA0B,EAAE,EAAE;IACrE,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAClC,iBAAiB,IAAI,+BAAuB,CAC7C,CAAC;IACF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,oCAA4B,CAAC;IACtC,CAAC;IACD,OAAO,oCAA4B,CAAC;AACtC,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC;AAEF;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,0DAA+D;AAE/D,WAAW;AACE,QAAA,KAAK,GAAG,KAAK,CAAC;AAEd,QAAA,eAAe,GAC1B,sIAAsI,CAAC;AAE5H,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAClC,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAElC,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAC1C,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAE1C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACI,MAAM,wBAAwB,GAAG,CAAC,iBAA0B,EAAE,EAAE;IACrE,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAClC,iBAAiB,IAAI,+BAAuB,CAC7C,CAAC;IACF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,oCAA4B,CAAC;IACtC,CAAC;IACD,OAAO,oCAA4B,CAAC;AACtC,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC;AAEF;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,+BAAkB,GAAE,CAAC,OAAO,CAAC;IAC5C,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,UAAU,MAAM,aAAa,KAAK,CAAC,EAAE,EAAE,CAAC;IACjD,CAAC;IACD,OAAO,WAAW,KAAK,CAAC,EAAE,IAAI,MAAM,KAAK,CAAC;AAC5C,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAmB,EAAE;IACvE,MAAM,kBAAkB,GAAG,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,kBAAkB,KAAK,+BAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,kBAAkB,KAAK,+BAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC;AATW,QAAA,oBAAoB,wBAS/B"}
|
|
@@ -32,9 +32,7 @@ async function getPaymasterAndData(args) {
|
|
|
32
32
|
"Content-Type": "application/json",
|
|
33
33
|
};
|
|
34
34
|
const entrypoint = entrypointAddress ?? constants_js_1.ENTRYPOINT_ADDRESS_v0_6;
|
|
35
|
-
const
|
|
36
|
-
const paymasterVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
|
|
37
|
-
const paymasterUrl = (0, constants_js_1.getDefaultBundlerUrl)(chain, paymasterVersion);
|
|
35
|
+
const paymasterUrl = (0, constants_js_1.getDefaultBundlerUrl)(chain);
|
|
38
36
|
// Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
|
|
39
37
|
const fetchWithHeaders = (0, fetch_js_1.getClientFetch)(client);
|
|
40
38
|
const response = await fetchWithHeaders(paymasterUrl, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
|
|
@@ -149,9 +149,7 @@ async function createUnsignedUserOp(args) {
|
|
|
149
149
|
async function getGasFees(args) {
|
|
150
150
|
const { executeTx, bundlerOptions, chain, client } = args;
|
|
151
151
|
let { maxFeePerGas, maxPriorityFeePerGas } = executeTx;
|
|
152
|
-
const
|
|
153
|
-
const bundlerVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
|
|
154
|
-
const bundlerUrl = bundlerOptions?.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(chain, bundlerVersion);
|
|
152
|
+
const bundlerUrl = bundlerOptions?.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(chain);
|
|
155
153
|
if ((0, fetch_js_1.isThirdwebUrl)(bundlerUrl)) {
|
|
156
154
|
// get gas prices from bundler
|
|
157
155
|
const bundlerGasPrice = await (0, bundler_js_1.getUserOpGasFees)({
|