Merge master -> develop

deployments/.arbitrum-sepolia-v0.3.json

@@ -6,5 +6,12 @@
 "axis.EncryptedMarginalPrice": "0x87F2a19FBbf9e557a68bD35D85FAd20dEec40494",
 "axis.FixedPriceSale": "0x0A0BA689D2D72D3f376293c534AF299B3C6Dac85",
 "axis.AtomicLinearVesting": "0xA7413717C633175Bc5B669E94625a4d3FE009870",
-"axis.BatchLinearVesting": "0xC818f1f000f9C24D014BCe2c5334e14B1360d9CD"
+"axis.BatchLinearVesting": "0xC818f1f000f9C24D014BCe2c5334e14B1360d9CD",
+"axis.FixedPriceBatch": "0xB24D0b6ae015DC6fd279E330db101bB890d8060c",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE681311Ec0Aff9E6aCD03208f366eF4CD06e8215",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE6B7D1ba64c03A9e716358D0AfE34A087E3d26B1",
+"axis.BatchCappedMerkleAllowlist": "0x98Bc9615c54fA03C7E31cD0e6599938f1a418d1b",
+"axis.BatchMerkleAllowlist": "0x98Cd72f2271BC8485474E6277eAadA28c8Da4C59",
+"axis.BatchTokenAllowlist": "0x98d7b3E03DEAA5039ff06D977EdE2EF2b6cD3169",
+"axis.BatchAllocatedMerkleAllowlist": "0x98Dd423FD18cfbf34c78E24B8E923dadE7bcFCC0"
 }

deployments/.arbitrum-sepolia-v0.4.json

@@ -0,0 +1,13 @@
+{
+"axis.BatchAuctionHouse": "0xBA00002999aBfa63cA25B3A7aD4c8F3a578aBe28",
+"axis.BatchCatalogue": "0x664268B82971D0c9A4F000a7329a057e85361E83",
+"axis.EncryptedMarginalPrice": "0x2Ca8954B468E2FbfE55240B69db937861c12F0d0",
+"axis.FixedPriceBatch": "0x8b47F82a58d8AFBE5167feBf0D3F3Bb509aaf2bd",
+"axis.BatchLinearVesting": "0xFB1113E170CA6d95f3a91121BDD2370a822598E9",
+"axis.BatchCappedMerkleAllowlist": "0x9888DbABd5981763697A4433Cb57E3F9DABEcB6a",
+"axis.BatchMerkleAllowlist": "0x9837cA34C444cEbd07C699036D1D174C6392D9fa",
+"axis.BatchTokenAllowlist": "0x988c61b36F7898e464a0Bf477d2dc06aC4E95F95",
+"axis.BatchAllocatedMerkleAllowlist": "0x98B59b4BF62b0316D9B0f89D28A28d5D75BB8B46",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE64E0807E5a0d789dB2fABB3345aB763f879521C",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE6ECF0f655E642834c79F30323e7ae941883ac00"
+}

deployments/.base-sepolia-v0.3.json

@@ -3,5 +3,11 @@
 "axis.BatchCatalogue": "0xD55227c0C37C97Fa2619a9C7F658C173883C1E2a",
 "axis.EncryptedMarginalPrice": "0x0599DA010907835037A0beC4525Dc5D600e790EB",
 "axis.FixedPriceBatch": "0x71a2946A761FC6ecE1b16cb4517a3E3D7E30Cc92",
-"axis.BatchLinearVesting": "0xc20918b09dE9708d2A7997dfFc3c5ACB34d4a15b"
+"axis.BatchLinearVesting": "0xc20918b09dE9708d2A7997dfFc3c5ACB34d4a15b",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE629a36159C7C6F827DA480DD541009031d50637",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE694614675d7b99d53Af80c98E02AAD46cd27183",
+"axis.BatchCappedMerkleAllowlist": "0x98CcB00c5F9854517DA6ED466b3B391fEF501542",
+"axis.BatchMerkleAllowlist": "0x98408652D32571BEd7e357D1402A1A8c27B879e7",
+"axis.BatchTokenAllowlist": "0x980110C58Ace1FD0422E5c27c7d4e248a547Ec7D",
+"axis.BatchAllocatedMerkleAllowlist": "0x98469eF36DDD7bEAF28EDbd3fE2F57bD18A4BF2c"
 }

deployments/.base-sepolia-v0.4.json

@@ -0,0 +1,13 @@
+{
+"axis.BatchAuctionHouse": "0xBA00002999aBfa63cA25B3A7aD4c8F3a578aBe28",
+"axis.BatchCatalogue": "0x408fB738592232372069B592022F03BF3a241613",
+"axis.EncryptedMarginalPrice": "0x02c63F8aE0a8e9D0F7267AA4d0Af0567858188C2",
+"axis.FixedPriceBatch": "0x188Ad428c60eADFB0749B2E3A4836D63489304E3",
+"axis.BatchLinearVesting": "0x392C629741a0c7350c7181addD5870dE178eeD94",
+"axis.BatchCappedMerkleAllowlist": "0x9888DbABd5981763697A4433Cb57E3F9DABEcB6a",
+"axis.BatchMerkleAllowlist": "0x9837cA34C444cEbd07C699036D1D174C6392D9fa",
+"axis.BatchTokenAllowlist": "0x988c61b36F7898e464a0Bf477d2dc06aC4E95F95",
+"axis.BatchAllocatedMerkleAllowlist": "0x98B59b4BF62b0316D9B0f89D28A28d5D75BB8B46",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE650A43485b89F26FB98ad16811BF45BD52ad014",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE661c46d94c53584095A8240958695bAD6d6fC2F"
+}

deployments/.blast-sepolia-v0.3.json

@@ -6,5 +6,12 @@
 "axis.EncryptedMarginalPrice": "0x96B52Ab3e5CAc0BbF49Be5039F2f9ef5d53bD322",
 "axis.FixedPriceSale": "0x3661B7704F7032103B3122C7796B5E03fAC715b5",
 "axis.AtomicLinearVesting": "0x8270f3e8D874De8b974A0Bf928abDFf92171B1b2",
-"axis.BatchLinearVesting": "0xFb1B55504E6f996D192f1F1B8fDfD4E987355552"
+"axis.BatchLinearVesting": "0xFb1B55504E6f996D192f1F1B8fDfD4E987355552",
+"axis.FixedPriceBatch": "0xEDa0cC0bbb45D8cd6354755856053d6Ea646E201",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE6093314BD7496437002B06bd0Cc3B245Adc32aE",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE64057e0BbDF8DFaA4cEa25E64391B22e4b55607",
+"axis.BatchCappedMerkleAllowlist": "0x987727BD02CBf92B2E2d8e23B69E6FE627c2968e",
+"axis.BatchMerkleAllowlist": "0x98d1E5d8961BAfBE848337c723DD3dC590923454",
+"axis.BatchTokenAllowlist": "0x98062088FAE9D96C83B3efEbdE473A7C5B18C95F",
+"axis.BatchAllocatedMerkleAllowlist": "0x98381a5D00a0B6c9Cdd94206F4b2B383457C312e"
 }

deployments/.blast-sepolia-v0.4.json

@@ -0,0 +1,13 @@
+{
+"axis.BatchAuctionHouse": "0xBA00007A1868f4AEFdd39041327CbC4Ba5bF1632",
+"axis.BatchCatalogue": "0xC6D5E3A1823304D28cdc6dc23b4117b6cA34C98E",
+"axis.EncryptedMarginalPrice": "0x8F34bBB3edd28017f826FE7a73eb9297384BF0d8",
+"axis.FixedPriceBatch": "0x87ED152099949F870725bD9517A1697d428ddF74",
+"axis.BatchLinearVesting": "0xBD0474b8e7b65f3dF35d2817BA09aC864a199e31",
+"axis.BatchCappedMerkleAllowlist": "0x981d6a6997B23C06f4E95862f72B7C06c039a647",
+"axis.BatchMerkleAllowlist": "0x9859c6FA2594e93149bd76415cE3982f39888CCb",
+"axis.BatchTokenAllowlist": "0x984B6165fC87c682441E81B4aa23A017cdbFba18",
+"axis.BatchAllocatedMerkleAllowlist": "0x986455Ab4f64303E8F51e72F6BF1789182563F65",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE6282DDB61f81F4d769FE511676dC21E570AF815",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE6b1113d108f86Fb7eF662ecF235dB6dB8978Cc3"
+}

deployments/.mode-sepolia-v0.3.json

@@ -6,5 +6,12 @@
 "axis.EncryptedMarginalPrice": "0x4e519eEf63b9e127cFCeCA31C8E5485CdA65D355",
 "axis.FixedPriceSale": "0xacD10C2B4aA625dd00cba40E4466c8Ff07288a16",
 "axis.AtomicLinearVesting": "0x408fB738592232372069B592022F03BF3a241613",
-"axis.BatchLinearVesting": "0x6CC5b76C2c98cB347F07C07a74a88134265312FF"
+"axis.BatchLinearVesting": "0x6CC5b76C2c98cB347F07C07a74a88134265312FF",
+"axis.FixedPriceBatch": "0xC818f1f000f9C24D014BCe2c5334e14B1360d9CD",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE688Ee9d0527B4D4e9440619a99F0dADF68B4b26",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE68806DB45E015E9476339a3e54c8F2B4D4F7ecA",
+"axis.BatchCappedMerkleAllowlist": "0x98565d59C0E85cB2922822B941342b24e0B36710",
+"axis.BatchMerkleAllowlist": "0x98281879DF6b77eBfc3c7B584325cFE3cf3a499D",
+"axis.BatchTokenAllowlist": "0x98Db66f6F636D6e863229c32662AFF11bE8Ab53F",
+"axis.BatchAllocatedMerkleAllowlist": "0x98aAA09Fba83eD888Fa57eBb42c2e54fA6BF3611"
 }

deployments/.mode-sepolia-v0.4.json

@@ -0,0 +1,13 @@
+{
+"axis.BatchAuctionHouse": "0xBA00002999aBfa63cA25B3A7aD4c8F3a578aBe28",
+"axis.BatchCatalogue": "0x40Efc944A9bDe7Aea4853b435D5517433D02FfF8",
+"axis.EncryptedMarginalPrice": "0x1A6Ba70B8e5957bCd03C20f9CF42D9e6D3d9b514",
+"axis.FixedPriceBatch": "0x75DA61536510BA0bCa0C9Af21311A1Fc035DCf4e",
+"axis.BatchLinearVesting": "0x90608F57161aC771b28fb0adCd2434cfa1463201",
+"axis.BatchCappedMerkleAllowlist": "0x9888DbABd5981763697A4433Cb57E3F9DABEcB6a",
+"axis.BatchMerkleAllowlist": "0x9837cA34C444cEbd07C699036D1D174C6392D9fa",
+"axis.BatchTokenAllowlist": "0x988c61b36F7898e464a0Bf477d2dc06aC4E95F95",
+"axis.BatchAllocatedMerkleAllowlist": "0x98B59b4BF62b0316D9B0f89D28A28d5D75BB8B46",
+"axis.BatchUniswapV2DirectToLiquidity": "0xE60f928d399782836540752Eb3fCfE46b0Cb4E24",
+"axis.BatchUniswapV3DirectToLiquidity": "0xE6ce65C413a5Fc10Fa77B26032B33DCD68F8474a"
+}

lib/g-uni-v1-core/deploy/GUniPool.deploy.ts

@@ -0,0 +1,39 @@
+import { deployments, getNamedAccounts } from "hardhat";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+import { getAddresses } from "../src/addresses";
+
+const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  if (
+    hre.network.name === "mainnet" ||
+    hre.network.name === "optimism" ||
+    hre.network.name === "polygon"
+  ) {
+    console.log(
+      `!! Deploying GUniPool to ${hre.network.name}. Hit ctrl + c to abort`
+    );
+    await new Promise((r) => setTimeout(r, 20000));
+  }
+
+  const { deploy } = deployments;
+  const { deployer } = await getNamedAccounts();
+  const addresses = getAddresses(hre.network.name);
+
+  await deploy("GUniPool", {
+    from: deployer,
+    args: [addresses.Gelato],
+  });
+};
+
+func.skip = async (hre: HardhatRuntimeEnvironment) => {
+  const shouldSkip =
+    hre.network.name === "mainnet" ||
+    hre.network.name === "polygon" ||
+    hre.network.name === "optimism" ||
+    hre.network.name === "goerli";
+  return shouldSkip ? true : false;
+};
+
+func.tags = ["GUniPool"];
+
+export default func;