From fe5d2cd3d7ade027af01b98ddf1a6d97443c70b1 Mon Sep 17 00:00:00 2001 From: dbeal Date: Thu, 22 Aug 2024 13:08:56 +0900 Subject: [PATCH 1/7] update spartan council pool settings SC pool should always disable other collaterals by default --- tomls/pools/spartan-council.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tomls/pools/spartan-council.toml b/tomls/pools/spartan-council.toml index b387aa86c..d6d25c790 100644 --- a/tomls/pools/spartan-council.toml +++ b/tomls/pools/spartan-council.toml @@ -19,6 +19,14 @@ func = "setPoolName" args = ["<%= settings.sc_pool_id %>", "Spartan Council Pool"] depends = ["invoke.createScPool"] +[invoke.setPreferredPool] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.sc_pool_id %>"] +func = "setPoolCollateralDisabledByDefault" +args = ["<%= settings.sc_pool_id %>", true] +depends = ["invoke.createScPool"] + [invoke.setPreferredPool] target = ["system.CoreProxy"] fromCall.func = "owner" From b232020010a09cf2ab5c3e39a137aed7dffa7282 Mon Sep 17 00:00:00 2001 From: dbeal Date: Thu, 22 Aug 2024 13:10:06 +0900 Subject: [PATCH 2/7] Update spartan-council.toml --- tomls/pools/spartan-council.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomls/pools/spartan-council.toml b/tomls/pools/spartan-council.toml index d6d25c790..cea4166f7 100644 --- a/tomls/pools/spartan-council.toml +++ b/tomls/pools/spartan-council.toml @@ -19,7 +19,7 @@ func = "setPoolName" args = ["<%= settings.sc_pool_id %>", "Spartan Council Pool"] depends = ["invoke.createScPool"] -[invoke.setPreferredPool] +[invoke.setScCollateralDisabledByDefault] target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.sc_pool_id %>"] From 13f0105cea40a6f6a527f26800812545c132894b Mon Sep 17 00:00:00 2001 From: Noisekit Date: Mon, 2 Sep 2024 18:00:22 +1000 Subject: [PATCH 3/7] Update omnibus-sepolia.toml have to add snx type # Conflicts: # omnibus-sepolia.toml --- omnibus-sepolia.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index e93e922ab..00fb61c82 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -159,3 +159,14 @@ source = "pyth-erc7412-wrapper:3.3.15" targetPreset = "<%= settings.target_preset %>" options.salt = "<%= settings.salt %>" options.pythAddress = "<%= settings.pyth_price_verification_address %>" + +[invoke.CoreProxy_setPoolCollateralConfiguration_SNX] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.sc_pool_id %>"] +func = "setPoolCollateralConfiguration" +args = [ + "<%= settings.sc_pool_id %>", + "<%= settings.snx_address %>", + { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 } +] From 8867e002b9c3ae2163a93f42b77ec128c554441b Mon Sep 17 00:00:00 2001 From: Noisekit Date: Mon, 2 Sep 2024 18:01:23 +1000 Subject: [PATCH 4/7] Update omnibus-mainnet.toml # Conflicts: # omnibus-mainnet.toml --- omnibus-mainnet.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml index 74b9fdf76..a58d8ac57 100644 --- a/omnibus-mainnet.toml +++ b/omnibus-mainnet.toml @@ -127,6 +127,17 @@ source = "usde-token" #"<%= settings.synth_usde_max_market_collateral %>", #] +[invoke.CoreProxy_setPoolCollateralConfiguration_SNX] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.sc_pool_id %>"] +func = "setPoolCollateralConfiguration" +args = [ + "<%= settings.sc_pool_id %>", + "<%= settings.snx_address %>", + { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 } +] + [invoke.pauseLMMigration] target = ["legacyMarket.Proxy"] fromCall.func = "owner" From 8a0fd5d86d923f8746ce0b19b37f38bfe6a39f34 Mon Sep 17 00:00:00 2001 From: Daniel Beal Date: Thu, 22 Aug 2024 13:18:00 +0900 Subject: [PATCH 5/7] pretty --- omnibus-mainnet.toml | 2 +- omnibus-sepolia.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml index a58d8ac57..423b386c3 100644 --- a/omnibus-mainnet.toml +++ b/omnibus-mainnet.toml @@ -135,7 +135,7 @@ func = "setPoolCollateralConfiguration" args = [ "<%= settings.sc_pool_id %>", "<%= settings.snx_address %>", - { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 } + { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 }, ] [invoke.pauseLMMigration] diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index 00fb61c82..5e8f56eb4 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -168,5 +168,5 @@ func = "setPoolCollateralConfiguration" args = [ "<%= settings.sc_pool_id %>", "<%= settings.snx_address %>", - { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 } + { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = 0 }, ] From 912878183d0ccbd5ef9b1504f37817462a830954 Mon Sep 17 00:00:00 2001 From: Noisekit Date: Mon, 2 Sep 2024 18:03:01 +1000 Subject: [PATCH 6/7] Rename new invoke step --- omnibus-mainnet.toml | 2 +- omnibus-sepolia.toml | 2 +- tomls/pools/spartan-council.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml index 423b386c3..188ca2aa8 100644 --- a/omnibus-mainnet.toml +++ b/omnibus-mainnet.toml @@ -127,7 +127,7 @@ source = "usde-token" #"<%= settings.synth_usde_max_market_collateral %>", #] -[invoke.CoreProxy_setPoolCollateralConfiguration_SNX] +[invoke.CoreProxy_setPoolCollateralConfiguration_SpartanCouncilPool_SNX] target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.sc_pool_id %>"] diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index 5e8f56eb4..0b3779638 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -160,7 +160,7 @@ targetPreset = "<%= settings.target_preset %>" options.salt = "<%= settings.salt %>" options.pythAddress = "<%= settings.pyth_price_verification_address %>" -[invoke.CoreProxy_setPoolCollateralConfiguration_SNX] +[invoke.CoreProxy_setPoolCollateralConfiguration_SpartanCouncilPool_SNX] target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.sc_pool_id %>"] diff --git a/tomls/pools/spartan-council.toml b/tomls/pools/spartan-council.toml index cea4166f7..f4ccae4c1 100644 --- a/tomls/pools/spartan-council.toml +++ b/tomls/pools/spartan-council.toml @@ -19,7 +19,7 @@ func = "setPoolName" args = ["<%= settings.sc_pool_id %>", "Spartan Council Pool"] depends = ["invoke.createScPool"] -[invoke.setScCollateralDisabledByDefault] +[invoke.CoreProxy_setPoolCollateralDisabledByDefault_SpartanCouncilPool] target = ["system.CoreProxy"] fromCall.func = "getPoolOwner" fromCall.args = ["<%= settings.sc_pool_id %>"] From 052ad4429bd216cfd4ecefac69be7cde720b5d43 Mon Sep 17 00:00:00 2001 From: Noisekit Date: Mon, 2 Sep 2024 18:06:22 +1000 Subject: [PATCH 7/7] Bump versions --- omnibus-mainnet.toml | 2 +- omnibus-sepolia.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml index 188ca2aa8..c4f5215f1 100644 --- a/omnibus-mainnet.toml +++ b/omnibus-mainnet.toml @@ -1,5 +1,5 @@ name = "synthetix-omnibus" -version = "10" +version = "11" description = "Includes the full synthetix system with configurations applied" include = [ "tomls/settings.toml", diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index 0b3779638..7e36d1cfc 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -1,5 +1,5 @@ name = "synthetix-omnibus" -version = "7" +version = "8" description = "Includes the full synthetix system with configurations applied" include = [ "tomls/settings.toml",