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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":";;;AAsFA,oDAkBC;AAuBD,oDA+EC;AA6UD,gCAgDC;AAkED,kDAuEC;AAptBD,+BAA8B;AAG9B,+DAGuC;AACvC,wGAAkG;AAClG,kHAAgI;AAChI,sHAAoI;AACpI,0DAAkE;AAClE,sEAAgE;AAChE,gHAAwG;AAGxG,6FAAqF;AAErF,qEAAiE;AACjE,sDAAwD;AACxD,gGAAwF;AASxF,6CAIsB;AACtB,yCAKoB;AACpB,iDAOwB;AACxB,mDAAyD;AACzD,iDAAqD;AACrD,yCAAmD;AAEnD,MAAM,cAAc,GAAgB,IAAI,GAAG,EAAE,CAAC;AAE9C,MAAM,MAAM,GAAG,CAAC,eAAiC,EAAE,EAAE;IACnD,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,eAAiC,EAAE,EAAE;IACjE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,eAAiC,EAAE,EAAE;IACzE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEF,MAAM,kBAAkB,GAAG,CAAC,eAAiC,EAAE,EAAE;IAC/D,OAAO,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,oBAAoB,CACxC,IAIC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC,QAAQ;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,KAAK;IAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IACrC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAgB,EAAC,IAAI,CAAC,CAAC;QACnD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAO1C;IACC,MAAM,EACJ,WAAW,EAAE,SAAS,EACtB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,SAAS,EACT,UAAU,GACX,GAAG,IAAI,CAAC;IACT,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;IAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IAEhC,MAAM,cAAc,GAAG;QACrB,MAAM;QACN,KAAK;QACL,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;KAChD,CAAC;IAEF,MAAM,iBAAiB,GAAG,IAAA,mCAAoB,EAC5C,IAAI,CAAC,SAAS,EAAE,iBAAiB,IAAI,sCAAuB,CAC7D,CAAC;IAEF,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/D,IAAA,4CAAkB,EAAC,eAAe,CAAC;QACnC,IAAA,kBAAM,EAAC,SAAS,CAAC;QACjB,UAAU,CAAC;YACT,SAAS;YACT,cAAc;YACd,KAAK;YACL,MAAM;SACP,CAAC;QACF,eAAe,CAAC;YACd,eAAe;YACf,KAAK;YACL,MAAM;YACN,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;YAC/C,gBAAgB,EAAE,SAAS,EAAE,eAAe;SAC7C,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC;IAEvD,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QACjC,OAAO,mBAAmB,CAAC;YACzB,cAAc;YACd,eAAe;YACf,eAAe;YACf,YAAY;YACZ,UAAU;YACV,SAAS;YACT,UAAU;YACV,KAAK;YACL,QAAQ;YACR,YAAY;YACZ,oBAAoB;SACrB,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IAClB,OAAO,mBAAmB,CAAC;QACzB,cAAc;QACd,eAAe;QACf,eAAe;QACf,YAAY;QACZ,UAAU;QACV,SAAS;QACT,UAAU;QACV,KAAK;QACL,QAAQ;QACR,YAAY;QACZ,oBAAoB;KACrB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAKzB;IAIC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC1D,IAAI,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAEvD,MAAM,iBAAiB,GAAG,IAAA,mCAAoB,EAC5C,cAAc,CAAC,iBAAiB,IAAI,sCAAuB,CAC5D,CAAC;IACF,MAAM,cAAc,GAAG,iBAAiB,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAClE,MAAM,UAAU,GACd,cAAc,EAAE,UAAU,IAAI,IAAA,mCAAoB,EAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IAE5E,IAAI,IAAA,wBAAa,EAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,8BAA8B;QAC9B,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAgB,EAAC;YAC7C,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;QACH,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;QAC5C,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,6BAA6B;QAC7B,MAAM,CAAC,oBAAoB,EAAE,4BAA4B,CAAC,GACxD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAA,gDAAoB,EAAC,YAAY,CAAC;YAClC,IAAA,gDAAoB,EAAC,oBAAoB,CAAC;SAC3C,CAAC,CAAC;QAEL,IAAI,oBAAoB,IAAI,4BAA4B,EAAE,CAAC;YACzD,iDAAiD;YACjD,YAAY,GAAG,oBAAoB,CAAC;YACpC,oBAAoB,GAAG,4BAA4B,CAAC;QACtD,CAAC;aAAM,CAAC;YACN,4DAA4D;YAC5D,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAsB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE5D,4EAA4E;YAC5E,oBAAoB;gBAClB,4BAA4B,IAAI,OAAO,CAAC,oBAAoB,IAAI,EAAE,CAAC;YACrE,YAAY,GAAG,oBAAoB,IAAI,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QACpE,CAAC;IACH,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAYlC;IACC,MAAM,EACJ,cAAc,EACd,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,GACrB,GAAG,IAAI,CAAC;IACT,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IAEzC,IAAI,OAA2B,CAAC;IAChC,IAAI,WAAgB,CAAC;IACrB,mIAAmI;IACnI,IAAI,UAAU,IAAI,kBAAkB,CAAC,eAAe,CAAC,EAAE,CAAC;QACtD,WAAW,GAAG,IAAI,CAAC;QACnB,MAAM,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QAClC,WAAW,GAAG,MAAM,IAAA,kBAAM,EACxB,IAAA,+BAAoB,EAAC;YACnB,eAAe,EAAE,eAAe;YAChC,YAAY;YACZ,WAAW,EAAE,SAAS,EAAE,WAAW;YACnC,qBAAqB,EAAE,SAAS,EAAE,aAAa;SAChD,CAAC,CACH,CAAC;QACF,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,SAAS,GAAqB;QAClC,MAAM,EAAE,eAAe,CAAC,OAAO;QAC/B,KAAK;QACL,QAAQ;QACR,YAAY;QACZ,oBAAoB;QACpB,YAAY,EAAE,EAAE;QAChB,oBAAoB,EAAE,EAAE;QACxB,kBAAkB,EAAE,EAAE;QACtB,OAAO;QACP,WAAW;QACX,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,IAAI;QACnB,6BAA6B,EAAE,EAAE;QACjC,uBAAuB,EAAE,EAAE;QAC3B,SAAS,EAAE,8BAAe;KAC3B,CAAC;IAEF,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,kCAAmB,EAAC;YACjD,MAAM,EAAE,SAAS;YACjB,KAAK;YACL,MAAM;YACN,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;YAC/C,iBAAiB,EAAE,SAAS,EAAE,SAAS;SACxC,CAAC,CAAoD,CAAC;QACvD,IAAI,eAAe,CAAC,SAAS,IAAI,eAAe,CAAC,aAAa,EAAE,CAAC;YAC/D,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;YAChD,SAAS,CAAC,aAAa,GAAG,eAAe,CAAC,aAAoB,CAAC;QACjE,CAAC;QACD,oDAAoD;QACpD,IACE,eAAe,CAAC,YAAY;YAC5B,eAAe,CAAC,oBAAoB;YACpC,eAAe,CAAC,kBAAkB;YAClC,eAAe,CAAC,uBAAuB;YACvC,eAAe,CAAC,6BAA6B,EAC7C,CAAC;YACD,SAAS,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;YACtD,SAAS,CAAC,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAC;YACtE,SAAS,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;YAClE,SAAS,CAAC,uBAAuB;gBAC/B,eAAe,CAAC,uBAAuB,CAAC;YAC1C,SAAS,CAAC,6BAA6B;gBACrC,eAAe,CAAC,6BAA6B,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,+CAA+C;YAC/C,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAiB,EAAC;gBACxC,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,cAAc;aACxB,CAAC,CAAC;YACH,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;YAChD,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,oBAAoB,CAAC;YAChE,SAAS,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;YAC5D,SAAS,CAAC,uBAAuB;gBAC/B,eAAe,CAAC,uBAAuB,IAAI,EAAE,CAAC;YAChD,SAAS,CAAC,6BAA6B;gBACrC,eAAe,CAAC,6BAA6B,IAAI,EAAE,CAAC;YACtD,4CAA4C;YAC5C,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,kCAAmB,EAAC;gBAClD,MAAM,EAAE,SAAS;gBACjB,KAAK;gBACL,MAAM;gBACN,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;gBAC/C,iBAAiB,EAAE,SAAS,EAAE,SAAS;aACxC,CAAC,CAAoD,CAAC;YACvD,IAAI,gBAAgB,CAAC,SAAS,IAAI,gBAAgB,CAAC,aAAa,EAAE,CAAC;gBACjE,SAAS,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC;gBACjD,SAAS,CAAC,aAAa,GAAG,gBAAgB,CAAC,aAAoB,CAAC;YAClE,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,sDAAsD;QACtD,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAiB,EAAC;YACxC,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAChD,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,oBAAoB,CAAC;QAChE,SAAS,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;QAC5D,SAAS,CAAC,uBAAuB,GAAG,SAAS,CAAC,uBAAuB,IAAI,EAAE,CAAC;QAC5E,SAAS,CAAC,6BAA6B;YACrC,SAAS,CAAC,6BAA6B,IAAI,EAAE,CAAC;IAClD,CAAC;IACD,OAAO;QACL,GAAG,SAAS;QACZ,SAAS,EAAE,IAAW;KACvB,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,IAYlC;IACC,MAAM,EACJ,cAAc,EACd,UAAU,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,oBAAoB,GACrB,GAAG,IAAI,CAAC;IACT,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;IACzC,IAAI,QAAa,CAAC;IAElB,mIAAmI;IACnI,IAAI,UAAU,IAAI,kBAAkB,CAAC,eAAe,CAAC,EAAE,CAAC;QACtD,QAAQ,GAAG,IAAI,CAAC;QAChB,MAAM,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,QAAQ,GAAG,MAAM,kBAAkB,CAAC;YAClC,eAAe,EAAE,eAAe;YAChC,YAAY;YACZ,WAAW,EAAE,SAAS,EAAE,WAAW;YACnC,qBAAqB,EAAE,SAAS,EAAE,aAAa;SAChD,CAAC,CAAC;QACH,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,SAAS,GAAqB;QAClC,MAAM,EAAE,eAAe,CAAC,OAAO;QAC/B,KAAK;QACL,QAAQ;QACR,QAAQ;QACR,YAAY;QACZ,oBAAoB;QACpB,YAAY,EAAE,EAAE;QAChB,oBAAoB,EAAE,EAAE;QACxB,kBAAkB,EAAE,EAAE;QACtB,gBAAgB,EAAE,IAAI;QACtB,SAAS,EAAE,8BAAe;KAC3B,CAAC;IAEF,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,eAAe,GAAG,MAAM,IAAA,kCAAmB,EAAC;YAChD,MAAM,EAAE,SAAS;YACjB,KAAK;YACL,MAAM;YACN,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;YAC/C,iBAAiB,EAAE,SAAS,EAAE,SAAS;SACxC,CAAC,CAAC;QACH,MAAM,gBAAgB,GACpB,kBAAkB,IAAI,eAAe;YACnC,CAAC,CAAC,eAAe,CAAC,gBAAgB;YAClC,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAClD,SAAS,CAAC,gBAAgB,GAAG,gBAAuB,CAAC;QACvD,CAAC;QACD,oDAAoD;QACpD,IACE,eAAe,CAAC,YAAY;YAC5B,eAAe,CAAC,oBAAoB;YACpC,eAAe,CAAC,kBAAkB,EAClC,CAAC;YACD,SAAS,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;YACtD,SAAS,CAAC,oBAAoB,GAAG,eAAe,CAAC,oBAAoB,CAAC;YACtE,SAAS,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,+CAA+C;YAC/C,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAiB,EAAC;gBACxC,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,cAAc;aACxB,CAAC,CAAC;YACH,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;YAChD,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,oBAAoB,CAAC;YAChE,SAAS,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;YAC5D,4CAA4C;YAC5C,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAClD,MAAM,gBAAgB,GAAG,MAAM,IAAA,kCAAmB,EAAC;oBACjD,MAAM,EAAE,SAAS;oBACjB,KAAK;oBACL,MAAM;oBACN,iBAAiB,EAAE,SAAS,EAAE,iBAAiB;oBAC/C,iBAAiB,EAAE,SAAS,EAAE,SAAS;iBACxC,CAAC,CAAC;gBACH,MAAM,iBAAiB,GACrB,kBAAkB,IAAI,gBAAgB;oBACpC,CAAC,CAAC,gBAAgB,CAAC,gBAAgB;oBACnC,CAAC,CAAC,IAAI,CAAC;gBACX,IAAI,iBAAiB,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;oBACpD,SAAS,CAAC,gBAAgB,GAAG,iBAAwB,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,sDAAsD;QACtD,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAiB,EAAC;YACxC,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;QACH,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;QAChD,SAAS,CAAC,oBAAoB,GAAG,SAAS,CAAC,oBAAoB,CAAC;QAChE,SAAS,CAAC,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;IAC9D,CAAC;IACD,OAAO;QACL,GAAG,SAAS;QACZ,SAAS,EAAE,IAAW;KACvB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACI,KAAK,UAAU,UAAU,CAAC,IAMhC;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAEhE,MAAM,iBAAiB,GAAG,IAAA,mCAAoB,EAC5C,iBAAiB,IAAI,sCAAuB,CAC7C,CAAC;IAEF,IAAI,UAAe,CAAC;IAEpB,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,IAAA,sCAAsB,EAAC,MAA0B,CAAC,CAAC;QACxE,UAAU,GAAG,MAAM,IAAA,gCAAgB,EAAC;YAClC,QAAQ,EAAE,IAAA,yBAAW,EAAC;gBACpB,OAAO,EAAE,iBAAiB,IAAI,sCAAuB;gBACrD,KAAK;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC;YACF,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,MAAM,IAAA,gCAAgB,EAAC;YAClC,QAAQ,EAAE,IAAA,yBAAW,EAAC;gBACpB,OAAO,EAAE,iBAAiB,IAAI,sCAAuB;gBACrD,KAAK;gBACL,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC;YACF,MAAM,EAAE,MAA0B;SACnC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;YAC/C,OAAO,EAAE;gBACP,GAAG,EAAE,IAAA,wBAAU,EAAC,UAAU,CAAC;aAC5B;SACF,CAAC,CAAC;QACH,OAAO;YACL,GAAG,MAAM;YACT,SAAS;SACV,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,OAOjC;IACC,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,GACzE,OAAO,CAAC;IACV,MAAM,QAAQ,GAAG,IAAA,+BAAoB,EAAC;QACpC,eAAe;QACf,YAAY;QACZ,WAAW;QACX,qBAAqB;KACtB,CAAC,CAAC;IACH,OAAO,IAAA,aAAM,EAAC,CAAC,eAAe,CAAC,OAAc,EAAE,MAAM,IAAA,kBAAM,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,OAM9B;IACC,MAAM,EACJ,eAAe,EACf,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IACZ,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,IAAA,sBAAQ,EAAC;QACd,QAAQ,EAAE,IAAA,yBAAW,EAAC;YACpB,OAAO,EAAE,iBAAiB,IAAI,sCAAuB;YACrD,KAAK;YACL,MAAM;SACP,CAAC;QACF,GAAG,EAAE,IAAA,gCAAqB,GAAE;QAC5B,MAAM,EAAE,eAAe,CAAC,OAAO;KAChC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACI,KAAK,UAAU,mBAAmB,CAAC,OAKzC;IACC,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAC1C,MAAM,eAAe,GAAG,IAAA,yBAAW,EAAC;QAClC,OAAO,EACL,MAAM,CAAC,cAAc;YACrB,IAAA,uCAAwB,EAAC,MAAM,CAAC,SAAS,EAAE,iBAAiB,CAAC;QAC/D,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,MAAM,IAAA,yBAAc,EAAC;QAC1C,eAAe;QACf,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO;QAC1C,sBAAsB,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc;QACxD,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,WAAW;QAC1C,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc;KACjD,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,IAAA,yBAAW,EAAC;QAClC,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IAEH,IAAI,SAA8B,CAAC;IACnC,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAwB,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,IAAA,0DAAyB,EAAC;YACnD,WAAW,EAAE,EAAE;YACf,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;QACH,SAAS,GAAG,IAAA,yBAAc,EAAC;YACzB,eAAe;YACf,WAAW,EAAE,YAAY;YACzB,eAAe,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO;SAC3C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC9B,IAAA,0DAAyB,EAAC;YACxB,WAAW,EAAE,EAAE;YACf,IAAI,EAAE,cAAc;SACrB,CAAC,CACH,CACF,CAAC;QACF,SAAS,GAAG,IAAA,8BAAmB,EAAC;YAC9B,eAAe;YACf,YAAY,EAAE,aAAa;YAC3B,oBAAoB,EAAE,MAAM,CAAC,SAAS,EAAE,YAAY;SACrD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC;QAChD,WAAW,EAAE,SAAS;QACtB,eAAe;QACf,eAAe;QACf,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO;QAC1C,UAAU,EAAE,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO;QACvE,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC;QACpC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,iBAAiB,EAAE,MAAM,CAAC,SAAS,EAAE,iBAAiB;QACtD,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,eAAiC;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,OAAO,kBAAkB,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,KAAK,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
*/
|
|
7
7
|
export function formatCompilerMetadata(
|
|
8
8
|
// biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
|
|
9
|
-
metadata
|
|
9
|
+
metadata) {
|
|
10
10
|
let meta = metadata;
|
|
11
|
-
if (
|
|
12
|
-
meta = metadata.source_metadata
|
|
11
|
+
if ("source_metadata" in metadata) {
|
|
12
|
+
meta = metadata.source_metadata;
|
|
13
13
|
}
|
|
14
14
|
const compilationTarget = meta.settings.compilationTarget;
|
|
15
15
|
const targets = Object.keys(compilationTarget);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"AAuBA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB;AACpC,8DAA8D;AAC9D,QAAa
|
|
1
|
+
{"version":3,"file":"compiler-metadata.js","sourceRoot":"","sources":["../../../../src/contract/actions/compiler-metadata.ts"],"names":[],"mappings":"AAuBA;;;;;GAKG;AACH,MAAM,UAAU,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"}
|
|
@@ -19,7 +19,6 @@ export async function fetchPublishedContractMetadata(options) {
|
|
|
19
19
|
publisherAddress: options.publisher || THIRDWEB_DEPLOYER,
|
|
20
20
|
contractId: options.contractId,
|
|
21
21
|
version: options.version,
|
|
22
|
-
compilerType: options.compilerType,
|
|
23
22
|
});
|
|
24
23
|
if (!publishedContract.publishMetadataUri) {
|
|
25
24
|
throw new Error(`No published metadata URI found for ${options.contractId}`);
|
|
@@ -27,7 +26,6 @@ export async function fetchPublishedContractMetadata(options) {
|
|
|
27
26
|
const data = await fetchDeployMetadata({
|
|
28
27
|
client: options.client,
|
|
29
28
|
uri: publishedContract.publishMetadataUri,
|
|
30
|
-
compilerType: options.compilerType,
|
|
31
29
|
});
|
|
32
30
|
return data;
|
|
33
31
|
}, { cacheKey, cacheTime: 1000 * 60 * 60 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/contract/deployment/publisher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAEL,mBAAmB,GACpB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,OAAO,EAAyB,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpE,MAAM,CAAC,MAAM,0BAA0B,GACrC,4CAA4C,CAAC,CAAC,eAAe;AAC/D,MAAM,iBAAiB,GAAG,4CAA4C,CAAC;AAEvE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,
|
|
1
|
+
{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/contract/deployment/publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
|
|
2
|
+
import { fetchBytecodeFromCompilerMetadata, } from "../../../utils/any-evm/deploy-metadata.js";
|
|
2
3
|
import { isZkSyncChain } from "../../../utils/any-evm/zksync/isZkSyncChain.js";
|
|
3
4
|
import { getContract } from "../../contract.js";
|
|
4
5
|
import { fetchPublishedContractMetadata } from "../publisher.js";
|
|
@@ -11,7 +12,7 @@ import { getDeployedInfraContract, getDeployedInfraContractFromMetadata, prepare
|
|
|
11
12
|
* @internal
|
|
12
13
|
*/
|
|
13
14
|
export async function getOrDeployInfraForPublishedContract(args) {
|
|
14
|
-
const { chain, client, account, contractId, constructorParams, publisher, version,
|
|
15
|
+
const { chain, client, account, contractId, constructorParams, publisher, version, } = args;
|
|
15
16
|
if (await isZkSyncChain(chain)) {
|
|
16
17
|
const cloneFactoryContract = await zkDeployCreate2Factory({
|
|
17
18
|
chain,
|
|
@@ -23,14 +24,17 @@ export async function getOrDeployInfraForPublishedContract(args) {
|
|
|
23
24
|
contractId,
|
|
24
25
|
publisher,
|
|
25
26
|
version,
|
|
26
|
-
compilerType,
|
|
27
27
|
});
|
|
28
28
|
const implementationContract = await zkDeployContractDeterministic({
|
|
29
29
|
chain,
|
|
30
30
|
client,
|
|
31
31
|
account,
|
|
32
32
|
abi: compilerMetadata.abi,
|
|
33
|
-
bytecode:
|
|
33
|
+
bytecode: await fetchBytecodeFromCompilerMetadata({
|
|
34
|
+
compilerMetadata,
|
|
35
|
+
client,
|
|
36
|
+
chain,
|
|
37
|
+
}),
|
|
34
38
|
params: constructorParams,
|
|
35
39
|
});
|
|
36
40
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../../../src/contract/deployment/utils/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8DAA8D,CAAC;AACzG,OAAO,EAEL,iCAAiC,GAClC,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAE/E,OAAO,EAAyB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EACL,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,wBAAwB,EACxB,oCAAoC,EACpC,iDAAiD,GAClD,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACxD,IAKC;IAKD,MAAM,EACJ,KAAK,EACL,MAAM,EACN,OAAO,EACP,UAAU,EACV,iBAAiB,EACjB,SAAS,EACT,OAAO,GACR,GAAG,IAAI,CAAC;IAET,IAAI,MAAM,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,oBAAoB,GAAG,MAAM,sBAAsB,CAAC;YACxD,KAAK;YACL,MAAM;YACN,OAAO;SACR,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAAC;YAC5D,MAAM;YACN,UAAU;YACV,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QACH,MAAM,sBAAsB,GAAG,MAAM,6BAA6B,CAAC;YACjE,KAAK;YACL,MAAM;YACN,OAAO;YACP,GAAG,EAAE,gBAAgB,CAAC,GAAG;YACzB,QAAQ,EAAE,MAAM,iCAAiC,CAAC;gBAChD,gBAAgB;gBAChB,MAAM;gBACN,KAAK;aACN,CAAC;YACF,MAAM,EAAE,iBAAiB;SAC1B,CAAC,CAAC;QACH,OAAO;YACL,oBAAoB,EAAE,WAAW,CAAC;gBAChC,OAAO,EAAE,oBAAoB;gBAC7B,KAAK;gBACL,MAAM;aACP,CAAC;YACF,sBAAsB,EAAE,WAAW,CAAC;gBAClC,OAAO,EAAE,sBAAsB;gBAC/B,KAAK;gBACL,MAAM;aACP,CAAC;SACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,oBAAoB,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrE,+BAA+B,CAAC;YAC9B,KAAK;YACL,MAAM;SACP,CAAC;QACF,wBAAwB,CAAC;YACvB,KAAK;YACL,MAAM;YACN,UAAU;YACV,iBAAiB;YACjB,SAAS;YACT,OAAO;SACR,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,CAAC,sBAAsB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACrD,6DAA6D;QAC7D,oBAAoB,GAAG,MAAM,kBAAkB,CAAC;YAC9C,MAAM;YACN,KAAK;YACL,OAAO;SACR,CAAC,CAAC;QACH,sBAAsB,GAAG,MAAM,oBAAoB,CAAC;YAClD,MAAM;YACN,KAAK;YACL,OAAO;YACP,UAAU;YACV,iBAAiB;YACjB,SAAS;YACT,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAiC;IACxE,kBAAkB;IAClB,MAAM,cAAc,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,YAAY;IACZ,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAAC;QAC/C,GAAG,OAAO;QACV,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,gBAAgB;IAChB,OAAO,wBAAwB,CAAC;QAC9B,GAAG,OAAO;QACV,UAAU,EAAE,gBAAgB;QAC5B,iBAAiB,EAAE,EAAE,iBAAiB,EAAE,SAAS,CAAC,OAAO,EAAE;KAC5D,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,OAKC;IAED,OAAO,wBAAwB,CAAC;QAC9B,GAAG,OAAO;QACV,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAKC;IAED,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAAC;QAC5D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,OAAO,oCAAoC,CAAC;QAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CACxD,OAGC;IAED,MAAM,aAAa,GAAG,MAAM,oCAAoC,CAAC,OAAO,CAAC,CAAC;IAC1E,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,MAAM,WAAW,GACf,iDAAiD,CAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,yBAAyB,CAAC;QAC9B,WAAW;QACX,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,MAAM,qBAAqB,GACzB,MAAM,oCAAoC,CAAC,OAAO,CAAC,CAAC;IACtD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC"}
|
|
@@ -10,6 +10,7 @@ import { resolveMethod } from "../../transaction/resolve-method.js";
|
|
|
10
10
|
import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
|
|
11
11
|
import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
|
|
12
12
|
import { getAddress } from "../../utils/address.js";
|
|
13
|
+
import { fetchBytecodeFromCompilerMetadata, } from "../../utils/any-evm/deploy-metadata.js";
|
|
13
14
|
import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
|
|
14
15
|
import { getAllDefaultConstructorParamsForImplementation } from "./get-required-transactions.js";
|
|
15
16
|
/**
|
|
@@ -57,13 +58,12 @@ import { getAllDefaultConstructorParamsForImplementation } from "./get-required-
|
|
|
57
58
|
* @extension DEPLOY
|
|
58
59
|
*/
|
|
59
60
|
export async function deployPublishedContract(options) {
|
|
60
|
-
const { client, account, chain, contractId, contractParams, publisher, version, implementationConstructorParams, salt,
|
|
61
|
+
const { client, account, chain, contractId, contractParams, publisher, version, implementationConstructorParams, salt, } = options;
|
|
61
62
|
const deployMetadata = await fetchPublishedContractMetadata({
|
|
62
63
|
client,
|
|
63
64
|
contractId,
|
|
64
65
|
publisher,
|
|
65
66
|
version,
|
|
66
|
-
compilerType,
|
|
67
67
|
});
|
|
68
68
|
return deployContractfromDeployMetadata({
|
|
69
69
|
account,
|
|
@@ -73,14 +73,13 @@ export async function deployPublishedContract(options) {
|
|
|
73
73
|
initializeParams: contractParams,
|
|
74
74
|
implementationConstructorParams,
|
|
75
75
|
salt,
|
|
76
|
-
compilerType,
|
|
77
76
|
});
|
|
78
77
|
}
|
|
79
78
|
/**
|
|
80
79
|
* @internal
|
|
81
80
|
*/
|
|
82
81
|
export async function deployContractfromDeployMetadata(options) {
|
|
83
|
-
const { client, account, chain, initializeParams, deployMetadata, implementationConstructorParams, modules, salt,
|
|
82
|
+
const { client, account, chain, initializeParams, deployMetadata, implementationConstructorParams, modules, salt, } = options;
|
|
84
83
|
switch (deployMetadata?.deployType) {
|
|
85
84
|
case "standard": {
|
|
86
85
|
return directDeploy({
|
|
@@ -108,7 +107,6 @@ export async function deployContractfromDeployMetadata(options) {
|
|
|
108
107
|
client,
|
|
109
108
|
})),
|
|
110
109
|
publisher: deployMetadata.publisher,
|
|
111
|
-
compilerType,
|
|
112
110
|
});
|
|
113
111
|
const initializeTransaction = await getInitializeTransaction({
|
|
114
112
|
client,
|
|
@@ -183,7 +181,11 @@ async function directDeploy(options) {
|
|
|
183
181
|
account,
|
|
184
182
|
client,
|
|
185
183
|
chain,
|
|
186
|
-
bytecode:
|
|
184
|
+
bytecode: await fetchBytecodeFromCompilerMetadata({
|
|
185
|
+
compilerMetadata,
|
|
186
|
+
client,
|
|
187
|
+
chain,
|
|
188
|
+
}),
|
|
187
189
|
abi: compilerMetadata.abi,
|
|
188
190
|
params: contractParams,
|
|
189
191
|
salt,
|
|
@@ -194,7 +196,11 @@ async function directDeploy(options) {
|
|
|
194
196
|
account,
|
|
195
197
|
client,
|
|
196
198
|
chain,
|
|
197
|
-
bytecode:
|
|
199
|
+
bytecode: await fetchBytecodeFromCompilerMetadata({
|
|
200
|
+
compilerMetadata,
|
|
201
|
+
client,
|
|
202
|
+
chain,
|
|
203
|
+
}),
|
|
198
204
|
abi: compilerMetadata.abi,
|
|
199
205
|
constructorParams: contractParams,
|
|
200
206
|
salt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,oCAAoC,EAAE,MAAM,8CAA8C,CAAC;AACpG,OAAO,EAAE,MAAM,0CAA0C,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sDAAsD,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-published.js","sourceRoot":"","sources":["../../../../src/extensions/prebuilts/deploy-published.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { computeCreate2FactoryAddress } from "../../contract/deployment/utils/cr
|
|
|
3
3
|
import { encodeAbiParameters } from "../abi/encodeAbiParameters.js";
|
|
4
4
|
import { normalizeFunctionParams } from "../abi/normalizeFunctionParams.js";
|
|
5
5
|
import { ensureBytecodePrefix } from "../bytecode/prefix.js";
|
|
6
|
+
import { fetchBytecodeFromCompilerMetadata, } from "./deploy-metadata.js";
|
|
6
7
|
import { getInitBytecodeWithSalt } from "./get-init-bytecode-with-salt.js";
|
|
7
8
|
/**
|
|
8
9
|
* @internal
|
|
@@ -31,7 +32,11 @@ export async function computeDeploymentInfoFromMetadata(args) {
|
|
|
31
32
|
client: args.client,
|
|
32
33
|
chain: args.chain,
|
|
33
34
|
abi: args.contractMetadata.abi,
|
|
34
|
-
bytecode:
|
|
35
|
+
bytecode: await fetchBytecodeFromCompilerMetadata({
|
|
36
|
+
compilerMetadata: args.contractMetadata,
|
|
37
|
+
client: args.client,
|
|
38
|
+
chain: args.chain,
|
|
39
|
+
}),
|
|
35
40
|
constructorParams: args.constructorParams,
|
|
36
41
|
salt: args.salt,
|
|
37
42
|
});
|
|
@@ -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":"AAGA,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"compute-published-contract-deploy-info.js","sourceRoot":"","sources":["../../../../src/utils/any-evm/compute-published-contract-deploy-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAEL,iCAAiC,GAClC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E;;GAEG;AACH,MAAM,CAAC,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,8BAA8B,CAAC;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;AACH,MAAM,CAAC,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,iCAAiC,CAAC;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;AAED,MAAM,CAAC,KAAK,UAAU,iCAAiC,CAAC,IAOvD;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACxD,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC;QAC/D,MAAM;QACN,KAAK;KACN,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,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,mBAAmB,CACrC,cAAc,EAAE,MAAM,IAAI,EAAE,EAC5B,uBAAuB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC3D,CAAC;IACF,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;QACnD,QAAQ;QACR,WAAW;QACX,IAAI;KACL,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,oBAAoB;QACpB,WAAW;QACX,qBAAqB;KACtB,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { formatCompilerMetadata } from "../../contract/actions/compiler-metadata.js";
|
|
2
2
|
import { download } from "../../storage/download.js";
|
|
3
|
+
import { withCache } from "../promise/withCache.js";
|
|
4
|
+
import { isZkSyncChain } from "./zksync/isZkSyncChain.js";
|
|
3
5
|
/**
|
|
4
6
|
* Fetches the deployment metadata.
|
|
5
7
|
* @param options - The options for fetching the deploy metadata.
|
|
@@ -7,34 +9,19 @@ import { download } from "../../storage/download.js";
|
|
|
7
9
|
* @internal
|
|
8
10
|
*/
|
|
9
11
|
export async function fetchDeployMetadata(options) {
|
|
10
|
-
const isZksolc = options.compilerType === "zksolc";
|
|
11
12
|
const rawMeta = await download({
|
|
12
13
|
uri: options.uri,
|
|
13
14
|
client: options.client,
|
|
14
15
|
}).then((r) => r.json());
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
? rawMeta.compilers.zksolc[0].metadataUri
|
|
21
|
-
: rawMeta.metadataUri;
|
|
22
|
-
const bytecodeUri = isZksolc
|
|
23
|
-
? rawMeta.compilers.zksolc[0].bytecodeUri
|
|
24
|
-
: rawMeta.bytecodeUri;
|
|
25
|
-
const [deployBytecode, parsedMeta] = await Promise.all([
|
|
26
|
-
download({ uri: bytecodeUri, client: options.client }).then((res) => res.text()),
|
|
27
|
-
fetchAndParseCompilerMetadata({
|
|
28
|
-
client: options.client,
|
|
29
|
-
uri: metadataUri,
|
|
30
|
-
compilerType: options.compilerType,
|
|
31
|
-
}),
|
|
32
|
-
]);
|
|
16
|
+
const metadataUri = rawMeta.metadataUri;
|
|
17
|
+
const parsedMeta = await fetchAndParseCompilerMetadata({
|
|
18
|
+
client: options.client,
|
|
19
|
+
uri: metadataUri,
|
|
20
|
+
});
|
|
33
21
|
return {
|
|
34
22
|
...rawMeta,
|
|
35
23
|
...parsedMeta,
|
|
36
24
|
version: rawMeta.version,
|
|
37
|
-
bytecode: deployBytecode,
|
|
38
25
|
name: rawMeta.name,
|
|
39
26
|
};
|
|
40
27
|
}
|
|
@@ -51,7 +38,27 @@ async function fetchAndParseCompilerMetadata(options) {
|
|
|
51
38
|
}
|
|
52
39
|
return {
|
|
53
40
|
...metadata,
|
|
54
|
-
...formatCompilerMetadata(metadata
|
|
41
|
+
...formatCompilerMetadata(metadata),
|
|
55
42
|
};
|
|
56
43
|
}
|
|
44
|
+
export async function fetchBytecodeFromCompilerMetadata(options) {
|
|
45
|
+
const { compilerMetadata, client, chain } = options;
|
|
46
|
+
return withCache(async () => {
|
|
47
|
+
const isZksolc = await isZkSyncChain(chain);
|
|
48
|
+
const bytecodeUri = isZksolc
|
|
49
|
+
? compilerMetadata.compilers?.zksolc[0]?.bytecodeUri
|
|
50
|
+
: compilerMetadata.bytecodeUri;
|
|
51
|
+
if (!bytecodeUri) {
|
|
52
|
+
throw new Error(`No bytecode URI found in compiler metadata for ${compilerMetadata.name} on chain ${chain.name}`);
|
|
53
|
+
}
|
|
54
|
+
const deployBytecode = await download({
|
|
55
|
+
uri: bytecodeUri,
|
|
56
|
+
client,
|
|
57
|
+
}).then((res) => res.text());
|
|
58
|
+
return deployBytecode;
|
|
59
|
+
}, {
|
|
60
|
+
cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
|
|
61
|
+
cacheTime: 24 * 60 * 60 * 1000,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
57
64
|
//# 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":"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,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,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;QACzD,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;KAC/B,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -3,20 +3,25 @@ export async function isZkSyncChain(chain) {
|
|
|
3
3
|
if (chain.id === 1337 || chain.id === 31337) {
|
|
4
4
|
return false;
|
|
5
5
|
}
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
6
|
+
// check known zksync chain-ids first
|
|
7
|
+
if (chain.id === 324 ||
|
|
8
|
+
chain.id === 300 ||
|
|
9
|
+
chain.id === 302 ||
|
|
10
|
+
chain.id === 11124 ||
|
|
11
|
+
chain.id === 282 || // cronos zkevm testnet
|
|
12
|
+
chain.id === 388 // cronos zkevm mainnet
|
|
13
|
+
) {
|
|
14
|
+
return true;
|
|
15
|
+
}
|
|
16
|
+
// fallback to checking the stack on rpc
|
|
17
|
+
try {
|
|
18
|
+
const stack = await getChainStack(chain.id);
|
|
19
|
+
return stack === "zksync-stack";
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
// If the network check fails, assume it's not a ZkSync chain
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
async function getChainStack(chainId) {
|
|
22
27
|
return withCache(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isZkSyncChain.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/isZkSyncChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,MAAM,CAAC,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,
|
|
1
|
+
{"version":3,"file":"isZkSyncChain.js","sourceRoot":"","sources":["../../../../../src/utils/any-evm/zksync/isZkSyncChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,MAAM,CAAC,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,SAAS,CACd,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/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const version = "5.60.1-nightly-
|
|
1
|
+
export const version = "5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
|
@@ -67,6 +67,7 @@ export function ecosystemWallet(...args) {
|
|
|
67
67
|
...createOptions?.auth,
|
|
68
68
|
options: [], // controlled by ecosystem
|
|
69
69
|
},
|
|
70
|
+
partnerId: createOptions?.partnerId,
|
|
70
71
|
},
|
|
71
72
|
connectorFactory: async (client) => {
|
|
72
73
|
const { InAppNativeConnector } = await import("./native-connector.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/native/ecosystem.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,MAAM,UAAU,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,iBAAiB,CAAC;QACvB,SAAS;QACT,aAAa,EAAE;YACb,IAAI,EAAE;gBACJ,GAAG,aAAa,EAAE,IAAI;gBACtB,OAAO,EAAE,EAAE,EAAE,0BAA0B;aACxC;
|
|
1
|
+
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/native/ecosystem.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,MAAM,UAAU,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,iBAAiB,CAAC;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,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;YACvE,OAAO,IAAI,oBAAoB,CAAC;gBAC9B,MAAM;gBACN,SAAS;gBACT,sDAAsD;aACvD,CAAC,CAAC;QACL,CAAC;KACF,CAA8B,CAAC;AAClC,CAAC"}
|
|
@@ -67,6 +67,7 @@ export function ecosystemWallet(...args) {
|
|
|
67
67
|
...createOptions?.auth,
|
|
68
68
|
options: [], // controlled by ecosystem
|
|
69
69
|
},
|
|
70
|
+
partnerId: ecosystem.partnerId,
|
|
70
71
|
},
|
|
71
72
|
connectorFactory: async (client) => {
|
|
72
73
|
const { InAppWebConnector } = await import("./lib/web-connector.js");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/ecosystem.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,MAAM,UAAU,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,iBAAiB,CAAC;QACvB,SAAS;QACT,aAAa,EAAE;YACb,IAAI,EAAE;gBACJ,GAAG,aAAa,EAAE,IAAI;gBACtB,OAAO,EAAE,EAAE,EAAE,0BAA0B;aACxC;
|
|
1
|
+
{"version":3,"file":"ecosystem.js","sourceRoot":"","sources":["../../../../../src/wallets/in-app/web/ecosystem.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,MAAM,UAAU,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,iBAAiB,CAAC;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,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;YACrE,OAAO,IAAI,iBAAiB,CAAC;gBAC3B,MAAM;gBACN,SAAS;aACV,CAAC,CAAC;QACL,CAAC;KACF,CAA8B,CAAC;AAClC,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { hexToBigInt } from "../../../utils/encoding/hex.js";
|
|
|
6
6
|
import { getClientFetch } from "../../../utils/fetch.js";
|
|
7
7
|
import { stringify } from "../../../utils/json.js";
|
|
8
8
|
import { formatUserOperationReceipt, } from "../types.js";
|
|
9
|
-
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, MANAGED_ACCOUNT_GAS_BUFFER, getDefaultBundlerUrl,
|
|
9
|
+
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, MANAGED_ACCOUNT_GAS_BUFFER, getDefaultBundlerUrl, } from "./constants.js";
|
|
10
10
|
import { hexlifyUserOp } from "./utils.js";
|
|
11
11
|
/**
|
|
12
12
|
* Bundle a user operation.
|
|
@@ -195,9 +195,7 @@ async function sendBundlerRequest(args) {
|
|
|
195
195
|
if (DEBUG) {
|
|
196
196
|
console.debug(`>>> sending ${operation} with payload:`, params);
|
|
197
197
|
}
|
|
198
|
-
const
|
|
199
|
-
const bundlerVersion = entryPointVersion === "v0.6" ? "v1" : "v2";
|
|
200
|
-
const bundlerUrl = options.bundlerUrl ?? getDefaultBundlerUrl(options.chain, bundlerVersion);
|
|
198
|
+
const bundlerUrl = options.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
|
|
201
199
|
const fetchWithHeaders = getClientFetch(options.client);
|
|
202
200
|
const response = await fetchWithHeaders(bundlerUrl, {
|
|
203
201
|
method: "POST",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAE,MAAM,2FAA2F,CAAC;AAC3I,OAAO,EAAE,uBAAuB,EAAE,MAAM,wFAAwF,CAAC;AAEjI,OAAO,EAAY,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAQL,0BAA0B,GAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,EACL,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,
|
|
1
|
+
{"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,12 +21,12 @@ export const getDefaultAccountFactory = (entryPointAddress) => {
|
|
|
21
21
|
/**
|
|
22
22
|
* @internal
|
|
23
23
|
*/
|
|
24
|
-
export const getDefaultBundlerUrl = (chain
|
|
24
|
+
export const getDefaultBundlerUrl = (chain) => {
|
|
25
25
|
const domain = getThirdwebDomains().bundler;
|
|
26
26
|
if (domain.startsWith("localhost:")) {
|
|
27
|
-
return `http://${domain}
|
|
27
|
+
return `http://${domain}/v2?chain=${chain.id}`;
|
|
28
28
|
}
|
|
29
|
-
return `https://${chain.id}.${domain}
|
|
29
|
+
return `https://${chain.id}.${domain}/v2`;
|
|
30
30
|
};
|
|
31
31
|
export const getEntryPointVersion = (address) => {
|
|
32
32
|
const checksummedAddress = getAddress(address);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,WAAW;AACX,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC;AAE3B,MAAM,CAAC,MAAM,eAAe,GAC1B,sIAAsI,CAAC;AAEzI,MAAM,CAAC,MAAM,4BAA4B,GACvC,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,4BAA4B,GACvC,4CAA4C,CAAC;AAE/C,MAAM,CAAC,MAAM,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAEvD,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,iBAA0B,EAAE,EAAE;IACrE,MAAM,OAAO,GAAG,oBAAoB,CAClC,iBAAiB,IAAI,uBAAuB,CAC7C,CAAC;IACF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IACD,OAAO,4BAA4B,CAAC;AACtC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,WAAW;AACX,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC;AAE3B,MAAM,CAAC,MAAM,eAAe,GAC1B,sIAAsI,CAAC;AAEzI,MAAM,CAAC,MAAM,4BAA4B,GACvC,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,4BAA4B,GACvC,4CAA4C,CAAC;AAE/C,MAAM,CAAC,MAAM,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAEvD,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,iBAA0B,EAAE,EAAE;IACrE,MAAM,OAAO,GAAG,oBAAoB,CAClC,iBAAiB,IAAI,uBAAuB,CAC7C,CAAC;IACF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IACD,OAAO,4BAA4B,CAAC;AACtC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,kBAAkB,EAAE,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;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAmB,EAAE;IACvE,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,kBAAkB,KAAK,uBAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,kBAAkB,KAAK,uBAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { hexToBigInt } from "../../../utils/encoding/hex.js";
|
|
2
2
|
import { getClientFetch } from "../../../utils/fetch.js";
|
|
3
|
-
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, getDefaultBundlerUrl,
|
|
3
|
+
import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, getDefaultBundlerUrl, } from "./constants.js";
|
|
4
4
|
import { hexlifyUserOp } from "./utils.js";
|
|
5
5
|
/**
|
|
6
6
|
* Get paymaster and data details for a user operation.
|
|
@@ -29,9 +29,7 @@ export async function getPaymasterAndData(args) {
|
|
|
29
29
|
"Content-Type": "application/json",
|
|
30
30
|
};
|
|
31
31
|
const entrypoint = entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6;
|
|
32
|
-
const
|
|
33
|
-
const paymasterVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
|
|
34
|
-
const paymasterUrl = getDefaultBundlerUrl(chain, paymasterVersion);
|
|
32
|
+
const paymasterUrl = getDefaultBundlerUrl(chain);
|
|
35
33
|
// Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
|
|
36
34
|
const fetchWithHeaders = getClientFetch(client);
|
|
37
35
|
const response = await fetchWithHeaders(paymasterUrl, {
|