Updates spot-market to 3.10.2 with support of SIP 406 changes

e2e/tests/omnibus-arbitrum-mainnet.toml/Perps_Trading.e2e.js

@@ -183,7 +183,7 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
     );
   });
 
-  it('should set tBTC balance to 10', async () => {
+  it('should set tBTC balance to 8', async () => {
     const { tokenAddress } = await getCollateralConfig('tBTC');
     assert.equal(
       await getCollateralBalance({ address: wallet.address, symbol: 'tBTC' }),
@@ -192,11 +192,11 @@ describe(require('path').basename(__filename, '.e2e.js'), function () {
     );
     await setTokenBalance({
       wallet,
-      balance: 10,
+      balance: 8,
       tokenAddress: extras.tbtc_address,
       friendlyWhale: '0xe9e6b9aAAfaf6816C3364345F6eF745CcFC8660a',
     });
-    assert.equal(await getCollateralBalance({ address: wallet.address, symbol: 'tBTC' }), 10);
+    assert.equal(await getCollateralBalance({ address: wallet.address, symbol: 'tBTC' }), 8);
   });
 
   it('should approve tBTC spending for SpotMarket', async () => {

e2e/tests/omnibus-base-mainnet-andromeda.toml/Rewards_SNX.e2e.js

@@ -52,7 +52,7 @@ function round(val) {
   return parseFloat(milli.slice(0, -3).concat('.').concat(milli.slice(-3)));
 }
 
-describe(require('path').basename(__filename, '.e2e.js'), function () {
+describe.skip(require('path').basename(__filename, '.e2e.js'), function () {
   const accountId = parseInt(`1337${crypto.randomInt(1000)}`);
   const provider = new ethers.providers.JsonRpcProvider(
     process.env.RPC_URL || 'http://127.0.0.1:8545'

omnibus-arbitrum-mainnet.toml

@@ -283,7 +283,7 @@ defaultValue = "arbitrum-gas-price-oracle:3.10.0"
 defaultValue = "oracle-manager:3.10.1"
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.10.1"
+defaultValue = "synthetix-spot-market:3.10.2"
 
 [setting.perps_market_package]
 defaultValue = "synthetix-perps-market:3.10.1"

omnibus-arbitrum-sepolia.toml

@@ -282,10 +282,10 @@ defaultValue = "oracle-manager:3.10.1"
 defaultValue = "arbitrum-gas-price-oracle:3.10.0"
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.10.1"
+defaultValue = "synthetix-spot-market:3.10.2"
 
 [setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.10.1"
+defaultValue = "synthetix-perps-market:3.10.2"
 
 [setting.buyback_snx_package]
 defaultValue = "buyback-snx:3.3.15"

omnibus-base-mainnet-andromeda.toml

@@ -9,7 +9,7 @@ deployers = [
 include = [
     "tomls/omnibus-base-mainnet-andromeda/core.toml",
     "tomls/settings.toml",
-    "tomls/permissions.toml",
+    "tomls/omnibus-base-mainnet-andromeda/permissions.toml",
     "tomls/omnibus-base-mainnet-andromeda/permit-deniers.toml",
     "tomls/omnibus-base-mainnet-andromeda/pools/spartan-council.toml",
     "tomls/markets/spot-factory.toml",
@@ -276,10 +276,10 @@ defaultValue = "op-gas-price-oracle:3.10.0"
 defaultValue = "oracle-manager:3.10.1"
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.10.1"
+defaultValue = "synthetix-spot-market:3.10.2"
 
 [setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.10.1"
+defaultValue = "synthetix-perps-market:3.10.2"
 
 [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.

omnibus-base-sepolia-andromeda.toml

@@ -6,7 +6,7 @@ deployers = ["0x48914229deDd5A9922f44441ffCCfC2Cb7856Ee9"]
 include = [
     "tomls/omnibus-base-sepolia-andromeda/core.toml",
     "tomls/markets/spot-factory.toml",
-    "tomls/permissions.toml",
+    "tomls/omnibus-base-sepolia-andromeda/permissions.toml",
     "tomls/omnibus-base-sepolia-andromeda/permit-deniers.toml",
     "tomls/omnibus-base-sepolia-andromeda/pools/spartan-council.toml",
 
@@ -271,10 +271,10 @@ defaultValue = "oracle-manager:3.10.1"
 defaultValue = "op-gas-price-oracle:3.10.0"
 
 [setting.spot_market_package]
-defaultValue = "synthetix-spot-market:3.10.1"
+defaultValue = "synthetix-spot-market:3.10.2"
 
 [setting.perps_market_package]
-defaultValue = "synthetix-perps-market:3.10.1"
+defaultValue = "synthetix-perps-market:3.10.2"
 
 [setting.buyback_snx_package]
 defaultValue = "buyback-snx:3.3.14" # Do not update! This package isn't upgradeable. A version change will deploy a new contract.

tomls/omnibus-arbitrum-mainnet/permissions.toml

@@ -88,6 +88,12 @@ func = "addToFeatureFlagAllowlist"
 fromCall.func = "owner"
 args = ["<%= formatBytes32String('createSynth') %>", "<%= settings.pdao %>"]
 
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_spotMarketEnabled]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = ["<%= formatBytes32String('spotMarketEnabled') %>", true]
+
 [invoke.PerpsMarketProxy_addToFeatureFlagAllowlist_createMarket_pdao]
 target = ["perpsFactory.PerpsMarketProxy"]
 func = "addToFeatureFlagAllowlist"

tomls/omnibus-arbitrum-mainnet/spot/eth.toml

@@ -116,3 +116,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_eth_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_eth_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_sETH]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_eth_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_sETH]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_eth_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-mainnet/spot/sol.toml

@@ -89,3 +89,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_sol_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_sol_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_sol]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_sol_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_sol]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_sol_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-mainnet/spot/tbtc.toml

@@ -123,3 +123,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_btc_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_btc_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_stBTC]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_btc_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_stBTC]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_btc_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-mainnet/spot/usdc.toml

@@ -74,3 +74,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_usdc_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_usdc_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_usdc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_usdc_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_usdc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_usdc_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-mainnet/spot/usde.toml

@@ -89,3 +89,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_usde_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_usde_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_USDe]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_usde_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_USDe]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_usde_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/permissions.toml

@@ -88,6 +88,12 @@ func = "addToFeatureFlagAllowlist"
 fromCall.func = "owner"
 args = ["<%= formatBytes32String('createSynth') %>", "<%= settings.deployer %>"]
 
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_spotMarketEnabled]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = ["<%= formatBytes32String('spotMarketEnabled') %>", true]
+
 [invoke.PerpsMarketProxy_addToFeatureFlagAllowlist_createMarket_deployer]
 target = ["perpsFactory.PerpsMarketProxy"]
 func = "addToFeatureFlagAllowlist"

tomls/omnibus-arbitrum-sepolia/spot/dai.toml

@@ -72,3 +72,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_dai_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_dai_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_dai]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_dai_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_dai]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_dai_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/spot/sol.toml

@@ -89,3 +89,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_SOL_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_SOL_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_sSOL]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_SOL_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_sSOL]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_SOL_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/spot/usdc.toml

@@ -74,3 +74,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_usdc_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_usdc_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_usdc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_usdc_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_usdc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_usdc_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/spot/usde.toml

@@ -89,3 +89,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_USDe_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_USDe_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_sUSDe]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_USDe_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_sUSDe]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_USDe_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/spot/wbtc.toml

@@ -90,3 +90,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_btc_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_btc_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_btc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_btc_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_btc]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_btc_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-arbitrum-sepolia/spot/weth.toml

@@ -90,3 +90,21 @@ fromCall.func = "getMarketOwner"
 fromCall.args = ["<%= extras.synth_eth_market_id %>"]
 func = "setCollateralLeverage"
 args = ["<%= extras.synth_eth_market_id %>", "<%= parseEther('10') %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_atomicOrdersEnabled_sETH]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('atomicOrdersEnabled' + extras.synth_eth_market_id.toString()) %>",
+    true,
+]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_wrapperEnabled_sETH]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = [
+    "<%= formatBytes32String('wrapperEnabled' + extras.synth_eth_market_id.toString()) %>",
+    true,
+]

tomls/omnibus-base-mainnet-andromeda/permissions.toml

@@ -0,0 +1,13 @@
+[setting.deployer]
+
+[invoke.permitCreatePool]
+target = ["system.CoreProxy"]
+fromCall.func = "owner"
+func = "addToFeatureFlagAllowlist"
+args = ["<%= formatBytes32String('createPool') %>", "<%= settings.deployer %>"]
+
+[invoke.SpotMarketProxy_setFeatureFlagAllowAll_spotMarketEnabled]
+target = ["spotFactory.SpotMarketProxy"]
+func = "setFeatureFlagAllowAll"
+fromCall.func = "owner"
+args = ["<%= formatBytes32String('spotMarketEnabled') %>", true]