@hyperlane-xyz/sdk 16.0.0 → 16.1.0
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/block-explorer/etherscan.d.ts +1 -12
- package/dist/block-explorer/etherscan.d.ts.map +1 -1
- package/dist/block-explorer/etherscan.js +14 -2
- package/dist/block-explorer/etherscan.js.map +1 -1
- package/dist/block-explorer/utils.d.ts +3 -0
- package/dist/block-explorer/utils.d.ts.map +1 -0
- package/dist/block-explorer/utils.js +16 -0
- package/dist/block-explorer/utils.js.map +1 -0
- package/dist/consts/testChains.d.ts +2 -0
- package/dist/consts/testChains.d.ts.map +1 -1
- package/dist/consts/testChains.js +36 -1
- package/dist/consts/testChains.js.map +1 -1
- package/dist/contracts/contracts.d.ts +9 -1
- package/dist/contracts/contracts.d.ts.map +1 -1
- package/dist/contracts/contracts.js +15 -1
- package/dist/contracts/contracts.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +16 -5
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/metadata/ChainMetadataManager.d.ts +10 -0
- package/dist/metadata/ChainMetadataManager.d.ts.map +1 -1
- package/dist/metadata/ChainMetadataManager.js +33 -2
- package/dist/metadata/ChainMetadataManager.js.map +1 -1
- package/dist/metadata/blockExplorer.d.ts.map +1 -1
- package/dist/metadata/blockExplorer.js +27 -1
- package/dist/metadata/blockExplorer.js.map +1 -1
- package/dist/metadata/blockExplorer.test.js +176 -1
- package/dist/metadata/blockExplorer.test.js.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5TimelockSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5TimelockSubmitter.js +3 -3
- package/dist/providers/transactions/submitter/ethersV5/EV5TimelockSubmitter.js.map +1 -1
- package/dist/rpc/evm/EvmEventLogsReader.d.ts +79 -0
- package/dist/rpc/evm/EvmEventLogsReader.d.ts.map +1 -0
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.d.ts +2 -0
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.d.ts.map +1 -0
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.js +279 -0
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.js.map +1 -0
- package/dist/rpc/evm/EvmEventLogsReader.js +107 -0
- package/dist/rpc/evm/EvmEventLogsReader.js.map +1 -0
- package/dist/rpc/evm/types.d.ts +11 -0
- package/dist/rpc/evm/types.d.ts.map +1 -0
- package/dist/rpc/evm/types.js +2 -0
- package/dist/rpc/evm/types.js.map +1 -0
- package/dist/rpc/evm/utils.d.ts +18 -0
- package/dist/rpc/evm/utils.d.ts.map +1 -0
- package/dist/rpc/evm/utils.hardhat-test.d.ts +2 -0
- package/dist/rpc/evm/utils.hardhat-test.d.ts.map +1 -0
- package/dist/rpc/evm/utils.hardhat-test.js +144 -0
- package/dist/rpc/evm/utils.hardhat-test.js.map +1 -0
- package/dist/rpc/evm/utils.js +67 -0
- package/dist/rpc/evm/utils.js.map +1 -0
- package/dist/timelock/evm/EvmTimelockReader.d.ts +30 -0
- package/dist/timelock/evm/EvmTimelockReader.d.ts.map +1 -0
- package/dist/timelock/evm/EvmTimelockReader.hardhat-test.d.ts +2 -0
- package/dist/timelock/evm/EvmTimelockReader.hardhat-test.d.ts.map +1 -0
- package/dist/timelock/evm/EvmTimelockReader.hardhat-test.js +649 -0
- package/dist/timelock/evm/EvmTimelockReader.hardhat-test.js.map +1 -0
- package/dist/timelock/evm/EvmTimelockReader.js +173 -0
- package/dist/timelock/evm/EvmTimelockReader.js.map +1 -0
- package/dist/timelock/evm/utils.d.ts +4 -0
- package/dist/timelock/evm/utils.d.ts.map +1 -0
- package/dist/timelock/evm/utils.js +11 -0
- package/dist/timelock/evm/utils.js.map +1 -0
- package/dist/timelock/types.d.ts +11 -0
- package/dist/timelock/types.d.ts.map +1 -1
- package/dist/timelock/types.js.map +1 -1
- package/dist/token/checker.js +2 -2
- package/dist/token/checker.js.map +1 -1
- package/dist/token/types.d.ts +1 -1
- package/dist/token/xerc20.d.ts.map +1 -1
- package/dist/token/xerc20.js +3 -35
- package/dist/token/xerc20.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmTimelockReader.hardhat-test.js","sourceRoot":"","sources":["../../../src/timelock/evm/EvmTimelockReader.hardhat-test.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EACL,4BAA4B,EAC5B,aAAa,EACb,aAAa,EACb,KAAK,GACN,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAEzB,QAAQ,CAAC,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE;IACpC,IAAI,aAAgC,CAAC;IACrC,IAAI,QAA2B,CAAC;IAChC,IAAI,QAA2B,CAAC;IAChC,IAAI,kBAAmC,CAAC;IACxC,IAAI,aAA4B,CAAC;IACjC,IAAI,gBAAqC,CAAC;IAC1C,IAAI,cAAiC,CAAC;IACtC,IAAI,eAAuB,CAAC;IAE5B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,CAAC,aAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAEpE,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;QAC/D,kBAAkB,GAAG,aAAa,CAAC,QAA2B,CAAC;QAE/D,2CAA2C;QAC3C,MAAM,eAAe,GAAkB,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,eAAe,CAAC,cAAc,GAAG,EAAE,CAAC;QAEpC,aAAa,GAAG,IAAI,aAAa,CAAC;YAChC,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,eAAe;SACvC,CAAC,CAAC;QACH,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QACnE,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QAE7C,2BAA2B;QAC3B,gBAAgB,GAAG,IAAI,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,KAAK,UAAU,kBAAkB;QAC/B,MAAM,MAAM,GAAmB;YAC7B,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC7B,SAAS,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC7B,KAAK,EAAE,aAAa,CAAC,OAAO;SAC7B,CAAC;QAEF,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,gBAAgB,CAAC,eAAe,CACnE,aAAa,CAAC,KAAK,EACnB,MAAM,CACP,CAAC;QAEF,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC;QAE7C,MAAM,CACJ,kBAAkB,CAAC,iBAAiB,CAAC,WAAW,EAChD,6DAA6D,CAC9D,CAAC;QAEF,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE;QAC/C,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,MAAM,kBAAkB,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC;gBAC1C,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,eAAe;gBACf,aAAa;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;YACnD,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACrE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,CAAC,GAAG,EAAE;gBACV,iBAAiB,CAAC,UAAU,CAAC;oBAC3B,KAAK,EAAE,aAAa,CAAC,KAAK;oBAC1B,eAAe;oBACf,aAAa;iBACd,CAAC,CAAC;YACL,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,IAAI,QAAQ,EAAE,GAAG,EAAE;QAC/C,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,MAAM,kBAAkB,EAAE,CAAC;YAE3B,cAAc,GAAG,iBAAiB,CAAC,UAAU,CAAC;gBAC5C,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,eAAe;gBACf,aAAa;aACd,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC1E,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;gBAC7E,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,sBAAsB,EAAE,CAAC;gBAEnE,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YAOH,MAAM,iBAAiB,GAAuB;gBAC5C;oBACE,KAAK,EAAE,wDAAwD;oBAC/D,UAAU,EAAE;wBACV,IAAI,EAAE;4BACJ;gCACE,EAAE,EAAE,aAAa,EAAE;gCACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gCACnC,IAAI,EAAE,QAAQ;6BACf;yBACF;wBACD,KAAK,EAAE,CAAC;wBACR,WAAW,EAAE,cAAc;wBAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;qBACpD;iBACF;gBACD;oBACE,KAAK,EAAE,0DAA0D;oBACjE,UAAU,EAAE;wBACV,IAAI,EAAE;4BACJ;gCACE,EAAE,EAAE,aAAa,EAAE;gCACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gCACnC,IAAI,EAAE,QAAQ;6BACf;4BACD;gCACE,EAAE,EAAE,aAAa,EAAE;gCACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gCACnC,IAAI,EAAE,QAAQ;6BACf;yBACF;wBACD,KAAK,EAAE,CAAC;wBACR,WAAW,EAAE,cAAc;wBAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC;qBACrD;iBACF;gBACD;oBACE,KAAK,EACH,gEAAgE;oBAClE,UAAU,EAAE;wBACV,IAAI,EAAE;4BACJ;gCACE,EAAE,EAAE,aAAa,EAAE;gCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gCAC/B,IAAI,EAAE,IAAI;6BACX;yBACF;wBACD,KAAK,EAAE,CAAC;wBACR,WAAW,EAAE,cAAc;wBAC3B,IAAI,EAAE,cAAc;qBACrB;iBACF;aACF,CAAC;YAEF,KAAK,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,iBAAiB,EAAE,CAAC;gBACtD,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBACnB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBAEF,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;oBAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBAEvD,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CACrD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,KAAK,CACjB,CAAC;oBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;oBAExB,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,sBAAsB,EAAE,CAAC;oBACnE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAExC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAEhC,MAAM,WAAW,GAAe,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAEhE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAChD,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAC1D,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC3C,CAAC;wBACF,MAAM,CACJ,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EACzB,yDAAyD,CAC1D,CAAC;wBACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CACpD,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,CAC5C,CAAC;wBACF,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACrE,CAAC;oBAED,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;oBACrD,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;oBACjE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACnD,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC5E,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;gBAC1E,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,wBAAwB,EAAE,CAAC;gBACrE,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YAOH,MAAM,eAAe,GAAqB;gBACxC;oBACE,KAAK,EAAE,yDAAyD;oBAChE,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,CAAC;yBACtD;qBACF;iBACF;gBACD;oBACE,KAAK,EAAE,6CAA6C;oBACpD,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;yBACnD;wBACD;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;yBACnD;qBACF;iBACF;aACF,CAAC;YAEF,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC;gBACrD,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBACnB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBAEF,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,iCAAiC;oBACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;wBACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;wBAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;wBAEvD,WAAW;wBACX,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CACrD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,KAAK,CACjB,CAAC;wBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;wBAExB,mBAAmB;wBACnB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CAC3D,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;wBACF,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBAE/B,SAAS;wBACT,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC5D,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACxB,CAAC;oBAED,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,wBAAwB,EAAE,CAAC;oBACrE,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBAEvD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;wBACvC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;oBACnD,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC3E,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;gBACzE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,uBAAuB,EAAE,CAAC;gBAEnE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YAOH,MAAM,gBAAgB,GAAsB;gBAC1C;oBACE,KAAK,EAAE,wDAAwD;oBAC/D,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC;yBACvD;qBACF;iBACF;gBACD;oBACE,KAAK,EAAE,4CAA4C;oBACnD,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;yBACpD;wBACD;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;yBACpD;qBACF;iBACF;aACF,CAAC;YAEF,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,gBAAgB,EAAE,CAAC;gBACtD,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBACnB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBACF,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBAEF,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,kCAAkC;oBAClC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;wBACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;wBAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;wBAEvD,WAAW;wBACX,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CACrD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,KAAK,CACjB,CAAC;wBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;wBAExB,mBAAmB;wBACnB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CAC3D,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;wBACF,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBAE/B,UAAU;wBACV,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,YAAY,CACnD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;wBACF,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;oBACzB,CAAC;oBAED,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,uBAAuB,EAAE,CAAC;oBACnE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBAEtD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;wBACvC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;oBAClD,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YACxE,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;gBACvD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBAE/D,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;YAQH,MAAM,cAAc,GAAoB;gBACtC;oBACE,KAAK,EAAE,qDAAqD;oBAC5D,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC;yBACrD;qBACF;oBACD,kBAAkB,EAAE,CAAC;iBACtB;gBACD;oBACE,KAAK,EAAE,qDAAqD;oBAC5D,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,IAAI;4BACX,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;yBACpD;qBACF;oBACD,kBAAkB,EAAE,CAAC;iBACtB;gBACD;oBACE,KAAK,EAAE,oDAAoD;oBAC3D,WAAW,EAAE;wBACX;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,SAAS,CAAC;yBAClD;wBACD;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,IAAI;4BACX,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,CAAC;yBACtD;qBACF;oBACD,kBAAkB,EAAE,CAAC;iBACtB;aACF,CAAC;YAEF,KAAK,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,IAAI,cAAc,EAAE,CAAC;gBACxE,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBACnB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBAEF,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,sBAAsB;oBACtB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;wBACrC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;wBACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;wBAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;wBAEvD,WAAW;wBACX,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CACrD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,KAAK,CACjB,CAAC;wBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;wBAExB,mBAAmB;wBACnB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CAC3D,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;wBACF,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACjC,CAAC;oBAED,MAAM,QAAQ,GACZ,MAAM,cAAc,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;oBAC1D,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,kCAAkC,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YACtF,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;gBAChF,MAAM,aAAa,GACjB,MAAM,cAAc,CAAC,kCAAkC,EAAE,CAAC;gBAE5D,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAUH,MAAM,mBAAmB,GAAyB;gBAChD;oBACE,KAAK,EAAE,iDAAiD;oBACxD,YAAY,EAAE;wBACZ;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC;yBACrD;qBACF;oBACD,uBAAuB,EAAE,CAAC;iBAC3B;gBACD;oBACE,KAAK,EAAE,4DAA4D;oBACnE,YAAY,EAAE;wBACZ;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;yBACpD;qBACF;oBACD,kBAAkB,EAAE,CAAC,CAAC,CAAC;oBACvB,uBAAuB,EAAE,CAAC;iBAC3B;gBACD;oBACE,KAAK,EAAE,2DAA2D;oBAClE,YAAY,EAAE;wBACZ;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC;yBACnD;qBACF;oBACD,iBAAiB,EAAE,CAAC,CAAC,CAAC;oBACtB,uBAAuB,EAAE,CAAC;iBAC3B;gBACD;oBACE,KAAK,EACH,qEAAqE;oBACvE,YAAY,EAAE;wBACZ;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC;yBACvD;wBACD;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,QAAQ;iCACf;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,CAAC;yBACtD;wBACD;4BACE,IAAI,EAAE;gCACJ;oCACE,EAAE,EAAE,aAAa,EAAE;oCACnB,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCAC/B,IAAI,EAAE,IAAI;iCACX;6BACF;4BACD,KAAK,EAAE,CAAC;4BACR,WAAW,EAAE,cAAc;4BAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC;yBACrD;qBACF;oBACD,kBAAkB,EAAE,CAAC,CAAC,CAAC;oBACvB,iBAAiB,EAAE,CAAC,CAAC,CAAC;oBACtB,uBAAuB,EAAE,CAAC;iBAC3B;aACF,CAAC;YAEF,KAAK,MAAM,EACT,KAAK,EACL,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,GACxB,IAAI,mBAAmB,EAAE,CAAC;gBACzB,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;oBACnB,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBACF,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAC1D,eAAe,EACf,QAAQ,CACT,CAAC;oBAEF,MAAM,YAAY,GAAa,EAAE,CAAC;oBAElC,4BAA4B;oBAC5B,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;wBACtC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;wBACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;wBAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;wBAEvD,WAAW;wBACX,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CACrD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,EACf,UAAU,CAAC,KAAK,CACjB,CAAC;wBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;wBAExB,mBAAmB;wBACnB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CAC3D,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;wBACF,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACjC,CAAC;oBAED,+BAA+B;oBAC/B,IAAI,kBAAkB,EAAE,CAAC;wBACvB,KAAK,MAAM,KAAK,IAAI,kBAAkB,EAAE,CAAC;4BACvC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAC5C,YAAY,CAAC,KAAK,CAAC,CACpB,CAAC;4BACF,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACxB,CAAC;oBACH,CAAC;oBAED,gCAAgC;oBAChC,IAAI,iBAAiB,EAAE,CAAC;wBACtB,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;4BACtC,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;4BACvC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;4BACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;4BAC5D,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;4BAEvD,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,YAAY,CACnD,OAAO,EACP,MAAM,EACN,SAAS,EACT,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;4BACF,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;wBACzB,CAAC;oBACH,CAAC;oBAED,MAAM,aAAa,GACjB,MAAM,cAAc,CAAC,kCAAkC,EAAE,CAAC;oBAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAEzC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;oBAEtD,8CAA8C;oBAC9C,KAAK,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;wBACjE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACvC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;wBAC5C,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBACtD,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;wBACjE,MAAM,CACJ,YAAY,CAAC,yBAAyB,CAAC,MAAM,CAC9C,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;wBACvB,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;wBAC7C,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;wBACnD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC9C,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,IAAI,mBAAmB,EAAE,GAAG,EAAE;QAC1D,IAAI,MAAyB,CAAC;QAC9B,IAAI,aAA4B,CAAC;QAEjC,UAAU,CAAC,KAAK,IAAI,EAAE;YACpB,aAAa,GAAG,IAAI,aAAa,CAAC;gBAChC,IAAI,EAAE,aAAa;aACpB,CAAC,CAAC;YACH,MAAM,GAAG,iBAAiB,CAAC,UAAU,CAAC;gBACpC,KAAK,EAAE,aAAa,CAAC,IAAI;gBACzB,eAAe,EAAE,4BAA4B;gBAC7C,aAAa;aACd,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC1E,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;gBAC9E,MAAM,YAAY,GAChB,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC;gBAExC,2DAA2D;gBAC3D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAE9D,8CAA8C;gBAC9C,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;oBACtD,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;oBAE1D,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC7B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC5C,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;oBACrC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;oBACpE,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;gBAC/D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC5E,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;gBAC/E,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,wBAAwB,EAAE,CAAC;gBAE7D,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC3C,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;oBAC9B,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;gBAC1D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,uBAAuB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YAC3E,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;gBAC9E,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAC;gBAE3D,0DAA0D;gBAC1D,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC9C,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;oBAC7B,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;gBAC1D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,iBAAiB,CAAC,SAAS,CAAC,kCAAkC,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;YACtF,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,kCAAkC,EAAE,CAAC;gBAExE,KAAK,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACvC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;oBAC1D,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBACtD,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBACjE,MAAM,CACJ,YAAY,CAAC,yBAAyB,CAAC,MAAM,CAC9C,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBACvB,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;oBAC/C,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE;yBAClE,EAAE,CAAC,IAAI,CAAC;oBACX,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE;yBAC9D,IAAI,CAAC;gBACV,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { BigNumber, constants } from 'ethers';
|
|
2
|
+
import { getAbiItem, parseEventLogs, toEventSelector, } from 'viem';
|
|
3
|
+
import { TimelockController__factory, } from '@hyperlane-xyz/core';
|
|
4
|
+
import { objFilter, objMap } from '@hyperlane-xyz/utils';
|
|
5
|
+
import { EvmEventLogsReader, } from '../../rpc/evm/EvmEventLogsReader.js';
|
|
6
|
+
import { viemLogFromGetEventLogsResponse } from '../../rpc/evm/utils.js';
|
|
7
|
+
import { CANCELLER_ROLE, EMPTY_BYTES_32, EXECUTOR_ROLE, PROPOSER_ROLE, } from './constants.js';
|
|
8
|
+
import { getTimelockExecutableTransactionFromBatch } from './utils.js';
|
|
9
|
+
const CALL_EXECUTED_EVENT_SELECTOR = toEventSelector(getAbiItem({
|
|
10
|
+
abi: TimelockController__factory.abi,
|
|
11
|
+
name: 'CallExecuted',
|
|
12
|
+
}));
|
|
13
|
+
const CALL_SCHEDULED_EVENT_SELECTOR = toEventSelector(getAbiItem({
|
|
14
|
+
abi: TimelockController__factory.abi,
|
|
15
|
+
name: 'CallScheduled',
|
|
16
|
+
}));
|
|
17
|
+
const CALL_CANCELLED_EVENT_SELECTOR = toEventSelector(getAbiItem({
|
|
18
|
+
abi: TimelockController__factory.abi,
|
|
19
|
+
name: 'Cancelled',
|
|
20
|
+
}));
|
|
21
|
+
const CALL_SALT_EVENT_SELECTOR = toEventSelector(getAbiItem({
|
|
22
|
+
abi: TimelockController__factory.abi,
|
|
23
|
+
name: 'CallSalt',
|
|
24
|
+
}));
|
|
25
|
+
export class EvmTimelockReader {
|
|
26
|
+
chain;
|
|
27
|
+
multiProvider;
|
|
28
|
+
timelockInstance;
|
|
29
|
+
evmLogReader;
|
|
30
|
+
constructor(chain, multiProvider, timelockInstance, evmLogReader) {
|
|
31
|
+
this.chain = chain;
|
|
32
|
+
this.multiProvider = multiProvider;
|
|
33
|
+
this.timelockInstance = timelockInstance;
|
|
34
|
+
this.evmLogReader = evmLogReader;
|
|
35
|
+
}
|
|
36
|
+
static fromConfig(config) {
|
|
37
|
+
const { chain, timelockAddress, multiProvider, useRPC, paginationBlockRange, } = config;
|
|
38
|
+
const timelockInstance = TimelockController__factory.connect(timelockAddress, multiProvider.getProvider(chain));
|
|
39
|
+
const evmLogReader = EvmEventLogsReader.fromConfig({ chain, useRPC, paginationBlockRange }, multiProvider);
|
|
40
|
+
return new EvmTimelockReader(chain, multiProvider, timelockInstance, evmLogReader);
|
|
41
|
+
}
|
|
42
|
+
async getOperationsSalt() {
|
|
43
|
+
const logs = await this.evmLogReader.getLogsByTopic({
|
|
44
|
+
contractAddress: this.timelockInstance.address,
|
|
45
|
+
eventTopic: CALL_SALT_EVENT_SELECTOR,
|
|
46
|
+
});
|
|
47
|
+
const result = parseEventLogs({
|
|
48
|
+
abi: TimelockController__factory.abi,
|
|
49
|
+
eventName: 'CallSalt',
|
|
50
|
+
logs: logs.map(viemLogFromGetEventLogsResponse),
|
|
51
|
+
});
|
|
52
|
+
return Object.fromEntries(result.map((parsedEvent) => [parsedEvent.args.id, parsedEvent.args.salt]));
|
|
53
|
+
}
|
|
54
|
+
async getScheduledOperations() {
|
|
55
|
+
const [callScheduledEvents, callSaltByOperationId] = await Promise.all([
|
|
56
|
+
this.evmLogReader.getLogsByTopic({
|
|
57
|
+
contractAddress: this.timelockInstance.address,
|
|
58
|
+
eventTopic: CALL_SCHEDULED_EVENT_SELECTOR,
|
|
59
|
+
}),
|
|
60
|
+
this.getOperationsSalt(),
|
|
61
|
+
]);
|
|
62
|
+
return getScheduledTimelockOperationIdsFromLogs(callScheduledEvents, callSaltByOperationId);
|
|
63
|
+
}
|
|
64
|
+
async getCancelledOperationIds() {
|
|
65
|
+
const cancelledOperationEvents = await this.evmLogReader.getLogsByTopic({
|
|
66
|
+
contractAddress: this.timelockInstance.address,
|
|
67
|
+
eventTopic: CALL_CANCELLED_EVENT_SELECTOR,
|
|
68
|
+
});
|
|
69
|
+
return getOperationIdFromEventLogs(cancelledOperationEvents, 'Cancelled');
|
|
70
|
+
}
|
|
71
|
+
async getExecutedOperationIds() {
|
|
72
|
+
const executedOperationEvents = await this.evmLogReader.getLogsByTopic({
|
|
73
|
+
contractAddress: this.timelockInstance.address,
|
|
74
|
+
eventTopic: CALL_EXECUTED_EVENT_SELECTOR,
|
|
75
|
+
});
|
|
76
|
+
return getOperationIdFromEventLogs(executedOperationEvents, 'CallExecuted');
|
|
77
|
+
}
|
|
78
|
+
async getReadyOperationIds(operationIds) {
|
|
79
|
+
const readyOperationIds = new Set();
|
|
80
|
+
for (const operationId of operationIds) {
|
|
81
|
+
const isReady = await this.timelockInstance.isOperationReady(operationId);
|
|
82
|
+
if (isReady) {
|
|
83
|
+
readyOperationIds.add(operationId);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return readyOperationIds;
|
|
87
|
+
}
|
|
88
|
+
async getScheduledExecutableTransactions() {
|
|
89
|
+
const [scheduledOperations, cancelledOperations, executedOperations] = await Promise.all([
|
|
90
|
+
this.getScheduledOperations(),
|
|
91
|
+
this.getCancelledOperationIds(),
|
|
92
|
+
this.getExecutedOperationIds(),
|
|
93
|
+
]);
|
|
94
|
+
// Remove the operations that have been cancelled or executed
|
|
95
|
+
const maybeExecutableOperations = objFilter(scheduledOperations, (id, _operation) => !(cancelledOperations.has(id) || executedOperations.has(id)));
|
|
96
|
+
const readyOperationIds = await this.getReadyOperationIds(Object.keys(maybeExecutableOperations));
|
|
97
|
+
const pendingExecutableOperations = objFilter(maybeExecutableOperations, (operationId, _operation) => readyOperationIds.has(operationId));
|
|
98
|
+
return objMap(pendingExecutableOperations, (_operationId, operationData) => {
|
|
99
|
+
return {
|
|
100
|
+
data: operationData.data,
|
|
101
|
+
delay: operationData.delay,
|
|
102
|
+
encodedExecuteTransaction: getTimelockExecutableTransactionFromBatch(operationData),
|
|
103
|
+
id: operationData.id,
|
|
104
|
+
predecessor: operationData.predecessor,
|
|
105
|
+
salt: operationData.salt,
|
|
106
|
+
};
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
async hasRole(address, role) {
|
|
110
|
+
// If the 0 address has the role anyone has the role
|
|
111
|
+
const [hasRole, isOpenRole] = await Promise.all([
|
|
112
|
+
this.timelockInstance.hasRole(role, address),
|
|
113
|
+
this.timelockInstance.hasRole(role, constants.AddressZero),
|
|
114
|
+
]);
|
|
115
|
+
return hasRole || isOpenRole;
|
|
116
|
+
}
|
|
117
|
+
async canExecuteOperations(address) {
|
|
118
|
+
return this.hasRole(address, EXECUTOR_ROLE);
|
|
119
|
+
}
|
|
120
|
+
async canCancelOperations(address) {
|
|
121
|
+
return this.hasRole(address, CANCELLER_ROLE);
|
|
122
|
+
}
|
|
123
|
+
async canScheduleOperations(address) {
|
|
124
|
+
return this.hasRole(address, PROPOSER_ROLE);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
function getScheduledTimelockOperationIdsFromLogs(callScheduledLogs, callSaltByOperationId) {
|
|
128
|
+
const parsedLogs = parseEventLogs({
|
|
129
|
+
abi: TimelockController__factory.abi,
|
|
130
|
+
eventName: 'CallScheduled',
|
|
131
|
+
logs: callScheduledLogs.map(viemLogFromGetEventLogsResponse),
|
|
132
|
+
});
|
|
133
|
+
return parsedLogs.reduce((operationsById, parsedLog) => {
|
|
134
|
+
const { data, delay, id, index, predecessor, target, value } = parsedLog.args;
|
|
135
|
+
if (!operationsById[id]) {
|
|
136
|
+
operationsById[id] = {
|
|
137
|
+
data: [
|
|
138
|
+
{
|
|
139
|
+
data,
|
|
140
|
+
to: target,
|
|
141
|
+
value: BigNumber.from(value),
|
|
142
|
+
},
|
|
143
|
+
],
|
|
144
|
+
delay: Number(delay),
|
|
145
|
+
predecessor,
|
|
146
|
+
// If no CallSalt event was emitted for this operation batch
|
|
147
|
+
// it means that no salt was provided when proposing the transaction
|
|
148
|
+
salt: callSaltByOperationId[id] ?? EMPTY_BYTES_32,
|
|
149
|
+
id,
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
// it should be safe to convert a bigint to number
|
|
154
|
+
// in this case as it is an array index for a Timelock
|
|
155
|
+
// contract operation
|
|
156
|
+
operationsById[id].data[Number(index.toString())] = {
|
|
157
|
+
data,
|
|
158
|
+
to: target,
|
|
159
|
+
value: BigNumber.from(value),
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
return operationsById;
|
|
163
|
+
}, {});
|
|
164
|
+
}
|
|
165
|
+
function getOperationIdFromEventLogs(logs, eventName) {
|
|
166
|
+
const result = parseEventLogs({
|
|
167
|
+
abi: TimelockController__factory.abi,
|
|
168
|
+
eventName: eventName,
|
|
169
|
+
logs: logs.map(viemLogFromGetEventLogsResponse),
|
|
170
|
+
});
|
|
171
|
+
return new Set(result.map((parsedEvent) => parsedEvent.args.id));
|
|
172
|
+
}
|
|
173
|
+
//# sourceMappingURL=EvmTimelockReader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmTimelockReader.js","sourceRoot":"","sources":["../../../src/timelock/evm/EvmTimelockReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/timelock/evm/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,wBAAgB,yCAAyC,CACvD,eAAe,EAAE,UAAU,GAC1B,SAAS,CAkBX"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { TimelockController__factory } from '@hyperlane-xyz/core';
|
|
2
|
+
export function getTimelockExecutableTransactionFromBatch(transactionData) {
|
|
3
|
+
const [to, data, value] = transactionData.data.reduce(([targets, data, values], item) => {
|
|
4
|
+
targets.push(item.to);
|
|
5
|
+
data.push(item.data);
|
|
6
|
+
values.push(item.value?.toString() ?? '0');
|
|
7
|
+
return [targets, data, values];
|
|
8
|
+
}, [[], [], []]);
|
|
9
|
+
return TimelockController__factory.createInterface().encodeFunctionData('executeBatch(address[],uint256[],bytes[],bytes32,bytes32)', [to, value, data, transactionData.predecessor, transactionData.salt]);
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/timelock/evm/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAKlE,MAAM,UAAU,yCAAyC,CACvD,eAA2B;IAE3B,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAGnD,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC;QAE3C,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC,EACD,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACb,CAAC;IAEF,OAAO,2BAA2B,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACrE,2DAA2D,EAC3D,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,CACrE,CAAC;AACJ,CAAC"}
|
package/dist/timelock/types.d.ts
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { CallData, HexString } from '@hyperlane-xyz/utils';
|
|
3
|
+
export type TimelockTx = {
|
|
4
|
+
id: HexString;
|
|
5
|
+
delay: number;
|
|
6
|
+
predecessor: HexString;
|
|
7
|
+
salt: HexString;
|
|
8
|
+
data: [CallData, ...CallData[]];
|
|
9
|
+
};
|
|
10
|
+
export type ExecutableTimelockTx = TimelockTx & {
|
|
11
|
+
encodedExecuteTransaction: HexString;
|
|
12
|
+
};
|
|
2
13
|
export declare const TimelockConfigSchema: z.ZodObject<{
|
|
3
14
|
minimumDelay: z.ZodNumber;
|
|
4
15
|
proposers: z.ZodArray<z.ZodString, "many">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/timelock/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/timelock/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,SAAS,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,CAAC,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG;IAC9C,yBAAyB,EAAE,SAAS,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;EAM/B,CAAC;AAEH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;GAGnC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/timelock/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/timelock/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAc3E,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,YAAY,EAAE,OAAO;IACrB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3C,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC5C,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;CACxB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAC7C,UAAU,EACV,oBAAoB,CACrB,CAAC"}
|
package/dist/token/checker.js
CHANGED
|
@@ -4,7 +4,7 @@ import { eqAddress, objMap } from '@hyperlane-xyz/utils';
|
|
|
4
4
|
import { filterOwnableContracts } from '../contracts/contracts.js';
|
|
5
5
|
import { isProxy, proxyAdmin } from '../deploy/proxy.js';
|
|
6
6
|
import { ProxiedRouterChecker } from '../router/ProxiedRouterChecker.js';
|
|
7
|
-
import { TokenType } from './config.js';
|
|
7
|
+
import { NON_ZERO_SENDER_ADDRESS, TokenType } from './config.js';
|
|
8
8
|
import { isCctpTokenConfig, isCollateralTokenConfig, isNativeTokenConfig, isSyntheticTokenConfig, isXERC20TokenConfig, } from './types.js';
|
|
9
9
|
export class HypERC20Checker extends ProxiedRouterChecker {
|
|
10
10
|
async checkChain(chain) {
|
|
@@ -76,7 +76,7 @@ export class HypERC20Checker extends ProxiedRouterChecker {
|
|
|
76
76
|
try {
|
|
77
77
|
await this.multiProvider.estimateGas(chain, {
|
|
78
78
|
to: hypToken.address,
|
|
79
|
-
from:
|
|
79
|
+
from: NON_ZERO_SENDER_ADDRESS,
|
|
80
80
|
value: BigNumber.from(1),
|
|
81
81
|
});
|
|
82
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checker.js","sourceRoot":"","sources":["../../src/token/checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAEL,cAAc,EAEd,uBAAuB,EAEvB,gBAAgB,EAChB,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAKzE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"checker.js","sourceRoot":"","sources":["../../src/token/checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EAEL,cAAc,EAEd,uBAAuB,EAEvB,gBAAgB,EAChB,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAKzE,OAAO,EAAE,uBAAuB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,EAGL,iBAAiB,EACjB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAEpB,MAAM,OAAO,eAAgB,SAAQ,oBAIpC;IACC,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,IAAI,cAAwB,CAAC;QAC7B,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,eAAe,EAAE,aAAa,EAAE,CAAC;YACnC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,GAAG,CAC7D,CAAC,iBAAiB,EAAE,EAAE,CACpB,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,iBAAiB,CAAC,CACrD,CAAC;QACJ,CAAC;QACD,cAAc,GAAG,cAAc;aAC5B,MAAM,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,KAAK,KAAK,CAAC;aAC1D,IAAI,EAAE,CAAC;QAEV,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAgB;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAE7C,6EAA6E;QAC7E,MAAM,2BAA2B,GAC/B,cAAc,CAAC,cAAc,EAAE,oBAAoB;YACnD,cAAc,CAAC,cAAc,EAAE,eAAe,CAAC;QAEjD,IACE,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC7C,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7C,2BAA2B,EAC3B,CAAC;YACD,IAAI,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEvD,sBAAsB;YAEtB,IAAI,cAAc,CAAC,IAAI,KAAK,SAAS,CAAC,aAAa,EAAE,CAAC;gBACpD,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,CAC7C,cAAc,CAAC,KAAK,EACpB,QAAQ,CACT,CAAC;gBACF,eAAe,GAAG,cAAc,CAAC,OAAO,CACtC,MAAM,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,EACtC,QAAQ,CACT,CAAC;gBACF,SAAS,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,OAAO,CACrD,eAAe,CAAC,OAAO,EACvB,QAAQ,CACT,CAAC;YACJ,CAAC;YAED,IAAI,cAAc,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC7C,SAAS,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,OAAO,CACrD,eAAe,CAAC,OAAO,EACvB,QAAQ,CACT,CAAC;YACJ,CAAC;YACD,IAAI,MAAM,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;gBAClE,SAAS,CAAC,sBAAsB,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAC7D,KAAK,EACL,QAAQ,CACT,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,UAAU,GAAG,KAAK,EACtB,KAAY,EACZ,MAA4B,EACb,EAAE;YACjB,MAAM,MAAM,GAGN;gBACJ,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,qBAAqB,EAAE;gBAC1D,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE;gBACtD,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,uBAAuB,EAAE;aAC/D,CAAC;YAEF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACtC,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;oBAClD,MAAM,SAAS,GAA2B;wBACxC,IAAI,EAAE,KAAK,CAAC,aAAa;wBACzB,KAAK;wBACL,QAAQ;wBACR,MAAM;wBACN,YAAY,EAAE,KAAK,CAAC,OAAO;qBAC5B,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/D,2DAA2D;QAC3D,IAAI,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,EAAE;oBAC1C,EAAE,EAAE,QAAQ,CAAC,OAAO;oBACpB,IAAI,EAAE,uBAAuB;oBAC7B,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;iBACzB,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,SAAS,GAA2B;oBACxC,IAAI,EAAE,4BAA4B;oBAClC,KAAK;oBACL,QAAQ,EAAE,MAAM;oBAChB,MAAM,EAAE,OAAO;oBACf,YAAY,EAAE,QAAQ,CAAC,OAAO;iBAC/B,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;aAAM,IAAI,sBAAsB,CAAC,cAAc,CAAC,EAAE,CAAC;YAClD,MAAM,UAAU,CAAC,QAA4B,EAAE,cAAc,CAAC,CAAC;QACjE,CAAC;aAAM,IACL,uBAAuB,CAAC,cAAc,CAAC;YACvC,mBAAmB,CAAC,cAAc,CAAC,EACnC,CAAC;YACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,MAClB,QACD,CAAC,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrD,MAAM,SAAS,GAA2B;oBACxC,IAAI,EAAE,yBAAyB;oBAC/B,KAAK;oBACL,QAAQ,EAAE,eAAe,CAAC,OAAO;oBACjC,MAAM,EAAE,WAAW;oBACnB,YAAY,EAAE,QAAQ,CAAC,OAAO;iBAC/B,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,iKAAiK;QACjK,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9D,IAAI,CAAC,uBAAuB,CAC1B,KAAK,EACL,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,IAAI,CACL,CAAC;QAEF,mDAAmD;QACnD,MAAM,cAAc,GAAG,MAAM,CAC3B,IAAI,CAAC,SAAS,EACd,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CACpC,CAAC;QACF,IAAI,CAAC,uBAAuB,CAC1B,KAAK,EACL,QAAQ,EACR,cAAc,EACd,QAAQ,EACR,KAAK,CACN,CAAC;IACJ,CAAC;IAEO,uBAAuB,GAC7B,SAAS,CAAC;IAEZ,KAAK,CAAC,oBAAoB;QACxB,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,uBAAuB,CAAC;QACtC,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAC5D,OAAO,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC,uBAAwB,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,KAAgB,EAChB,QAAqB;QAErB,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,QAAQ,GAAuB,SAAS,CAAC;QAE7C,IAAI,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;YACxC,QAAQ;gBACN,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC;QACrE,CAAC;aAAM,IAAI,sBAAsB,CAAC,cAAc,CAAC,EAAE,CAAC;YAClD,QAAQ,GAAG,MAAO,QAA6B,CAAC,QAAQ,EAAE,CAAC;QAC7D,CAAC;aAAM,IACL,uBAAuB,CAAC,cAAc,CAAC;YACvC,mBAAmB,CAAC,cAAc,CAAC,EACnC,CAAC;YACD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC7D,QAAQ,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAC9C,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAgB;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,eAAe,GAAsB,SAAS,CAAC;QAEnD,IACE,uBAAuB,CAAC,cAAc,CAAC;YACvC,iBAAiB,CAAC,cAAc,CAAC;YACjC,mBAAmB,CAAC,cAAc,CAAC,EACnC,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEvD,IAAI,cAAc,CAAC,IAAI,KAAK,SAAS,CAAC,aAAa,EAAE,CAAC;gBACpD,MAAM,sBAAsB,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAClE,cAAc,CAAC,KAAK,EACpB,QAAQ,CACT,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACrB,eAAe,GAAG,cAAc,CAAC,OAAO,CACtC,sBAAsB,EACtB,QAAQ,CACT,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,eAAe,GAAG,cAAc,CAAC,OAAO,CACtC,cAAc,CAAC,KAAK,EACpB,QAAQ,CACT,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,uBAAuB,CACrB,KAAgB,EAChB,QAAqB,EACrB,aAAoD,EACpD,WAAmB,EACnB,QAAiB;QAEjB,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC9D,CAAC;QACF,IACE,mBAAmB,CAAC,IAAI,GAAG,CAAC;YAC5B,CAAC,QAAQ,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,CAAC,EAC5C,CAAC;YACD,MAAM,SAAS,GAA2B;gBACxC,IAAI,EAAE,uBAAuB;gBAC7B,KAAK;gBACL,QAAQ,EAAE,GACR,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAChC,cAAc,WAAW,WAAW;gBACpC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;gBACrC,YAAY,EAAE,QAAQ,CAAC,OAAO;aAC/B,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF"}
|
package/dist/token/types.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ export declare const WarpRouteDeployConfigSchemaErrors: {
|
|
|
9
9
|
NO_SYNTHETIC_ONLY: string;
|
|
10
10
|
};
|
|
11
11
|
export declare const contractVersionMatchesDependency: (version: string) => boolean;
|
|
12
|
-
export declare const VERSION_ERROR_MESSAGE = "Contract version must match the @hyperlane-xyz/core dependency version (9.0.
|
|
12
|
+
export declare const VERSION_ERROR_MESSAGE = "Contract version must match the @hyperlane-xyz/core dependency version (9.0.3)";
|
|
13
13
|
export declare const TokenMetadataSchema: z.ZodObject<{
|
|
14
14
|
name: z.ZodString;
|
|
15
15
|
symbol: z.ZodString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xerc20.d.ts","sourceRoot":"","sources":["../../src/token/xerc20.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"xerc20.d.ts","sourceRoot":"","sources":["../../src/token/xerc20.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAC;AAM3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAqC3D,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,aAAa,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,sBAAsB,CAAC,EAC3C,aAAa,EACb,KAAK,EACL,aAAa,EACb,MAAmB,GACpB,EAAE,IAAI,CAAC,wBAAwB,EAAE,aAAa,GAAG,QAAQ,CAAC,GAAG,OAAO,CACnE,6BAA6B,EAAE,CAChC,CAwBA"}
|
package/dist/token/xerc20.js
CHANGED
|
@@ -2,7 +2,7 @@ import { getAbiItem, parseEventLogs, toEventSelector } from 'viem';
|
|
|
2
2
|
import { IXERC20Lockbox__factory } from '@hyperlane-xyz/core';
|
|
3
3
|
import { rootLogger } from '@hyperlane-xyz/utils';
|
|
4
4
|
import { getContractDeploymentTransaction, getLogsFromEtherscanLikeExplorerAPI, } from '../block-explorer/etherscan.js';
|
|
5
|
-
import {
|
|
5
|
+
import { viemLogFromGetEventLogsResponse } from '../rpc/evm/utils.js';
|
|
6
6
|
const minimalXERC20VSABI = [
|
|
7
7
|
{
|
|
8
8
|
anonymous: false,
|
|
@@ -34,32 +34,8 @@ const CONFIGURATION_CHANGED_EVENT_SELECTOR = toEventSelector(getAbiItem({
|
|
|
34
34
|
abi: minimalXERC20VSABI,
|
|
35
35
|
name: 'ConfigurationChanged',
|
|
36
36
|
}));
|
|
37
|
-
function isEvmBlockExplorerAndNotEtherscan(blockExplorer) {
|
|
38
|
-
if (!blockExplorer.family) {
|
|
39
|
-
return false;
|
|
40
|
-
}
|
|
41
|
-
const byFamily = {
|
|
42
|
-
[ExplorerFamily.Blockscout]: true,
|
|
43
|
-
[ExplorerFamily.Etherscan]: false,
|
|
44
|
-
[ExplorerFamily.Other]: false,
|
|
45
|
-
[ExplorerFamily.Routescan]: true,
|
|
46
|
-
[ExplorerFamily.Voyager]: false,
|
|
47
|
-
[ExplorerFamily.ZkSync]: true,
|
|
48
|
-
};
|
|
49
|
-
return byFamily[blockExplorer.family] ?? false;
|
|
50
|
-
}
|
|
51
37
|
export async function getExtraLockBoxConfigs({ xERC20Address, chain, multiProvider, logger = rootLogger, }) {
|
|
52
|
-
const
|
|
53
|
-
const chainMetadata = multiProvider.getChainMetadata(chain);
|
|
54
|
-
const [fallBackExplorer] = chainMetadata.blockExplorers?.filter((blockExplorer) => isEvmBlockExplorerAndNotEtherscan(blockExplorer)) ?? [];
|
|
55
|
-
// Fallback to use other block explorers if the default block explorer is etherscan and an API key is not
|
|
56
|
-
// configured
|
|
57
|
-
const isExplorerConfiguredCorrectly = defaultExplorer.family === ExplorerFamily.Etherscan
|
|
58
|
-
? !!defaultExplorer.apiKey
|
|
59
|
-
: true;
|
|
60
|
-
const canUseExplorerApi = defaultExplorer.family !== ExplorerFamily.Other &&
|
|
61
|
-
isExplorerConfiguredCorrectly;
|
|
62
|
-
const explorer = canUseExplorerApi ? defaultExplorer : fallBackExplorer;
|
|
38
|
+
const explorer = multiProvider.tryGetEvmExplorerMetadata(chain);
|
|
63
39
|
if (!explorer) {
|
|
64
40
|
logger.warn(`No block explorer was configured correctly, skipping lockbox derivation on chain ${chain}`);
|
|
65
41
|
return [];
|
|
@@ -71,15 +47,7 @@ export async function getExtraLockBoxConfigs({ xERC20Address, chain, multiProvid
|
|
|
71
47
|
explorerUrl: explorer.apiUrl,
|
|
72
48
|
apiKey: explorer.apiKey,
|
|
73
49
|
});
|
|
74
|
-
const viemLogs = logs.map(
|
|
75
|
-
address: log.address,
|
|
76
|
-
data: log.data,
|
|
77
|
-
blockNumber: BigInt(log.blockNumber),
|
|
78
|
-
transactionHash: log.transactionHash,
|
|
79
|
-
logIndex: Number(log.logIndex),
|
|
80
|
-
transactionIndex: Number(log.transactionIndex),
|
|
81
|
-
topics: log.topics,
|
|
82
|
-
}));
|
|
50
|
+
const viemLogs = logs.map(viemLogFromGetEventLogsResponse);
|
|
83
51
|
return getLockboxesFromLogs(viemLogs, multiProvider.getProvider(chain), chain, logger);
|
|
84
52
|
}
|
|
85
53
|
async function getConfigurationChangedLogsFromExplorerApi({ xERC20Address, chain, multiProvider, explorerUrl, apiKey, }) {
|
package/dist/token/xerc20.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xerc20.js","sourceRoot":"","sources":["../../src/token/xerc20.ts"],"names":[],"mappings":"AAEA,OAAO,EAAO,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAW,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,
|
|
1
|
+
{"version":3,"file":"xerc20.js","sourceRoot":"","sources":["../../src/token/xerc20.ts"],"names":[],"mappings":"AAEA,OAAO,EAAO,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAW,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EACL,gCAAgC,EAChC,mCAAmC,GACpC,MAAM,gCAAgC,CAAC;AAGxC,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAKtE,MAAM,kBAAkB,GAAG;IACzB;QACE,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACN;gBACE,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,OAAO;KACd;CACO,CAAC;AAEX,MAAM,oCAAoC,GAAG,eAAe,CAC1D,UAAU,CAAC;IACT,GAAG,EAAE,kBAAkB;IACvB,IAAI,EAAE,sBAAsB;CAC7B,CAAC,CACH,CAAC;AAWF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,aAAa,EACb,KAAK,EACL,aAAa,EACb,MAAM,GAAG,UAAU,GACsC;IAGzD,MAAM,QAAQ,GAAG,aAAa,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;IAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CACT,oFAAoF,KAAK,EAAE,CAC5F,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,0CAA0C,CAAC;QAC5D,KAAK;QACL,aAAa;QACb,aAAa;QACb,WAAW,EAAE,QAAQ,CAAC,MAAM;QAC5B,MAAM,EAAE,QAAQ,CAAC,MAAM;KACxB,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAC3D,OAAO,oBAAoB,CACzB,QAAQ,EACR,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAChC,KAAK,EACL,MAAM,CACP,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,0CAA0C,CAAC,EACxD,aAAa,EACb,KAAK,EACL,aAAa,EACb,WAAW,EACX,MAAM,GACmB;IACzB,MAAM,oBAAoB,GAAG,MAAM,gCAAgC,CACjE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAC/B,EAAE,eAAe,EAAE,aAAa,EAAE,CACnC,CAAC;IAEF,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3E,QAAQ,CAAC,cAAc,EAAE;QACzB,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,MAAM,CAAC;KAC5D,CAAC,CAAC;IAEH,OAAO,mCAAmC,CACxC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAC/B;QACE,OAAO,EAAE,aAAa;QACtB,SAAS,EAAE,4BAA4B,CAAC,WAAW;QACnD,OAAO,EAAE,kBAAkB;QAC3B,MAAM,EAAE,oCAAoC;KAC7C,CACF,CAAC;AACJ,CAAC;AAYD,KAAK,UAAU,oBAAoB,CACjC,IAAW,EACX,QAAmC,EACnC,KAAoB,EACpB,MAAc;IAEd,MAAM,UAAU,GAAG,cAAc,CAAC;QAChC,GAAG,EAAE,kBAAkB;QACvB,SAAS,EAAE,sBAAsB;QACjC,IAAI;KACL,CAAC,CAAC;IAEH,sEAAsE;IACtE,sEAAsE;IACtE,eAAe;IACf,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACX,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,MAAM,wBAAwB,GAC5B,GAAG,CAAC,WAAW,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;QAE5D,IAAI,wBAAwB,EAAE,CAAC;YAC7B,GAAG,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC;QAC3B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA6C,CAC9C,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;QACnD,+FAA+F;SAC9F,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,kBAAkB,KAAK,EAAE,CACzE;SACA,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACjB,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,OAAO,CACxD,GAAG,CAAC,IAAI,CAAC,MAAM,EACf,QAAQ,CACT,CAAC;YAEF,MAAM,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAC7C,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,CAAC,KAAK,CACV,uBAAuB,GAAG,CAAC,IAAI,CAAC,MAAM,aAAa,KAAK,mCAAmC,CAC5F,CAAC;YACF,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACrD,OAAO,SAAS;SACb,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC;SAClC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAA8B,CAAC;SAC5C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;QACxB,MAAM,EAAE;YACN,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YACxC,kBAAkB,EAAE,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;SAC3D;KACF,CAAC,CAAC,CAAC;AACR,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hyperlane-xyz/sdk",
|
|
3
3
|
"description": "The official SDK for the Hyperlane Network",
|
|
4
|
-
"version": "16.
|
|
4
|
+
"version": "16.1.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@arbitrum/sdk": "^4.0.0",
|
|
7
7
|
"@aws-sdk/client-s3": "^3.577.0",
|
|
8
8
|
"@chain-registry/types": "^0.50.122",
|
|
9
9
|
"@cosmjs/cosmwasm-stargate": "^0.32.4",
|
|
10
10
|
"@cosmjs/stargate": "^0.32.4",
|
|
11
|
-
"@hyperlane-xyz/core": "9.0.
|
|
12
|
-
"@hyperlane-xyz/cosmos-sdk": "16.
|
|
13
|
-
"@hyperlane-xyz/starknet-core": "16.
|
|
14
|
-
"@hyperlane-xyz/utils": "16.
|
|
11
|
+
"@hyperlane-xyz/core": "9.0.3",
|
|
12
|
+
"@hyperlane-xyz/cosmos-sdk": "16.1.0",
|
|
13
|
+
"@hyperlane-xyz/starknet-core": "16.1.0",
|
|
14
|
+
"@hyperlane-xyz/utils": "16.1.0",
|
|
15
15
|
"@safe-global/api-kit": "1.3.0",
|
|
16
16
|
"@safe-global/protocol-kit": "1.3.0",
|
|
17
17
|
"@safe-global/safe-core-sdk-types": "2.3.0",
|