gateway-fm · asolovov · Dec 20, 2023 · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ generate-perps_market-andromeda:
 
 # generate go file for PerpsMarket contract on andromeda net from cannon abi
 generate-perps_market-andromeda-c:
-	go run ./utils/getAbis/get-abis.go --get-mkdir ./cannon-synthetix/andromeda/perpsFactory/PerpsMarketProxy.json ./contracts/perpsMarket
+	go run ./utils/getAbis/get-abis.go --get-mkdir ./cannon-synthetix/base/perpsFactory/PerpsMarketProxy.json ./contracts/perpsMarket
 	abigen --abi=./contracts/PerpsMarketProxy.json --pkg=perpsMarket --out=./contracts/perpsMarket/contract.go
 
 # generate go file for snxUSDT contract on andromeda net
@@ -29,11 +29,20 @@ generate-forwarder-andromeda:
 	go run ./utils/getAbis/get-abis.go --get-mkdir ./additional-abis/84531-TrustedMulticallForwarder.json ./contracts/forwarder
 	abigen --abi=./contracts/84531-TrustedMulticallForwarder.json --pkg=forwarder --out=./contracts/forwarder/contract.go
 
+generate-forwarder-mainnet-c:
+	go run ./utils/getAbis/get-abis.go --get-mkdir ./cannon-synthetix/base/system/trusted_multicall_forwarder/TrustedMulticallForwarder.json ./contracts/forwarder
+	abigen --abi=./contracts/TrustedMulticallForwarder.json --pkg=forwarder --out=./contracts/forwarder/contract.go
+
+
 # generate go file for ERC7412 contract on andromeda net
 generate-erc7412-andromeda:
 	go run ./utils/getAbis/get-abis.go --get-mkdir ./additional-abis/84531-ERC7412.json ./contracts/ERC7412
 	abigen --abi=./contracts/84531-ERC7412.json --pkg=erc7412 --out=./contracts/ERC7412/contract.go
 
+generate-erc7412-mainnet-c:
+	go run ./utils/getAbis/get-abis.go --get-mkdir ./cannon-synthetix/base/pyth_erc7412_wrapper/PythERC7412Wrapper.json ./contracts/ERC7412
+	abigen --abi=./contracts/PythERC7412Wrapper.json --pkg=ERC7412 --out=./contracts/ERC7412/contract.go
+
 # update Synthetix-Gitbook-v3 subtree
 update-subtree:
 	git subtree pull --prefix Synthetix-Gitbook-v3 [email protected]:Synthetixio/Synthetix-Gitbook-v3.git en --squash
@@ -42,6 +51,10 @@ update-subtree:
 fetch-cannon-andromeda:
 	cannon inspect synthetix-omnibus:latest@andromeda --chain-id 84531 -w ./cannon-synthetix/andromeda --sources
 
+# fetch ABIs from cannon
+fetch-cannon-base:
+	cannon inspect synthetix-omnibus:latest@andromeda --chain-id 8453 -w ./cannon-synthetix/andromeda --sources
+
 # generate mock for service interface for testing
 mock-service:
 	mockgen -source=services/service.go -destination=mocks/service/mockService.go

diff --git a/cannon-synthetix/andromeda/buyback_snx/buyback_snx.json b/cannon-synthetix/andromeda/buyback_snx/buyback_snx.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x9e21Aa824b352856463F8525B805e0776FB96688",
+  "address": "0x53f1E640C058337a12D036265681bC172e6fB962",
   "abi": [
     {
       "inputs": [
@@ -184,16 +184,16 @@
   "constructorArgs": [
     "10000000000000000",
     "500000000000000000",
-    "0x439e6cbAaF61C63f406687907022960088801EC0",
-    "0x1b41fbc42103cff8bca2f94cf0650bdd354e65e022b5e30a4c24508b18362028",
-    "0x6B9db85A008424b1C985FE132D58dDaD80099b91",
-    "0xa89163A087fe38022690C313b5D4BBF12574637f"
+    "0x3d07CBC5Cb9376A67E76C0655Fe239dDa8E2B264",
+    "0xeaedabbf2f1796bfa84463de1630473226fa7e0beb281ee6da5a5f5b33668f03",
+    "0x22e6966B799c4D5B13BE962E1D117b56327FDa66",
+    "0x09d51516F38980035153a554c26Df3C6f51a23C3"
   ],
   "linkedLibraries": {},
-  "deployTxnHash": "0x481aeb5935644fe4dcca306babc0ca82db9e34675506d8bc6e437c1f70d9ab3e",
+  "deployTxnHash": "0x71eeff572189159a66e806d4f151abcbc99b2fa9277fa6ea718f01b5f627a3b2",
   "sourceName": "contracts/BuybackSnx.sol",
   "contractName": "BuybackSnx",
   "deployedOn": "contract.buyback_snx",
-  "gasUsed": 580519,
-  "gasCost": "1500000254"
+  "gasUsed": 580393,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/AsyncOrderCancelModule.json b/cannon-synthetix/andromeda/perpsFactory/AsyncOrderCancelModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xeB8fDC4712AD9B84010F47efA655cF52766BB760",
+  "address": "0xfb10377f5dE8F393C9D00213Ea34D530E575e86a",
   "abi": [
     {
       "inputs": [
@@ -284,10 +284,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x215da1e72b7e5e6b7747a3e057575684d598d5b2dfd8de420ad16087dfc30a83",
+  "deployTxnHash": "0x9f4f84042120e6c4b76b97d8972f9766719afc0c0cbe1e4ddc60e89bd58f6ab3",
   "sourceName": "contracts/modules/AsyncOrderCancelModule.sol",
   "contractName": "AsyncOrderCancelModule",
   "deployedOn": "contract.AsyncOrderCancelModule",
-  "gasUsed": 1461354,
-  "gasCost": "101000304"
+  "gasUsed": 1460944,
+  "gasCost": "1500000053"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/AsyncOrderModule.json b/cannon-synthetix/andromeda/perpsFactory/AsyncOrderModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x0ade5f9C1873499413EBbA870E6a465771821180",
+  "address": "0x4636C5EDCAfCe169b5d5aBD984B071f47Ea6a10E",
   "abi": [
     {
       "inputs": [
@@ -552,10 +552,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xe14566a09432f935bc24840620a7382f50468f6efa4eb66077d2ec6879c247c4",
+  "deployTxnHash": "0x86958e607a05558db5f8c3e97d596bb825c4b0f7b5575ada4b5ccd9c27d1f318",
   "sourceName": "contracts/modules/AsyncOrderModule.sol",
   "contractName": "AsyncOrderModule",
   "deployedOn": "contract.AsyncOrderModule",
-  "gasUsed": 2635162,
-  "gasCost": "10825290"
+  "gasUsed": 2634412,
+  "gasCost": "1500000052"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/AsyncOrderSettlementPythModule.json b/cannon-synthetix/andromeda/perpsFactory/AsyncOrderSettlementPythModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xE97AE65AB0108DDc4dF34b6Aff7B17D911C39931",
+  "address": "0x030c3c458CcE7c77F05e7B0826226609da350242",
   "abi": [
     {
       "inputs": [
@@ -408,10 +408,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x0fa87148aea660b3f169cdc8f3e836788a38e45aba497a05d01f5cce5453e2d0",
+  "deployTxnHash": "0xda7cc41091156d7737e6927e4e36f4ae0284961f4e0227d69468067304fc0ec7",
   "sourceName": "contracts/modules/AsyncOrderSettlementPythModule.sol",
   "contractName": "AsyncOrderSettlementPythModule",
   "deployedOn": "contract.AsyncOrderSettlementPythModule",
-  "gasUsed": 3293414,
-  "gasCost": "10825291"
+  "gasUsed": 3292474,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/CoreModule.json b/cannon-synthetix/andromeda/perpsFactory/CoreModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xfAAB21B6B950e17F3E3E667587310Cb5cb55E73a",
+  "address": "0x7BC5ECeD96aeC561012C5274BC7fce49e1C8414B",
   "abi": [
     {
       "inputs": [
@@ -206,10 +206,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x7f30a38951e448fa0880a74e19a5bd0bc0f3fa768ee14a313071c598bc6745e1",
+  "deployTxnHash": "0xe7c5e241e13c17abc47a437521311851a9764db8024308c75a307e27155c68a2",
   "sourceName": "contracts/modules/CoreModule.sol",
   "contractName": "CoreModule",
   "deployedOn": "contract.CoreModule",
-  "gasUsed": 940299,
-  "gasCost": "1500000254"
+  "gasUsed": 940021,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/FeatureFlagModule.json b/cannon-synthetix/andromeda/perpsFactory/FeatureFlagModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xAE55c944509DBd7958A632c7054D70fF90C7C118",
+  "address": "0x6a8a998A0C4a7C687Cee4E362F64481b2Bd8bEe5",
   "abi": [
     {
       "inputs": [
@@ -310,10 +310,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xbd5fbb460eedc4b924420413188186d63b0f41687db5d25b8d39eafa2c02a5a5",
+  "deployTxnHash": "0x45a96b9b08d7730e21136758e90413e158dd501fd31ce6a1cc50ea0e1e5ea639",
   "sourceName": "contracts/modules/FeatureFlagModule.sol",
   "contractName": "FeatureFlagModule",
   "deployedOn": "contract.FeatureFlagModule",
-  "gasUsed": 765178,
-  "gasCost": "10825293"
+  "gasUsed": 764968,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/GlobalPerpsMarketModule.json b/cannon-synthetix/andromeda/perpsFactory/GlobalPerpsMarketModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x09fAa539B6AD1aD130286Eb9c30052D1a9b4a02b",
+  "address": "0x0DdF6f7653676B87138c2F89dCa7FCAfb2eb3EAc",
   "abi": [
     {
       "inputs": [
@@ -488,10 +488,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0x3e2c5d499cff163ef4dabddfffe9756c504223fc28e1f3442361511e25927b11",
+  "deployTxnHash": "0xc2a10b4651b3d9acf6c4026a68f5ea21c22b7d049067815e4135f711bf356679",
   "sourceName": "contracts/modules/GlobalPerpsMarketModule.sol",
   "contractName": "GlobalPerpsMarketModule",
   "deployedOn": "contract.GlobalPerpsMarketModule",
-  "gasUsed": 1189034,
-  "gasCost": "340550195"
+  "gasUsed": 1188702,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/InitialProxy.json b/cannon-synthetix/andromeda/perpsFactory/InitialProxy.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x75c43165ea38cB857C45216a37C5405A7656673c",
+  "address": "0x0A2AF931eFFd34b81ebcc57E3d3c9B1E1dE1C9Ce",
   "abi": [
     {
       "inputs": [
@@ -205,14 +205,14 @@
     }
   ],
   "constructorArgs": [
-    "0xfAAB21B6B950e17F3E3E667587310Cb5cb55E73a",
-    "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+    "0x7BC5ECeD96aeC561012C5274BC7fce49e1C8414B",
+    "0xEde8a407913A874Dd7e3d5B731AFcA135D30375E"
   ],
   "linkedLibraries": {},
-  "deployTxnHash": "0x3ea5485002eb8983ae4130979b4bde886709ea9413e0b6809dabece0d8df066e",
+  "deployTxnHash": "0x9e8ae09979bd427ebd41cf1c5b34034c4b15d0d7a5617176341b543f6d3bb9ce",
   "sourceName": "contracts/Proxy.sol",
   "contractName": "Proxy",
   "deployedOn": "contract.InitialProxy",
-  "gasUsed": 248149,
-  "gasCost": "1500000254"
+  "gasUsed": 248039,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/LiquidationModule.json b/cannon-synthetix/andromeda/perpsFactory/LiquidationModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xb3De9E9d9cB7cef362E7dE3eABB3edCA986771c0",
+  "address": "0x72e13c7c96b6Bf4825e9f61350B0a4F22fD807D2",
   "abi": [
     {
       "inputs": [
@@ -305,10 +305,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xc683b8bedb9646272db521ab85429e800f63facd1877fc68aded85460d2fdeec",
+  "deployTxnHash": "0xf3dc0bb026ee2a954709e8b9d0d6fd934e967bf0c5c224ec84394e9a37ba2eea",
   "sourceName": "contracts/modules/LiquidationModule.sol",
   "contractName": "LiquidationModule",
   "deployedOn": "contract.LiquidationModule",
-  "gasUsed": 2833630,
-  "gasCost": "1000000001"
+  "gasUsed": 2832822,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/MarketConfigurationModule.json b/cannon-synthetix/andromeda/perpsFactory/MarketConfigurationModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x833fb2D8dC68d2DC15becf619C0F2F4150aA1Aa7",
+  "address": "0x38c9E00B2A6029D4E59Ab44199682315f5De1801",
   "abi": [
     {
       "inputs": [
@@ -943,10 +943,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xd8a032d5bd301a391a1026259f9cd07c0a8b7a92b6106500623ce8a86ba72d15",
+  "deployTxnHash": "0x64a76da000034f26e8e5e858574d51a8754b958143aaf18ddaa28af49bde273b",
   "sourceName": "contracts/modules/MarketConfigurationModule.sol",
   "contractName": "MarketConfigurationModule",
   "deployedOn": "contract.MarketConfigurationModule",
-  "gasUsed": 1027259,
-  "gasCost": "1000000001"
+  "gasUsed": 1026975,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsAccountModule.json b/cannon-synthetix/andromeda/perpsFactory/PerpsAccountModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x3f91E54E1533A27323C3c939e18269Ae1b90c862",
+  "address": "0x484dD4359453E9F6E685330483D21d69247Fd4B7",
   "abi": [
     {
       "inputs": [
@@ -497,10 +497,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xe208275551bd8c15b868070f0072c4d86e1c5869064d61ba13fc37da0a4b8f13",
+  "deployTxnHash": "0x496143425c2d722672cda47ddb16d292bf0471004e52be9d687b1bf0cb1082bf",
   "sourceName": "contracts/modules/PerpsAccountModule.sol",
   "contractName": "PerpsAccountModule",
   "deployedOn": "contract.PerpsAccountModule",
-  "gasUsed": 2611781,
-  "gasCost": "1000000000"
+  "gasUsed": 2611037,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsAccountProxy.json b/cannon-synthetix/andromeda/perpsFactory/PerpsAccountProxy.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xD8FD25C1A4d90244699f5Eb1966dB07FbDE9dcFa",
+  "address": "0xcb68b813210aFa0373F076239Ad4803f8809e8cf",
   "abi": [
     {
       "inputs": [

diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsMarketFactoryModule.json b/cannon-synthetix/andromeda/perpsFactory/PerpsMarketFactoryModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0xE55331C2f9Ff0d05415C11Da17401ffCcc50658b",
+  "address": "0x60F83b3dC91FF77791C4d4D3B3e436deba07E266",
   "abi": [
     {
       "inputs": [
@@ -273,10 +273,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xfa52459a5392e8ad59ecec5e5624fbb5533c2bebe6004e27d26fc6f9bfb5d5b6",
+  "deployTxnHash": "0x9c002605d4843c9d00e45e2b3e7a656f1ec318b18f5aa59d8e8126db8bc1fc3b",
   "sourceName": "contracts/modules/PerpsMarketFactoryModule.sol",
   "contractName": "PerpsMarketFactoryModule",
   "deployedOn": "contract.PerpsMarketFactoryModule",
-  "gasUsed": 1590006,
-  "gasCost": "1000000002"
+  "gasUsed": 1589558,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsMarketModule.json b/cannon-synthetix/andromeda/perpsFactory/PerpsMarketModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x8331e823ede10BC267456917c74A40327F77F7c3",
+  "address": "0x0AC30C0a05e1750ec2B9314D17a79404833CaA73",
   "abi": [
     {
       "inputs": [],
@@ -232,10 +232,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xa6675e520fd50ff1e37c12cb8a4a6be569d1534fa6333a250afa7ae51920b618",
+  "deployTxnHash": "0x256d56a11391497b019fabe5638eba99382724e4fb8ad239fb5609dbe5456dc4",
   "sourceName": "contracts/modules/PerpsMarketModule.sol",
   "contractName": "PerpsMarketModule",
   "deployedOn": "contract.PerpsMarketModule",
-  "gasUsed": 878953,
-  "gasCost": "1000000001"
+  "gasUsed": 878711,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsMarketProxy.json b/cannon-synthetix/andromeda/perpsFactory/PerpsMarketProxy.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x75c43165ea38cB857C45216a37C5405A7656673c",
+  "address": "0x0A2AF931eFFd34b81ebcc57E3d3c9B1E1dE1C9Ce",
   "abi": [
     {
       "inputs": [

diff --git a/cannon-synthetix/andromeda/perpsFactory/PerpsMarketRouter.json b/cannon-synthetix/andromeda/perpsFactory/PerpsMarketRouter.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x45be3564e966cD01EF48e1005aAA19C502f72033",
+  "address": "0x0F5cCde20910487076BC97cf04Ea7242b57Cafc0",
   "abi": [
     {
       "inputs": [
@@ -4262,9 +4262,9 @@
     }
   ],
   "deployedOn": "router.PerpsMarketRouter",
-  "deployTxnHash": "0x826b91c168fea47fecee96942a70fe8f37baf765fee070ced18afb80b908136d",
+  "deployTxnHash": "0xa26f7a0f5eea7f805e886c5d7ed4269179b049f7f4064f398c83173c60b0991a",
   "contractName": "PerpsMarketRouter",
   "sourceName": "PerpsMarketRouter.sol",
-  "gasUsed": 1098958,
-  "gasCost": "1000000001"
+  "gasUsed": 1098856,
+  "gasCost": "1500000051"
 }
diff --git a/cannon-synthetix/andromeda/perpsFactory/spotMarket/AsyncOrderConfigurationModule.json b/cannon-synthetix/andromeda/perpsFactory/spotMarket/AsyncOrderConfigurationModule.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x9051D63125844BC1a450e348B15B6Ac7B966f583",
+  "address": "0x86770a2940efF6a778768592B42A6668FfB162a4",
   "abi": [
     {
       "inputs": [
@@ -408,10 +408,10 @@
   ],
   "constructorArgs": [],
   "linkedLibraries": {},
-  "deployTxnHash": "0xdca8bb6e16fe9c46230488fe8f5958e322485220c3c468cc0174bb96cd17f39c",
+  "deployTxnHash": "0x586628cdc11606d1040ea94e29e009c830e7c991eafe857d34d55b45119873a9",
   "sourceName": "contracts/modules/AsyncOrderConfigurationModule.sol",
   "contractName": "AsyncOrderConfigurationModule",
   "deployedOn": "contract.AsyncOrderConfigurationModule",
-  "gasUsed": 896430,
-  "gasCost": "3000000256"
+  "gasUsed": 896184,
+  "gasCost": "1500000051"
 }