Merge pull request #30 from Synthetixio/supermarket-release-testnet

supermarket and eth market changes

omnibus-optimism-goerli.toml

@@ -1,5 +1,5 @@
 name = "synthetix-omnibus"
-version = "3.2.1"
+version = "3.2.1-dev.b257e30b"
 description = "Includes the full synthetix system with configurations applied"
 include = [
     "tomls/settings-testnet.toml",
@@ -15,7 +15,7 @@ include = [
     "tomls/markets/perps/eth.toml",
     "tomls/permit-all-createPool.toml",
     "tomls/permit-all-registerMarket.toml",
-    "tomls/permit-all-createAccount.toml", # used for perps market
+    "tomls/permit-all-perps-createAccount.toml",
     "tomls/permit-all-transferCrossChain.toml",
 ]
 
@@ -74,6 +74,7 @@ defaultValue = "0x57241A37733983F97C4Ab06448F244A1E0Ca0ba8"
 
 # Perps Global Configuration
 # TODO: move these into perps-factory once settings support max uint
+
 [invoke.setPerpsMaxCollateralForSnxUsd]
 target = ["perpsFactory.PerpsMarketProxy"]
 fromCall.func = "owner"
@@ -109,6 +110,9 @@ defaultValue = "500"
 
 # ETH Perps Configuration
 
+[setting.ethPerpsMarketId]
+defaultValue = "100"
+
 [setting.perpsEthSkewScale]
 defaultValue = "100000"
 
@@ -198,7 +202,7 @@ args = [
         { marketId = "<%= extras.synth_btc_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" },
         { marketId = "<%= extras.synth_eth_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" },
         { marketId = "<%= extras.synth_link_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" },
-        { marketId = "<%= extras.perps_eth_market_id %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" }
+        { marketId = "<%= imports.perpsFactory.extras.superMarketId %>", weightD18 = 1, maxDebtShareValueD18 = "<%= parseEther('1') %>" }
     ],
 ]
 

tomls/core.toml

@@ -1,5 +1,5 @@
 [setting.snx_package]
-defaultValue = "synthetix:3.2.0"
+defaultValue = "synthetix:3.2.1-dev.b257e30b"
 
 [setting.owner]
 

tomls/markets/perps-factory.toml

@@ -3,14 +3,14 @@ include = [
 ]
 
 [setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.2.0"
+defaultValue = "synthetix-perps-market:3.2.1-dev.b257e30b"
 
 [provision.perpsFactory]
 source = "<%= settings.perps_market_package %>"
 targetPreset = "main"
 options.coreProxyOwner = "<%= settings.owner %>"
 options.owner = "<%= settings.owner %>"
-options.salt = ""
+options.salt = "alpha"
 options.synthetixPackage = "<%= settings.snx_package %>"
 options.spotMarketPackage = "<%= settings.spot_market_package %>"
 

tomls/markets/perps/eth.toml

@@ -7,6 +7,8 @@ include = [
   "../common/settlement-strategies/eth/pyth.toml"
 ]
 
+[setting.ethPerpsMarketId]
+
 [setting.perpsEthSkewScale]
 
 [setting.perpsEthMaxFundingVelocity]
@@ -39,75 +41,67 @@ defaultValue = "0"
 target = ["perpsFactory.PerpsMarketProxy"]
 fromCall.func = "owner"
 func = "createMarket"
-args = ["Ethereum", "ETH", "<%= settings.owner %>"]
-extra.perps_eth_market_id.event = "MarketRegistered"
-extra.perps_eth_market_id.arg = 0
+args = ["<%= settings.ethPerpsMarketId %>", "Ethereum", "ETH"]
 depends = ["provision.perpsFactory"]
 
 [invoke.setPerpsPriceEth]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "updatePriceData"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   "<%= extras.eth_oracle_id %>"
 ]
 depends = ["invoke.createEthPerpsMarket", "invoke.registerEthOracleNode"]
 
 [invoke.setPerpsEthSettlementStrategy]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "addSettlementStrategy"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   { strategyType = "<%= settings.strategyType %>", settlementDelay = "<%= settings.ethSettlementDelay %>", settlementWindowDuration = "<%= settings.ethSettlementWindowDuration %>", priceWindowDuration = "<%= settings.priceWindowDuration %>", 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 %>"]
+fromCall.func = "owner"
 func = "setFundingParameters"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   "<%= parseEther(settings.perpsEthSkewScale) %>",
   "<%= parseEther(settings.perpsEthMaxFundingVelocity) %>"
 ]
 depends = ["invoke.createEthPerpsMarket"]
 
 [invoke.setPerpsEthOrderFees]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "setOrderFees"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   "<%= parseEther(settings.perpsEthMakerFeeRatio) %>",
   "<%= parseEther(settings.perpsEthTakerFeeRatio) %>"
 ]
 depends = ["invoke.createEthPerpsMarket"]
 
 [invoke.setPerpsEthMaxMarketSize]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "setMaxMarketSize"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   "<%= parseEther(settings.perpsEthMaxMarketSize) %>"
 ]
 depends = ["invoke.createEthPerpsMarket"]
 
 [invoke.setPerpsEthLiquidationParameters]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "setLiquidationParameters"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>", 
   "<%= parseEther(settings.perpsEthInitialMarginRatio) %>",
   "<%= parseEther(settings.perpsEthMaintenanceMarginFraction) %>",
   "<%= parseEther(settings.perpsEthLiquidationRewardRatioD18) %>",
@@ -119,11 +113,10 @@ depends = ["invoke.createEthPerpsMarket"]
 
 [invoke.setPerpsEthLockedOiRatio]
 target = ["perpsFactory.PerpsMarketProxy"]
-fromCall.func = "getMarketOwner"
-fromCall.args = ["<%= extras.perps_eth_market_id %>"]
+fromCall.func = "owner"
 func = "setLockedOiRatio"
 args = [
-  "<%= extras.perps_eth_market_id %>", 
+  "<%= settings.ethPerpsMarketId %>",
   "<%= parseEther(settings.perpsEthLockedOiRatio) %>"
 ]
 depends = ["invoke.createEthPerpsMarket"]

tomls/markets/spot-factory.toml

@@ -3,7 +3,7 @@ include = [
 ]
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.2.0"
+defaultValue = "synthetix-spot-market:3.2.1-dev.b257e30b"
 
 [provision.spotFactory]
 source = "<%= settings.spot_market_package %>"