From 8e422dc1c00fad5b3461081bd8857fd5c2b95b01 Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 11:22:44 -0500 Subject: [PATCH 1/7] fix: remove redundant check from BaseDTL --- script/salts/salts.json | 48 +++++++++---------- script/salts/test/TestSalts.s.sol | 6 +-- src/callbacks/liquidity/BaseDTL.sol | 29 ++--------- .../UniswapV2DTL/UniswapV2DTLTest.sol | 2 +- 4 files changed, 32 insertions(+), 53 deletions(-) diff --git a/script/salts/salts.json b/script/salts/salts.json index 209394b4..6738470c 100644 --- a/script/salts/salts.json +++ b/script/salts/salts.json @@ -38,38 +38,38 @@ "0xed4ba02077e70f78db70ce191509333d2dcccfff136d30dcb011f567305e88ad": "0x2b8bc588174d409692f1bd993942e3806c9a11344dbe674f46aed32a030aacf1" }, "Test_AllocatedMerkleAllowlist": { - "0x1242d528fb3d9259e7192f83e1faf95370bfd8d7f2b1bae5d3ea350d3d9c563c": "0xb80697991eaa9d0a7bb1cb476ffcd740328b1cd4053a31a235c332ab518e2cef", - "0x7cca57da19a5847b2b87641c1b721a32d4778e3e58641d6771cd14ed112b3bc3": "0x7bdee14ccb49ce7eeb49e85f2fbd05aa0ef2533a16f23a874a705d60ae6d8ca2" + "0x45f122f7acac9ed91811650b3c82832717d513261edf3b7d0cc58ed3a05758d3": "0x887c6e9f1dff86a76039b07e38f5f0e22f8058b820f6522625668a433e341f45", + "0x7c9807f1115c3fa2796e18082a2391a1f0805230b4ff8ced38a0c61f3c22dbed": "0xf711d69db3d5630fc695f46e7c9c3cdeb9876d0b0a41000161a6163186f08d0d" }, "Test_CappedMerkleAllowlist": { - "0x240bdd876f7c0070009c234b8cde981c3865d49db15097f59cd4ffb15d818d1e": "0x1daf174abe93432b9d9477ee696e91595165db910369a788959277b2015a1649", - "0xb8a17b3ee693ebdcfc6913bb2f65d0fadbe8812d9ef4d927595a7dc75db68727": "0x896bbad5f52d535d137900a5bc67f8d1ac05b77535e1d0f063b792c8a3d43950" + "0xd58198d6386bc22dedd66edac04700ff631f3e4954a81c9c0277c926faa1b781": "0x0ff9135df6a7769f7b22612987f1b26fe7e1a4a3f30dbec6d89009e49611c288", + "0xee9c9d52ceec0f82ecd70c8a9860529f9eba002c5e2a19fdb4983647a2b45417": "0x442ab55b95bed405a03b050eb62c2e9f6c3276f9eef1d0b9a8dca09e88ba9981" }, "Test_MockCallback": { - "0x0825d99059fe0dc95e0b5cd7b853a5f3f50b58f25c5812fc7fd01d69ff4ec679": "0x1651f1c538aa5bd285c6adc8b93f7e67da8aa1a29d80e8c698744d21d45fc884", - "0x51526251ca3003df174c65f2fb581f61820ce57c14720e0d67480ed8c8b77925": "0xdd9130d0b972415e918b25614f6b4840f520ea47319adf3732b1fc56114c179f", - "0x6206c9845f35f3006fc507c15aaaf4a719380265cf472773a270ffe6d5eb5299": "0x93a8b2f8f82b55a0c37080a98664a8edaf85e547276d6b0c033e60a0d2bdef8f", - "0x6b7fa77ae82f95cc8c5fe53dca64702ea0dc8e3dad74749dc8cd77de2884e704": "0x76c418f9988972d5bb9bc4eeb4f08b2048673bcf7ae70fc53a02716dc960bd26", - "0x7310243dabd76344326f3659aabda0b846a9c8e9e7d50b990261c14f2b44d560": "0xb1bbcaa44b2450a9ee47a2fbdc33924300b34298fec9464aa4fad74c034de162", - "0x7602309c05771de8281f2f3f08e74ec9f19f1bfdaac8cd970d9f7a8d62173b6e": "0xbc83fe471ad18cff2adc4682afe916acac385fc9ef07a4ba91818de6ec1efece", - "0x892e1120a976151ae5375dca978040abe705c8cbdd3c7b64b41ff1087ee01c22": "0x0bfb9e85c536a3893badf90474a897babc0a354424eac59a399b9a1afbd80658", - "0x8a69dcb863773a3bb971a969233286e75cba80abf6ec8d881cada7ea0ad674b0": "0x24a009aa7da7d2a4ac05d36d48877deab4871b39e550be29219fc918c836c5f0", - "0x8d8681a539f3b359e94a05239187dc55cb9cb2dcfe01726d3053573206efe25f": "0x2bc525d742b50318b05508248d64cd1f921e12ce2c92e0bc6540a3b6a9bfa167", - "0x918d87a20c837fa93ce3089d2cb6386b66f79bbfd0f09bd6784bc52108b69938": "0xb28d63640bf4daec90083b7bd2bad4f3b2a022d0dc05112bcabf76912ab971ee", - "0x9569f58e5e127ceb73049eea8119bb21f8c4328d3b4770da5a67075be3f77c12": "0x21e165a2cfa59019517b2ccbfab94e5ad99bcba41683678c8a52b97018294372", - "0x96f0481f00eeec717fa8c0d41efd04b6e3fdccbebbaa223ee2118449ebea2406": "0x33f0b692b2d93a6c56c4c2c64f478238f9eace7ba2afe99c435feb14c7f1d969", - "0x9c35a3189126603f4b187149f54e09082403dac10b3e899a503e28e897edd6f9": "0x2f34589c949eb68f1bcb6a3184bea2943628eb53950d8fbf450bb26722777c26", - "0x9db4bc605469ede684fbaa475d320b3fbe6a707deaa953ee1ba29ecb3c1125fb": "0xd6e401f9d95933c00188f4be27a59c98469d0aaaafb7af16cfb4bbda70d900ed", - "0xb8e0b3cbd7273e83cfdbcb8269e5c3510a28892e815fe28bc0f515be0df2c8f9": "0x2a04e81f425ae24b794f9c4d418613717dce0ba4efff430542c513c047bc163f", - "0xc38bb4813ebdb9978d2485ae5ad92e1152f8a955430a63210b69b2277eed9477": "0x3f17a3630401129b9f926580be166ff3283062d85c2990ac4a81091b384d1dee", - "0xd75e639b43b1d29e1703abcd2616b6b67f3ae232d53915d472f3a5b6aae6083c": "0x9ff548e0d2a851a0c9660a4ddfe2e755a6eb3959f05c7947463c01e484d5a4b2", - "0xf2644573f57aea10dffac6e7215b409fa19236ae57b735b20b9fac9834391850": "0x0ec60e71b213d8edda9d1abd30b37229e08f48ab0b3f4593b8d06a2a1cab08ef" + "0x0292f11feedba71470bec5d64e63ce3fc8264fdf8afbc612ff30f05c378715d9": "0x0d73ec9643790eb44bb0ff731d8e3849a6a701104d3b776dece4afcc8a48e960", + "0x1de2a5597856d096b736ce7dc2d319b0a5b7a684c13389fdf6e457c9c90214fb": "0xb7fbf1e8c27107e66c4448db09638de3f61ed3cfac8c0f57b959bfdc5bf25d5e", + "0x50c11fc2cd89485e70f8efa6fde9be37a6d38321a60a68c54d5120223bace7a9": "0xb2d6620fc01e928a56503a7a53298269db6640de48e79233ed1a5715efd96294", + "0x5b95347fbbc3f07ab9d5479ac37a1b90c6faab9447597cdc7658c5d0dfa9f282": "0xb2f95f0e482a7373157445ce8993e3376b3e9b086fa03af0e9bccd5e714b1aa8", + "0x6e2aabb3152820d75be49c9015c214ff9cb446c24236c582fe609776624f7e02": "0x513f4b22288205df1c9d5d98ec57e9b2f7ad490b364bc673736352e65743a845", + "0x7031cc1db083ab38787974aecb4110c3d9b90be0f4f6100c2d3fd71882efa006": "0x9dca5c0db64242c127b00525aaad3019cbbb81f016f9f1e41f98ab1dab7bb508", + "0x71586e15027e9300f69cd748c3978b2895cc60c75e1da758965522b3ba4094a5": "0xb6a88fe19302055960d2df5ad5def0e7039896c8a66fe07287769bf8280cacf2", + "0x75c5ccb3a9d652c0ee9f3ff80450c3642fb4051365877ed001dd40f11459642e": "0xd7c0ad8c19b55c31aaf5f51dec7382ac7643f7e67b89f88ef69cb0481a808cd0", + "0x84cf8d6389a683a3491be6f92bc24c0eab804373610d5831a88a1b4dba04a8f2": "0xe4801b39160d3d2df7afa251499ba3d5106f9cab0c980597ae69513d00b86e60", + "0x906d15feb6bc4ec71cdc7a1591950e1c9f4e85437e1a1a75552360908d5c0be4": "0xe4b13d8fa77cca1237d6e39fc3c7ca3bd62cec749fc1a948343a46f493892edd", + "0x980e581f6d53c2836e0811bf60907af8fc262e6ed24c22068a755a40ff4939ac": "0x337af06ba78d79f46f30932af57a326a475c0ac450aaff389c00d3c85989f833", + "0xa289110cf10f63814b2f56f2504faacf3d9fc25b9422987377c4ceccc422594a": "0xbb81d3bba620126850c3b0b0a286fb74a77c5b788bcc84fed2d59b8cb195ffcf", + "0xae701a6e57cfc23ac94b95e11c6af02bc6fcebf44517e77fd0fb7ad68d76ef5d": "0xcd12229a288ada981ac764da237bacf01b38d5d7465ba7f77f911b52761de88a", + "0xb2819ef15777e6d234863480af5c99c30116346b6ffdbddfcc8317313ea5d58d": "0x693ad1ae8dd60108634199f654b7c5d185246850b10d0f8889651bb3aa629e0a", + "0xb566f44afa573034186bee699bcc6f7f2d40982d1dd31bb27335f20f35a87041": "0x57c981873651bd1445886867135aa17e2172bbb359de8c29076017f85d60ad12", + "0xbd4ceec59115b5cdd4b37c9485ab1c4ce4626ed59e5cb169cf5869cbf8ce8319": "0xb31b4afde22dc36be14b760d1ce1958638d6e442bd94eb7610cd5411eaee96f1", + "0xd1c5e9171a5aaddc37bd1443137989748b01a500abc2834bd60920c0a0ae50bb": "0x7e16545b4ee6924b527d0c653cb1be9d571a5ae7a85034fedbcca6477d88688e", + "0xe10dcccb933d6f19d1932c609db896016864d0897dd2be8944c60ebd4522d41d": "0x07517f5e0fd293382b4f125e09aa721c0d7ef7b272433725e0deb35fef8f7433" }, "Test_UniswapV2DirectToLiquidity": { - "0x8aa87d37877643656e4c99ac5894ef1db7d58a30e3d0f576d3900163491b50de": "0x93ba4418a111f3fd9d30718f1d1adacf772b3c4515dac235676320b9b5753652" + "0x3affd19c52d53040bb6c82e4607acc23f6bb2e3e3c97bd29743e6d5f4e2f6eaf": "0xc078efab9e3ce0d7076ea278f34bcdefdaa8f15d740efcc43d89bc3f6aef6b26" }, "Test_UniswapV3DirectToLiquidity": { - "0x205b2d8780f5fa0bb6edef93607aa4f671b524b5d2b2f3278d238d08dfdf900c": "0x52c359e9c03d7e4b2af98f5b70fc386406184608f7f882d2789be69a2743d09a" + "0xc7bca1ff82e19c4da11db2cd7ac5aff9f7dae29d5694d2542477e07b0aa26738": "0xed03bd8eb8078f6de3b10b1b548db37b4bb69ae268a44c3078ac7083394f7766" }, "TokenAllowlist": { "0x09db47d395a68db033a3b222b9d1a212cec8422b03aeafc313aa4d2813c6dd60": "0xe07a005213f35e1f050a4da040d6bc3cae2ad333647b51a6ffa2e7941980043a", diff --git a/script/salts/test/TestSalts.s.sol b/script/salts/test/TestSalts.s.sol index bfcaa134..8670a704 100644 --- a/script/salts/test/TestSalts.s.sol +++ b/script/salts/test/TestSalts.s.sol @@ -21,10 +21,10 @@ contract TestSalts is Script, WithEnvironment, Permit2User, WithSalts { address internal constant _UNISWAP_V2_FACTORY = address(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); address internal constant _UNISWAP_V2_ROUTER = - address(0x584A2a1F5eCdCDcB6c0616cd280a7Db89239872B); + address(0x48a34D8572aC949eFDa3f70263499DdE1F160A26); address internal constant _UNISWAP_V3_FACTORY = - address(0x43de928116768b88F8BF8f768b3de90A0Aaf9551); - address internal constant _GUNI_FACTORY = address(0xc46b184e5521Cb87Fc5288Ff49D978A4BE4B055c); + address(0x42c8cc563856b148EBcD98cc26BdC2ebD7C4F8C8); + address internal constant _GUNI_FACTORY = address(0x804962b4bB9981E4bE47BEE57Fbfe5E603C48F7a); string internal constant _MOCK_CALLBACK = "MockCallback"; string internal constant _CAPPED_MERKLE_ALLOWLIST = "CappedMerkleAllowlist"; diff --git a/src/callbacks/liquidity/BaseDTL.sol b/src/callbacks/liquidity/BaseDTL.sol index ecd0b4a3..bbdf769b 100644 --- a/src/callbacks/liquidity/BaseDTL.sol +++ b/src/callbacks/liquidity/BaseDTL.sol @@ -128,7 +128,7 @@ abstract contract BaseDirectToLiquidity is BaseCallback { uint256 capacity_, bool prefund_, bytes calldata callbackData_ - ) internal virtual override onlyIfLotDoesNotExist(lotId_) { + ) internal virtual override { // Decode callback data into the params OnCreateParams memory params = abi.decode(callbackData_, (OnCreateParams)); @@ -218,12 +218,7 @@ abstract contract BaseDirectToLiquidity is BaseCallback { /// - The lot is not registered /// /// @param lotId_ The lot ID - function _onCancel( - uint96 lotId_, - uint256, - bool, - bytes calldata - ) internal override onlyIfLotExists(lotId_) { + function _onCancel(uint96 lotId_, uint256, bool, bytes calldata) internal override { // Mark the lot as inactive to prevent further actions DTLConfiguration storage config = lotConfiguration[lotId_]; config.active = false; @@ -243,7 +238,7 @@ abstract contract BaseDirectToLiquidity is BaseCallback { uint256 curatorPayout_, bool, bytes calldata - ) internal override onlyIfLotExists(lotId_) { + ) internal override { // Update the funding DTLConfiguration storage config = lotConfiguration[lotId_]; config.lotCuratorPayout = curatorPayout_; @@ -294,7 +289,7 @@ abstract contract BaseDirectToLiquidity is BaseCallback { uint256 proceeds_, uint256 refund_, bytes calldata callbackData_ - ) internal virtual override onlyIfLotExists(lotId_) { + ) internal virtual override { DTLConfiguration memory config = lotConfiguration[lotId_]; address seller; address baseToken; @@ -408,22 +403,6 @@ abstract contract BaseDirectToLiquidity is BaseCallback { bytes memory callbackData_ ) internal virtual returns (ERC20 poolToken); - // ========== MODIFIERS ========== // - - modifier onlyIfLotDoesNotExist(uint96 lotId_) { - if (lotConfiguration[lotId_].recipient != address(0)) { - revert Callback_InvalidParams(); - } - _; - } - - modifier onlyIfLotExists(uint96 lotId_) { - if (!lotConfiguration[lotId_].active) { - revert Callback_InvalidParams(); - } - _; - } - // ========== INTERNAL FUNCTIONS ========== // function _getAmountWithSlippage( diff --git a/test/callbacks/UniswapV2DTL/UniswapV2DTLTest.sol b/test/callbacks/UniswapV2DTL/UniswapV2DTLTest.sol index 49237698..3a62bc54 100644 --- a/test/callbacks/UniswapV2DTL/UniswapV2DTLTest.sol +++ b/test/callbacks/UniswapV2DTL/UniswapV2DTLTest.sol @@ -88,7 +88,7 @@ abstract contract UniswapV2DirectToLiquidityTest is Test, Permit2User, WithSalts _uniV2Router = new UniswapV2Router02{ salt: bytes32(0x035ba535d735a8e92093764ec05c30d49ab56cfd0d3da306185ab02b1fcac4f4) }(address(_uniV2Factory), address(0)); - console2.log("UniswapV2Router address: {}", address(_uniV2Router)); // 0x584A2a1F5eCdCDcB6c0616cd280a7Db89239872B + console2.log("UniswapV2Router address: {}", address(_uniV2Router)); // 0x48a34D8572aC949eFDa3f70263499DdE1F160A26 _linearVesting = new LinearVesting(address(_auctionHouse)); _batchAuctionModule = new MockBatchAuctionModule(address(_auctionHouse)); From 43002286cbf1312852e03266314e639267ac3b2c Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 11:29:59 -0500 Subject: [PATCH 2/7] fix: change OnClaimProceedsParams to OnSettleParams in DTL callbacks --- script/salts/salts.json | 4 ++-- src/callbacks/liquidity/UniswapV2DTL.sol | 4 ++-- src/callbacks/liquidity/UniswapV3DTL.sol | 6 +++--- test/callbacks/UniswapV2DTL/onSettle.t.sol | 4 +--- test/callbacks/UniswapV3DTL/onSettle.t.sol | 4 +--- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/script/salts/salts.json b/script/salts/salts.json index 6738470c..66bb460a 100644 --- a/script/salts/salts.json +++ b/script/salts/salts.json @@ -66,10 +66,10 @@ "0xe10dcccb933d6f19d1932c609db896016864d0897dd2be8944c60ebd4522d41d": "0x07517f5e0fd293382b4f125e09aa721c0d7ef7b272433725e0deb35fef8f7433" }, "Test_UniswapV2DirectToLiquidity": { - "0x3affd19c52d53040bb6c82e4607acc23f6bb2e3e3c97bd29743e6d5f4e2f6eaf": "0xc078efab9e3ce0d7076ea278f34bcdefdaa8f15d740efcc43d89bc3f6aef6b26" + "0x626618624e7cb5a948cf123863a73497af9a9b8be1b913741cc300ca40132946": "0xd4a3091ca52ef1cdaad42a68e93ccb9e278d6513384782d02bd53a88e42a847f" }, "Test_UniswapV3DirectToLiquidity": { - "0xc7bca1ff82e19c4da11db2cd7ac5aff9f7dae29d5694d2542477e07b0aa26738": "0xed03bd8eb8078f6de3b10b1b548db37b4bb69ae268a44c3078ac7083394f7766" + "0xc798f2c774e10893d5bcd73d7f25ae5fb55087f5f2705410f41a79eaab83e1c4": "0x39bf30ee1510752a100f998e6fa1edd1c098e965e803a7444677d73f860a8a79" }, "TokenAllowlist": { "0x09db47d395a68db033a3b222b9d1a212cec8422b03aeafc313aa4d2813c6dd60": "0xe07a005213f35e1f050a4da040d6bc3cae2ad333647b51a6ffa2e7941980043a", diff --git a/src/callbacks/liquidity/UniswapV2DTL.sol b/src/callbacks/liquidity/UniswapV2DTL.sol index 2d3f2ef7..8c603636 100644 --- a/src/callbacks/liquidity/UniswapV2DTL.sol +++ b/src/callbacks/liquidity/UniswapV2DTL.sol @@ -30,7 +30,7 @@ contract UniswapV2DirectToLiquidity is BaseDirectToLiquidity { /// @dev This will be encoded in the `callbackData_` parameter /// /// @param maxSlippage The maximum slippage allowed when adding liquidity (in terms of `MAX_PERCENT`) - struct OnClaimProceedsParams { + struct OnSettleParams { uint24 maxSlippage; } @@ -98,7 +98,7 @@ contract UniswapV2DirectToLiquidity is BaseDirectToLiquidity { bytes memory callbackData_ ) internal virtual override returns (ERC20 poolToken) { // Decode the callback data - OnClaimProceedsParams memory params = abi.decode(callbackData_, (OnClaimProceedsParams)); + OnSettleParams memory params = abi.decode(callbackData_, (OnSettleParams)); // Create and initialize the pool if necessary // Token orientation is irrelevant diff --git a/src/callbacks/liquidity/UniswapV3DTL.sol b/src/callbacks/liquidity/UniswapV3DTL.sol index 3f3cccf9..0b1d414a 100644 --- a/src/callbacks/liquidity/UniswapV3DTL.sol +++ b/src/callbacks/liquidity/UniswapV3DTL.sol @@ -40,11 +40,11 @@ contract UniswapV3DirectToLiquidity is BaseDirectToLiquidity { // ========== STRUCTS ========== // - /// @notice Parameters for the onClaimProceeds callback + /// @notice Parameters for the onSettle callback /// @dev This will be encoded in the `callbackData_` parameter /// /// @param maxSlippage The maximum slippage allowed when adding liquidity (in terms of `MAX_PERCENT`) - struct OnClaimProceedsParams { + struct OnSettleParams { uint24 maxSlippage; } @@ -129,7 +129,7 @@ contract UniswapV3DirectToLiquidity is BaseDirectToLiquidity { bytes memory callbackData_ ) internal virtual override returns (ERC20 poolToken) { // Decode the callback data - OnClaimProceedsParams memory params = abi.decode(callbackData_, (OnClaimProceedsParams)); + OnSettleParams memory params = abi.decode(callbackData_, (OnSettleParams)); // Extract the pool fee from the implParams (uint24 poolFee) = abi.decode(lotConfiguration[lotId_].implParams, (uint24)); diff --git a/test/callbacks/UniswapV2DTL/onSettle.t.sol b/test/callbacks/UniswapV2DTL/onSettle.t.sol index 88548566..bdb0d32d 100644 --- a/test/callbacks/UniswapV2DTL/onSettle.t.sol +++ b/test/callbacks/UniswapV2DTL/onSettle.t.sol @@ -150,9 +150,7 @@ contract UniswapV2DirectToLiquidityOnSettleTest is UniswapV2DirectToLiquidityTes lotId_, _proceeds, _refund, - abi.encode( - UniswapV2DirectToLiquidity.OnClaimProceedsParams({maxSlippage: _maxSlippage}) - ) + abi.encode(UniswapV2DirectToLiquidity.OnSettleParams({maxSlippage: _maxSlippage})) ); } diff --git a/test/callbacks/UniswapV3DTL/onSettle.t.sol b/test/callbacks/UniswapV3DTL/onSettle.t.sol index 58e8b4c6..074c9936 100644 --- a/test/callbacks/UniswapV3DTL/onSettle.t.sol +++ b/test/callbacks/UniswapV3DTL/onSettle.t.sol @@ -165,9 +165,7 @@ contract UniswapV3DirectToLiquidityOnSettleTest is UniswapV3DirectToLiquidityTes lotId_, _proceeds, _refund, - abi.encode( - UniswapV3DirectToLiquidity.OnClaimProceedsParams({maxSlippage: _maxSlippage}) - ) + abi.encode(UniswapV3DirectToLiquidity.OnSettleParams({maxSlippage: _maxSlippage})) ); } From 34543940931732c3d4221a6308f1b11253bd4915 Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 11:30:11 -0500 Subject: [PATCH 3/7] chore: fix testnet deploy versioning --- ...llowlists-v3.1.json => .arbitrum-sepolia-allowlists-v0.3.json} | 0 ...trum-sepolia-dtl-v3.1.json => .arbitrum-sepolia-dtl-v0.3.json} | 0 ...trum-sepolia-fpb-v3.1.json => .arbitrum-sepolia-fpb-v0.3.json} | 0 .../{.arbitrum-sepolia-v2.json => .arbitrum-sepolia-v0.1.json} | 0 .../{.arbitrum-sepolia-v3.json => .arbitrum-sepolia-v0.2.json} | 0 .../{.arbitrum-sepolia-v3.1.json => .arbitrum-sepolia-v0.3.json} | 0 ...ia-allowlists-v3.1.json => .base-sepolia-allowlists-v0.3.json} | 0 .../{.base-sepolia-dtl-v3.1.json => .base-sepolia-dtl-v0.3.json} | 0 deployments/{.base-sepolia-v3.1.json => .base-sepolia-v0.3.json} | 0 ...a-allowlists-v3.1.json => .blast-sepolia-allowlists-v0.3.json} | 0 ...{.blast-sepolia-dtl-v3.1.json => .blast-sepolia-dtl-v0.3.json} | 0 ...{.blast-sepolia-fpb-v3.1.json => .blast-sepolia-fpb-v0.3.json} | 0 deployments/{.blast-sepolia-v2.json => .blast-sepolia-v0.1.json} | 0 deployments/{.blast-sepolia-v3.json => .blast-sepolia-v0.2.json} | 0 .../{.blast-sepolia-v3.1.json => .blast-sepolia-v0.3.json} | 0 ...ia-allowlists-v3.1.json => .mode-sepolia-allowlists-v0.3.json} | 0 .../{.mode-sepolia-dtl-v3.1.json => .mode-sepolia-dtl-v0.3.json} | 0 .../{.mode-sepolia-fpb-v3.1.json => .mode-sepolia-fpb-v0.3.json} | 0 deployments/{.mode-sepolia-v2.json => .mode-sepolia-v0.1.json} | 0 deployments/{.mode-sepolia-v3.json => .mode-sepolia-v0.2.json} | 0 deployments/{.mode-sepolia-v3.1.json => .mode-sepolia-v0.3.json} | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename deployments/{.arbitrum-sepolia-allowlists-v3.1.json => .arbitrum-sepolia-allowlists-v0.3.json} (100%) rename deployments/{.arbitrum-sepolia-dtl-v3.1.json => .arbitrum-sepolia-dtl-v0.3.json} (100%) rename deployments/{.arbitrum-sepolia-fpb-v3.1.json => .arbitrum-sepolia-fpb-v0.3.json} (100%) rename deployments/{.arbitrum-sepolia-v2.json => .arbitrum-sepolia-v0.1.json} (100%) rename deployments/{.arbitrum-sepolia-v3.json => .arbitrum-sepolia-v0.2.json} (100%) rename deployments/{.arbitrum-sepolia-v3.1.json => .arbitrum-sepolia-v0.3.json} (100%) rename deployments/{.base-sepolia-allowlists-v3.1.json => .base-sepolia-allowlists-v0.3.json} (100%) rename deployments/{.base-sepolia-dtl-v3.1.json => .base-sepolia-dtl-v0.3.json} (100%) rename deployments/{.base-sepolia-v3.1.json => .base-sepolia-v0.3.json} (100%) rename deployments/{.blast-sepolia-allowlists-v3.1.json => .blast-sepolia-allowlists-v0.3.json} (100%) rename deployments/{.blast-sepolia-dtl-v3.1.json => .blast-sepolia-dtl-v0.3.json} (100%) rename deployments/{.blast-sepolia-fpb-v3.1.json => .blast-sepolia-fpb-v0.3.json} (100%) rename deployments/{.blast-sepolia-v2.json => .blast-sepolia-v0.1.json} (100%) rename deployments/{.blast-sepolia-v3.json => .blast-sepolia-v0.2.json} (100%) rename deployments/{.blast-sepolia-v3.1.json => .blast-sepolia-v0.3.json} (100%) rename deployments/{.mode-sepolia-allowlists-v3.1.json => .mode-sepolia-allowlists-v0.3.json} (100%) rename deployments/{.mode-sepolia-dtl-v3.1.json => .mode-sepolia-dtl-v0.3.json} (100%) rename deployments/{.mode-sepolia-fpb-v3.1.json => .mode-sepolia-fpb-v0.3.json} (100%) rename deployments/{.mode-sepolia-v2.json => .mode-sepolia-v0.1.json} (100%) rename deployments/{.mode-sepolia-v3.json => .mode-sepolia-v0.2.json} (100%) rename deployments/{.mode-sepolia-v3.1.json => .mode-sepolia-v0.3.json} (100%) diff --git a/deployments/.arbitrum-sepolia-allowlists-v3.1.json b/deployments/.arbitrum-sepolia-allowlists-v0.3.json similarity index 100% rename from deployments/.arbitrum-sepolia-allowlists-v3.1.json rename to deployments/.arbitrum-sepolia-allowlists-v0.3.json diff --git a/deployments/.arbitrum-sepolia-dtl-v3.1.json b/deployments/.arbitrum-sepolia-dtl-v0.3.json similarity index 100% rename from deployments/.arbitrum-sepolia-dtl-v3.1.json rename to deployments/.arbitrum-sepolia-dtl-v0.3.json diff --git a/deployments/.arbitrum-sepolia-fpb-v3.1.json b/deployments/.arbitrum-sepolia-fpb-v0.3.json similarity index 100% rename from deployments/.arbitrum-sepolia-fpb-v3.1.json rename to deployments/.arbitrum-sepolia-fpb-v0.3.json diff --git a/deployments/.arbitrum-sepolia-v2.json b/deployments/.arbitrum-sepolia-v0.1.json similarity index 100% rename from deployments/.arbitrum-sepolia-v2.json rename to deployments/.arbitrum-sepolia-v0.1.json diff --git a/deployments/.arbitrum-sepolia-v3.json b/deployments/.arbitrum-sepolia-v0.2.json similarity index 100% rename from deployments/.arbitrum-sepolia-v3.json rename to deployments/.arbitrum-sepolia-v0.2.json diff --git a/deployments/.arbitrum-sepolia-v3.1.json b/deployments/.arbitrum-sepolia-v0.3.json similarity index 100% rename from deployments/.arbitrum-sepolia-v3.1.json rename to deployments/.arbitrum-sepolia-v0.3.json diff --git a/deployments/.base-sepolia-allowlists-v3.1.json b/deployments/.base-sepolia-allowlists-v0.3.json similarity index 100% rename from deployments/.base-sepolia-allowlists-v3.1.json rename to deployments/.base-sepolia-allowlists-v0.3.json diff --git a/deployments/.base-sepolia-dtl-v3.1.json b/deployments/.base-sepolia-dtl-v0.3.json similarity index 100% rename from deployments/.base-sepolia-dtl-v3.1.json rename to deployments/.base-sepolia-dtl-v0.3.json diff --git a/deployments/.base-sepolia-v3.1.json b/deployments/.base-sepolia-v0.3.json similarity index 100% rename from deployments/.base-sepolia-v3.1.json rename to deployments/.base-sepolia-v0.3.json diff --git a/deployments/.blast-sepolia-allowlists-v3.1.json b/deployments/.blast-sepolia-allowlists-v0.3.json similarity index 100% rename from deployments/.blast-sepolia-allowlists-v3.1.json rename to deployments/.blast-sepolia-allowlists-v0.3.json diff --git a/deployments/.blast-sepolia-dtl-v3.1.json b/deployments/.blast-sepolia-dtl-v0.3.json similarity index 100% rename from deployments/.blast-sepolia-dtl-v3.1.json rename to deployments/.blast-sepolia-dtl-v0.3.json diff --git a/deployments/.blast-sepolia-fpb-v3.1.json b/deployments/.blast-sepolia-fpb-v0.3.json similarity index 100% rename from deployments/.blast-sepolia-fpb-v3.1.json rename to deployments/.blast-sepolia-fpb-v0.3.json diff --git a/deployments/.blast-sepolia-v2.json b/deployments/.blast-sepolia-v0.1.json similarity index 100% rename from deployments/.blast-sepolia-v2.json rename to deployments/.blast-sepolia-v0.1.json diff --git a/deployments/.blast-sepolia-v3.json b/deployments/.blast-sepolia-v0.2.json similarity index 100% rename from deployments/.blast-sepolia-v3.json rename to deployments/.blast-sepolia-v0.2.json diff --git a/deployments/.blast-sepolia-v3.1.json b/deployments/.blast-sepolia-v0.3.json similarity index 100% rename from deployments/.blast-sepolia-v3.1.json rename to deployments/.blast-sepolia-v0.3.json diff --git a/deployments/.mode-sepolia-allowlists-v3.1.json b/deployments/.mode-sepolia-allowlists-v0.3.json similarity index 100% rename from deployments/.mode-sepolia-allowlists-v3.1.json rename to deployments/.mode-sepolia-allowlists-v0.3.json diff --git a/deployments/.mode-sepolia-dtl-v3.1.json b/deployments/.mode-sepolia-dtl-v0.3.json similarity index 100% rename from deployments/.mode-sepolia-dtl-v3.1.json rename to deployments/.mode-sepolia-dtl-v0.3.json diff --git a/deployments/.mode-sepolia-fpb-v3.1.json b/deployments/.mode-sepolia-fpb-v0.3.json similarity index 100% rename from deployments/.mode-sepolia-fpb-v3.1.json rename to deployments/.mode-sepolia-fpb-v0.3.json diff --git a/deployments/.mode-sepolia-v2.json b/deployments/.mode-sepolia-v0.1.json similarity index 100% rename from deployments/.mode-sepolia-v2.json rename to deployments/.mode-sepolia-v0.1.json diff --git a/deployments/.mode-sepolia-v3.json b/deployments/.mode-sepolia-v0.2.json similarity index 100% rename from deployments/.mode-sepolia-v3.json rename to deployments/.mode-sepolia-v0.2.json diff --git a/deployments/.mode-sepolia-v3.1.json b/deployments/.mode-sepolia-v0.3.json similarity index 100% rename from deployments/.mode-sepolia-v3.1.json rename to deployments/.mode-sepolia-v0.3.json From e9c3ebb2eb2a0b19bd381030f0a5998e0b7de7e9 Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 11:31:06 -0500 Subject: [PATCH 4/7] chore: set license conversion date --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index bf5fb693..8e6012c1 100644 --- a/LICENSE +++ b/LICENSE @@ -15,7 +15,7 @@ Licensed Work: Axis Protocol Additional Use Grant: Any uses listed and defined at license-grants.axis.eth -Change Date: The earlier of 2028-[TODO] or a date specified at +Change Date: The earlier of 2028-07-01 or a date specified at license-date.axis.eth Change License: GNU Affero General Public License v3.0 or later From 4ec0c2bd608aa785ad0cbd625e1322cf3c3212e0 Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 11:43:32 -0500 Subject: [PATCH 5/7] chore: remove baseline v1 callback --- src/callbacks/liquidity/BaselinePreAsset.sol | 297 ------------------- 1 file changed, 297 deletions(-) delete mode 100644 src/callbacks/liquidity/BaselinePreAsset.sol diff --git a/src/callbacks/liquidity/BaselinePreAsset.sol b/src/callbacks/liquidity/BaselinePreAsset.sol deleted file mode 100644 index 8958305c..00000000 --- a/src/callbacks/liquidity/BaselinePreAsset.sol +++ /dev/null @@ -1,297 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.19; - -import {ERC20} from "lib/solmate/src/tokens/ERC20.sol"; -import {BaseCallback} from "src/callbacks/BaseCallback.sol"; -import {Callbacks} from "src/lib/Callbacks.sol"; - -interface IPreAsset { - function seed() external returns (uint256); - - function setBAsset(address bAsset_) external; - - function claim() external returns (uint256); -} - -interface IBAsset { - function baseline() external view returns (address); - - function balanceOf(address account) external view returns (uint256); - - function transfer(address recipient, uint256 amount) external returns (bool); -} - -interface IBaselineFactory { - function deploy( - address preAsset_, - string memory name_, - string memory symbol_, - address reserve_, - bytes32 salt_, - address feeRecipient_, - int24 initTick_, - uint256 initFloor_, - uint256 initDisc_ - ) external returns (address baseline); -} - -/// @notice This contract is a replacement PreAsset for a Baseline Market that allows depositing proceeds from a Batch auction directly into Baseline. -/// @dev The contract is the base token that should be auctioned. It provides a pre-asset token that buyers can then use to claim bAssets from after the Baseline Market is deployed. -contract BaselinePreAsset is ERC20, BaseCallback, IPreAsset { - // ========== ERRORS ========== // - - error Callback_AlreadyComplete(); - error Callback_MissingFunds(); - error PreAsset_AuctionNotComplete(); - error PreAsset_AlreadySeeded(); - error PreAsset_BAssetAlreadySet(); - error PreAsset_BAssetNotSet(); - error PreAsset_NotAuthorized(); - error PreAsset_PoolNotSeeded(); - - // ========== EVENTS ========== // - - event Seeded(uint256 totalReserves); - event Claim(address indexed user, uint256 amount); - - // ========== STATE VARIABLES ========== // - - // Baseline Variables - ERC20 public immutable reserve; - IBaselineFactory public immutable baselineFactory; - IBAsset public bAsset; - - /// @notice Lot ID of the auction for the baseline market. This callback only supports one lot. - uint96 public lotId; - bool public auctionComplete; - bool public seeded; - uint256 public totalPreAssets; - uint256 public totalBAssets; - - // ========== CONSTRUCTOR ========== // - - constructor( - string memory preAssetName_, - string memory preAssetSymbol_, - address auctionHouse_, - Callbacks.Permissions memory permissions_, - address reserve_, - address baselineFactory_ - ) ERC20(preAssetName_, preAssetSymbol_, 18) BaseCallback(auctionHouse_, permissions_) { - // Check that the reserve token has 18 decimals - if (ERC20(reserve_).decimals() != 18) revert Callback_InvalidParams(); - - // Store immutable variables - reserve = ERC20(reserve_); - baselineFactory = IBaselineFactory(baselineFactory_); - - // Set lot ID to max uint(96) initially - lotId = type(uint96).max; - } - - // ========== CALLBACK FUNCTIONS ========== // - - // CALLBACK PERMISSIONS - // onCreate: true - // onCancel: true - // onCurate: true - // onPurchase: false - // onBid: false - // onSettle: true - // receiveQuoteTokens: true - // sendBaseTokens: true - // Contract prefix should be: 11100111 = 0xE7 - - function _onCreate( - uint96 lotId_, - address, - address baseToken_, - address quoteToken_, - uint256 capacity_, - bool prefund_, - bytes calldata - ) internal override { - // Validate the base token is the pre asset (this contract) - // and the quote token is the reserve - if (baseToken_ != address(this) || quoteToken_ != address(reserve)) { - revert Callback_InvalidParams(); - } - - // Validate that prefund is true - if (!prefund_) revert Callback_InvalidParams(); - - // Validate that the lot ID is not already set - if (lotId != type(uint96).max) revert Callback_InvalidParams(); - - // Set the lot ID - lotId = lotId_; - - // Mint the capacity of preAsset tokens to the auction house - _mint(msg.sender, capacity_); - } - - function _onCancel( - uint96 lotId_, - uint256 refund_, - bool prefunded_, - bytes calldata - ) internal override { - // Validate the lot ID - if (lotId_ != lotId) revert Callback_InvalidParams(); - - // Validate that prefunded is true - if (!prefunded_) revert Callback_InvalidParams(); - - // Burn the refund amount of preAsset tokens that was sent from the auction house - // Will revert if the auction house did not send the correct amount of preAsset tokens - _burn(address(this), refund_); - } - - function _onCurate( - uint96 lotId_, - uint256 curatorFee_, - bool prefund_, - bytes calldata - ) internal override { - // Validate the lot ID - if (lotId_ != lotId) revert Callback_InvalidParams(); - - // Validate that prefund is true - if (!prefund_) revert Callback_InvalidParams(); - - // Mint the curator fee amount of preAsset tokens to the auction house - _mint(msg.sender, curatorFee_); - } - - function _onPurchase( - uint96, - address, - uint256, - uint256, - bool, - bytes calldata - ) internal pure override { - // Not implemented - revert Callback_NotImplemented(); - } - - function _onBid(uint96, uint64, address, uint256, bytes calldata) internal pure override { - // Not implemented - revert Callback_NotImplemented(); - } - - function _onSettle( - uint96 lotId_, - uint256 proceeds_, - uint256 refund_, - bytes calldata callbackData - ) internal override { - // Validate the lot ID - if (lotId_ != lotId) revert Callback_InvalidParams(); - - // Validate that the auction is not already complete - if (auctionComplete) revert Callback_AlreadyComplete(); - - // Validate that the callback received the correct amount of proceeds - if (proceeds_ < reserve.balanceOf(address(this))) revert Callback_MissingFunds(); - - // Decode callback data to get bAsset initialization parameters - (string memory name, string memory symbol, bytes32 salt, address feeRecipient) = - abi.decode(callbackData, (string, string, bytes32, address)); - - // Set the auction as complete - auctionComplete = true; - - // Burn any refunded preAsset tokens that were sent from the auction house - _burn(address(this), refund_); - - // Store the total supply of preAsset tokens at the point of baseline deployment - totalPreAssets = totalSupply; - - // Calculate the clearing price in quote tokens per base token - // TODO discuss with baseline team - uint256 clearingPrice = (proceeds_ * 1e18) / totalPreAssets; - int24 initTick = 0; // TODO calculate from clearing price - uint256 initFloor = 0; // TODO liquidity in floor - uint256 initDisc = 0; // TODO liquidity in discovery - - // Deploy the baseline pool - // This function will re-enter this contract to set the bAsset and seed the pool - // At the end of the call, this contract should have the initial supply of bAssets - // We store them to use for claiming - baselineFactory.deploy( - address(this), - name, - symbol, - address(reserve), - salt, - feeRecipient, - initTick, - initFloor, - initDisc - ); - - // Store the total bAssets received - totalBAssets = bAsset.balanceOf(address(this)); - } - - // ========== BASELINE PREASSET FUNCTIONS ========== // - - // Transfer reserves to baseline to seed the pool - function seed() external override returns (uint256) { - // Ensure the auction is complete - if (!auctionComplete) revert PreAsset_AuctionNotComplete(); - - // Ensure that the baseline market hasn't already been seeded - if (seeded) revert PreAsset_AlreadySeeded(); - - // Ensure that the bAsset has been set - if (address(bAsset) == address(0)) revert PreAsset_BAssetNotSet(); - - // Ensure caller is the baseline contract - address baseline = bAsset.baseline(); - if (msg.sender != baseline) revert PreAsset_NotAuthorized(); - - // Set the preAsset as seeded - seeded = true; - - // Transfer reserves to the baseline market - uint256 totalReserves = reserve.balanceOf(address(this)); - reserve.transfer(baseline, totalReserves); - - emit Seeded(totalReserves); - return totalReserves; - } - - // Set the precalculated BAsset address, must be called before baseline deployment - function setBAsset(address bAsset_) external override { - // Ensure caller is the baseline factory - if (msg.sender != address(baselineFactory)) revert PreAsset_NotAuthorized(); - - // Ensure the bAsset has not already been set - if (address(bAsset) != address(0)) revert PreAsset_BAssetAlreadySet(); - - // Set the bAsset - bAsset = IBAsset(bAsset_); - } - - // Claim bAssets - function claim() external returns (uint256) { - // Validate that pool has been seeded and the preasset received the bAssets - if (!seeded) revert PreAsset_PoolNotSeeded(); - - // Get the user's balance of preAsset tokens - uint256 preAssetBalance = balanceOf[msg.sender]; - - // If balance is 0, return 0 - if (preAssetBalance == 0) return 0; - - // Calculate amount claimable - uint256 claimable = (preAssetBalance * totalBAssets) / totalPreAssets; - - bAsset.transfer(msg.sender, claimable); - - emit Claim(msg.sender, claimable); - return claimable; - } -} From f1ca6e17f44972c184d70aa24d0adbbce99a7877 Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 12:16:50 -0500 Subject: [PATCH 6/7] chore: fix test salts --- script/salts/salts.json | 48 +++++++++++++++---------------- script/salts/test/TestSalts.s.sol | 6 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/script/salts/salts.json b/script/salts/salts.json index 66bb460a..651da0ba 100644 --- a/script/salts/salts.json +++ b/script/salts/salts.json @@ -38,38 +38,38 @@ "0xed4ba02077e70f78db70ce191509333d2dcccfff136d30dcb011f567305e88ad": "0x2b8bc588174d409692f1bd993942e3806c9a11344dbe674f46aed32a030aacf1" }, "Test_AllocatedMerkleAllowlist": { - "0x45f122f7acac9ed91811650b3c82832717d513261edf3b7d0cc58ed3a05758d3": "0x887c6e9f1dff86a76039b07e38f5f0e22f8058b820f6522625668a433e341f45", - "0x7c9807f1115c3fa2796e18082a2391a1f0805230b4ff8ced38a0c61f3c22dbed": "0xf711d69db3d5630fc695f46e7c9c3cdeb9876d0b0a41000161a6163186f08d0d" + "0x1242d528fb3d9259e7192f83e1faf95370bfd8d7f2b1bae5d3ea350d3d9c563c": "0x0ec2c9d910490e897c952a3210e5915006080f59a14a022b941a8c8cef2886e3", + "0x7cca57da19a5847b2b87641c1b721a32d4778e3e58641d6771cd14ed112b3bc3": "0xe0631d27a3d241774729d8c3ee1d9efae407f1073f89fa0956b2d308bd3adec4" }, "Test_CappedMerkleAllowlist": { - "0xd58198d6386bc22dedd66edac04700ff631f3e4954a81c9c0277c926faa1b781": "0x0ff9135df6a7769f7b22612987f1b26fe7e1a4a3f30dbec6d89009e49611c288", - "0xee9c9d52ceec0f82ecd70c8a9860529f9eba002c5e2a19fdb4983647a2b45417": "0x442ab55b95bed405a03b050eb62c2e9f6c3276f9eef1d0b9a8dca09e88ba9981" + "0x240bdd876f7c0070009c234b8cde981c3865d49db15097f59cd4ffb15d818d1e": "0xe68b5bbeed8a53eb7e97b7bc84ec08e1e6a5b360cae16f0653c60eff312dec3f", + "0xb8a17b3ee693ebdcfc6913bb2f65d0fadbe8812d9ef4d927595a7dc75db68727": "0x956b71c3545015d12e8bbefbad72019b673860f32a5b4313eeb866425d97be17" }, "Test_MockCallback": { - "0x0292f11feedba71470bec5d64e63ce3fc8264fdf8afbc612ff30f05c378715d9": "0x0d73ec9643790eb44bb0ff731d8e3849a6a701104d3b776dece4afcc8a48e960", - "0x1de2a5597856d096b736ce7dc2d319b0a5b7a684c13389fdf6e457c9c90214fb": "0xb7fbf1e8c27107e66c4448db09638de3f61ed3cfac8c0f57b959bfdc5bf25d5e", - "0x50c11fc2cd89485e70f8efa6fde9be37a6d38321a60a68c54d5120223bace7a9": "0xb2d6620fc01e928a56503a7a53298269db6640de48e79233ed1a5715efd96294", - "0x5b95347fbbc3f07ab9d5479ac37a1b90c6faab9447597cdc7658c5d0dfa9f282": "0xb2f95f0e482a7373157445ce8993e3376b3e9b086fa03af0e9bccd5e714b1aa8", - "0x6e2aabb3152820d75be49c9015c214ff9cb446c24236c582fe609776624f7e02": "0x513f4b22288205df1c9d5d98ec57e9b2f7ad490b364bc673736352e65743a845", - "0x7031cc1db083ab38787974aecb4110c3d9b90be0f4f6100c2d3fd71882efa006": "0x9dca5c0db64242c127b00525aaad3019cbbb81f016f9f1e41f98ab1dab7bb508", - "0x71586e15027e9300f69cd748c3978b2895cc60c75e1da758965522b3ba4094a5": "0xb6a88fe19302055960d2df5ad5def0e7039896c8a66fe07287769bf8280cacf2", - "0x75c5ccb3a9d652c0ee9f3ff80450c3642fb4051365877ed001dd40f11459642e": "0xd7c0ad8c19b55c31aaf5f51dec7382ac7643f7e67b89f88ef69cb0481a808cd0", - "0x84cf8d6389a683a3491be6f92bc24c0eab804373610d5831a88a1b4dba04a8f2": "0xe4801b39160d3d2df7afa251499ba3d5106f9cab0c980597ae69513d00b86e60", - "0x906d15feb6bc4ec71cdc7a1591950e1c9f4e85437e1a1a75552360908d5c0be4": "0xe4b13d8fa77cca1237d6e39fc3c7ca3bd62cec749fc1a948343a46f493892edd", - "0x980e581f6d53c2836e0811bf60907af8fc262e6ed24c22068a755a40ff4939ac": "0x337af06ba78d79f46f30932af57a326a475c0ac450aaff389c00d3c85989f833", - "0xa289110cf10f63814b2f56f2504faacf3d9fc25b9422987377c4ceccc422594a": "0xbb81d3bba620126850c3b0b0a286fb74a77c5b788bcc84fed2d59b8cb195ffcf", - "0xae701a6e57cfc23ac94b95e11c6af02bc6fcebf44517e77fd0fb7ad68d76ef5d": "0xcd12229a288ada981ac764da237bacf01b38d5d7465ba7f77f911b52761de88a", - "0xb2819ef15777e6d234863480af5c99c30116346b6ffdbddfcc8317313ea5d58d": "0x693ad1ae8dd60108634199f654b7c5d185246850b10d0f8889651bb3aa629e0a", - "0xb566f44afa573034186bee699bcc6f7f2d40982d1dd31bb27335f20f35a87041": "0x57c981873651bd1445886867135aa17e2172bbb359de8c29076017f85d60ad12", - "0xbd4ceec59115b5cdd4b37c9485ab1c4ce4626ed59e5cb169cf5869cbf8ce8319": "0xb31b4afde22dc36be14b760d1ce1958638d6e442bd94eb7610cd5411eaee96f1", - "0xd1c5e9171a5aaddc37bd1443137989748b01a500abc2834bd60920c0a0ae50bb": "0x7e16545b4ee6924b527d0c653cb1be9d571a5ae7a85034fedbcca6477d88688e", - "0xe10dcccb933d6f19d1932c609db896016864d0897dd2be8944c60ebd4522d41d": "0x07517f5e0fd293382b4f125e09aa721c0d7ef7b272433725e0deb35fef8f7433" + "0x0825d99059fe0dc95e0b5cd7b853a5f3f50b58f25c5812fc7fd01d69ff4ec679": "0x222b47fd0259b3eacfbc04b9dddf5bb5ba060245c2c3c3673672ad4d815d01df", + "0x51526251ca3003df174c65f2fb581f61820ce57c14720e0d67480ed8c8b77925": "0xd25a3174b866cae4f78f513123ffebf33114f3df0093e06159010b3d9fbadff3", + "0x6206c9845f35f3006fc507c15aaaf4a719380265cf472773a270ffe6d5eb5299": "0xe9943f7c46c50e34e5f91da14d0ca6c58b5504172e156e19108bf2844fdaec63", + "0x6b7fa77ae82f95cc8c5fe53dca64702ea0dc8e3dad74749dc8cd77de2884e704": "0x600196a40f70c0b91ab3ace5873750bc77d14dddf6b1093b03def43f31ddb4c3", + "0x7310243dabd76344326f3659aabda0b846a9c8e9e7d50b990261c14f2b44d560": "0x86d15e2125c36574017c86d4fcd04bb470225e835b76e3cbe63c5908da46ab8c", + "0x7602309c05771de8281f2f3f08e74ec9f19f1bfdaac8cd970d9f7a8d62173b6e": "0xd28f39fd2d2e1a378b0fe177abc5ac22a4642634847865a096a5e96bd04c6411", + "0x892e1120a976151ae5375dca978040abe705c8cbdd3c7b64b41ff1087ee01c22": "0x748af80730f660a2400a4d6f8f4f41d21cca1cc117fc2f1c51e131e16fa43ce3", + "0x8a69dcb863773a3bb971a969233286e75cba80abf6ec8d881cada7ea0ad674b0": "0xd7bacad37fd5e507c6bc424ed88ae37e8d4935b54d7e41cf1306d46c37eaebb4", + "0x8d8681a539f3b359e94a05239187dc55cb9cb2dcfe01726d3053573206efe25f": "0x6f209918e9619b620b306b2014e6aabe3688c4a4043117b6835ab17bd70bf004", + "0x918d87a20c837fa93ce3089d2cb6386b66f79bbfd0f09bd6784bc52108b69938": "0x64473a26214c7b928ff6c08104e3b18ae36918097eefb554aa17c2b9347fd7f2", + "0x9569f58e5e127ceb73049eea8119bb21f8c4328d3b4770da5a67075be3f77c12": "0x2123580432d5ece19c5e099d5156a9598f2c49fdcbcc1029f7d21276ccab2ba3", + "0x96f0481f00eeec717fa8c0d41efd04b6e3fdccbebbaa223ee2118449ebea2406": "0x6bc41d5bab2740be84e43b053ed3b46acb6f3ac1cb9031fb3203edd92a833a07", + "0x9c35a3189126603f4b187149f54e09082403dac10b3e899a503e28e897edd6f9": "0xa35f7a6870564c7a14d71310c87a6816c3ef4f80eb0a5ac43d56235e075ae162", + "0x9db4bc605469ede684fbaa475d320b3fbe6a707deaa953ee1ba29ecb3c1125fb": "0x67f66566dfb091aeeb776b692eba5f570f5a310cf25e94f0e06120cf64737a9d", + "0xb8e0b3cbd7273e83cfdbcb8269e5c3510a28892e815fe28bc0f515be0df2c8f9": "0x17f7fbab547a6a69119fee8820b0ff11a8da7a1f9902a19d8f3917a6c8aff2da", + "0xc38bb4813ebdb9978d2485ae5ad92e1152f8a955430a63210b69b2277eed9477": "0x9bf9b60e2afb2faf561385c61d5c3f5b6b910c97bdd3bb4af59d193140215a31", + "0xd75e639b43b1d29e1703abcd2616b6b67f3ae232d53915d472f3a5b6aae6083c": "0xa45904df2431729c77de44b4b88e032130e12dcbc735f0f72a29af686e15f3ed", + "0xf2644573f57aea10dffac6e7215b409fa19236ae57b735b20b9fac9834391850": "0x3a824c912eb7f08b82a8d936c2e29cb2b6fdde7e33ea9af18d9ccbde9c454161" }, "Test_UniswapV2DirectToLiquidity": { - "0x626618624e7cb5a948cf123863a73497af9a9b8be1b913741cc300ca40132946": "0xd4a3091ca52ef1cdaad42a68e93ccb9e278d6513384782d02bd53a88e42a847f" + "0x174201fc5371e6b5c38ac3e8a150aac595a79929c11ade671773a4af96e796b2": "0xf79f6bfb74c7ea1422de906b5c897cbc4e8e282d391348930a7f75feaa4fc6ce" }, "Test_UniswapV3DirectToLiquidity": { - "0xc798f2c774e10893d5bcd73d7f25ae5fb55087f5f2705410f41a79eaab83e1c4": "0x39bf30ee1510752a100f998e6fa1edd1c098e965e803a7444677d73f860a8a79" + "0xbbc3774034dce84cb792ad50a090b7c2b736a85af6e59e595e55e4f369523495": "0x2cb699095381555944575ef169da11fe4a944e6c6c382910eefd1a06c32b2c33" }, "TokenAllowlist": { "0x09db47d395a68db033a3b222b9d1a212cec8422b03aeafc313aa4d2813c6dd60": "0xe07a005213f35e1f050a4da040d6bc3cae2ad333647b51a6ffa2e7941980043a", diff --git a/script/salts/test/TestSalts.s.sol b/script/salts/test/TestSalts.s.sol index 8670a704..bfcaa134 100644 --- a/script/salts/test/TestSalts.s.sol +++ b/script/salts/test/TestSalts.s.sol @@ -21,10 +21,10 @@ contract TestSalts is Script, WithEnvironment, Permit2User, WithSalts { address internal constant _UNISWAP_V2_FACTORY = address(0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f); address internal constant _UNISWAP_V2_ROUTER = - address(0x48a34D8572aC949eFDa3f70263499DdE1F160A26); + address(0x584A2a1F5eCdCDcB6c0616cd280a7Db89239872B); address internal constant _UNISWAP_V3_FACTORY = - address(0x42c8cc563856b148EBcD98cc26BdC2ebD7C4F8C8); - address internal constant _GUNI_FACTORY = address(0x804962b4bB9981E4bE47BEE57Fbfe5E603C48F7a); + address(0x43de928116768b88F8BF8f768b3de90A0Aaf9551); + address internal constant _GUNI_FACTORY = address(0xc46b184e5521Cb87Fc5288Ff49D978A4BE4B055c); string internal constant _MOCK_CALLBACK = "MockCallback"; string internal constant _CAPPED_MERKLE_ALLOWLIST = "CappedMerkleAllowlist"; From 60a7dd07868683797edf3a137732b25d56d8838c Mon Sep 17 00:00:00 2001 From: Oighty Date: Tue, 11 Jun 2024 12:19:24 -0500 Subject: [PATCH 7/7] chore: update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35b102ce..4149b275 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "moonraker", + "name": "axis-core", "version": "1.0.0", "description": "", "main": "index.js",