Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sccp-315-316-317-318-mainnet #179

Merged
merged 3 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
const { skewScale, maxFundingVelocity } = await PerpsMarketProxy.getFundingParameters(marketId);

log({ skewScale, maxFundingVelocity });
assert.equal(Number(ethers.utils.formatEther(skewScale)), 100_000, 'skewScale');
assert.equal(Number(ethers.utils.formatEther(skewScale)), 50_000, 'skewScale');
assert.equal(Number(ethers.utils.formatEther(maxFundingVelocity)), 9, 'maxFundingVelocity');
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
const { skewScale, maxFundingVelocity } = await PerpsMarketProxy.getFundingParameters(marketId);

log({ skewScale, maxFundingVelocity });
assert.equal(Number(ethers.utils.formatEther(skewScale)), 1_000_000, 'skewScale');
assert.equal(Number(ethers.utils.formatEther(skewScale)), 500_000, 'skewScale');
assert.equal(Number(ethers.utils.formatEther(maxFundingVelocity)), 9, 'maxFundingVelocity');
});

Expand Down
4 changes: 2 additions & 2 deletions omnibus-base-mainnet-andromeda.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "synthetix-omnibus"
version = "13"
version = "14"
description = "Andromeda deployment"
preset = "andromeda"
include = [
Expand Down Expand Up @@ -62,7 +62,7 @@ defaultValue = "op-gas-price-oracle:3.3.15"
defaultValue = "synthetix-spot-market:3.3.15"

[setting.perps_market_package]
defaultValue = "synthetix-perps-market:3.3.18"
defaultValue = "synthetix-perps-market:3.3.19"

[setting.buyback_snx_package]
defaultValue = "buyback-snx:3.3.5" # Do not update! This package isn't upgradeable. A version change will deploy a new contract.
Expand Down
2 changes: 1 addition & 1 deletion tomls/omnibus-base-mainnet-andromeda/perps/btc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defaultValue = "0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b
defaultValue = "200"

[setting.perpsBtcSkewScale]
defaultValue = "100000"
defaultValue = "50000"

[setting.perpsBtcMaxFundingVelocity]
defaultValue = "9"
Expand Down
2 changes: 1 addition & 1 deletion tomls/omnibus-base-mainnet-andromeda/perps/eth.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defaultValue = "0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0a
defaultValue = "100"

[setting.perpsEthSkewScale]
defaultValue = "1000000"
defaultValue = "500000"

[setting.perpsEthMaxFundingVelocity]
defaultValue = "9"
Expand Down
4 changes: 2 additions & 2 deletions tomls/omnibus-base-mainnet-andromeda/perps/global.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defaultValue = "1"
defaultValue = "30000"

[setting.perps_keeper_l2_cost_settle_gas_units]
defaultValue = "1500000"
defaultValue = "1650000"

[setting.perps_keeper_l1_cost_flag_gas_units]
defaultValue = "31000"
Expand Down Expand Up @@ -67,7 +67,7 @@ args = [["0"]]
target = ["perpsFactory.PerpsMarketProxy"]
fromCall.func = "owner"
func = "setPerAccountCaps"
args = ["2", "1"]
args = ["3", "1"]

[invoke.setPerpsMarketKeeperCostNodeId]
target = ["perpsFactory.PerpsMarketProxy"]
Expand Down
4 changes: 2 additions & 2 deletions tomls/omnibus-base-mainnet-andromeda/perps/snx.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ defaultValue = "0.0002"
defaultValue = "0.0010"

[setting.perpsSnxMaxMarketSize]
defaultValue = "0"
defaultValue = "127000"

[setting.perpsSnxMaxMarketValue]
defaultValue = "0"
defaultValue = "500000"

[setting.perpsSnxInitialMarginRatio]
defaultValue = "2.82"
Expand Down
4 changes: 2 additions & 2 deletions tomls/omnibus-base-mainnet-andromeda/perps/sol.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ defaultValue = "0.0002"
defaultValue = "0.0008"

[setting.perpsSolMaxMarketSize]
defaultValue = "0"
defaultValue = "2900"

[setting.perpsSolMaxMarketValue]
defaultValue = "0"
defaultValue = "500000"

[setting.perpsSolInitialMarginRatio]
defaultValue = "24.39"
Expand Down
4 changes: 2 additions & 2 deletions tomls/omnibus-base-mainnet-andromeda/perps/w.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ defaultValue = "0.0002"
defaultValue = "0.0010"

[setting.perpsWMaxMarketSize]
defaultValue = "0"
defaultValue = "508000"

[setting.perpsWMaxMarketValue]
defaultValue = "0"
defaultValue = "500000"

[setting.perpsWInitialMarginRatio]
defaultValue = "15.39"
Expand Down
4 changes: 2 additions & 2 deletions tomls/omnibus-base-mainnet-andromeda/perps/wif.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ defaultValue = "0.0002"
defaultValue = "0.0010"

[setting.perpsWifMaxMarketSize]
defaultValue = "0"
defaultValue = "152000"

[setting.perpsWifMaxMarketValue]
defaultValue = "0"
defaultValue = "500000"

[setting.perpsWifInitialMarginRatio]
defaultValue = "5.99"
Expand Down
6 changes: 6 additions & 0 deletions tomls/permit-pdao-createMarket.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@ target = ["perpsFactory.PerpsMarketProxy"]
fromCall.func = "owner"
func = "addToFeatureFlagAllowlist"
args = ["<%= formatBytes32String('createMarket') %>", "<%= settings.pdao %>"]

[invoke.removeDeployerFromCreateMarketPerps]
target = ["perpsFactory.PerpsMarketProxy"]
fromCall.func = "owner"
func = "removeFromFeatureFlagAllowlist"
args = ["<%= formatBytes32String('createMarket') %>", "<%= settings.deployer %>"]