thirdweb 5.93.8 → 5.93.9
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/extensions/marketplace/offers/write/makeOffer.js +9 -0
- package/dist/cjs/extensions/marketplace/offers/write/makeOffer.js.map +1 -1
- package/dist/cjs/utils/any-evm/deploy-metadata.js +1 -1
- package/dist/cjs/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/extensions/marketplace/offers/write/makeOffer.js +9 -0
- package/dist/esm/extensions/marketplace/offers/write/makeOffer.js.map +1 -1
- package/dist/esm/utils/any-evm/deploy-metadata.js +1 -1
- package/dist/esm/utils/any-evm/deploy-metadata.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/extensions/marketplace/offers/write/makeOffer.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/extensions/marketplace/offers/write/makeOffer.ts +9 -0
- package/src/extensions/prebuilts/process-ref-deployments.test.ts +0 -2
- package/src/utils/any-evm/deploy-metadata.ts +1 -1
- package/src/version.ts +1 -1
@@ -51,6 +51,7 @@ function makeOffer(options) {
|
|
51
51
|
return options.currencyContractAddress;
|
52
52
|
}
|
53
53
|
// otherwise determine the wrapped native token address for the chain
|
54
|
+
// TODO: auto wrap native tokens if the currency is a native token address
|
54
55
|
// TODO: add known wrapped native token addresses for each chain on the chain config
|
55
56
|
const { getDeployedInfraContract } = await Promise.resolve().then(() => require("../../../../contract/deployment/utils/infra.js"));
|
56
57
|
// predict the address for the wrapped token
|
@@ -75,6 +76,14 @@ function makeOffer(options) {
|
|
75
76
|
tokenId: options.tokenId,
|
76
77
|
totalPrice: normalizedPrice,
|
77
78
|
},
|
79
|
+
overrides: {
|
80
|
+
erc20Value: (0, addresses_js_1.isNativeTokenAddress)(currency)
|
81
|
+
? undefined
|
82
|
+
: {
|
83
|
+
tokenAddress: currency,
|
84
|
+
amountWei: normalizedPrice,
|
85
|
+
},
|
86
|
+
},
|
78
87
|
};
|
79
88
|
},
|
80
89
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"makeOffer.js","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":";;AAoEA,
|
1
|
+
{"version":3,"file":"makeOffer.js","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":";;AAoEA,8BA0EC;AA7ID,qEAA0E;AAE1E,iFAAiG;AA0CjG;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,SAAgB,SAAS,CAAC,OAAgD;IACxE,OAAO,IAAA,wBAAkB,EAAC;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpD,CAAC,KAAK,IAAI,EAAE;oBACV,qDAAqD;oBACrD,IAAI,eAAe,IAAI,OAAO,EAAE,CAAC;wBAC/B,OAAO,OAAO,CAAC,aAAa,CAAC;oBAC/B,CAAC;oBACD,6DAA6D;oBAC7D,MAAM,EAAE,kBAAkB,EAAE,GAAG,2CAC7B,sDAAsD,EACvD,CAAC;oBACF,OAAO,MAAM,kBAAkB,CAAC;wBAC9B,MAAM,EAAE,OAAO,CAAC,UAAU;wBAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,YAAY,EAAE,OAAO,CAAC,uBAAuB;wBAC7C,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;qBAChC,CAAC,CAAC;gBACL,CAAC,CAAC,EAAE;gBACJ,CAAC,KAAK,IAAI,EAAE;oBACV,iFAAiF;oBACjF,IAAI,CAAC,IAAA,mCAAoB,EAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC3D,OAAO,OAAO,CAAC,uBAAuB,CAAC;oBACzC,CAAC;oBACD,qEAAqE;oBAErE,0EAA0E;oBAC1E,oFAAoF;oBAEpF,MAAM,EAAE,wBAAwB,EAAE,GAAG,2CACnC,gDAAgD,EACjD,CAAC;oBACF,4CAA4C;oBAC5C,MAAM,KAAK,GAAG,MAAM,wBAAwB,CAAC;wBAC3C,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;wBAC/B,UAAU,EAAE,OAAO;qBACpB,CAAC,CAAC;oBAEH,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,iGAAiG,CAClG,CAAC;oBACJ,CAAC;oBACD,OAAO,KAAK,CAAC,OAAO,CAAC;gBACvB,CAAC,CAAC,EAAE;aACL,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,MAAM,CAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CACpD,CAAC;YAEF,OAAO;gBACL,MAAM,EAAE;oBACN,aAAa,EAAE,OAAO,CAAC,oBAAoB;oBAC3C,QAAQ;oBACR,mBAAmB;oBACnB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;oBAChC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,UAAU,EAAE,eAAe;iBAC5B;gBACD,SAAS,EAAE;oBACT,UAAU,EAAE,IAAA,mCAAoB,EAAC,QAAQ,CAAC;wBACxC,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC;4BACE,YAAY,EAAE,QAAQ;4BACtB,SAAS,EAAE,eAAe;yBAC3B;iBACN;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
@@ -61,7 +61,7 @@ async function fetchBytecodeFromCompilerMetadata(options) {
|
|
61
61
|
}).then((res) => res.text());
|
62
62
|
return deployBytecode;
|
63
63
|
}, {
|
64
|
-
cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
|
64
|
+
cacheKey: `bytecode:${compilerMetadata.name}:${compilerMetadata.publisher}:${compilerMetadata.version}:${chain.id}`,
|
65
65
|
cacheTime: 24 * 60 * 60 * 1000,
|
66
66
|
});
|
67
67
|
}
|
@@ -1 +1 @@
|
|
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,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW;YACtD,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;
|
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,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW;YACtD,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,gBAAgB,CAAC,SAAS,IAAI,gBAAgB,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;QACnH,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;KAC/B,CACF,CAAC;AACJ,CAAC"}
|
package/dist/cjs/version.js
CHANGED
@@ -48,6 +48,7 @@ export function makeOffer(options) {
|
|
48
48
|
return options.currencyContractAddress;
|
49
49
|
}
|
50
50
|
// otherwise determine the wrapped native token address for the chain
|
51
|
+
// TODO: auto wrap native tokens if the currency is a native token address
|
51
52
|
// TODO: add known wrapped native token addresses for each chain on the chain config
|
52
53
|
const { getDeployedInfraContract } = await import("../../../../contract/deployment/utils/infra.js");
|
53
54
|
// predict the address for the wrapped token
|
@@ -72,6 +73,14 @@ export function makeOffer(options) {
|
|
72
73
|
tokenId: options.tokenId,
|
73
74
|
totalPrice: normalizedPrice,
|
74
75
|
},
|
76
|
+
overrides: {
|
77
|
+
erc20Value: isNativeTokenAddress(currency)
|
78
|
+
? undefined
|
79
|
+
: {
|
80
|
+
tokenAddress: currency,
|
81
|
+
amountWei: normalizedPrice,
|
82
|
+
},
|
83
|
+
},
|
75
84
|
};
|
76
85
|
},
|
77
86
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"makeOffer.js","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AA0CjG;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,SAAS,CAAC,OAAgD;IACxE,OAAO,kBAAkB,CAAC;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpD,CAAC,KAAK,IAAI,EAAE;oBACV,qDAAqD;oBACrD,IAAI,eAAe,IAAI,OAAO,EAAE,CAAC;wBAC/B,OAAO,OAAO,CAAC,aAAa,CAAC;oBAC/B,CAAC;oBACD,6DAA6D;oBAC7D,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,sDAAsD,CACvD,CAAC;oBACF,OAAO,MAAM,kBAAkB,CAAC;wBAC9B,MAAM,EAAE,OAAO,CAAC,UAAU;wBAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,YAAY,EAAE,OAAO,CAAC,uBAAuB;wBAC7C,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;qBAChC,CAAC,CAAC;gBACL,CAAC,CAAC,EAAE;gBACJ,CAAC,KAAK,IAAI,EAAE;oBACV,iFAAiF;oBACjF,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC3D,OAAO,OAAO,CAAC,uBAAuB,CAAC;oBACzC,CAAC;oBACD,qEAAqE;oBAErE,oFAAoF;oBAEpF,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAC/C,gDAAgD,CACjD,CAAC;oBACF,4CAA4C;oBAC5C,MAAM,KAAK,GAAG,MAAM,wBAAwB,CAAC;wBAC3C,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;wBAC/B,UAAU,EAAE,OAAO;qBACpB,CAAC,CAAC;oBAEH,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,iGAAiG,CAClG,CAAC;oBACJ,CAAC;oBACD,OAAO,KAAK,CAAC,OAAO,CAAC;gBACvB,CAAC,CAAC,EAAE;aACL,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,MAAM,CAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CACpD,CAAC;YAEF,OAAO;gBACL,MAAM,EAAE;oBACN,aAAa,EAAE,OAAO,CAAC,oBAAoB;oBAC3C,QAAQ;oBACR,mBAAmB;oBACnB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;oBAChC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,UAAU,EAAE,eAAe;iBAC5B;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
1
|
+
{"version":3,"file":"makeOffer.js","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AA0CjG;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,SAAS,CAAC,OAAgD;IACxE,OAAO,kBAAkB,CAAC;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,WAAW,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpD,CAAC,KAAK,IAAI,EAAE;oBACV,qDAAqD;oBACrD,IAAI,eAAe,IAAI,OAAO,EAAE,CAAC;wBAC/B,OAAO,OAAO,CAAC,aAAa,CAAC;oBAC/B,CAAC;oBACD,6DAA6D;oBAC7D,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,sDAAsD,CACvD,CAAC;oBACF,OAAO,MAAM,kBAAkB,CAAC;wBAC9B,MAAM,EAAE,OAAO,CAAC,UAAU;wBAC1B,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,YAAY,EAAE,OAAO,CAAC,uBAAuB;wBAC7C,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;qBAChC,CAAC,CAAC;gBACL,CAAC,CAAC,EAAE;gBACJ,CAAC,KAAK,IAAI,EAAE;oBACV,iFAAiF;oBACjF,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE,CAAC;wBAC3D,OAAO,OAAO,CAAC,uBAAuB,CAAC;oBACzC,CAAC;oBACD,qEAAqE;oBAErE,0EAA0E;oBAC1E,oFAAoF;oBAEpF,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAC/C,gDAAgD,CACjD,CAAC;oBACF,4CAA4C;oBAC5C,MAAM,KAAK,GAAG,MAAM,wBAAwB,CAAC;wBAC3C,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK;wBAC7B,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;wBAC/B,UAAU,EAAE,OAAO;qBACpB,CAAC,CAAC;oBAEH,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CACb,iGAAiG,CAClG,CAAC;oBACJ,CAAC;oBACD,OAAO,KAAK,CAAC,OAAO,CAAC;gBACvB,CAAC,CAAC,EAAE;aACL,CAAC,CAAC;YAEH,MAAM,mBAAmB,GAAG,MAAM,CAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CACpD,CAAC;YAEF,OAAO;gBACL,MAAM,EAAE;oBACN,aAAa,EAAE,OAAO,CAAC,oBAAoB;oBAC3C,QAAQ;oBACR,mBAAmB;oBACnB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;oBAChC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,UAAU,EAAE,eAAe;iBAC5B;gBACD,SAAS,EAAE;oBACT,UAAU,EAAE,oBAAoB,CAAC,QAAQ,CAAC;wBACxC,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC;4BACE,YAAY,EAAE,QAAQ;4BACtB,SAAS,EAAE,eAAe;yBAC3B;iBACN;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
@@ -57,7 +57,7 @@ export async function fetchBytecodeFromCompilerMetadata(options) {
|
|
57
57
|
}).then((res) => res.text());
|
58
58
|
return deployBytecode;
|
59
59
|
}, {
|
60
|
-
cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
|
60
|
+
cacheKey: `bytecode:${compilerMetadata.name}:${compilerMetadata.publisher}:${compilerMetadata.version}:${chain.id}`,
|
61
61
|
cacheTime: 24 * 60 * 60 * 1000,
|
62
62
|
});
|
63
63
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/deploy-metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAU1D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAmC;IAEnC,MAAM,OAAO,GAAwB,MAAM,QAAQ,CAAC;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,QAAQ,CAAC;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,sBAAsB,CAAC,QAAQ,CAAC;KACpC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,OAIvD;IACC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACpD,OAAO,SAAS,CACd,KAAK,IAAI,EAAE;QACT,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,QAAQ;YAC1B,CAAC,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW;YACtD,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,QAAQ,CAAC;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;
|
1
|
+
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/deploy-metadata.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = "5.93.
|
1
|
+
export const version = "5.93.9";
|
2
2
|
//# sourceMappingURL=version.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"makeOffer.d.ts","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAG/E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,cAAc,EAAE,IAAI,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,CACA;IACE;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB,CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"makeOffer.d.ts","sourceRoot":"","sources":["../../../../../../src/extensions/marketplace/offers/write/makeOffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAG/E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,cAAc,EAAE,IAAI,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,CACA;IACE;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IACE;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB,CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,wMA0EzE"}
|
package/dist/types/version.d.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "5.93.
|
1
|
+
export declare const version = "5.93.9";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
@@ -94,6 +94,7 @@ export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
|
|
94
94
|
}
|
95
95
|
// otherwise determine the wrapped native token address for the chain
|
96
96
|
|
97
|
+
// TODO: auto wrap native tokens if the currency is a native token address
|
97
98
|
// TODO: add known wrapped native token addresses for each chain on the chain config
|
98
99
|
|
99
100
|
const { getDeployedInfraContract } = await import(
|
@@ -128,6 +129,14 @@ export function makeOffer(options: BaseTransactionOptions<MakeOfferParams>) {
|
|
128
129
|
tokenId: options.tokenId,
|
129
130
|
totalPrice: normalizedPrice,
|
130
131
|
},
|
132
|
+
overrides: {
|
133
|
+
erc20Value: isNativeTokenAddress(currency)
|
134
|
+
? undefined
|
135
|
+
: {
|
136
|
+
tokenAddress: currency,
|
137
|
+
amountWei: normalizedPrice,
|
138
|
+
},
|
139
|
+
},
|
131
140
|
};
|
132
141
|
},
|
133
142
|
});
|
@@ -74,9 +74,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
|
|
74
74
|
chain: ANVIL_CHAIN,
|
75
75
|
account: TEST_ACCOUNT_A,
|
76
76
|
contractId: "WETH9",
|
77
|
-
version: "0.0.1",
|
78
77
|
salt: "",
|
79
|
-
publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
|
80
78
|
});
|
81
79
|
forwarderAddress = await deployPublishedContract({
|
82
80
|
client: TEST_CLIENT,
|
@@ -96,7 +96,7 @@ export async function fetchBytecodeFromCompilerMetadata(options: {
|
|
96
96
|
return deployBytecode;
|
97
97
|
},
|
98
98
|
{
|
99
|
-
cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
|
99
|
+
cacheKey: `bytecode:${compilerMetadata.name}:${compilerMetadata.publisher}:${compilerMetadata.version}:${chain.id}`,
|
100
100
|
cacheTime: 24 * 60 * 60 * 1000,
|
101
101
|
},
|
102
102
|
);
|
package/src/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = "5.93.
|
1
|
+
export const version = "5.93.9";
|