thirdweb 5.89.0 → 5.89.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/cjs/adapters/ethers5.js +2 -0
- package/dist/cjs/adapters/ethers5.js.map +1 -1
- package/dist/cjs/contract/actions/resolve-abi.js +9 -11
- package/dist/cjs/contract/actions/resolve-abi.js.map +1 -1
- package/dist/cjs/exports/extensions/erc721.js +4 -2
- package/dist/cjs/exports/extensions/erc721.js.map +1 -1
- package/dist/cjs/extensions/erc721/read/getNFT.js +30 -7
- package/dist/cjs/extensions/erc721/read/getNFT.js.map +1 -1
- package/dist/cjs/extensions/erc721/read/getNFTs.js.map +1 -1
- package/dist/cjs/gas/fee-data.js +22 -15
- package/dist/cjs/gas/fee-data.js.map +1 -1
- package/dist/cjs/transaction/actions/to-serializable-transaction.js +3 -1
- package/dist/cjs/transaction/actions/to-serializable-transaction.js.map +1 -1
- package/dist/cjs/transaction/prepare-transaction.js +8 -0
- package/dist/cjs/transaction/prepare-transaction.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/smart/lib/calls.js +13 -7
- package/dist/cjs/wallets/smart/lib/calls.js.map +1 -1
- package/dist/cjs/wallets/smart/lib/userop.js +7 -4
- package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
- package/dist/esm/adapters/ethers5.js +2 -0
- package/dist/esm/adapters/ethers5.js.map +1 -1
- package/dist/esm/contract/actions/resolve-abi.js +9 -11
- package/dist/esm/contract/actions/resolve-abi.js.map +1 -1
- package/dist/esm/exports/extensions/erc721.js +1 -0
- package/dist/esm/exports/extensions/erc721.js.map +1 -1
- package/dist/esm/extensions/erc721/read/getNFT.js +30 -7
- package/dist/esm/extensions/erc721/read/getNFT.js.map +1 -1
- package/dist/esm/extensions/erc721/read/getNFTs.js.map +1 -1
- package/dist/esm/gas/fee-data.js +22 -15
- package/dist/esm/gas/fee-data.js.map +1 -1
- package/dist/esm/transaction/actions/to-serializable-transaction.js +3 -1
- package/dist/esm/transaction/actions/to-serializable-transaction.js.map +1 -1
- package/dist/esm/transaction/prepare-transaction.js +7 -0
- package/dist/esm/transaction/prepare-transaction.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/smart/lib/calls.js +13 -7
- package/dist/esm/wallets/smart/lib/calls.js.map +1 -1
- package/dist/esm/wallets/smart/lib/userop.js +7 -4
- package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
- package/dist/types/adapters/ethers5.d.ts.map +1 -1
- package/dist/types/chains/types.d.ts +2 -0
- package/dist/types/chains/types.d.ts.map +1 -1
- package/dist/types/contract/actions/resolve-abi.d.ts.map +1 -1
- package/dist/types/exports/extensions/erc721.d.ts +1 -0
- package/dist/types/exports/extensions/erc721.d.ts.map +1 -1
- package/dist/types/extensions/erc721/read/getNFT.d.ts +19 -0
- package/dist/types/extensions/erc721/read/getNFT.d.ts.map +1 -1
- package/dist/types/extensions/erc721/read/getNFTs.d.ts +7 -0
- package/dist/types/extensions/erc721/read/getNFTs.d.ts.map +1 -1
- package/dist/types/gas/fee-data.d.ts +6 -5
- package/dist/types/gas/fee-data.d.ts.map +1 -1
- package/dist/types/transaction/actions/to-serializable-transaction.d.ts +2 -0
- package/dist/types/transaction/actions/to-serializable-transaction.d.ts.map +1 -1
- package/dist/types/transaction/prepare-transaction.d.ts +3 -0
- package/dist/types/transaction/prepare-transaction.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/wallets/smart/lib/calls.d.ts.map +1 -1
- package/dist/types/wallets/smart/lib/userop.d.ts +2 -0
- package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
- package/package.json +27 -27
- package/src/adapters/ethers5.ts +5 -1
- package/src/auth/verify-typed-data.test.ts +4 -2
- package/src/chains/types.ts +3 -0
- package/src/contract/actions/resolve-abi.ts +27 -25
- package/src/exports/extensions/erc721.ts +1 -0
- package/src/extensions/erc721/read/getNFT.ts +37 -7
- package/src/extensions/erc721/read/getNFTs.ts +7 -0
- package/src/gas/fee-data.ts +32 -19
- package/src/transaction/actions/to-serializable-transaction.ts +46 -35
- package/src/transaction/prepare-transaction.ts +11 -0
- package/src/version.ts +1 -1
- package/src/wallets/smart/lib/calls.ts +18 -9
- package/src/wallets/smart/lib/userop.ts +11 -3
- package/src/wallets/smart/smart-wallet-integration-v07.test.ts +6 -3
- package/src/wallets/smart/smart-wallet-modular.test.ts +2 -1
|
@@ -11,6 +11,7 @@ const utils_js_1 = require("../chains/utils.js");
|
|
|
11
11
|
const contract_js_1 = require("../contract/contract.js");
|
|
12
12
|
const to_serializable_transaction_js_1 = require("../transaction/actions/to-serializable-transaction.js");
|
|
13
13
|
const wait_for_tx_receipt_js_1 = require("../transaction/actions/wait-for-tx-receipt.js");
|
|
14
|
+
const prepare_transaction_js_1 = require("../transaction/prepare-transaction.js");
|
|
14
15
|
const hex_js_1 = require("../utils/encoding/hex.js");
|
|
15
16
|
/**
|
|
16
17
|
* Checks if the given ethers object is of type ethers5.
|
|
@@ -393,6 +394,7 @@ async function toEthersSigner(ethers, client, account, chain) {
|
|
|
393
394
|
const result = await account.sendTransaction(serialized);
|
|
394
395
|
const response = {
|
|
395
396
|
...serialized,
|
|
397
|
+
type: serialized.type ? prepare_transaction_js_1.TransactionTypeMap[serialized.type] : undefined,
|
|
396
398
|
nonce: Number(serialized.nonce ?? 0),
|
|
397
399
|
from: account.address,
|
|
398
400
|
maxFeePerGas: serialized.maxFeePerGas
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethers5.js","sourceRoot":"","sources":["../../../src/adapters/ethers5.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ethers5.js","sourceRoot":"","sources":["../../../src/adapters/ethers5.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ exports.resolveCompositeAbi = resolveCompositeAbi;
|
|
|
7
7
|
const abitype_1 = require("abitype");
|
|
8
8
|
const download_js_1 = require("../../storage/download.js");
|
|
9
9
|
const fetch_js_1 = require("../../utils/fetch.js");
|
|
10
|
+
const withCache_js_1 = require("../../utils/promise/withCache.js");
|
|
10
11
|
const contract_js_1 = require("../contract.js");
|
|
11
|
-
const ABI_RESOLUTION_CACHE = new WeakMap();
|
|
12
12
|
/**
|
|
13
13
|
* Resolves the ABI (Application Binary Interface) for a given contract.
|
|
14
14
|
* If the ABI is already cached, it returns the cached value.
|
|
@@ -33,29 +33,27 @@ const ABI_RESOLUTION_CACHE = new WeakMap();
|
|
|
33
33
|
* @contract
|
|
34
34
|
*/
|
|
35
35
|
function resolveContractAbi(contract, contractApiBaseUrl = "https://contract.thirdweb.com/abi") {
|
|
36
|
-
|
|
37
|
-
return ABI_RESOLUTION_CACHE.get(contract);
|
|
38
|
-
}
|
|
39
|
-
const prom = (async () => {
|
|
36
|
+
return (0, withCache_js_1.withCache)(async () => {
|
|
40
37
|
// if the contract already HAS a user defined we always use that!
|
|
41
38
|
if (contract.abi) {
|
|
42
39
|
return contract.abi;
|
|
43
40
|
}
|
|
44
41
|
// for local chains, we need to resolve the composite abi from bytecode
|
|
45
42
|
if (contract.chain.id === 31337 || contract.chain.id === 1337) {
|
|
46
|
-
return await resolveCompositeAbi(contract);
|
|
43
|
+
return (await resolveCompositeAbi(contract));
|
|
47
44
|
}
|
|
48
45
|
// try to get it from the api
|
|
49
46
|
try {
|
|
50
|
-
return await resolveAbiFromContractApi(contract, contractApiBaseUrl);
|
|
47
|
+
return (await resolveAbiFromContractApi(contract, contractApiBaseUrl));
|
|
51
48
|
}
|
|
52
49
|
catch {
|
|
53
50
|
// if that fails, try to resolve it from the bytecode
|
|
54
|
-
return await resolveCompositeAbi(contract);
|
|
51
|
+
return (await resolveCompositeAbi(contract));
|
|
55
52
|
}
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
}, {
|
|
54
|
+
cacheKey: `${contract.chain.id}-${contract.address}`,
|
|
55
|
+
cacheTime: 1000 * 60 * 60 * 1, // 1 hour
|
|
56
|
+
});
|
|
59
57
|
}
|
|
60
58
|
/**
|
|
61
59
|
* Resolves the ABI (Application Binary Interface) for a contract from the contract API.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-abi.js","sourceRoot":"","sources":["../../../../src/contract/actions/resolve-abi.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"resolve-abi.js","sourceRoot":"","sources":["../../../../src/contract/actions/resolve-abi.ts"],"names":[],"mappings":";;AA6BA,gDAgCC;AAsBD,8DAeC;AAsBD,wDA+BC;AAwID,kDA0CC;AAzUD,qCAAwD;AACxD,2DAAqD;AACrD,mDAAsD;AACtD,mEAA6D;AAC7D,gDAAoE;AAEpE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,SAAgB,kBAAkB,CAChC,QAA+B,EAC/B,kBAAkB,GAAG,mCAAmC;IAExD,OAAO,IAAA,wBAAS,EACd,KAAK,IAAI,EAAE;QACT,iEAAiE;QACjE,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC,GAAU,CAAC;QAC7B,CAAC;QAED,uEAAuE;QACvE,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;YAC9D,OAAO,CAAC,MAAM,mBAAmB,CAAC,QAA4B,CAAC,CAAQ,CAAC;QAC1E,CAAC;QAED,6BAA6B;QAC7B,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,yBAAyB,CACrC,QAAQ,EACR,kBAAkB,CACnB,CAAQ,CAAC;QACZ,CAAC;QAAC,MAAM,CAAC;YACP,qDAAqD;YACrD,OAAO,CAAC,MAAM,mBAAmB,CAAC,QAA4B,CAAC,CAAQ,CAAC;QAC1E,CAAC;IACH,CAAC,EACD;QACE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE;QACpD,SAAS,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,SAAS;KACzC,CACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACI,KAAK,UAAU,yBAAyB;AAC7C,8FAA8F;AAC9F,QAA+B,EAC/B,kBAAkB,GAAG,mCAAmC;IAExD,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAc,EAAC,QAAQ,CAAC,MAAM,CAAC,CACpD,GAAG,kBAAkB,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE,CACjE,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,4CAA4C,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,CAC/D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACI,KAAK,UAAU,sBAAsB;AAC1C,8FAA8F;AAC9F,QAA+B;IAE/B,MAAM,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;6CACjE,+CAA+C;6CAC/C,qCAAqC;KAC7C,CAAC,CAAC;IACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAC3D,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;QACpC,MAAM,IAAI,KAAK,CACb,6DACE,QAAQ,CAAC,OACX,0BAA0B,IAAI,IAAI,eAAe,eAAe,EAAE,IAAI,CACvE,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,+CAA+C;QAC/C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAA,sBAAQ,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,8BAA8B;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,uEAAuE;QACvE,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE;QACP;YACE,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,QAAQ;oBACtB,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,YAAY,EAAE,QAAQ;oBACtB,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,QAAQ;iBACf;gBACD;oBACE,YAAY,EAAE,SAAS;oBACvB,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,SAAS;iBAChB;aACF;YACD,YAAY,EAAE,4BAA4B;YAC1C,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,SAAS;SAChB;KACF;IACD,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,UAAU;CACR,CAAC;AAEX,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,kBAAkB;IACxB,OAAO,EAAE;QACP;YACE,UAAU,EAAE;gBACV;oBACE,UAAU,EAAE;wBACV;4BACE,YAAY,EAAE,QAAQ;4BACtB,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,QAAQ;yBACf;wBACD;4BACE,YAAY,EAAE,QAAQ;4BACtB,IAAI,EAAE,aAAa;4BACnB,IAAI,EAAE,QAAQ;yBACf;wBACD;4BACE,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,gBAAgB;4BACtB,IAAI,EAAE,SAAS;yBAChB;qBACF;oBACD,YAAY,EAAE,qCAAqC;oBACnD,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,OAAO;iBACd;gBACD;oBACE,UAAU,EAAE;wBACV;4BACE,YAAY,EAAE,QAAQ;4BACtB,IAAI,EAAE,kBAAkB;4BACxB,IAAI,EAAE,QAAQ;yBACf;wBACD;4BACE,YAAY,EAAE,QAAQ;4BACtB,IAAI,EAAE,mBAAmB;4BACzB,IAAI,EAAE,QAAQ;yBACf;qBACF;oBACD,YAAY,EAAE,uCAAuC;oBACrD,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,SAAS;iBAChB;aACF;YACD,YAAY,EAAE,+BAA+B;YAC7C,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,SAAS;SAChB;KACF;IACD,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,UAAU;CACR,CAAC;AAEX,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE;QACP;YACE,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,SAAS;oBACvB,IAAI,EAAE,cAAc;oBACpB,IAAI,EAAE,SAAS;iBAChB;gBACD;oBACE,YAAY,EAAE,UAAU;oBACxB,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,UAAU;iBACjB;aACF;YACD,IAAI,EAAE,SAAS;SAChB;KACF;IACD,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,UAAU;CACR,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACI,KAAK,UAAU,mBAAmB,CACvC,QAA0B,EAC1B,OAAa,EACb,aAA4D;IAE5D,MAAM,CACJ,QAAQ,EACR,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,qBAAqB,EACtB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC;QACpD,mCAAmC;QACnC,6BAA6B,CAAC,QAAQ,CAAC;QACvC,0BAA0B,CAAC,QAAQ,CAAC;QACpC,6BAA6B,CAAC,QAAQ,CAAC;QACvC,4BAA4B,CAAC,QAAQ,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG;QACpB,GAAG,IAAI,GAAG,CAAC;YACT,GAAG,sBAAsB;YACzB,GAAG,mBAAmB;YACtB,GAAG,yBAAyB;YAC5B,GAAG,qBAAqB;SACzB,CAAC;KACH,CAAC;IAEF,aAAa;IACb,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,mCAAmC;IACnC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC;QACzC,QAAQ;QACR,OAAO,EAAE,aAAa;QACtB,aAAa;KACd,CAAC,CAAC;IAEH,qBAAqB;IACrB,OAAO,QAAQ,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,QAA0B;IAE1B,IAAI,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,GAAG,2CAAa,oCAAoC,EAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC;YACnC,QAAQ;YACR,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC;QACH,+CAA+C;QAC/C,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,+BAA+B;QAC/B,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,uDAAuD;IACzD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,KAAK,UAAU,0BAA0B,CACvC,QAA0B;IAE1B,IAAI,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,GAAG,2CAAa,oCAAoC,EAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC;YACnC,QAAQ;YACR,MAAM,EAAE,eAAe;SACxB,CAAC,CAAC;QACH,+CAA+C;QAC/C,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,+BAA+B;QAC/B,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,uDAAuD;IACzD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,QAA0B;IAE1B,IAAI,CAAC;QACH,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAC9B,iFAAiF,EAClF,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,+CAA+C;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,+BAA+B;QAC/B,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,uDAAuD;IACzD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,QAA0B;IAE1B,IAAI,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,GAAG,2CAAa,oCAAoC,EAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QACrE,8CAA8C;QAC9C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,+BAA+B;QAC/B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,uDAAuD;IACzD,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AASD,KAAK,UAAU,iBAAiB,CAC9B,OAAiC;IAEjC,OAAO,OAAO,CAAC,GAAG,CAChB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACpC,MAAM,WAAW,GAAG,IAAA,yBAAW,EAAC;YAC9B,GAAG,OAAO,CAAC,QAAQ;YACnB,OAAO,EAAE,aAAa;SACvB,CAAC,CAAC;QACH,kFAAkF;QAClF,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC5C,CAAC;QACD,0BAA0B;QAC1B,OAAO,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAOD,SAAS,QAAQ,CAAC,OAAwB;IACxC,IAAI,aAAa,GAAQ,OAAO,CAAC,UAAU;SACxC,IAAI,EAAE;SACN,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAEjD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,aAAa,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC;aACnD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;aACrE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;IAED,iEAAiE;IACjE,2CAA2C;IAC3C,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAA,mBAAS,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAEhE,4BAA4B;IAC5B,OAAO,IAAA,kBAAQ,EAAC,gBAAgB,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.claimToBatch = exports.isUpdateTokenURISupported = exports.updateTokenURI = exports.isUpdateMetadataSupported = exports.updateMetadata = exports.isGetBatchesToRevealSupported = exports.getBatchesToReveal = exports.isRevealSupported = exports.reveal = exports.isCreateDelayedRevealBatchSupported = exports.createDelayedRevealBatch = exports.tokenURIRevealedEvent = exports.sharedMetadataUpdatedEvent = exports.tokensClaimedEvent = exports.claimConditionsUpdatedEvent = exports.tokensMintedWithSignatureEvent = exports.approvalForAllEvent = exports.approvalEvent = exports.tokensLazyMintedEvent = exports.transferEvent = exports.isSetSharedMetadataSupported = exports.setSharedMetadata = void 0;
|
|
3
|
+
exports.sharedMetadata = exports.generateMintSignature = exports.mintWithSignature = exports.isResetClaimEligibilitySupported = exports.resetClaimEligibility = exports.isSetClaimConditionsSupported = exports.setClaimConditions = exports.isLazyMintSupported = exports.lazyMint = exports.isClaimToSupported = exports.claimTo = exports.canClaim = exports.isGetActiveClaimConditionSupported = exports.getActiveClaimCondition = exports.isGetClaimConditionsSupported = exports.getClaimConditions = exports.isGetActiveClaimConditionIdSupported = exports.getActiveClaimConditionId = exports.isGetClaimConditionByIdSupported = exports.getClaimConditionById = exports.setTokenURI = exports.approve = exports.setApprovalForAll = exports.isBurnSupported = exports.burn = exports.transferFrom = exports.isMintToSupported = exports.mintTo = exports.getOwnedNFTs = exports.getOwnedTokenIds = exports.getTotalClaimedSupply = exports.getTotalUnclaimedSupply = exports.isApprovedForAll = exports.getAllOwners = exports.tokensOfOwner = exports.tokenOfOwnerByIndex = exports.balanceOf = exports.isTotalSupplySupported = exports.totalSupply = exports.tokenURI = exports.startTokenId = exports.ownerOf = exports.isTokenByIndexSupported = exports.isNextTokenIdToMintSupported = exports.nextTokenIdToMint = exports.isGetNFTsSupported = exports.getNFTs = exports.isGetNFTSupported = exports.getNFT = exports.isERC721 = void 0;
|
|
4
|
+
exports.claimToBatch = exports.isUpdateTokenURISupported = exports.updateTokenURI = exports.isUpdateMetadataSupported = exports.updateMetadata = exports.isGetBatchesToRevealSupported = exports.getBatchesToReveal = exports.isRevealSupported = exports.reveal = exports.isCreateDelayedRevealBatchSupported = exports.createDelayedRevealBatch = exports.tokenURIRevealedEvent = exports.sharedMetadataUpdatedEvent = exports.tokensClaimedEvent = exports.claimConditionsUpdatedEvent = exports.tokensMintedWithSignatureEvent = exports.approvalForAllEvent = exports.approvalEvent = exports.tokensLazyMintedEvent = exports.transferEvent = exports.isSetSharedMetadataSupported = exports.setSharedMetadata = exports.isSharedMetadataSupported = void 0;
|
|
5
5
|
/**
|
|
6
6
|
* READ extension for ERC721
|
|
7
7
|
*/
|
|
@@ -16,6 +16,8 @@ Object.defineProperty(exports, "isGetNFTsSupported", { enumerable: true, get: fu
|
|
|
16
16
|
var nextTokenIdToMint_js_1 = require("../../extensions/erc721/__generated__/IERC721Enumerable/read/nextTokenIdToMint.js");
|
|
17
17
|
Object.defineProperty(exports, "nextTokenIdToMint", { enumerable: true, get: function () { return nextTokenIdToMint_js_1.nextTokenIdToMint; } });
|
|
18
18
|
Object.defineProperty(exports, "isNextTokenIdToMintSupported", { enumerable: true, get: function () { return nextTokenIdToMint_js_1.isNextTokenIdToMintSupported; } });
|
|
19
|
+
var tokenByIndex_js_1 = require("../../extensions/erc721/__generated__/IERC721Enumerable/read/tokenByIndex.js");
|
|
20
|
+
Object.defineProperty(exports, "isTokenByIndexSupported", { enumerable: true, get: function () { return tokenByIndex_js_1.isTokenByIndexSupported; } });
|
|
19
21
|
var ownerOf_js_1 = require("../../extensions/erc721/__generated__/IERC721A/read/ownerOf.js");
|
|
20
22
|
Object.defineProperty(exports, "ownerOf", { enumerable: true, get: function () { return ownerOf_js_1.ownerOf; } });
|
|
21
23
|
var startTokenId_js_1 = require("../../extensions/erc721/__generated__/IERC721A/read/startTokenId.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erc721.js","sourceRoot":"","sources":["../../../../src/exports/extensions/erc721.ts"],"names":[],"mappings":";;;;AAAA;;GAEG;AACH,wEAAoE;AAA3D,uGAAA,QAAQ,OAAA;AACjB,oEAIgD;AAH9C,mGAAA,MAAM,OAAA;AAEN,8GAAA,iBAAiB,OAAA;AAEnB,sEAIiD;AAH/C,qGAAA,OAAO,OAAA;AAEP,gHAAA,kBAAkB,OAAA;AAEpB,0HAG2F;AAFzF,yHAAA,iBAAiB,OAAA;AACjB,oIAAA,4BAA4B,OAAA;AAE9B,6FAGwE;AAFtE,qGAAA,OAAO,OAAA;AAGT,uGAAmG;AAA1F,+GAAA,YAAY,OAAA;AACrB,+FAGyE;AAFvE,uGAAA,QAAQ,OAAA;AAGV,qGAG4E;AAF1E,6GAAA,WAAW,OAAA;AACX,wHAAA,sBAAsB,OAAA;AAExB,iGAG0E;AAFxE,yGAAA,SAAS,OAAA;AAGX,8HAG6F;AAF3F,6HAAA,mBAAmB,OAAA;AAGrB,kHAGuF;AAFrF,iHAAA,aAAa,OAAA;AAGf,gFAGsD;AAFpD,+GAAA,YAAY,OAAA;AAGd,+GAGiF;AAF/E,uHAAA,gBAAgB,OAAA;AAGlB,sGAAkG;AAAzF,qIAAA,uBAAuB,OAAA;AAChC,kGAA8F;AAArF,iIAAA,qBAAqB,OAAA;AAC9B,wFAG0D;AAFxD,uHAAA,gBAAgB,OAAA;AAGlB,gFAGsD;AAFpD,+GAAA,YAAY,OAAA;AAGd;;GAEG;AACH,qEAIiD;AAH/C,mGAAA,MAAM,OAAA;AAEN,8GAAA,iBAAiB,OAAA;AAEnB,wGAG8E;AAF5E,+GAAA,YAAY,OAAA;AAGd,+FAI6E;AAH3E,+FAAA,IAAI,OAAA;AAEJ,0GAAA,eAAe,OAAA;AAEjB,kHAGmF;AAFjF,yHAAA,iBAAiB,OAAA;AAGnB,8FAGyE;AAFvE,qGAAA,OAAO,OAAA;AAGT,0GAGiF;AAF/E,6GAAA,WAAW,OAAA;AAIb;;GAEG;AACH,OAAO;AACP,sHAGmF;AAFjF,iIAAA,qBAAqB,OAAA;AACrB,4IAAA,gCAAgC,OAAA;AAElC,8HAGuF;AAFrF,yIAAA,yBAAyB,OAAA;AACzB,oJAAA,oCAAoC,OAAA;AAEtC,kGAGkE;AAFhE,2HAAA,kBAAkB,OAAA;AAClB,sIAAA,6BAA6B,OAAA;AAE/B,4GAGuE;AAFrE,qIAAA,uBAAuB,OAAA;AACvB,gJAAA,kCAAkC,OAAA;AAEpC,8EAIwD;AAHtD,uGAAA,QAAQ,OAAA;AAKV,QAAQ;AACR,6EAIwD;AAHtD,qGAAA,OAAO,OAAA;AAEP,gHAAA,kBAAkB,OAAA;AAEpB,yEAImD;AAHjD,uGAAA,QAAQ,OAAA;AAER,kHAAA,mBAAmB,OAAA;AAErB,mGAImE;AAHjE,2HAAA,kBAAkB,OAAA;AAElB,sIAAA,6BAA6B,OAAA;AAE/B,yGAGsE;AAFpE,iIAAA,qBAAqB,OAAA;AACrB,4IAAA,gCAAgC,OAAA;AAGlC;;GAEG;AACH,uEAIkD;AAHhD,+GAAA,iBAAiB,OAAA;AAEjB,mHAAA,qBAAqB,OAAA;AAGvB;;GAEG;AACH,kHAGsF;AAFpF,mHAAA,cAAc,OAAA;AACd,8HAAA,yBAAyB,OAAA;AAE3B,2FAI4D;AAH1D,yHAAA,iBAAiB,OAAA;AAEjB,oIAAA,4BAA4B,OAAA;AAG9B;;GAEG;AACH,iGAG2E;AAFzE,4GAAA,aAAa,OAAA;AAGf,kHAGoF;AAFlF,4HAAA,qBAAqB,OAAA;AAGvB,iGAG2E;AAFzE,4GAAA,aAAa,OAAA;AAGf,6GAGiF;AAF/E,wHAAA,mBAAmB,OAAA;AAGrB,+IAGwG;AAFtG,8IAAA,8BAA8B,OAAA;AAGhC,0HAA2H;AAAlH,wIAAA,2BAA2B,OAAA;AACpC,wGAG6E;AAF3E,sHAAA,kBAAkB,OAAA;AAGpB,kIAAmI;AAA1H,sIAAA,0BAA0B,OAAA;AACnC,uHAGyF;AAFvF,4HAAA,qBAAqB,OAAA;AAIvB,eAAe;AACf,qHAI+E;AAF7E,uIAAA,wBAAwB,OAAA;AACxB,kJAAA,mCAAmC,OAAA;AAErC,iFAI6D;AAF3D,mGAAA,MAAM,OAAA;AACN,8GAAA,iBAAiB,OAAA;AAEnB,wGAIwE;AAFtE,2HAAA,kBAAkB,OAAA;AAClB,sIAAA,6BAA6B,OAAA;AAE/B,2FAI+D;AAH7D,mHAAA,cAAc,OAAA;AAEd,8HAAA,yBAAyB,OAAA;AAE3B,qFAIyD;AAHvD,mHAAA,cAAc,OAAA;AAEd,8HAAA,yBAAyB,OAAA;AAE3B,uFAG6D;AAF3D,+GAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"erc721.js","sourceRoot":"","sources":["../../../../src/exports/extensions/erc721.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.getNFT = getNFT;
|
|
|
5
5
|
const fetchTokenMetadata_js_1 = require("../../../utils/nft/fetchTokenMetadata.js");
|
|
6
6
|
const parseNft_js_1 = require("../../../utils/nft/parseNft.js");
|
|
7
7
|
const tokenURI_js_1 = require("../__generated__/IERC721A/read/tokenURI.js");
|
|
8
|
+
const tokenByIndex_js_1 = require("../__generated__/IERC721Enumerable/read/tokenByIndex.js");
|
|
8
9
|
var tokenURI_js_2 = require("../__generated__/IERC721A/read/tokenURI.js");
|
|
9
10
|
Object.defineProperty(exports, "isGetNFTSupported", { enumerable: true, get: function () { return tokenURI_js_2.isTokenURISupported; } });
|
|
10
11
|
/**
|
|
@@ -20,22 +21,44 @@ Object.defineProperty(exports, "isGetNFTSupported", { enumerable: true, get: fun
|
|
|
20
21
|
* tokenId: 1n,
|
|
21
22
|
* });
|
|
22
23
|
* ```
|
|
24
|
+
*
|
|
25
|
+
* * @example
|
|
26
|
+
* ```ts
|
|
27
|
+
* import { getNFT } from "thirdweb/extensions/erc721";
|
|
28
|
+
*
|
|
29
|
+
*
|
|
30
|
+
* const nft = await getNFT({
|
|
31
|
+
* contract,
|
|
32
|
+
* tokenId: 1n,
|
|
33
|
+
* tokenByIndex: true // use this flag if the contract supports `tokenByIndex` and the above tokenId should be treated as an index.
|
|
34
|
+
* });
|
|
35
|
+
* ```
|
|
23
36
|
*/
|
|
24
37
|
async function getNFT(options) {
|
|
38
|
+
let tokenId = options.tokenId;
|
|
39
|
+
if (options.tokenByIndex) {
|
|
40
|
+
try {
|
|
41
|
+
tokenId = await (0, tokenByIndex_js_1.tokenByIndex)({
|
|
42
|
+
contract: options.contract,
|
|
43
|
+
index: options.tokenId,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
catch { }
|
|
47
|
+
}
|
|
25
48
|
const [uri, owner] = await Promise.all([
|
|
26
|
-
(0, tokenURI_js_1.tokenURI)(options).catch(() => null),
|
|
49
|
+
(0, tokenURI_js_1.tokenURI)({ contract: options.contract, tokenId }).catch(() => null),
|
|
27
50
|
options.includeOwner
|
|
28
|
-
? Promise.resolve().then(() => require("../__generated__/IERC721A/read/ownerOf.js")).then((m) => m.ownerOf(options))
|
|
51
|
+
? Promise.resolve().then(() => require("../__generated__/IERC721A/read/ownerOf.js")).then((m) => m.ownerOf({ contract: options.contract, tokenId }))
|
|
29
52
|
.catch(() => null)
|
|
30
53
|
: null,
|
|
31
54
|
]);
|
|
32
55
|
if (!uri?.trim()) {
|
|
33
56
|
return (0, parseNft_js_1.parseNFT)({
|
|
34
|
-
id:
|
|
57
|
+
id: tokenId,
|
|
35
58
|
type: "ERC721",
|
|
36
59
|
uri: "",
|
|
37
60
|
}, {
|
|
38
|
-
tokenId
|
|
61
|
+
tokenId,
|
|
39
62
|
tokenUri: "",
|
|
40
63
|
type: "ERC721",
|
|
41
64
|
owner,
|
|
@@ -43,14 +66,14 @@ async function getNFT(options) {
|
|
|
43
66
|
}
|
|
44
67
|
return (0, parseNft_js_1.parseNFT)(await (0, fetchTokenMetadata_js_1.fetchTokenMetadata)({
|
|
45
68
|
client: options.contract.client,
|
|
46
|
-
tokenId
|
|
69
|
+
tokenId,
|
|
47
70
|
tokenUri: uri,
|
|
48
71
|
}).catch(() => ({
|
|
49
|
-
id:
|
|
72
|
+
id: tokenId,
|
|
50
73
|
type: "ERC721",
|
|
51
74
|
uri,
|
|
52
75
|
})), {
|
|
53
|
-
tokenId:
|
|
76
|
+
tokenId: tokenId,
|
|
54
77
|
tokenUri: uri,
|
|
55
78
|
type: "ERC721",
|
|
56
79
|
owner,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNFT.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/read/getNFT.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getNFT.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/read/getNFT.ts"],"names":[],"mappings":";;;AA0DA,wBAuDC;AAhHD,oFAA8E;AAC9E,gEAAoE;AAEpE,4EAGoD;AACpD,6FAAuF;AAEvF,0EAAsG;AAA7F,gHAAA,mBAAmB,OAAqB;AAsBjD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,MAAM,CAC1B,OAA6C;IAE7C,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAC9B,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAA,8BAAY,EAAC;gBAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,KAAK,EAAE,OAAO,CAAC,OAAO;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrC,IAAA,sBAAQ,EAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QACnE,OAAO,CAAC,YAAY;YAClB,CAAC,CAAC,qCAAO,2CAA2C,GAC/C,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;iBAC/D,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;YACtB,CAAC,CAAC,IAAI;KACT,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC;QACjB,OAAO,IAAA,sBAAQ,EACb;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,EAAE;SACR,EACD;YACE,OAAO;YACP,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK;SACN,CACF,CAAC;IACJ,CAAC;IAED,OAAO,IAAA,sBAAQ,EACb,MAAM,IAAA,0CAAkB,EAAC;QACvB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;QAC/B,OAAO;QACP,QAAQ,EAAE,GAAG;KACd,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QACd,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,QAAQ;QACd,GAAG;KACJ,CAAC,CAAC,EACH;QACE,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,GAAG;QACb,IAAI,EAAE,QAAQ;QACd,KAAK;KACN,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNFTs.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/read/getNFTs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getNFTs.js","sourceRoot":"","sources":["../../../../../src/extensions/erc721/read/getNFTs.ts"],"names":[],"mappings":";;AA6DA,0BA6CC;AAcD,gDAMC;AA7HD,wDAA+C;AAE/C,oFAA8E;AAC9E,kFAGuD;AACvD,uGAGsE;AACtE,2CAAwD;AAExD,MAAM,uBAAuB,GAAG,IAAI,CAAC;AA+BrC;;;;;;;;;;;;;;;GAeG;AACI,KAAK,UAAU,OAAO,CAC3B,OAA8C;IAE9C,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;QAC1D,IAAA,8BAAY,EAAC,OAAO,CAAC;QACrB,IAAA,wCAAiB,EAAC,OAAO,CAAC;QAC1B,IAAA,4BAAW,EAAC,OAAO,CAAC;KACrB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;QACzC,gDAAgD;QAChD,MAAM,cAAc,GAClB,aAAa,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,UAAkB,CAAC;QACvB,+BAA+B;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YACjC,0FAA0F;YAC1F,UAAU,GAAG,KAAK,CAAC,KAAK,GAAG,cAAc,CAAC;QAC5C,CAAC;QACD,4BAA4B;aACvB,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YACvC,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CACb,yHAAyH,CAC1H,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,cAAc,EAAE,UAAU,CAAU,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,aAAa,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAC;IAE/D,MAAM,KAAK,GAAG,IAAA,eAAG,EAAC,SAAS,GAAG,aAAa,EAAE,KAAK,GAAG,KAAK,CAAC,CAAC;IAE5D,MAAM,QAAQ,GAAgC,EAAE,CAAC;IAEjD,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,QAAQ,CAAC,IAAI,CACX,IAAA,kBAAM,EAAC;YACL,GAAG,OAAO;YACV,OAAO,EAAE,CAAC;YACV,YAAY,EAAE,OAAO,CAAC,aAAa,IAAI,KAAK;SAC7C,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,kBAAkB,CAAC,kBAA4B;IAC7D,OAAO,CACL,IAAA,6BAAiB,EAAC,kBAAkB,CAAC;QACrC,CAAC,IAAA,uCAAsB,EAAC,kBAAkB,CAAC;YACzC,IAAA,mDAA4B,EAAC,kBAAkB,CAAC,CAAC,CACpD,CAAC;AACJ,CAAC"}
|
package/dist/cjs/gas/fee-data.js
CHANGED
|
@@ -32,10 +32,11 @@ const FORCE_GAS_PRICE_CHAIN_IDS = [
|
|
|
32
32
|
*/
|
|
33
33
|
async function getGasOverridesForTransaction(transaction) {
|
|
34
34
|
// first check for explicit values
|
|
35
|
-
const [maxFeePerGas, maxPriorityFeePerGas, gasPrice] = await Promise.all([
|
|
35
|
+
const [maxFeePerGas, maxPriorityFeePerGas, gasPrice, type] = await Promise.all([
|
|
36
36
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(transaction.maxFeePerGas),
|
|
37
37
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(transaction.maxPriorityFeePerGas),
|
|
38
38
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(transaction.gasPrice),
|
|
39
|
+
(0, resolve_promised_value_js_1.resolvePromisedValue)(transaction.type),
|
|
39
40
|
]);
|
|
40
41
|
// Exit early if the user explicitly provided enough options
|
|
41
42
|
if (maxFeePerGas !== undefined && maxPriorityFeePerGas !== undefined) {
|
|
@@ -48,7 +49,7 @@ async function getGasOverridesForTransaction(transaction) {
|
|
|
48
49
|
return { gasPrice };
|
|
49
50
|
}
|
|
50
51
|
// If we don't have enough explicit values, get defaults
|
|
51
|
-
const defaultGasOverrides = await getDefaultGasOverrides(transaction.client, transaction.chain);
|
|
52
|
+
const defaultGasOverrides = await getDefaultGasOverrides(transaction.client, transaction.chain, type === "legacy" ? "legacy" : "eip1559");
|
|
52
53
|
if (transaction.chain.experimental?.increaseZeroByteCount) {
|
|
53
54
|
// otherwise adjust each value
|
|
54
55
|
if (defaultGasOverrides.gasPrice) {
|
|
@@ -79,18 +80,24 @@ async function getGasOverridesForTransaction(transaction) {
|
|
|
79
80
|
* @returns An object containing the default gas overrides.
|
|
80
81
|
* @internal
|
|
81
82
|
*/
|
|
82
|
-
async function getDefaultGasOverrides(client, chain) {
|
|
83
|
-
//
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
83
|
+
async function getDefaultGasOverrides(client, chain, feeType) {
|
|
84
|
+
// give priority to the transaction fee type over the chain fee type
|
|
85
|
+
const resolvedFeeType = feeType ?? chain.feeType;
|
|
86
|
+
// if chain is configured to force legacy transactions or is in the legacy chain list
|
|
87
|
+
if (resolvedFeeType === "legacy" ||
|
|
88
|
+
FORCE_GAS_PRICE_CHAIN_IDS.includes(chain.id)) {
|
|
89
|
+
return {
|
|
90
|
+
gasPrice: await (0, get_gas_price_js_1.getGasPrice)({ client, chain, percentMultiplier: 10 }),
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
const feeData = await getDynamicFeeData(client, chain);
|
|
94
|
+
if (feeData.maxFeePerGas !== null && feeData.maxPriorityFeePerGas !== null) {
|
|
95
|
+
return {
|
|
96
|
+
maxFeePerGas: feeData.maxFeePerGas,
|
|
97
|
+
maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
|
|
98
|
+
};
|
|
93
99
|
}
|
|
100
|
+
// TODO: resolvedFeeType here could be "EIP1559", but we could not get EIP1559 fee data. should we throw?
|
|
94
101
|
return {
|
|
95
102
|
gasPrice: await (0, get_gas_price_js_1.getGasPrice)({ client, chain, percentMultiplier: 10 }),
|
|
96
103
|
};
|
|
@@ -110,7 +117,7 @@ async function getDynamicFeeData(client, chain, percentMultiplier = 10) {
|
|
|
110
117
|
(0, eth_getBlockByNumber_js_1.eth_getBlockByNumber)(rpcRequest, { blockTag: "latest" }),
|
|
111
118
|
(0, eth_maxPriorityFeePerGas_js_1.eth_maxPriorityFeePerGas)(rpcRequest).catch(() => null),
|
|
112
119
|
]);
|
|
113
|
-
const baseBlockFee = block?.baseFeePerGas
|
|
120
|
+
const baseBlockFee = block?.baseFeePerGas;
|
|
114
121
|
const chainId = chain.id;
|
|
115
122
|
// flag chain testnet & flag chain
|
|
116
123
|
if (chainId === 220 || chainId === 1220) {
|
|
@@ -127,7 +134,7 @@ async function getDynamicFeeData(client, chain, percentMultiplier = 10) {
|
|
|
127
134
|
// prioritize fee from eth_maxPriorityFeePerGas
|
|
128
135
|
maxPriorityFeePerGas_ = maxPriorityFeePerGas;
|
|
129
136
|
}
|
|
130
|
-
if (maxPriorityFeePerGas_ == null) {
|
|
137
|
+
if (maxPriorityFeePerGas_ == null || baseBlockFee == null) {
|
|
131
138
|
// chain does not support eip-1559, return null for both
|
|
132
139
|
return { maxFeePerGas: null, maxPriorityFeePerGas: null };
|
|
133
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fee-data.js","sourceRoot":"","sources":["../../../src/gas/fee-data.ts"],"names":[],"mappings":";;AAkDA,
|
|
1
|
+
{"version":3,"file":"fee-data.js","sourceRoot":"","sources":["../../../src/gas/fee-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ async function toSerializableTransaction(options) {
|
|
|
56
56
|
const rpcRequest = (0, rpc_js_1.getRpcClient)(options.transaction);
|
|
57
57
|
const chainId = options.transaction.chain.id;
|
|
58
58
|
const from = options.from;
|
|
59
|
-
let [data, nonce, gas, feeData, to, accessList, value, authorizationList] = await Promise.all([
|
|
59
|
+
let [data, nonce, gas, feeData, to, accessList, value, authorizationList, type,] = await Promise.all([
|
|
60
60
|
(0, encode_js_1.encode)(options.transaction),
|
|
61
61
|
(async () => {
|
|
62
62
|
// if the user has specified a nonce, use that
|
|
@@ -83,6 +83,7 @@ async function toSerializableTransaction(options) {
|
|
|
83
83
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(options.transaction.accessList),
|
|
84
84
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(options.transaction.value),
|
|
85
85
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(options.transaction.authorizationList),
|
|
86
|
+
(0, resolve_promised_value_js_1.resolvePromisedValue)(options.transaction.type),
|
|
86
87
|
]);
|
|
87
88
|
const extraGas = await (0, resolve_promised_value_js_1.resolvePromisedValue)(options.transaction.extraGas);
|
|
88
89
|
if (extraGas) {
|
|
@@ -97,6 +98,7 @@ async function toSerializableTransaction(options) {
|
|
|
97
98
|
accessList,
|
|
98
99
|
value,
|
|
99
100
|
authorizationList,
|
|
101
|
+
type,
|
|
100
102
|
...feeData,
|
|
101
103
|
};
|
|
102
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"to-serializable-transaction.js","sourceRoot":"","sources":["../../../../src/transaction/actions/to-serializable-transaction.ts"],"names":[],"mappings":";;AA+CA,
|
|
1
|
+
{"version":3,"file":"to-serializable-transaction.js","sourceRoot":"","sources":["../../../../src/transaction/actions/to-serializable-transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TransactionTypeMap = void 0;
|
|
3
4
|
exports.prepareTransaction = prepareTransaction;
|
|
5
|
+
exports.TransactionTypeMap = {
|
|
6
|
+
legacy: 0,
|
|
7
|
+
eip1559: 1,
|
|
8
|
+
eip2930: 2,
|
|
9
|
+
eip4844: 3,
|
|
10
|
+
eip7702: 4,
|
|
11
|
+
};
|
|
4
12
|
/**
|
|
5
13
|
* Prepares a transaction with the given options.
|
|
6
14
|
* @param options - The options for preparing the transaction.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare-transaction.js","sourceRoot":"","sources":["../../../src/transaction/prepare-transaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepare-transaction.js","sourceRoot":"","sources":["../../../src/transaction/prepare-transaction.ts"],"names":[],"mappings":";;;AAqHA,gDAWC;AAzFY,QAAA,kBAAkB,GAAoC;IACjE,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,CAAC;CACX,CAAC;AAqDF;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,kBAAkB,CAGhC,OAAkC,EAAE,IAA6B;IACjE,IAAI,IAAI,EAAE,CAAC;QACT,8DAA8D;QAC7D,OAAe,CAAC,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC;QACxD,8DAA8D;QAC7D,OAAe,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC9C,CAAC;IACD,OAAO,OAA0C,CAAC;AACpD,CAAC"}
|
package/dist/cjs/version.js
CHANGED
|
@@ -9,6 +9,7 @@ const contract_js_1 = require("../../../contract/contract.js");
|
|
|
9
9
|
const prepare_contract_call_js_1 = require("../../../transaction/prepare-contract-call.js");
|
|
10
10
|
const read_contract_js_1 = require("../../../transaction/read-contract.js");
|
|
11
11
|
const hex_js_1 = require("../../../utils/encoding/hex.js");
|
|
12
|
+
const withCache_js_1 = require("../../../utils/promise/withCache.js");
|
|
12
13
|
const constants_js_1 = require("./constants.js");
|
|
13
14
|
/**
|
|
14
15
|
* Predict the address of a smart account.
|
|
@@ -65,13 +66,18 @@ async function predictAddress(args) {
|
|
|
65
66
|
if (!adminAddress) {
|
|
66
67
|
throw new Error("Account address is required to predict the smart wallet address.");
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
69
|
+
return (0, withCache_js_1.withCache)(async () => {
|
|
70
|
+
const saltHex = accountSalt && (0, hex_js_1.isHex)(accountSalt)
|
|
71
|
+
? accountSalt
|
|
72
|
+
: (0, hex_js_1.stringToHex)(accountSalt ?? "");
|
|
73
|
+
return (0, read_contract_js_1.readContract)({
|
|
74
|
+
contract: factoryContract,
|
|
75
|
+
method: "function getAddress(address, bytes) returns (address)",
|
|
76
|
+
params: [adminAddress, saltHex],
|
|
77
|
+
});
|
|
78
|
+
}, {
|
|
79
|
+
cacheKey: `${args.factoryContract.chain.id}-${args.factoryContract.address}-${args.adminAddress}-${args.accountSalt}`,
|
|
80
|
+
cacheTime: 1000 * 60 * 60 * 24, // 1 day
|
|
75
81
|
});
|
|
76
82
|
}
|
|
77
83
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calls.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/calls.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"calls.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,7 +91,7 @@ async function waitForUserOpReceipt(args) {
|
|
|
91
91
|
* @walletUtils
|
|
92
92
|
*/
|
|
93
93
|
async function createUnsignedUserOp(args) {
|
|
94
|
-
const { transaction: executeTx, accountContract, factoryContract, adminAddress, overrides, sponsorGas, waitForDeployment = true, } = args;
|
|
94
|
+
const { transaction: executeTx, accountContract, factoryContract, adminAddress, overrides, sponsorGas, waitForDeployment = true, isDeployedOverride, } = args;
|
|
95
95
|
const chain = executeTx.chain;
|
|
96
96
|
const client = executeTx.client;
|
|
97
97
|
const bundlerOptions = {
|
|
@@ -102,7 +102,9 @@ async function createUnsignedUserOp(args) {
|
|
|
102
102
|
};
|
|
103
103
|
const entrypointVersion = (0, constants_js_1.getEntryPointVersion)(args.overrides?.entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6);
|
|
104
104
|
const [isDeployed, callData, callGasLimit, gasFees, nonce] = await Promise.all([
|
|
105
|
-
|
|
105
|
+
typeof isDeployedOverride === "boolean"
|
|
106
|
+
? isDeployedOverride
|
|
107
|
+
: (0, is_contract_deployed_js_1.isContractDeployed)(accountContract).then((isDeployed) => isDeployed || isAccountDeploying(accountContract)),
|
|
106
108
|
(0, encode_js_1.encode)(executeTx),
|
|
107
109
|
(0, resolve_promised_value_js_1.resolvePromisedValue)(executeTx.gas),
|
|
108
110
|
getGasFees({
|
|
@@ -193,7 +195,7 @@ async function populateUserOp_v0_7(args) {
|
|
|
193
195
|
const { chain, client } = bundlerOptions;
|
|
194
196
|
let factory;
|
|
195
197
|
let factoryData;
|
|
196
|
-
if (isDeployed
|
|
198
|
+
if (isDeployed) {
|
|
197
199
|
factoryData = "0x";
|
|
198
200
|
if (waitForDeployment) {
|
|
199
201
|
// lock until account is deployed if needed to avoid 'sender already created' errors when sending multiple transactions in parallel
|
|
@@ -315,7 +317,7 @@ async function populateUserOp_v0_6(args) {
|
|
|
315
317
|
const { bundlerOptions, isDeployed, factoryContract, accountContract, adminAddress, sponsorGas, overrides, nonce, callData, callGasLimit, maxFeePerGas, maxPriorityFeePerGas, waitForDeployment, } = args;
|
|
316
318
|
const { chain, client } = bundlerOptions;
|
|
317
319
|
let initCode;
|
|
318
|
-
if (isDeployed
|
|
320
|
+
if (isDeployed) {
|
|
319
321
|
initCode = "0x";
|
|
320
322
|
if (waitForDeployment) {
|
|
321
323
|
// lock until account is deployed if needed to avoid 'sender already created' errors when sending multiple transactions in parallel
|
|
@@ -559,6 +561,7 @@ async function createAndSignUserOp(options) {
|
|
|
559
561
|
sponsorGas: "sponsorGas" in config ? config.sponsorGas : config.gasless,
|
|
560
562
|
overrides: config.overrides,
|
|
561
563
|
waitForDeployment: options.waitForDeployment,
|
|
564
|
+
isDeployedOverride: options.isDeployedOverride,
|
|
562
565
|
});
|
|
563
566
|
const signedUserOp = await signUserOp({
|
|
564
567
|
client: options.client,
|