Merge pull request #23 from Synthetixio/xchainxfers

3.2.0 release
Synthetixio · Jul 11, 2023 · b57f3b9 · b57f3b9
2 parents 773a2c8 + 25d6a8d
commit b57f3b9
Show file tree

Hide file tree

Showing 15 changed files with 197 additions and 39 deletions.
diff --git a/omnibus-arbitrum-goerli.toml b/omnibus-arbitrum-goerli.toml
@@ -0,0 +1,50 @@
+name = "synthetix-omnibus"
+version = "3.2.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings-testnet.toml",
+    "tomls/core.toml",
+    "tomls/permissions.toml",
+    "tomls/collaterals/weth.toml",
+    "tomls/pools/spartan-council.toml",
+    "tomls/permit-all-createPool.toml",
+    "tomls/permit-all-registerMarket.toml",
+]
+
+[setting.owner]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.weth_address]
+defaultValue = "0x7F5bc2250ea57d8ca932898297b1FF9aE1a04999"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x62CAe0FA2da220f43a51F86Db2EDb36DcA9A5A08"
+
+[setting.snx_liquidation_reward]
+defaultValue = "10000000000000000000"
+
+[setting.weth_liquidation_reward]
+defaultValue = "10000000000000000000"
+
+[setting.minimum_liquidity_ratio]
+defaultValue = "2000000000000000000"
+
+[setting.account_timeout_withdraw]
+defaultValue = "86400"
+
+[setting.deployer]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.sc_pool_id]
+defaultValue = "1"
+
+[setting.sc_pool_owner]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+# Chainlink Configuration
+
+[setting.ccip_router]
+defaultValue = "0x88e492127709447a5abefdab8788a15b4567589e"
+
+[setting.ccip_token_pool]
+defaultValue = "0x7990f84bbe3e6638907d5fcc217555146304a8d9"
diff --git a/omnibus-base-goerli.toml b/omnibus-base-goerli.toml
@@ -1,8 +1,8 @@
 name = "synthetix-omnibus"
-version = "3.1.1"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-testnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
     #"tomls/collaterals/snx.toml",
@@ -21,12 +21,6 @@ defaultValue = "0x4200000000000000000000000000000000000006"
 [setting.weth_aggregator_address]
 defaultValue = "0xcD2A119bD1F7DF95d706DE6F2057fDD45A0503E2"
 
-#[setting.snx_address]
-#defaultValue = ""
-
-#[setting.snx_aggregator_address]
-#defaultValue = ""
-
 #[setting.snx_liquidation_reward]
 #defaultValue = "10000000000000000000"
 
@@ -47,3 +41,9 @@ defaultValue = "1"
 
 [setting.sc_pool_owner]
 defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.ccip_router]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.ccip_token_pool]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
diff --git a/omnibus-goerli.toml b/omnibus-goerli.toml
@@ -1,8 +1,8 @@
 name = "synthetix-omnibus"
-version = "3.1.1"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-testnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
     "tomls/collaterals/snx.toml",
@@ -44,3 +44,9 @@ defaultValue = "1"
 
 [setting.sc_pool_owner]
 defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.ccip_router]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.ccip_token_pool]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml
@@ -1,8 +1,8 @@
 name = "synthetix-omnibus"
-version = "3.1.1"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-mainnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
     "tomls/collaterals/snx.toml",
@@ -42,3 +42,9 @@ defaultValue = "1"
 
 [setting.sc_pool_owner]
 defaultValue = "0x302d2451d9f47620374B54c521423Bf0403916A2"
+
+[setting.ccip_router]
+defaultValue = "0xE561d5E02207fb5eB32cca20a699E0d8919a1476"
+
+[setting.ccip_token_pool]
+defaultValue = "0x057152DB365B47851B0A0bd431644b8eE21fE1b4"
diff --git a/omnibus-optimism-goerli.toml b/omnibus-optimism-goerli.toml
@@ -1,8 +1,8 @@
 name = "synthetix-omnibus"
-version = "3.1.2-dev.b58535f2"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-testnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
     "tomls/collaterals/snx.toml",
@@ -47,14 +47,11 @@ defaultValue = "1"
 [setting.sc_pool_owner]
 defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 
-[setting.snx_package]
-defaultValue = "synthetix:3.1.1"
+[setting.ccip_router]
+defaultValue = "0xeb52e9ae4a9fb37172978642d4c141ef53876f26"
 
-[setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.1.1"
-
-[setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.1.2-dev.b58535f2"
+[setting.ccip_token_pool]
+defaultValue = "0x7a81e36b40b0a778afb2ae3c8384b6195233d093"
 
 # Aggregators for markets
 

diff --git a/omnibus-optimism-mainnet.toml b/omnibus-optimism-mainnet.toml
@@ -1,8 +1,8 @@
 name = "synthetix-omnibus"
-version = "3.1.1"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-mainnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
     "tomls/collaterals/snx.toml",
@@ -47,6 +47,12 @@ defaultValue = "1"
 [setting.sc_pool_owner]
 defaultValue = "0x302d2451d9f47620374B54c521423Bf0403916A2"
 
+[setting.ccip_router]
+defaultValue = "0x261c05167db67B2b619f9d312e0753f3721ad6E8"
+
+[setting.ccip_token_pool]
+defaultValue = "0xe470A3068302CF045Eec3B800dDBFf42B42e18D8"
+
 # ETH Synth Configuration
 
 [setting.synthEthAsyncFixedFee]

diff --git a/omnibus-polygon-mumbai.toml b/omnibus-polygon-mumbai.toml
@@ -0,0 +1,50 @@
+name = "synthetix-omnibus"
+version = "3.2.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings-testnet.toml",
+    "tomls/core.toml",
+    "tomls/permissions.toml",
+    "tomls/collaterals/weth.toml",
+    "tomls/pools/spartan-council.toml",
+    "tomls/permit-all-createPool.toml",
+    "tomls/permit-all-registerMarket.toml",
+]
+
+[setting.owner]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.weth_address]
+defaultValue = "0xA6FA4fB5f76172d178d61B04b0ecd319C5d1C0aa"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x0715A7794a1dc8e42615F059dD6e406A6594651A"
+
+[setting.snx_liquidation_reward]
+defaultValue = "10000000000000000000"
+
+[setting.weth_liquidation_reward]
+defaultValue = "10000000000000000000"
+
+[setting.minimum_liquidity_ratio]
+defaultValue = "2000000000000000000"
+
+[setting.account_timeout_withdraw]
+defaultValue = "0"
+
+[setting.deployer]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.sc_pool_id]
+defaultValue = "1"
+
+[setting.sc_pool_owner]
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+# Chainlink Configuration
+
+[setting.ccip_router]
+defaultValue = "0x70499c328e1e2a3c41108bd3730f6670a44595d1"
+
+[setting.ccip_token_pool]
+defaultValue = "0x56ffa3ae8bb98b120067b1be50136f681aa3addf"
diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml
@@ -1,25 +1,18 @@
 name = "synthetix-omnibus"
-version = "3.1.1"
+version = "3.2.0"
 description = "Includes the full synthetix system with configurations applied"
 include = [
-    "tomls/settings.toml",
+    "tomls/settings-testnet.toml",
     "tomls/core.toml",
     "tomls/permissions.toml",
-    #"tomls/collaterals/snx.toml",
     "tomls/collaterals/weth.toml",
     "tomls/pools/spartan-council.toml",
     "tomls/permit-all-createPool.toml",
     "tomls/permit-all-registerMarket.toml",
 ]
 
 [setting.owner]
-defaultValue = "0x6E1613B5c68B4Cf2A58400D8019a97849A678139"
-
-[setting.salt]
-defaultValue = "0x3330363734343032330000000000000000000000000000000000000000000000"
-
-[setting.bundleSalt]
-defaultValue = "snax"
+defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 
 [setting.weth_address]
 defaultValue = "0x7b79995e5f793a07bc00c21412e50ecae098e7f9"
@@ -44,3 +37,9 @@ defaultValue = "1"
 
 [setting.sc_pool_owner]
 defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.ccip_router]
+defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf"
+
+[setting.ccip_token_pool]
+defaultValue = "0x2291909e328dd00e6b3284730d478f39dbde4c88"
diff --git a/tomls/core.toml b/tomls/core.toml
@@ -1,9 +1,10 @@
 [setting.snx_package]
-defaultValue = "synthetix:3.1.1"
+defaultValue = "synthetix:3.2.0"
 
 [setting.owner]
 
 [setting.target_preset]
+defaultValue = "main"
 
 [setting.salt]
 defaultValue = "snax"

diff --git a/tomls/markets/common/settlement-strategies/eth/pyth.toml b/tomls/markets/common/settlement-strategies/eth/pyth.toml
@@ -4,6 +4,9 @@ defaultValue = "15"
 [setting.ethSettlementWindowDuration]
 defaultValue = "60"
 
+[setting.ethPriceWindowDuration]
+defaultValue = "600"
+
 [setting.pythPriceVerificationAddress]
 defaultValue = "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C"
 

diff --git a/tomls/markets/perps-factory.toml b/tomls/markets/perps-factory.toml
@@ -3,14 +3,14 @@ include = [
 ]
 
 [setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.1.1"
+defaultValue = "synthetix-perps-market:3.2.0"
 
 [provision.perpsFactory]
 source = "<%= settings.perps_market_package %>"
 targetPreset = "main"
 options.coreProxyOwner = "<%= settings.owner %>"
 options.owner = "<%= settings.owner %>"
-options.salt = "<%= settings.salt %>"
+options.salt = ""
 options.synthetixPackage = "<%= settings.snx_package %>"
 options.spotMarketPackage = "<%= settings.spot_market_package %>"
 

diff --git a/tomls/markets/spot-factory.toml b/tomls/markets/spot-factory.toml
@@ -3,14 +3,14 @@ include = [
 ]
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.1.1"
+defaultValue = "synthetix-spot-market:3.2.0"
 
 [provision.spotFactory]
 source = "<%= settings.spot_market_package %>"
 targetPreset = "main"
 options.coreProxyOwner = "<%= settings.owner %>"
 options.owner = "<%= settings.owner %>"
-options.salt = "<%= settings.salt %>"
+options.salt = ""
 options.synthetixPackage = "<%= settings.snx_package %>"
 
 depends = ["provision.system"]
diff --git a/tomls/settings-mainnet.toml b/tomls/settings-mainnet.toml
@@ -0,0 +1,13 @@
+include = [
+    "settings.toml",
+]
+
+[invoke.setSupportedCrossChainNetworks]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "setSupportedCrossChainNetworks"
+args = [
+  ["1", "10"], 
+  ["5009297550715157269", "3734403246176062136"]
+]
+depends = ["provision.system"]
diff --git a/tomls/settings-testnet.toml b/tomls/settings-testnet.toml
@@ -0,0 +1,13 @@
+include = [
+    "settings.toml",
+]
+
+[invoke.setSupportedCrossChainNetworks]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "setSupportedCrossChainNetworks"
+args = [
+  ["11155111", "420", "421613", "80001"], 
+  ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517"]
+]
+depends = ["provision.system"]
diff --git a/tomls/settings.toml b/tomls/settings.toml
@@ -2,6 +2,10 @@
 
 [setting.account_timeout_withdraw]
 
+[setting.ccip_router]
+
+[setting.ccip_token_pool]
+
 [invoke.setMinimumLiquidityRatio]
 target = ["system.CoreProxy"]
 fromCall.func = "owner"
@@ -17,4 +21,14 @@ args = [
   "<%= formatBytes32String('accountTimeoutWithdraw') %>", 
   "<%= hexZeroPad(hexlify(parseInt(settings.account_timeout_withdraw)), 32) %>"
 ]
-depends = ["provision.system"]
+depends = ["provision.system"]
+
+[invoke.configureChainlinkCrossChain]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "configureChainlinkCrossChain"
+args = [
+  "<%= settings.ccip_router %>", 
+  "<%= settings.ccip_token_pool %>"
+]
+depends = ["provision.system"]