From 2c1f4a1df2028909268b7cfb9ed488c8852ce3da Mon Sep 17 00:00:00 2001 From: Noisekit Date: Fri, 6 Oct 2023 13:07:27 +0800 Subject: [PATCH] Set additional SNX pool configuration (#47) * Set additional SNX pool configuration * correct argument to disable all new collateral * Configure SNX collateral for SNX pool only for networks that have SNX * Pool collateral config should call as pool owner * Cleanup snx pool from all networks except goerli * there should not be default snx_pool_id * Unapprove wrongfully deployed snx passive pool (with incorrect pool id) * Don't run unapprove for undeployed networks --------- Co-authored-by: cavalier_eth <91091124+cavalier-eth@users.noreply.github.com> --- omnibus-arbitrum-goerli.toml | 8 +++++++- omnibus-base-goerli-competition.toml | 8 +++++++- omnibus-base-goerli.toml | 8 +++++++- omnibus-goerli.toml | 15 +++++++++++++++ omnibus-mainnet.toml | 1 - omnibus-optimism-goerli.toml | 7 ++++++- omnibus-optimism-mainnet.toml | 1 - omnibus-polygon-mumbai.toml | 8 +++++++- omnibus-sepolia.toml | 8 +++++++- tomls/pools/passive-snx.toml | 17 ++++++++++++++++- 10 files changed, 72 insertions(+), 9 deletions(-) diff --git a/omnibus-arbitrum-goerli.toml b/omnibus-arbitrum-goerli.toml index 19dcd9b0..955c7a50 100644 --- a/omnibus-arbitrum-goerli.toml +++ b/omnibus-arbitrum-goerli.toml @@ -7,7 +7,6 @@ include = [ "tomls/permissions.toml", "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-transferCrossChain.toml", @@ -58,3 +57,10 @@ defaultValue = "0x88e492127709447a5abefdab8788a15b4567589e" [setting.ccip_token_pool] defaultValue = "0xd7d47c0e62029a1a3eb8c08691c8c9863fe766c2" + +# TODO clean this block after deployment +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["2"] diff --git a/omnibus-base-goerli-competition.toml b/omnibus-base-goerli-competition.toml index 5a93514e..e814d0d5 100644 --- a/omnibus-base-goerli-competition.toml +++ b/omnibus-base-goerli-competition.toml @@ -9,7 +9,6 @@ include = [ "tomls/collaterals/wbtc.toml", "tomls/collaterals/op.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/omnibus-base-goerli-competition/pools/spots.toml", "tomls/omnibus-base-goerli-competition/pools/perps.toml", "tomls/permit-all-createPool.toml", @@ -189,3 +188,10 @@ depends = [ "invoke.createLinkSynth", "invoke.createOpSynth" ] + +# TODO clean this block after deployment +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["2"] diff --git a/omnibus-base-goerli.toml b/omnibus-base-goerli.toml index f6191e11..11c54c15 100644 --- a/omnibus-base-goerli.toml +++ b/omnibus-base-goerli.toml @@ -8,7 +8,6 @@ include = [ #"tomls/collaterals/snx.toml", "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/markets/spot/eth.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", @@ -102,3 +101,10 @@ args = [ ], ] depends = ["invoke.createScPool", "invoke.createEthSynth"] + +# TODO clean this block after deployment +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["2"] diff --git a/omnibus-goerli.toml b/omnibus-goerli.toml index 5b7310dd..400e452c 100644 --- a/omnibus-goerli.toml +++ b/omnibus-goerli.toml @@ -53,6 +53,9 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" [setting.sc_pool_id] defaultValue = "1" +[setting.snx_pool_id] +defaultValue = "69" + [setting.pool_owner] defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" @@ -61,3 +64,15 @@ defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" [setting.ccip_token_pool] defaultValue = "0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9" + +[invoke.configure_snx_collateral_for_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.snx_pool_id %>"] +func = "setPoolCollateralConfiguration" +args = [ + "<%= settings.snx_pool_id %>", + "<%= settings.snx_address %>", + { collateralLimitD18 = "<%= MaxUint256 %>", issuanceRatioD18 = "<%= MaxUint256 %>" } +] +depends = ["invoke.create_snx_pool"] diff --git a/omnibus-mainnet.toml b/omnibus-mainnet.toml index 3b4a3b46..1c9caa0e 100644 --- a/omnibus-mainnet.toml +++ b/omnibus-mainnet.toml @@ -8,7 +8,6 @@ include = [ "tomls/collaterals/snx.toml", # "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-transferCrossChain.toml", ] diff --git a/omnibus-optimism-goerli.toml b/omnibus-optimism-goerli.toml index 3eaa6798..7e4667b5 100644 --- a/omnibus-optimism-goerli.toml +++ b/omnibus-optimism-goerli.toml @@ -8,7 +8,6 @@ include = [ "tomls/collaterals/snx.toml", "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-perps-createAccount.toml", @@ -133,3 +132,9 @@ depends = [ "invoke.createLinkSynth", "provision.perpsFactory" ] + +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["<%= settings.snx_pool_id %>"] diff --git a/omnibus-optimism-mainnet.toml b/omnibus-optimism-mainnet.toml index ace1bbc9..b87d4aac 100644 --- a/omnibus-optimism-mainnet.toml +++ b/omnibus-optimism-mainnet.toml @@ -9,7 +9,6 @@ include = [ # eth collateral is not enabled/set up on v3 #"tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-transferCrossChain.toml", "tomls/markets/spot/eth.toml", ] diff --git a/omnibus-polygon-mumbai.toml b/omnibus-polygon-mumbai.toml index b9bce73c..3cfa15f1 100644 --- a/omnibus-polygon-mumbai.toml +++ b/omnibus-polygon-mumbai.toml @@ -7,7 +7,6 @@ include = [ "tomls/permissions.toml", "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-transferCrossChain.toml", @@ -58,3 +57,10 @@ defaultValue = "0x70499c328e1e2a3c41108bd3730f6670a44595d1" [setting.ccip_token_pool] defaultValue = "0xb8b8592aaf82bd42190aa8b629c6afa35a433461" + +# TODO clean this block after deployment +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["2"] diff --git a/omnibus-sepolia.toml b/omnibus-sepolia.toml index 604bbdb6..7f1a7ca2 100644 --- a/omnibus-sepolia.toml +++ b/omnibus-sepolia.toml @@ -7,7 +7,6 @@ include = [ "tomls/permissions.toml", "tomls/collaterals/weth.toml", "tomls/pools/spartan-council.toml", - "tomls/pools/passive-snx.toml", "tomls/permit-all-createPool.toml", "tomls/permit-all-registerMarket.toml", "tomls/permit-all-transferCrossChain.toml", @@ -54,3 +53,10 @@ defaultValue = "0xd0daae2231e9cb96b94c8512223533293c3693bf" [setting.ccip_token_pool] defaultValue = "0x9b65749b38278060c5787cce0391ac7f1094c8e8" + +# TODO clean this block after deployment +[invoke.unapprove_wrongfully_deployed_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "owner" +func = "removeApprovedPool" +args = ["2"] diff --git a/tomls/pools/passive-snx.toml b/tomls/pools/passive-snx.toml index 4ba1cff1..bba624c7 100644 --- a/tomls/pools/passive-snx.toml +++ b/tomls/pools/passive-snx.toml @@ -1,7 +1,6 @@ [setting.deployer] [setting.snx_pool_id] -defaultValue = "2" [setting.pool_owner] @@ -26,3 +25,19 @@ fromCall.func = "owner" func = "addApprovedPool" args = ["<%= settings.snx_pool_id %>"] depends = ["invoke.create_snx_pool"] + +[invoke.disable_all_new_collaterals_for_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.snx_pool_id %>"] +func = "setPoolCollateralDisabledByDefault" +args = ["<%= settings.snx_pool_id %>", true] +depends = ["invoke.create_snx_pool"] + +[invoke.configure_snx_pool] +target = ["system.CoreProxy"] +fromCall.func = "getPoolOwner" +fromCall.args = ["<%= settings.snx_pool_id %>"] +func = "setPoolConfiguration" +args = ["<%= settings.snx_pool_id %>", []] +depends = ["invoke.create_snx_pool"]