From 7877d2f0a72386f83747d3a465c1a689e19cf711 Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Fri, 9 Jun 2023 09:30:44 -0400
Subject: [PATCH 1/8] Add files for xchainxfers deployment

---
 omnibus-polygon-mumbai-xchainxfers.toml | 69 +++++++++++++++++++++++++
 omnibus-sepolia-xchainxfers.toml        | 69 +++++++++++++++++++++++++
 tomls/core.toml                         |  2 +-
 tomls/settings.toml                     | 17 ++++++
 4 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 omnibus-polygon-mumbai-xchainxfers.toml
 create mode 100644 omnibus-sepolia-xchainxfers.toml

diff --git a/omnibus-polygon-mumbai-xchainxfers.toml b/omnibus-polygon-mumbai-xchainxfers.toml
new file mode 100644
index 00000000..6a4599c7
--- /dev/null
+++ b/omnibus-polygon-mumbai-xchainxfers.toml
@@ -0,0 +1,69 @@
+name = "synthetix-omnibus"
+version = "3.2.0-xchain.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.salt]
+defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
+
+[setting.bundleSalt]
+defaultValue = "xchainxfers"
+
+[setting.target_preset]
+defaultValue = "xchainxfers"
+
+[setting.weth_address]
+defaultValue = "0xA6FA4fB5f76172d178d61B04b0ecd319C5d1C0aa"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x0715A7794a1dc8e42615F059dD6e406A6594651A"
+
+[setting.snx_address]
+defaultValue = "0x99ad600dda7879CFD0FdC55124585603DEED0070"
+
+[setting.snx_aggregator_address]
+defaultValue = "0x1C2252aeeD50e0c9B64bDfF2735Ee3C932F5C408"
+
+[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 = "0x8a710bbd77661d168d5a6725bd2e514ba1bff59d"
+
+[setting.ccip_token_pool]
+defaultValue = "0xddbfcc4308b238bf7fcb69ced2a4ac5fea6001af"
+
+[setting.chainlink_funcs]
+defaultValue = "0x8a710bbd77661d168d5a6725bd2e514ba1bff59d"
\ No newline at end of file
diff --git a/omnibus-sepolia-xchainxfers.toml b/omnibus-sepolia-xchainxfers.toml
new file mode 100644
index 00000000..ff257cc3
--- /dev/null
+++ b/omnibus-sepolia-xchainxfers.toml
@@ -0,0 +1,69 @@
+name = "synthetix-omnibus"
+version = "3.2.0-xchain.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.salt]
+defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
+
+[setting.bundleSalt]
+defaultValue = "xchainxfers"
+
+[setting.target_preset]
+defaultValue = "xchainxfers"
+
+[setting.weth_address]
+defaultValue = "0x7b79995e5f793a07bc00c21412e50ecae098e7f9"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x694AA1769357215DE4FAC081bf1f309aDC325306"
+
+[setting.snx_address]
+defaultValue = "0xd61c1bbd33744a5dab3b7843758b766c07e1fb97"
+
+[setting.snx_aggregator_address]
+defaultValue = "0xc0F82A46033b8BdBA4Bb0B0e28Bc2006F64355bC"
+
+[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 = "0xa5bd184d05c7535c8a022905558974752e646a88"
+
+[setting.ccip_token_pool]
+defaultValue = "0x6bb8d729c35f29df532eb3998ddace336187c84b"
+
+[setting.chainlink_funcs]
+defaultValue = "0xa5bd184d05c7535c8a022905558974752e646a88"
\ No newline at end of file
diff --git a/tomls/core.toml b/tomls/core.toml
index 3de5c1b9..011b2c31 100644
--- a/tomls/core.toml
+++ b/tomls/core.toml
@@ -1,5 +1,5 @@
 [setting.snx_package]
-defaultValue = "synthetix:3.1.1"
+defaultValue = "synthetix:3.2.0-xchain.0"
 
 [setting.owner]
 
diff --git a/tomls/settings.toml b/tomls/settings.toml
index d36f1f4c..ca522ee9 100644
--- a/tomls/settings.toml
+++ b/tomls/settings.toml
@@ -2,6 +2,12 @@
 
 [setting.account_timeout_withdraw]
 
+[setting.ccip_router]
+
+[setting.ccip_token_pool]
+
+[setting.chainlink_funcs]
+
 [invoke.setMinimumLiquidityRatio]
 target = ["system.CoreProxy"]
 fromCall.func = "owner"
@@ -17,4 +23,15 @@ args = [
   "<%= formatBytes32String('accountTimeoutWithdraw') %>", 
   "<%= hexZeroPad(hexlify(parseInt(settings.account_timeout_withdraw)), 32) %>"
 ]
+depends = ["provision.system"]
+
+[invoke.configureChainlinkCrossChain]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "configureChainlinkCrossChain"
+args = [
+  "<%= settings.ccip_router %>", 
+  "<%= settings.ccip_token_pool %>", 
+  "<%= settings.chainlink_funcs %>"
+]
 depends = ["provision.system"]
\ No newline at end of file

From 2f5da013f97c21f128d57ca79da2baf8e13571dd Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Thu, 15 Jun 2023 15:23:48 -0400
Subject: [PATCH 2/8] add omnibus files for op and arb testnets

---
 omnibus-arbitrum-goerli-xchainxfers.toml | 69 ++++++++++++++++++++++++
 omnibus-optimism-goerli-xchainxfers.toml | 69 ++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 omnibus-arbitrum-goerli-xchainxfers.toml
 create mode 100644 omnibus-optimism-goerli-xchainxfers.toml

diff --git a/omnibus-arbitrum-goerli-xchainxfers.toml b/omnibus-arbitrum-goerli-xchainxfers.toml
new file mode 100644
index 00000000..35d463e8
--- /dev/null
+++ b/omnibus-arbitrum-goerli-xchainxfers.toml
@@ -0,0 +1,69 @@
+name = "synthetix-omnibus"
+version = "3.2.0-xchain.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.salt]
+defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
+
+[setting.bundleSalt]
+defaultValue = "xchainxfers"
+
+[setting.target_preset]
+defaultValue = "xchainxfers"
+
+[setting.weth_address]
+defaultValue = "0x7F5bc2250ea57d8ca932898297b1FF9aE1a04999"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x62CAe0FA2da220f43a51F86Db2EDb36DcA9A5A08"
+
+[setting.snx_address]
+defaultValue = "0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28"
+
+[setting.snx_aggregator_address]
+defaultValue = "0xd28Ba6CA3bB72bF371b80a2a0a33cBcf9073C954"
+
+[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 = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
+
+[setting.ccip_token_pool]
+defaultValue = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
+
+[setting.chainlink_funcs]
+defaultValue = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
\ No newline at end of file
diff --git a/omnibus-optimism-goerli-xchainxfers.toml b/omnibus-optimism-goerli-xchainxfers.toml
new file mode 100644
index 00000000..ffb4cf91
--- /dev/null
+++ b/omnibus-optimism-goerli-xchainxfers.toml
@@ -0,0 +1,69 @@
+name = "synthetix-omnibus"
+version = "3.2.0-xchain.0"
+description = "Includes the full synthetix system with configurations applied"
+include = [
+    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
+
+[setting.salt]
+defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
+
+[setting.bundleSalt]
+defaultValue = "xchainxfers"
+
+[setting.target_preset]
+defaultValue = "xchainxfers"
+
+[setting.weth_address]
+defaultValue = "0x4200000000000000000000000000000000000006"
+
+[setting.eth_aggregator_address]
+defaultValue = "0x57241A37733983F97C4Ab06448F244A1E0Ca0ba8"
+
+[setting.snx_address]
+defaultValue = "0x2E5ED97596a8368EB9E44B1f3F25B2E813845303"
+
+[setting.snx_aggregator_address]
+defaultValue = "0x89A7630f46B8c35A7fBBC4f6e4783f1E2DC715c6"
+
+[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 = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
+
+[setting.ccip_token_pool]
+defaultValue = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
+
+[setting.chainlink_funcs]
+defaultValue = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
\ No newline at end of file

From ffafa7275cdd6c23559a9feba763bc79d2072e88 Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Fri, 16 Jun 2023 13:52:57 -0400
Subject: [PATCH 3/8] update ccip router and token pool addresses

---
 omnibus-arbitrum-goerli-xchainxfers.toml | 6 +++---
 omnibus-optimism-goerli-xchainxfers.toml | 6 +++---
 omnibus-polygon-mumbai-xchainxfers.toml  | 6 +++---
 omnibus-sepolia-xchainxfers.toml         | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/omnibus-arbitrum-goerli-xchainxfers.toml b/omnibus-arbitrum-goerli-xchainxfers.toml
index 35d463e8..03c81b1a 100644
--- a/omnibus-arbitrum-goerli-xchainxfers.toml
+++ b/omnibus-arbitrum-goerli-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
+defaultValue = "0x651ef69f635f5017e281c2ee09cdd4436560c89e"
 
 [setting.ccip_token_pool]
-defaultValue = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
+defaultValue = "0x691e9949df34268d338082a01e790688d64d837e"
 
 [setting.chainlink_funcs]
-defaultValue = "0xf9b7595d64a380ffa605a1d11bff5cd629fb7189"
\ No newline at end of file
+defaultValue = "0x651ef69f635f5017e281c2ee09cdd4436560c89e"
\ No newline at end of file
diff --git a/omnibus-optimism-goerli-xchainxfers.toml b/omnibus-optimism-goerli-xchainxfers.toml
index ffb4cf91..059e5415 100644
--- a/omnibus-optimism-goerli-xchainxfers.toml
+++ b/omnibus-optimism-goerli-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
+defaultValue = "0x8ec5ad6cb5496dae52d2e80cd59fa78d066626d6"
 
 [setting.ccip_token_pool]
-defaultValue = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
+defaultValue = "0x41eb1dc55fa7d124727e5810e1a78e2ab495a81a"
 
 [setting.chainlink_funcs]
-defaultValue = "0x6a9ccb433615caaf0ef20a9f7f04e339dca8f219"
\ No newline at end of file
+defaultValue = "0x8ec5ad6cb5496dae52d2e80cd59fa78d066626d6"
\ No newline at end of file
diff --git a/omnibus-polygon-mumbai-xchainxfers.toml b/omnibus-polygon-mumbai-xchainxfers.toml
index 6a4599c7..158efe8f 100644
--- a/omnibus-polygon-mumbai-xchainxfers.toml
+++ b/omnibus-polygon-mumbai-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x8a710bbd77661d168d5a6725bd2e514ba1bff59d"
+defaultValue = "0x43a2a4c2ecb74ff45eca704a14111d8f2b1c0fa0"
 
 [setting.ccip_token_pool]
-defaultValue = "0xddbfcc4308b238bf7fcb69ced2a4ac5fea6001af"
+defaultValue = "0x6b81108f83b197f8c4436bc905ff2ba61e679b85"
 
 [setting.chainlink_funcs]
-defaultValue = "0x8a710bbd77661d168d5a6725bd2e514ba1bff59d"
\ No newline at end of file
+defaultValue = "0x43a2a4c2ecb74ff45eca704a14111d8f2b1c0fa0"
\ No newline at end of file
diff --git a/omnibus-sepolia-xchainxfers.toml b/omnibus-sepolia-xchainxfers.toml
index ff257cc3..7a0435c7 100644
--- a/omnibus-sepolia-xchainxfers.toml
+++ b/omnibus-sepolia-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0xa5bd184d05c7535c8a022905558974752e646a88"
+defaultValue = "0x366e98df2881543185ece04dacffde417c7d2f1d"
 
 [setting.ccip_token_pool]
-defaultValue = "0x6bb8d729c35f29df532eb3998ddace336187c84b"
+defaultValue = "0x72621601257da0c36c99ae84e2817b2d82f4f1ad"
 
 [setting.chainlink_funcs]
-defaultValue = "0xa5bd184d05c7535c8a022905558974752e646a88"
\ No newline at end of file
+defaultValue = "0x366e98df2881543185ece04dacffde417c7d2f1d"
\ No newline at end of file

From 593ed5883714a89f6b40925f1cd6f429379c501b Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:24:00 -0400
Subject: [PATCH 4/8] Update router and token pool addresses

---
 omnibus-arbitrum-goerli-xchainxfers.toml | 4 ++--
 omnibus-optimism-goerli-xchainxfers.toml | 4 ++--
 omnibus-polygon-mumbai-xchainxfers.toml  | 4 ++--
 omnibus-sepolia-xchainxfers.toml         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/omnibus-arbitrum-goerli-xchainxfers.toml b/omnibus-arbitrum-goerli-xchainxfers.toml
index 03c81b1a..5518acbd 100644
--- a/omnibus-arbitrum-goerli-xchainxfers.toml
+++ b/omnibus-arbitrum-goerli-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x651ef69f635f5017e281c2ee09cdd4436560c89e"
+defaultValue = "0x88e492127709447a5abefdab8788a15b4567589e"
 
 [setting.ccip_token_pool]
-defaultValue = "0x691e9949df34268d338082a01e790688d64d837e"
+defaultValue = "0x7990f84bbe3e6638907d5fcc217555146304a8d9"
 
 [setting.chainlink_funcs]
 defaultValue = "0x651ef69f635f5017e281c2ee09cdd4436560c89e"
\ No newline at end of file
diff --git a/omnibus-optimism-goerli-xchainxfers.toml b/omnibus-optimism-goerli-xchainxfers.toml
index 059e5415..c6a40ff9 100644
--- a/omnibus-optimism-goerli-xchainxfers.toml
+++ b/omnibus-optimism-goerli-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x8ec5ad6cb5496dae52d2e80cd59fa78d066626d6"
+defaultValue = "0xeb52e9ae4a9fb37172978642d4c141ef53876f26"
 
 [setting.ccip_token_pool]
-defaultValue = "0x41eb1dc55fa7d124727e5810e1a78e2ab495a81a"
+defaultValue = "0x7a81e36b40b0a778afb2ae3c8384b6195233d093"
 
 [setting.chainlink_funcs]
 defaultValue = "0x8ec5ad6cb5496dae52d2e80cd59fa78d066626d6"
\ No newline at end of file
diff --git a/omnibus-polygon-mumbai-xchainxfers.toml b/omnibus-polygon-mumbai-xchainxfers.toml
index 158efe8f..10f83685 100644
--- a/omnibus-polygon-mumbai-xchainxfers.toml
+++ b/omnibus-polygon-mumbai-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x43a2a4c2ecb74ff45eca704a14111d8f2b1c0fa0"
+defaultValue = "0x70499c328e1e2a3c41108bd3730f6670a44595d1"
 
 [setting.ccip_token_pool]
-defaultValue = "0x6b81108f83b197f8c4436bc905ff2ba61e679b85"
+defaultValue = "0x56ffa3ae8bb98b120067b1be50136f681aa3addf"
 
 [setting.chainlink_funcs]
 defaultValue = "0x43a2a4c2ecb74ff45eca704a14111d8f2b1c0fa0"
\ No newline at end of file
diff --git a/omnibus-sepolia-xchainxfers.toml b/omnibus-sepolia-xchainxfers.toml
index 7a0435c7..7a8e4bf5 100644
--- a/omnibus-sepolia-xchainxfers.toml
+++ b/omnibus-sepolia-xchainxfers.toml
@@ -60,10 +60,10 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
 # Chainlink Configuration
 
 [setting.ccip_router]
-defaultValue = "0x366e98df2881543185ece04dacffde417c7d2f1d"
+defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf"
 
 [setting.ccip_token_pool]
-defaultValue = "0x72621601257da0c36c99ae84e2817b2d82f4f1ad"
+defaultValue = "0x2291909e328dd00e6b3284730d478f39dbde4c88"
 
 [setting.chainlink_funcs]
 defaultValue = "0x366e98df2881543185ece04dacffde417c7d2f1d"
\ No newline at end of file

From c46588f335dc333f7af5f85f0eebe51bf5c606ec Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:20:32 -0400
Subject: [PATCH 5/8] testnet deployments

---
 omnibus-arbitrum-goerli.toml                  | 50 +++++++++++++++++++
 omnibus-optimism-goerli.toml                  | 18 +++----
 omnibus-polygon-mumbai.toml                   | 50 +++++++++++++++++++
 omnibus-sepolia.toml                          | 19 ++++---
 tomls/core.toml                               |  3 +-
 .../settlement-strategies/eth/pyth.toml       |  3 ++
 tomls/markets/perps-factory.toml              |  4 +-
 tomls/markets/perps/eth.toml                  | 31 ++++++------
 tomls/markets/spot-factory.toml               |  4 +-
 tomls/settings-mainnet.toml                   | 13 +++++
 tomls/settings-testnet.toml                   | 13 +++++
 tomls/settings.toml                           | 15 ++++--
 12 files changed, 181 insertions(+), 42 deletions(-)
 create mode 100644 omnibus-arbitrum-goerli.toml
 create mode 100644 omnibus-polygon-mumbai.toml
 create mode 100644 tomls/settings-mainnet.toml
 create mode 100644 tomls/settings-testnet.toml

diff --git a/omnibus-arbitrum-goerli.toml b/omnibus-arbitrum-goerli.toml
new file mode 100644
index 00000000..1412e76f
--- /dev/null
+++ 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-optimism-goerli.toml b/omnibus-optimism-goerli.toml
index 5e873935..137a358b 100644
--- a/omnibus-optimism-goerli.toml
+++ b/omnibus-optimism-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",
@@ -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.1"
+[setting.ccip_token_pool]
+defaultValue = "0x7a81e36b40b0a778afb2ae3c8384b6195233d093"
 
 # Aggregators for markets
 
@@ -72,6 +69,9 @@ defaultValue = "0x57241A37733983F97C4Ab06448F244A1E0Ca0ba8"
 [setting.perpsEthSkewScale]
 defaultValue = "100000"
 
+[setting.perpsEthMaxFundingVelocity]
+defaultValue = "1"
+
 # ETH Synth Configuration
 
 [setting.synthEthAsyncFixedFee]
diff --git a/omnibus-polygon-mumbai.toml b/omnibus-polygon-mumbai.toml
new file mode 100644
index 00000000..4e3dd466
--- /dev/null
+++ 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
index 526dbc6f..949625b3 100644
--- a/omnibus-sepolia.toml
+++ b/omnibus-sepolia.toml
@@ -1,11 +1,10 @@
 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",
@@ -13,13 +12,7 @@ include = [
 ]
 
 [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"
\ No newline at end of file
diff --git a/tomls/core.toml b/tomls/core.toml
index 011b2c31..e66ea2be 100644
--- a/tomls/core.toml
+++ b/tomls/core.toml
@@ -1,9 +1,10 @@
 [setting.snx_package]
-defaultValue = "synthetix:3.2.0-xchain.0"
+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
index d9b98471..37e94bd8 100644
--- a/tomls/markets/common/settlement-strategies/eth/pyth.toml
+++ b/tomls/markets/common/settlement-strategies/eth/pyth.toml
@@ -7,6 +7,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
index 041690e6..996c0d7c 100644
--- 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/perps/eth.toml b/tomls/markets/perps/eth.toml
index d216e103..e130c9d8 100644
--- a/tomls/markets/perps/eth.toml
+++ b/tomls/markets/perps/eth.toml
@@ -9,6 +9,8 @@ include = [
 
 [setting.perpsEthSkewScale]
 
+[setting.perpsEthMaxFundingVelocity]
+
 [invoke.createEthPerpsMarket]
 target = ["perpsFactory.PerpsMarketProxy"]
 fromCall.func = "owner"
@@ -29,26 +31,27 @@ args = [
 ]
 depends = ["invoke.createEthPerpsMarket", "invoke.registerEthOracleNode"]
 
-[invoke.setPerpsEthSettlementStrategy]
-target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
-func = "addSettlementStrategy"
-args = [
-  "<%= extras.perps_eth_market_id %>", 
-  { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.ethSettlementDelay %>", settlementWindowDuration = "<%= settings.ethSettlementWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>",  url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther(settings.ethSettlementDeviationTolerance) %>", disabled = false }
-]
-depends = ["invoke.createEthPerpsMarket"]
-
-[invoke.setPerpsSkewScaleEth]
+#[invoke.setPerpsEthSettlementStrategy]
+#target = ["perpsFactory.PerpsMarketProxy"]
+#fromCall.func = "getMarketOwner"
+#fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+#func = "addSettlementStrategy"
+#args = [
+#  "<%= extras.perps_eth_market_id %>", 
+#  { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.ethSettlementDelay %>", settlementWindowDuration = "<%= settings.ethSettlementWindowDuration %>",  priceWindowDuration = "<%= settings.ethPriceWindowDuration %>", priceVerificationContract = "<%= settings.pythPriceVerificationAddress %>", feedId = "<%= settings.pythEthFeedId %>",  url = "<%= settings.pythFeedUrl %>", settlementReward = "<%= settings.settlementReward %>", priceDeviationTolerance = "<%= parseEther(settings.ethSettlementDeviationTolerance) %>", disabled = false }
+#]
+#depends = ["invoke.createEthPerpsMarket"]
+
+[invoke.setPerpsEthFundingParameters]
 target = ["perpsFactory.PerpsMarketProxy"]
 fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.perps_eth_market_id %>"]
 
-func = "setSkewScale"
+func = "setFundingParameters"
 args = [
   "<%= extras.perps_eth_market_id %>", 
-  "<%= parseEther(settings.perpsEthSkewScale) %>"
+  "<%= parseEther(settings.perpsEthSkewScale) %>",
+  "<%= settings.perpsEthSkewScale %>"
 ]
 
 depends = ["invoke.createEthPerpsMarket"]
diff --git a/tomls/markets/spot-factory.toml b/tomls/markets/spot-factory.toml
index 5b742ce2..35747bd7 100644
--- 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"]
\ No newline at end of file
diff --git a/tomls/settings-mainnet.toml b/tomls/settings-mainnet.toml
new file mode 100644
index 00000000..1b3f832e
--- /dev/null
+++ b/tomls/settings-mainnet.toml
@@ -0,0 +1,13 @@
+include = [
+    "tomls/settings.toml",
+]
+
+[invoke.setSupportedCrossChainNetworks]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "setSupportedCrossChainNetworks"
+args = [
+  ["1", "10"], 
+  ["", ""]
+]
+depends = ["provision.system"]
\ No newline at end of file
diff --git a/tomls/settings-testnet.toml b/tomls/settings-testnet.toml
new file mode 100644
index 00000000..40709463
--- /dev/null
+++ 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"]
\ No newline at end of file
diff --git a/tomls/settings.toml b/tomls/settings.toml
index ca522ee9..8c0494bf 100644
--- a/tomls/settings.toml
+++ b/tomls/settings.toml
@@ -6,8 +6,6 @@
 
 [setting.ccip_token_pool]
 
-[setting.chainlink_funcs]
-
 [invoke.setMinimumLiquidityRatio]
 target = ["system.CoreProxy"]
 fromCall.func = "owner"
@@ -31,7 +29,16 @@ fromCall.func = "owner"
 func = "configureChainlinkCrossChain"
 args = [
   "<%= settings.ccip_router %>", 
-  "<%= settings.ccip_token_pool %>", 
-  "<%= settings.chainlink_funcs %>"
+  "<%= settings.ccip_token_pool %>"
+]
+depends = ["provision.system"]
+
+[invoke.setSupportedCrossChainNetworks]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "setSupportedCrossChainNetworks"
+args = [
+  ["11155111", "420", "421613", "80001"], 
+  ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517"]
 ]
 depends = ["provision.system"]
\ No newline at end of file

From 8378f8ed6caed34cbcf7912d8255918351089a61 Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Mon, 10 Jul 2023 10:30:26 -0400
Subject: [PATCH 6/8] revert xchainxfers toml files

---
 omnibus-arbitrum-goerli-xchainxfers.toml | 69 ------------------------
 omnibus-optimism-goerli-xchainxfers.toml | 69 ------------------------
 omnibus-polygon-mumbai-xchainxfers.toml  | 69 ------------------------
 omnibus-sepolia-xchainxfers.toml         | 69 ------------------------
 4 files changed, 276 deletions(-)
 delete mode 100644 omnibus-arbitrum-goerli-xchainxfers.toml
 delete mode 100644 omnibus-optimism-goerli-xchainxfers.toml
 delete mode 100644 omnibus-polygon-mumbai-xchainxfers.toml
 delete mode 100644 omnibus-sepolia-xchainxfers.toml

diff --git a/omnibus-arbitrum-goerli-xchainxfers.toml b/omnibus-arbitrum-goerli-xchainxfers.toml
deleted file mode 100644
index 5518acbd..00000000
--- a/omnibus-arbitrum-goerli-xchainxfers.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-name = "synthetix-omnibus"
-version = "3.2.0-xchain.0"
-description = "Includes the full synthetix system with configurations applied"
-include = [
-    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
-
-[setting.salt]
-defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
-
-[setting.bundleSalt]
-defaultValue = "xchainxfers"
-
-[setting.target_preset]
-defaultValue = "xchainxfers"
-
-[setting.weth_address]
-defaultValue = "0x7F5bc2250ea57d8ca932898297b1FF9aE1a04999"
-
-[setting.eth_aggregator_address]
-defaultValue = "0x62CAe0FA2da220f43a51F86Db2EDb36DcA9A5A08"
-
-[setting.snx_address]
-defaultValue = "0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28"
-
-[setting.snx_aggregator_address]
-defaultValue = "0xd28Ba6CA3bB72bF371b80a2a0a33cBcf9073C954"
-
-[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 = "0x88e492127709447a5abefdab8788a15b4567589e"
-
-[setting.ccip_token_pool]
-defaultValue = "0x7990f84bbe3e6638907d5fcc217555146304a8d9"
-
-[setting.chainlink_funcs]
-defaultValue = "0x651ef69f635f5017e281c2ee09cdd4436560c89e"
\ No newline at end of file
diff --git a/omnibus-optimism-goerli-xchainxfers.toml b/omnibus-optimism-goerli-xchainxfers.toml
deleted file mode 100644
index c6a40ff9..00000000
--- a/omnibus-optimism-goerli-xchainxfers.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-name = "synthetix-omnibus"
-version = "3.2.0-xchain.0"
-description = "Includes the full synthetix system with configurations applied"
-include = [
-    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
-
-[setting.salt]
-defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
-
-[setting.bundleSalt]
-defaultValue = "xchainxfers"
-
-[setting.target_preset]
-defaultValue = "xchainxfers"
-
-[setting.weth_address]
-defaultValue = "0x4200000000000000000000000000000000000006"
-
-[setting.eth_aggregator_address]
-defaultValue = "0x57241A37733983F97C4Ab06448F244A1E0Ca0ba8"
-
-[setting.snx_address]
-defaultValue = "0x2E5ED97596a8368EB9E44B1f3F25B2E813845303"
-
-[setting.snx_aggregator_address]
-defaultValue = "0x89A7630f46B8c35A7fBBC4f6e4783f1E2DC715c6"
-
-[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 = "0xeb52e9ae4a9fb37172978642d4c141ef53876f26"
-
-[setting.ccip_token_pool]
-defaultValue = "0x7a81e36b40b0a778afb2ae3c8384b6195233d093"
-
-[setting.chainlink_funcs]
-defaultValue = "0x8ec5ad6cb5496dae52d2e80cd59fa78d066626d6"
\ No newline at end of file
diff --git a/omnibus-polygon-mumbai-xchainxfers.toml b/omnibus-polygon-mumbai-xchainxfers.toml
deleted file mode 100644
index 10f83685..00000000
--- a/omnibus-polygon-mumbai-xchainxfers.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-name = "synthetix-omnibus"
-version = "3.2.0-xchain.0"
-description = "Includes the full synthetix system with configurations applied"
-include = [
-    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
-
-[setting.salt]
-defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
-
-[setting.bundleSalt]
-defaultValue = "xchainxfers"
-
-[setting.target_preset]
-defaultValue = "xchainxfers"
-
-[setting.weth_address]
-defaultValue = "0xA6FA4fB5f76172d178d61B04b0ecd319C5d1C0aa"
-
-[setting.eth_aggregator_address]
-defaultValue = "0x0715A7794a1dc8e42615F059dD6e406A6594651A"
-
-[setting.snx_address]
-defaultValue = "0x99ad600dda7879CFD0FdC55124585603DEED0070"
-
-[setting.snx_aggregator_address]
-defaultValue = "0x1C2252aeeD50e0c9B64bDfF2735Ee3C932F5C408"
-
-[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"
-
-[setting.chainlink_funcs]
-defaultValue = "0x43a2a4c2ecb74ff45eca704a14111d8f2b1c0fa0"
\ No newline at end of file
diff --git a/omnibus-sepolia-xchainxfers.toml b/omnibus-sepolia-xchainxfers.toml
deleted file mode 100644
index 7a8e4bf5..00000000
--- a/omnibus-sepolia-xchainxfers.toml
+++ /dev/null
@@ -1,69 +0,0 @@
-name = "synthetix-omnibus"
-version = "3.2.0-xchain.0"
-description = "Includes the full synthetix system with configurations applied"
-include = [
-    "tomls/settings.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 = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"
-
-[setting.salt]
-defaultValue = "0x78636861696e7866657273000000000000000000000000000000000000000000"
-
-[setting.bundleSalt]
-defaultValue = "xchainxfers"
-
-[setting.target_preset]
-defaultValue = "xchainxfers"
-
-[setting.weth_address]
-defaultValue = "0x7b79995e5f793a07bc00c21412e50ecae098e7f9"
-
-[setting.eth_aggregator_address]
-defaultValue = "0x694AA1769357215DE4FAC081bf1f309aDC325306"
-
-[setting.snx_address]
-defaultValue = "0xd61c1bbd33744a5dab3b7843758b766c07e1fb97"
-
-[setting.snx_aggregator_address]
-defaultValue = "0xc0F82A46033b8BdBA4Bb0B0e28Bc2006F64355bC"
-
-[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 = "0xd0daae2231e9cb96b94c8512223533293c3693bf"
-
-[setting.ccip_token_pool]
-defaultValue = "0x2291909e328dd00e6b3284730d478f39dbde4c88"
-
-[setting.chainlink_funcs]
-defaultValue = "0x366e98df2881543185ece04dacffde417c7d2f1d"
\ No newline at end of file

From 17d3f5daddf73a4fed13f44235199e9ddbe85fa6 Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Mon, 10 Jul 2023 14:59:13 -0400
Subject: [PATCH 7/8] push testnet changes

---
 omnibus-base-goerli.toml | 16 ++++++++--------
 omnibus-goerli.toml      | 10 ++++++++--
 tomls/settings.toml      | 10 ----------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/omnibus-base-goerli.toml b/omnibus-base-goerli.toml
index 0699f8fa..5e39cb46 100644
--- 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"
\ No newline at end of file
diff --git a/omnibus-goerli.toml b/omnibus-goerli.toml
index 22e40b7a..33de0893 100644
--- 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"
\ No newline at end of file
diff --git a/tomls/settings.toml b/tomls/settings.toml
index 8c0494bf..842a661e 100644
--- a/tomls/settings.toml
+++ b/tomls/settings.toml
@@ -32,13 +32,3 @@ args = [
   "<%= settings.ccip_token_pool %>"
 ]
 depends = ["provision.system"]
-
-[invoke.setSupportedCrossChainNetworks]
-target = ["system.CoreProxy"]
-fromCall.func = "owner"
-func = "setSupportedCrossChainNetworks"
-args = [
-  ["11155111", "420", "421613", "80001"], 
-  ["16015286601757825753", "2664363617261496610", "6101244977088475029", "12532609583862916517"]
-]
-depends = ["provision.system"]
\ No newline at end of file

From 1822d7889a855b66a582036ead8406a54a38d09a Mon Sep 17 00:00:00 2001
From: meb <4982406+barrasso@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:19:03 -0400
Subject: [PATCH 8/8] 3.2.0 mainnet release

---
 omnibus-mainnet.toml          | 10 ++++++++--
 omnibus-optimism-mainnet.toml | 10 ++++++++--
 tomls/settings-mainnet.toml   |  4 ++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml
index bd3720ba..a94adc47 100644
--- 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-mainnet.toml b/omnibus-optimism-mainnet.toml
index c607886c..a6b6d918 100644
--- 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/tomls/settings-mainnet.toml b/tomls/settings-mainnet.toml
index 1b3f832e..d0457e22 100644
--- a/tomls/settings-mainnet.toml
+++ b/tomls/settings-mainnet.toml
@@ -1,5 +1,5 @@
 include = [
-    "tomls/settings.toml",
+    "settings.toml",
 ]
 
 [invoke.setSupportedCrossChainNetworks]
@@ -8,6 +8,6 @@ fromCall.func = "owner"
 func = "setSupportedCrossChainNetworks"
 args = [
   ["1", "10"], 
-  ["", ""]
+  ["5009297550715157269", "3734403246176062136"]
 ]
 depends = ["provision.system"]
\ No newline at end of file