From 210eb264a547e48e73e4477789f4fec55633ce91 Mon Sep 17 00:00:00 2001 From: Oighty Date: Wed, 17 Jul 2024 20:45:01 -0500 Subject: [PATCH] deploy: v1.0.0 --- CHANGELOG.md | 4 ++ deployments/.arbitrum-one-v1.0.0.json | 7 +++ deployments/.base-v1.0.0.json | 7 +++ deployments/.blast-v1.0.0.json | 7 +++ deployments/.mantle-v1.0.0.json | 7 +++ package.json | 2 +- script/deploy/deploy.sh | 2 +- script/env.json | 61 +++++++++++++++++++++++++-- script/salts/salts.json | 4 +- 9 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 deployments/.arbitrum-one-v1.0.0.json create mode 100644 deployments/.base-v1.0.0.json create mode 100644 deployments/.blast-v1.0.0.json create mode 100644 deployments/.mantle-v1.0.0.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 0264473a..9d436e94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.0.0 + +- Initial production deployments to arbitrum, base, blast, and mantle + ## 0.9.0 - Split periphery (callbacks) contracts out into a new repository: `axis-fi/axis-periphery` diff --git a/deployments/.arbitrum-one-v1.0.0.json b/deployments/.arbitrum-one-v1.0.0.json new file mode 100644 index 00000000..f2df3d73 --- /dev/null +++ b/deployments/.arbitrum-one-v1.0.0.json @@ -0,0 +1,7 @@ +{ +"deployments.BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", +"deployments.BatchCatalogue": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96", +"deployments.auctionModules.EncryptedMarginalPrice": "0x08B87749b379f5BCA1d74A7B3d4e9f3DeD41C706", +"deployments.auctionModules.FixedPriceBatch": "0xC11a71a304aB4c147e926342BA4CcCFd62d7368e", +"deployments.derivativeModules.BatchLinearVesting": "0x6c80F20C5C0404a3D5349F71F9B25c0654884092" +} diff --git a/deployments/.base-v1.0.0.json b/deployments/.base-v1.0.0.json new file mode 100644 index 00000000..4f9fed95 --- /dev/null +++ b/deployments/.base-v1.0.0.json @@ -0,0 +1,7 @@ +{ +"deployments.BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", +"deployments.BatchCatalogue": "0x3b8cFDEde19B4AA36AB21c96973f9281276a3da2", +"deployments.auctionModules.EncryptedMarginalPrice": "0xD55227c0C37C97Fa2619a9C7F658C173883C1E2a", +"deployments.auctionModules.FixedPriceBatch": "0x101b502D216d27cb342e9686A2B34A1cD19B2F75", +"deployments.derivativeModules.BatchLinearVesting": "0x68a8d91d9936b5Ef8b65f516F8a5AAB6c7b1E43e" +} diff --git a/deployments/.blast-v1.0.0.json b/deployments/.blast-v1.0.0.json new file mode 100644 index 00000000..8255abe3 --- /dev/null +++ b/deployments/.blast-v1.0.0.json @@ -0,0 +1,7 @@ +{ +"deployments.BatchAuctionHouse": "0xBA00000008b2B9CC31b98ed27628F714D12D9c7F", +"deployments.BatchCatalogue": "0x30c356DFBAc808BC62c860A9B285f024b40dF1fc", +"deployments.auctionModules.EncryptedMarginalPrice": "0x053219a03D5Bb08B8EeC2BB9743F723b312A1cE3", +"deployments.auctionModules.FixedPriceBatch": "0xe6c04Ce6ca70eeE60bEc40E2e6e62958D91E02CC", +"deployments.derivativeModules.BatchLinearVesting": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96" +} diff --git a/deployments/.mantle-v1.0.0.json b/deployments/.mantle-v1.0.0.json new file mode 100644 index 00000000..2a62385b --- /dev/null +++ b/deployments/.mantle-v1.0.0.json @@ -0,0 +1,7 @@ +{ +"deployments.BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", +"deployments.BatchCatalogue": "0x30c356DFBAc808BC62c860A9B285f024b40dF1fc", +"deployments.auctionModules.EncryptedMarginalPrice": "0x053219a03D5Bb08B8EeC2BB9743F723b312A1cE3", +"deployments.auctionModules.FixedPriceBatch": "0xe6c04Ce6ca70eeE60bEc40E2e6e62958D91E02CC", +"deployments.derivativeModules.BatchLinearVesting": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96" +} diff --git a/package.json b/package.json index 12e87f88..edd5b49f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "axis-core", - "version": "0.9.0", + "version": "1.0.0", "description": "", "main": "index.js", "engines": { diff --git a/script/deploy/deploy.sh b/script/deploy/deploy.sh index fd0fc5b0..4ffa68a1 100755 --- a/script/deploy/deploy.sh +++ b/script/deploy/deploy.sh @@ -146,4 +146,4 @@ $VERIFY_FLAG \ $RESUME_FLAG # Insert for Mantle deployments -# -g 4000000 --with-gas-price 20000000 --priority-gas-price 10000000 \ \ No newline at end of file +# --legacy -g 1000000 --with-gas-price 20000000 \ \ No newline at end of file diff --git a/script/env.json b/script/env.json index 8943c85c..30d01ff0 100644 --- a/script/env.json +++ b/script/env.json @@ -1,11 +1,22 @@ { "current": { - "arbitrum": { + "arbitrum-one": { "constants": { "axis": { "OWNER": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e", "PERMIT2": "0x000000000022D473030F116dDEE9F6B43aC78BA3", - "PROTOCOL": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e" + "PROTOCOL": "0x007F3eD580c754A9495881b066e9FC98e406c214" + } + }, + "deployments": { + "BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", + "BatchCatalogue": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96", + "auctionModules": { + "EncryptedMarginalPrice": "0x08B87749b379f5BCA1d74A7B3d4e9f3DeD41C706", + "FixedPriceBatch": "0xC11a71a304aB4c147e926342BA4CcCFd62d7368e" + }, + "derivativeModules": { + "BatchLinearVesting": "0x6c80F20C5C0404a3D5349F71F9B25c0654884092" } } }, @@ -34,7 +45,18 @@ "axis": { "OWNER": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e", "PERMIT2": "0x000000000022D473030F116dDEE9F6B43aC78BA3", - "PROTOCOL": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e" + "PROTOCOL": "0x007F3eD580c754A9495881b066e9FC98e406c214" + } + }, + "deployments": { + "BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", + "BatchCatalogue": "0x3b8cFDEde19B4AA36AB21c96973f9281276a3da2", + "auctionModules": { + "EncryptedMarginalPrice": "0xD55227c0C37C97Fa2619a9C7F658C173883C1E2a", + "FixedPriceBatch": "0x101b502D216d27cb342e9686A2B34A1cD19B2F75" + }, + "derivativeModules": { + "BatchLinearVesting": "0x68a8d91d9936b5Ef8b65f516F8a5AAB6c7b1E43e" } } }, @@ -63,13 +85,24 @@ "axis": { "OWNER": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e", "PERMIT2": "0x000000000022D473030F116dDEE9F6B43aC78BA3", - "PROTOCOL": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e" + "PROTOCOL": "0x007F3eD580c754A9495881b066e9FC98e406c214" }, "blast": { "blast": "0x4300000000000000000000000000000000000002", "usdb": "0x4300000000000000000000000000000000000003", "weth": "0x4300000000000000000000000000000000000004" } + }, + "deployments": { + "BatchAuctionHouse": "0xBA00000008b2B9CC31b98ed27628F714D12D9c7F", + "BatchCatalogue": "0x30c356DFBAc808BC62c860A9B285f024b40dF1fc", + "auctionModules": { + "EncryptedMarginalPrice": "0x053219a03D5Bb08B8EeC2BB9743F723b312A1cE3", + "FixedPriceBatch": "0xe6c04Ce6ca70eeE60bEc40E2e6e62958D91E02CC" + }, + "derivativeModules": { + "BatchLinearVesting": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96" + } } }, "blast-sepolia": { @@ -106,6 +139,26 @@ } } }, + "mantle": { + "constants": { + "axis": { + "OWNER": "0xB47C8e4bEb28af80eDe5E5bF474927b110Ef2c0e", + "PERMIT2": "0x000000000022D473030F116dDEE9F6B43aC78BA3", + "PROTOCOL": "0x007F3eD580c754A9495881b066e9FC98e406c214" + } + }, + "deployments": { + "BatchAuctionHouse": "0xBA00000054C5a2122cD6333054BFDdB90A287Ee3", + "BatchCatalogue": "0x30c356DFBAc808BC62c860A9B285f024b40dF1fc", + "auctionModules": { + "EncryptedMarginalPrice": "0x053219a03D5Bb08B8EeC2BB9743F723b312A1cE3", + "FixedPriceBatch": "0xe6c04Ce6ca70eeE60bEc40E2e6e62958D91E02CC" + }, + "derivativeModules": { + "BatchLinearVesting": "0xE292cF4e316191CbFEbD74909356DF3cd9455e96" + } + } + }, "mantle-sepolia": { "constants": { "axis": { diff --git a/script/salts/salts.json b/script/salts/salts.json index 7cfb4254..20b56672 100644 --- a/script/salts/salts.json +++ b/script/salts/salts.json @@ -5,6 +5,7 @@ "BatchAuctionHouse": { "0x1d8b7b9cfbd8610a556d5e2e85dcdb25a17d6b5407574aef07970a86e4b0e2c3": "0x06374b73456c869d550c6cb45aff40113752ac3c4dd8efb8185b6da5c898aa82", "0x4c4d86f9737bd18dab3f6dc74d2f5c610b7169459c90a457e0e126ed42ae3bba": "0xbe4a9dc1b73685497c6104df59c2a3d2c1c5039bd48b1b25e9c0a029f3744311", + "0x8097ce38781d66ff63d0519cb3cead1cbf16f61fb2985844629780698a23469e": "0xa79b0aafdc5de217c20fe5b743a3101249487bea09cfedc2127f7fd567e5273c", "0x926c218dfa94c5d70f80d1833ea9d4c6d581119f856d69e8fcc7e62c69773f4f": "0xb009513c506ae5ea1fd7caa71183203e72a2e197a17ac82f9797621fd7e4fa17", "0xf77b6d9024091bb6924c65ea67fb047db889c8f626975bc7222df6d0de23612e": "0xe6da5ed268cad156b2f5f63fb1d5a3a86a8c508e669f385d4a772fd22b87c684" }, @@ -15,7 +16,8 @@ "0x830d2c24dcae0fce9215903ca9d54cb6789a2ee37db8bc9b5477fa24a9b72db0": "0x386b0b1e66cea083db3427476295fa70b84f5ceb132b9355d90de9aa7c89051d", "0xc640e527fdcd05d6135de917e29082984847300ec6bf4cf38393f8dbfa742b19": "0x1e7690f0ac2409cb3804ffe443d81e9685d882d4d1804c8bfb1056cc624afee8", "0xcad29ef747f1a7ad12c1e5e715ac675f8534c0d3682dfddfa39287ae7b7d7f01": "0x761de87b1ea43dc2f84665b59b2ce8498c1a09458e3a89751578be7c72811114", - "0xf7e1693ed561ec566275117c8ea944263f9f801df4d4c61e4a934b7152f36dcc": "0x0b3e7731b05ed1f6d2cbbc4e64b503b8582801ae807ee756b3472916ec29c6fb" + "0xf7e1693ed561ec566275117c8ea944263f9f801df4d4c61e4a934b7152f36dcc": "0x0b3e7731b05ed1f6d2cbbc4e64b503b8582801ae807ee756b3472916ec29c6fb", + "0xf877dc218ee7538ffb3ad6f8fd1b4694cbb6f38d9e0b7a4d9a19ace3c24830a2": "0xad2a1f39589d55fd4fb667bda19d168106901d33100bb9c50fc57b1735024bcd" }, "Test_MockCallback": { "0x426cf8226b10a13d04f17ba04e521d7daaf03e645b464ba54efc07fad6dc8a8c": "0xb7abf06c3751c706a69f0232baa450718a43ac09cbc116c0e82dd21704da40db",