test: added test for post and reduce

test: split deal ticket tests
chore: update tranches
2023-04-06 15:06:12 +02:00 · 2023-04-05 06:08:13 +00:00 · 2023-04-05 00:15:53 +00:00 · 2023-04-04 15:14:36 -07:00 · 2023-04-04 11:41:11 -07:00 · 2023-04-04 18:09:38 +00:00
49 changed files with 747 additions and 1345 deletions
@@ -1,7 +1,7 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_NETWORKS='{"SANDBOX":"https://sandbox.explorer.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
@@ -1,20 +0,0 @@
-# App configuration variables
-NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_ENV=MIRROR
-NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-
-# App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1
-NX_EXPLORER_MARKETS=0
-NX_EXPLORER_ORACLES=0
-NX_EXPLORER_TXS_LIST=1
@@ -1,12 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.sandbox.vega.xyz/websocket
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://sandbox.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -9,5 +9,5 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/
+NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -1,12 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=MIRROR
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
-NX_VEGA_URL=https://api.n00.mainnet-mirror.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_EXPLORER_URL=https://mirror.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -1,9 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_DELEGATIONS_PAGINATION=50
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -8,3 +8,4 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -12,6 +12,7 @@ const TRUTHY = ['1', 'true'];
 interface VegaContracts {
  claimAddress: string;
  lockedAddress: string;
+  tokenVestingAddress?: string;
 }

 const customClaimAddress = process.env['NX_CUSTOM_CLAIM_ADDRESS'] as string;
@@ -36,21 +37,16 @@ export const ContractAddresses: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
-  SANDBOX: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
-  MIRROR: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  VALIDATOR_TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
+    // This is a fallback contract address for the validator testnet network which does not
+    // have a vesting contract address set and is therefore not in the ethereum config
+    tokenVestingAddress: '0xadFcb7f93a24F8743a8e548d74d2ecB373c92866',
  },
  MAINNET: {
    claimAddress: '0x0ee1fb382caf98e86e97e51f9f42f8b4654020f3',
@@ -49,6 +49,13 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
          signer = provider.getSigner();
        }

+        const tokenVestingAddress =
+          config.token_vesting_contract?.address ||
+          ENV.addresses.tokenVestingAddress;
+        if (!tokenVestingAddress) {
+          throw new Error('No token vesting address found');
+        }
+
        if (provider && config) {
          const staking = new StakingBridge(
            config.staking_bridge_contract.address,
@@ -63,7 +70,7 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
                signer || provider
              ),
              vesting: new TokenVesting(
-                config.token_vesting_contract.address,
+                tokenVestingAddress,
                signer || provider
              ),
              claim: new Claim(ENV.addresses.claimAddress, signer || provider),
@@ -14,6 +14,7 @@ import { TokenDetailsCirculating } from './token-details-circulating';
 import { SplashLoader } from '../../../components/splash-loader';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useContracts } from '../../../contexts/contracts/contracts-context';
+import { ENV } from '../../../config';

 export const TokenDetails = ({
  totalSupply,
@@ -49,6 +50,9 @@ export const TokenDetails = ({
    );
  }

+  const tokenVestingContractAddress =
+    config.token_vesting_contract?.address || ENV.addresses.tokenVestingAddress;
+
  return (
    <div className="token-details">
      <RoundedWrapper>
@@ -65,18 +69,20 @@ export const TokenDetails = ({
              {token.address}
            </Link>
          </KeyValueTableRow>
-          <KeyValueTableRow>
-            {t('Vesting contract').toUpperCase()}
-            <Link
-              data-testid="token-contract"
-              title={t('View on Etherscan (opens in a new tab)')}
-              className="font-mono text-white text-right"
-              href={`${ETHERSCAN_URL}/address/${config.token_vesting_contract.address}`}
-              target="_blank"
-            >
-              {config.token_vesting_contract.address}
-            </Link>
-          </KeyValueTableRow>
+          {tokenVestingContractAddress && (
+            <KeyValueTableRow>
+              {t('Vesting contract').toUpperCase()}
+              <Link
+                data-testid="token-contract"
+                title={t('View on Etherscan (opens in a new tab)')}
+                className="font-mono text-white text-right"
+                href={`${ETHERSCAN_URL}/address/${tokenVestingContractAddress}`}
+                target="_blank"
+              >
+                {tokenVestingContractAddress}
+              </Link>
+            </KeyValueTableRow>
+          )}
          <KeyValueTableRow>
            {t('Total supply').toUpperCase()}
            <span className="font-mono" data-testid="total-supply">
@@ -1,5 +0,0 @@
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_NETWORKS={\"DEVNET\":\"https://dev.token.vega.xyz\",\"STAGNET3\":\"https://stagnet3.token.vega.xyz\",\"STAGNET1\":\"https://stagnet1.token.vega.xyz\",\"TESTNET\":\"https://token.fairground.wtf\",\"MAINNET\":\"https://token.vega.xyz\"}
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
@@ -743,7 +743,7 @@
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
    "total_removed": "165.10784124668",
-    "locked_amount": "1020.23509744623685628",
+    "locked_amount": "338.514968637992270967",
    "deposits": [
      {
        "amount": "30",
@@ -3531,7 +3531,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "58231.0206471161547092772",
+    "locked_amount": "57875.1133625658226291517",
    "deposits": [
      {
        "amount": "86666.297",
@@ -3597,7 +3597,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "800.044356684981575",
+    "locked_amount": "779.454746642246625",
    "deposits": [
      {
        "amount": "2500",
@@ -3718,7 +3718,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "14289.43755661231775",
+    "locked_amount": "14146.87688707729625",
    "deposits": [
      {
        "amount": "12500",
@@ -3985,7 +3985,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "11781.2245815",
-    "locked_amount": "24705.08891574585375",
+    "locked_amount": "24394.53844383057",
    "deposits": [
      {
        "amount": "7500",
@@ -4305,7 +4305,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "58177.89216768362770314",
+    "locked_amount": "57822.30960374848094241",
    "deposits": [
      {
        "amount": "129999.45",
@@ -4338,7 +4338,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "53736.93921662980913205788",
+    "locked_amount": "53515.19367393810504083066",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -4371,7 +4371,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "26110.75656392694224",
+    "locked_amount": "25853.68089802130747",
    "deposits": [
      {
        "amount": "10000",
@@ -4564,7 +4564,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2277.30450913242",
+    "locked_amount": "2256.7713089802133",
    "deposits": [
      {
        "amount": "5000",
@@ -4775,7 +4775,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "289.2943236127702715019",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "97499.58",
@@ -4808,7 +4808,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "133818.54965292963650862",
-    "locked_amount": "395.4153957972609424964042112",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -4865,7 +4865,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "121.701126098142348042122",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "32499.86",
@@ -4898,7 +4898,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "39.612535585171623792263",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "10833.29",
@@ -4931,7 +4931,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "4720.860935375",
-    "locked_amount": "148.080505317408011860722",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "6500",
@@ -5083,7 +5083,7 @@
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
    "total_removed": "6357.929999175",
-    "locked_amount": "3386.5892610497226",
+    "locked_amount": "3200.2589779005528",
    "deposits": [
      {
        "amount": "7500",
@@ -5523,7 +5523,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "314870.1961185216721358008",
+    "locked_amount": "306903.608577024413946004",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -39256,7 +39256,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "700133.348465855088393",
-    "locked_amount": "508347.190004695251441550046",
+    "locked_amount": "496105.318624601551155638257",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -40637,8 +40637,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "814951.95458233668060452",
-    "locked_amount": "7102254.0823883096815429813321985808150852",
+    "total_removed": "815414.41205294384422952",
+    "locked_amount": "7058845.1924777653448375313192847387510138",
    "deposits": [
      {
        "amount": "16249.93",
@@ -41177,6 +41177,11 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
      },
+      {
+        "amount": "462.457470607163625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xa65322922116e2e0949be9d83e65ef0b1f2d8fe3eb399616a5cbbb7c95593717"
+      },
      {
        "amount": "545.4204142199725",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -43207,6 +43212,12 @@
            "tranche_id": 2,
            "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
          },
+          {
+            "amount": "462.457470607163625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xa65322922116e2e0949be9d83e65ef0b1f2d8fe3eb399616a5cbbb7c95593717"
+          },
          {
            "amount": "545.4204142199725",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44583,8 +44594,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "143495.97418057557425",
-        "remaining_tokens": "116502.91331942442575"
+        "withdrawn_tokens": "143958.431651182737875",
+        "remaining_tokens": "116040.455848817262125"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46929,8 +46940,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "5806817.570026167688715156",
-    "locked_amount": "835310.394250092778046317149087858",
+    "total_removed": "5807463.612246947184450156",
+    "locked_amount": "795235.584253058282571973568973987",
    "deposits": [
      {
        "amount": "129284.449",
@@ -47204,6 +47215,11 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
      },
+      {
+        "amount": "646.042220779495735",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xcd3480c11e987e702a52413185dcc232b399747ef2fd7529aa46bea02c6f4be5"
+      },
      {
        "amount": "755.482067130393772",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -50376,6 +50392,12 @@
            "tranche_id": 3,
            "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
          },
+          {
+            "amount": "646.042220779495735",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xcd3480c11e987e702a52413185dcc232b399747ef2fd7529aa46bea02c6f4be5"
+          },
          {
            "amount": "755.482067130393772",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -53054,8 +53076,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "338364.23991060390069175",
-        "remaining_tokens": "20759.22966439609930825"
+        "withdrawn_tokens": "339010.28213138339642675",
+        "remaining_tokens": "20113.18744361660357325"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -54482,8 +54504,8 @@
    "tranche_start": "2021-10-05T00:00:00.000Z",
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
-    "total_removed": "3381706.364737906998719578",
-    "locked_amount": "13132.78514323649783129733831977186",
+    "total_removed": "3421590.665302980803025769",
+    "locked_amount": "0",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -54627,6 +54649,26 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "10509.407528939748325",
+        "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
+        "tx": "0x621a569bfd19dbc0a6ba78addf836a9f2f1897258a88198d994e5b18c9f4901e"
+      },
+      {
+        "amount": "13312.213609122936225",
+        "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
+        "tx": "0x8a1d50991be09f4adc9eba704fbbcd271e8022db56498b300f39d3111bf187ea"
+      },
+      {
+        "amount": "13385.167736021049216341",
+        "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
+        "tx": "0xa6c475d9dc04d4f722ead66481243b19a2eaafac7d81b4b3bc711a8269a52259"
+      },
+      {
+        "amount": "2677.51169099007053985",
+        "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
+        "tx": "0x5d28a9be9d82440733d43afac61bcf6ff79024f1f73d621aa1d3afdba072db4c"
+      },
      {
        "amount": "8511.948415174862415",
        "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -55624,6 +55666,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "10509.407528939748325",
+            "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
+            "tranche_id": 4,
+            "tx": "0x621a569bfd19dbc0a6ba78addf836a9f2f1897258a88198d994e5b18c9f4901e"
+          },
          {
            "amount": "990.74735267405816",
            "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
@@ -55728,8 +55776,8 @@
          }
        ],
        "total_tokens": "110499.5291",
-        "withdrawn_tokens": "99798.20962987885552",
-        "remaining_tokens": "10701.31947012114448"
+        "withdrawn_tokens": "110307.617158818603845",
+        "remaining_tokens": "191.911941181396155"
      },
      {
        "address": "0xdbC5d439F373EB646345e1c67D1d46231ACE7dD3",
@@ -55770,6 +55818,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "2677.51169099007053985",
+            "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
+            "tranche_id": 4,
+            "tx": "0x5d28a9be9d82440733d43afac61bcf6ff79024f1f73d621aa1d3afdba072db4c"
+          },
          {
            "amount": "3239.30329480758879835",
            "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
@@ -55874,8 +55928,8 @@
          }
        ],
        "total_tokens": "92082.572555",
-        "withdrawn_tokens": "89387.21943647261010385",
-        "remaining_tokens": "2695.35311852738989615"
+        "withdrawn_tokens": "92064.7311274626806437",
+        "remaining_tokens": "17.8414275373193563"
      },
      {
        "address": "0x1dC9B91DE003fd503F25cB5d114cf0fc68F7aFe6",
@@ -55903,6 +55957,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "13385.167736021049216341",
+            "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
+            "tranche_id": 4,
+            "tx": "0xa6c475d9dc04d4f722ead66481243b19a2eaafac7d81b4b3bc711a8269a52259"
+          },
          {
            "amount": "16197.295646834677510988",
            "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
@@ -56031,8 +56091,8 @@
          }
        ],
        "total_tokens": "460415.072915097",
-        "withdrawn_tokens": "446939.762381235099977322",
-        "remaining_tokens": "13475.310533861900022678"
+        "withdrawn_tokens": "460324.930117256149193663",
+        "remaining_tokens": "90.142797840850806337"
      },
      {
        "address": "0xd66e4853c0880df150e7329974715BFC8d2da47D",
@@ -56247,6 +56307,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "13312.213609122936225",
+            "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
+            "tranche_id": 4,
+            "tx": "0x8a1d50991be09f4adc9eba704fbbcd271e8022db56498b300f39d3111bf187ea"
+          },
          {
            "amount": "8511.948415174862415",
            "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -56507,8 +56573,8 @@
          }
        ],
        "total_tokens": "331498.5873",
-        "withdrawn_tokens": "317966.428170547352487",
-        "remaining_tokens": "13532.159129452647513"
+        "withdrawn_tokens": "331278.641779670288712",
+        "remaining_tokens": "219.945520329711288"
      },
      {
        "address": "0x16da609341ed67750A8BCC5AAa2005471006Cd77",
@@ -56610,8 +56676,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "40152.1324861581949",
-    "locked_amount": "80550.51809266543339246000913244",
+    "total_removed": "41316.3370079701949",
+    "locked_amount": "78610.723594969487558672821308984",
    "deposits": [
      {
        "amount": "3000",
@@ -63290,6 +63356,16 @@
        "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
        "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
      },
+      {
+        "amount": "332.441235412",
+        "user": "0x5c8fadaf56946d60823Dae0526A540EEfE791c99",
+        "tx": "0x67af8d72b36a27796fbe8f52ac55951d54102ac58582f848f0d21cf8ca427e77"
+      },
+      {
+        "amount": "831.7632864",
+        "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
+        "tx": "0x0df6ec04cbdda41c8649a5e360ec541d14371e3877d82e1404308180024ede02"
+      },
      {
        "amount": "154.812094114",
        "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -68457,10 +68533,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "831.7632864",
+            "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
+            "tranche_id": 5,
+            "tx": "0x0df6ec04cbdda41c8649a5e360ec541d14371e3877d82e1404308180024ede02"
+          }
+        ],
        "total_tokens": "1000",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "1000"
+        "withdrawn_tokens": "831.7632864",
+        "remaining_tokens": "168.2367136"
      },
      {
        "address": "0x99b4635De6c5c8cdbBf728d7AA0d1b9DD8Ee381F",
@@ -84297,10 +84380,17 @@
            "tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "332.441235412",
+            "user": "0x5c8fadaf56946d60823Dae0526A540EEfE791c99",
+            "tranche_id": 5,
+            "tx": "0x67af8d72b36a27796fbe8f52ac55951d54102ac58582f848f0d21cf8ca427e77"
+          }
+        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "400"
+        "withdrawn_tokens": "332.441235412",
+        "remaining_tokens": "67.558764588"
      },
      {
        "address": "0x96715eF2F036069202B1C8065Db14601F40C9554",
@@ -86148,7 +86238,7 @@
    "tranche_start": "2021-12-05T00:00:00.000Z",
    "tranche_end": "2022-06-05T00:00:00.000Z",
    "total_added": "171288.42",
-    "total_removed": "67553.5995794947989",
+    "total_removed": "68803.5995794947989",
    "locked_amount": "0",
    "deposits": [
      {
@@ -90373,6 +90463,11 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "1250",
+        "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
+        "tx": "0x7dbc1e3f31a7aeea4e74f2bf14137bb99045b84afe7582a9ed2bc9d63b5458a4"
+      },
      {
        "amount": "250",
        "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5",
@@ -95797,10 +95892,17 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "1250",
+            "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
+            "tranche_id": 6,
+            "tx": "0x7dbc1e3f31a7aeea4e74f2bf14137bb99045b84afe7582a9ed2bc9d63b5458a4"
+          }
+        ],
        "total_tokens": "1250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "1250"
+        "withdrawn_tokens": "1250",
+        "remaining_tokens": "0"
      },
      {
        "address": "0xf36f5369adBE86DF71f5bFfB0264fc1D99fA2935",
@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-n00.mainnet-mirror.vega.rocks/graphql"]
-}
@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-n01.sandbox.vega.rocks/graphql"]
-}
@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery, mockConnectWallet } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import {
@@ -13,8 +13,6 @@ const orderSizeField = 'order-size';
 const orderPriceField = 'order-price';
 const orderTIFDropDown = 'order-tif';
 const placeOrderBtn = 'place-order';
-const toggleShort = 'order-side-SIDE_SELL';
-const toggleLong = 'order-side-SIDE_BUY';
 const toggleLimit = 'order-type-TYPE_LIMIT';
 const toggleMarket = 'order-type-TYPE_MARKET';

@@ -32,34 +30,6 @@ const displayTomorrow = () => {
  return tomorrow.toISOString().substring(0, 16);
 };

-describe('time in force default values', () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-});
-
 describe('must submit order', { tags: '@smoke' }, () => {
  // 7002-SORD-039
  before(() => {
@@ -393,227 +363,6 @@ describe(
  }
 );

-describe('deal ticket validation', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId('order-connect-wallet').should('exist');
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).children('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-});
-
-describe('deal ticket size validation', { tags: '@smoke' }, function () {
-  beforeEach(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must warn if order size input has too many digits after the decimal place', function () {
-    // 7002-SORD-016
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('1.234');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size must be whole numbers for this market'
-    );
-  });
-
-  it('must warn if order size is set to 0', function () {
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('0');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size cannot be lower than 1'
-    );
-  });
-});
-
-describe('limit order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleLimit).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must see the price unit', function () {
-    // 7002-SORD-018
-    cy.getByTestId(orderPriceField)
-      .siblings('label')
-      .should('have.text', 'Price (DAI)');
-  });
-
-  it('must see warning when placing an order with expiry date in past', () => {
-    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-    cy.log('choosing yesterday');
-    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-    cy.getByTestId(placeOrderBtn).click();
-
-    cy.getByTestId('dealticket-error-message-expiry').should(
-      'have.text',
-      'The expiry date that you have entered appears to be in the past'
-    );
-  });
-
-  it('must see warning if price has too many digits after decimal place', function () {
-    // 7002-SORD-059
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderPriceField).clear().type('1.123456');
-    cy.getByTestId('dealticket-error-message-price-limit').should(
-      'have.text',
-      'Price accepts up to 5 decimal places'
-    );
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    it('selections should be remembered', () => {
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'IOC')[0].text
-      );
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-      cy.getByTestId(toggleLimit).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'GTT')[0].text
-      );
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'FOK')[0].text
-      );
-    });
-  });
-});
-
-describe('market order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must not see the price unit', function () {
-    // 7002-SORD-019
-    cy.getByTestId(orderPriceField).should('not.exist');
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-});
-
 describe('suspended market validation', { tags: '@regression' }, () => {
  before(() => {
    cy.setVegaWallet();
@@ -0,0 +1,329 @@
+import * as Schema from '@vegaprotocol/types';
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+
+const orderSizeField = 'order-size';
+const orderPriceField = 'order-price';
+const orderTIFDropDown = 'order-tif';
+const placeOrderBtn = 'place-order';
+const toggleShort = 'order-side-SIDE_SELL';
+const toggleLong = 'order-side-SIDE_BUY';
+const toggleLimit = 'order-type-TYPE_LIMIT';
+const toggleMarket = 'order-type-TYPE_MARKET';
+
+const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
+  return {
+    code: Schema.OrderTimeInForceCode[value],
+    value,
+    text: Schema.OrderTimeInForceMapping[value],
+  };
+});
+
+describe('time in force default values', () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must have market order set up to IOC by default', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+  });
+
+  it('must have time in force set to GTC for limit order', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTC')[0].text
+    );
+  });
+});
+
+describe('deal ticket validation', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+});
+
+describe('deal ticket size validation', { tags: '@smoke' }, function () {
+  beforeEach(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must warn if order size input has too many digits after the decimal place', function () {
+    // 7002-SORD-016
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('1.234');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size must be whole numbers for this market'
+    );
+  });
+
+  it('must warn if order size is set to 0', function () {
+    cy.getByTestId('order-type-TYPE_MARKET').click();
+    cy.getByTestId(orderSizeField).clear().type('0');
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-size-market').should(
+      'have.text',
+      'Size cannot be lower than 1'
+    );
+  });
+});
+
+describe('limit order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleLimit).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must see the price unit', function () {
+    // 7002-SORD-018
+    cy.getByTestId(orderPriceField)
+      .siblings('label')
+      .should('have.text', 'Price (DAI)');
+  });
+
+  it('must see warning when placing an order with expiry date in past', () => {
+    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+    cy.log('choosing yesterday');
+    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+    cy.getByTestId(placeOrderBtn).click();
+
+    cy.getByTestId('dealticket-error-message-expiry').should(
+      'have.text',
+      'The expiry date that you have entered appears to be in the past'
+    );
+  });
+
+  it('must see warning if price has too many digits after decimal place', function () {
+    // 7002-SORD-059
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(orderPriceField).clear().type('1.123456');
+    cy.getByTestId('dealticket-error-message-price-limit').should(
+      'have.text',
+      'Price accepts up to 5 decimal places'
+    );
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist;
+    validTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    it('selections should be remembered', () => {
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'IOC')[0].text
+      );
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
+      cy.getByTestId(toggleLimit).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'GTT')[0].text
+      );
+      cy.getByTestId(toggleMarket).click();
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        TIFlist.filter((item) => item.code === 'FOK')[0].text
+      );
+    });
+  });
+});
+
+describe('market order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('must not see the price unit', function () {
+    // 7002-SORD-019
+    cy.getByTestId(orderPriceField).should('not.exist');
+  });
+
+  describe('time in force validations', function () {
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+    const invalidTIF = TIFlist.filter(
+      (tif) => !['FOK', 'IOC'].includes(tif.code)
+    );
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    invalidTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
+      it(`must not be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
+      });
+    });
+  });
+});
+
+describe('post and reduce order validations', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(toggleMarket).click();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+
+  validTIF.forEach((tif) => {
+    // 7002-SORD-025
+    // 7002-SORD-026
+
+    it(`post and reduce order market for ${tif.code}`, function () {
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.disabled');
+      cy.getByTestId('reduce-only').should('be.enabled');
+    });
+  });
+
+  validTIF.forEach((tif) => {
+    it(`post and reduce order limit for ${tif.code}`, function () {
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.disabled');
+      cy.getByTestId('reduce-only').should('be.enabled');
+    });
+  });
+
+  const validTIFLimit = TIFlist.filter((tif) =>
+    ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
+  );
+
+  validTIFLimit.forEach((tif) => {
+    it(`post and reduce order for limit ${tif.code}`, function () {
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select(tif.value);
+      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+        'have.text',
+        tif.text
+      );
+      cy.getByTestId('post-only').should('be.enabled');
+      cy.getByTestId('reduce-only').should('be.disabled');
+    });
+  });
+});
@@ -174,7 +174,7 @@ const ApprovalTxFeedback = ({
            <>
              <p>
                {t(
-                  `Your ${selectedAsset?.symbol} is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
+                  `Your ${selectedAsset?.symbol} approval is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
                )}{' '}
              </p>
              {txLink && <p>{txLink}</p>}
@@ -140,8 +140,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -181,8 +179,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -215,8 +211,6 @@ describe('Network switcher', () => {
      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
-      [Networks.SANDBOX]: 'https://sandbox.net',
-      [Networks.MIRROR]: 'https://mirror.net',
    };
    // @ts-ignore Typescript doesn't know about this module being mocked
    useEnvironment.mockImplementation(() => ({
@@ -17,12 +17,10 @@ export const envNameMapping: Record<Networks, string> = {
  [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
  [Networks.CUSTOM]: t('Custom'),
  [Networks.DEVNET]: t('Devnet'),
-  [Networks.SANDBOX]: t('Sandbox'),
  [Networks.STAGNET1]: t('Stagnet'),
  [Networks.STAGNET3]: t('Stagnet3'),
  [Networks.TESTNET]: t('Fairground testnet'),
  [Networks.MAINNET]: t('Mainnet'),
-  [Networks.MIRROR]: t('Mainnet mirror'),
 };

 export const envTriggerMapping: Record<Networks, string> = {
@@ -32,7 +30,6 @@ export const envTriggerMapping: Record<Networks, string> = {

 export const envDescriptionMapping: Record<Networks, string> = {
  [Networks.CUSTOM]: '',
-  [Networks.SANDBOX]: t('A playground test environment'),
  [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'),
  [Networks.DEVNET]: t('The latest Vega code auto-deployed'),
  [Networks.STAGNET1]: t('A release candidate for the staging environment'),
@@ -41,9 +38,6 @@ export const envDescriptionMapping: Record<Networks, string> = {
    'Public testnet run by the Vega team, often used for incentives'
  ),
  [Networks.MAINNET]: t('The vega mainnet'),
-  [Networks.MIRROR]: t(
-    'A mirror of the mainnet environment running on an Ethereum test network'
-  ),
 };

 const standardNetworkKeys = [Networks.MAINNET, Networks.TESTNET];
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { Networks } from '../types';
 import { useEnvironment } from './use-environment';

-type Net = Exclude<Networks, 'CUSTOM' | 'SANDBOX'>;
+type Net = Exclude<Networks, 'CUSTOM'>;
 export enum DApp {
  Explorer = 'Explorer',
  Console = 'Console',
@@ -21,7 +21,6 @@ const EmptyLinks: DAppLinks = {
  [Networks.STAGNET3]: '',
  [Networks.TESTNET]: '',
  [Networks.MAINNET]: '',
-  [Networks.MIRROR]: '',
 };

 const ExplorerLinks = {
@@ -61,7 +60,7 @@ export const useLinks = (dapp: DApp, network?: Net) => {
  };

  let net = network || VEGA_ENV;
-  if (net === Networks.CUSTOM || net === Networks.SANDBOX) {
+  if (net === Networks.CUSTOM) {
    net = Networks.TESTNET;
  }

@@ -5,13 +5,11 @@ import type { envSchema } from './utils/validate-environment';
 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
  CUSTOM = 'CUSTOM',
-  SANDBOX = 'SANDBOX',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
-  MIRROR = 'MIRROR',
 }
 export type Environment = z.infer<typeof envSchema>;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
@@ -3,13 +3,11 @@ import z from 'zod';
 export enum Networks {
  VALIDATOR_TESTNET = 'VALIDATOR_TESTNET',
  CUSTOM = 'CUSTOM',
-  SANDBOX = 'SANDBOX',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
-  MIRROR = 'MIRROR',
 }

 const schemaObject = {
@@ -103,13 +103,3 @@ query LiquidityProviderFeeShare($marketId: ID!) {
    }
  }
 }
-
-subscription LiquidityProviderFeeShareUpdate($marketId: ID!) {
-  marketsData(marketIds: [$marketId]) {
-    liquidityProviderFeeShare {
-      partyId
-      equityLikeShare
-      averageEntryValuation
-    }
-  }
-}
@@ -36,13 +36,6 @@ export type LiquidityProviderFeeShareQueryVariables = Types.Exact<{

 export type LiquidityProviderFeeShareQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, data?: { __typename?: 'MarketData', market: { __typename?: 'Market', id: string }, liquidityProviderFeeShare?: Array<{ __typename?: 'LiquidityProviderFeeShare', equityLikeShare: string, averageEntryValuation: string, party: { __typename?: 'Party', id: string } }> | null } | null } | null };

-export type LiquidityProviderFeeShareUpdateSubscriptionVariables = Types.Exact<{
-  marketId: Types.Scalars['ID'];
-}>;
-
-
-export type LiquidityProviderFeeShareUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', liquidityProviderFeeShare?: Array<{ __typename?: 'ObservableLiquidityProviderFeeShare', partyId: string, equityLikeShare: string, averageEntryValuation: string }> | null }> };
-
 export const LiquidityProvisionFieldsFragmentDoc = gql`
    fragment LiquidityProvisionFields on LiquidityProvision {
  party {
@@ -256,38 +249,4 @@ export function useLiquidityProviderFeeShareLazyQuery(baseOptions?: Apollo.LazyQ
        }
 export type LiquidityProviderFeeShareQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareQuery>;
 export type LiquidityProviderFeeShareLazyQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareLazyQuery>;
-export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
-export const LiquidityProviderFeeShareUpdateDocument = gql`
-    subscription LiquidityProviderFeeShareUpdate($marketId: ID!) {
-  marketsData(marketIds: [$marketId]) {
-    liquidityProviderFeeShare {
-      partyId
-      equityLikeShare
-      averageEntryValuation
-    }
-  }
-}
-    `;
-
-/**
- * __useLiquidityProviderFeeShareUpdateSubscription__
- *
- * To run a query within a React component, call `useLiquidityProviderFeeShareUpdateSubscription` and pass it any options that fit your needs.
- * When your component renders, `useLiquidityProviderFeeShareUpdateSubscription` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useLiquidityProviderFeeShareUpdateSubscription({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function useLiquidityProviderFeeShareUpdateSubscription(baseOptions: Apollo.SubscriptionHookOptions<LiquidityProviderFeeShareUpdateSubscription, LiquidityProviderFeeShareUpdateSubscriptionVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useSubscription<LiquidityProviderFeeShareUpdateSubscription, LiquidityProviderFeeShareUpdateSubscriptionVariables>(LiquidityProviderFeeShareUpdateDocument, options);
-      }
-export type LiquidityProviderFeeShareUpdateSubscriptionHookResult = ReturnType<typeof useLiquidityProviderFeeShareUpdateSubscription>;
-export type LiquidityProviderFeeShareUpdateSubscriptionResult = Apollo.SubscriptionResult<LiquidityProviderFeeShareUpdateSubscription>;
+export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
@@ -6,7 +6,6 @@ import produce from 'immer';

 import {
  LiquidityProviderFeeShareDocument,
-  LiquidityProviderFeeShareUpdateDocument,
  LiquidityProvisionsDocument,
  LiquidityProvisionsUpdateDocument,
  MarketLpDocument,
@@ -18,7 +17,6 @@ import type {
  LiquidityProviderFeeShareFieldsFragment,
  LiquidityProviderFeeShareQuery,
  LiquidityProviderFeeShareQueryVariables,
-  LiquidityProviderFeeShareUpdateSubscription,
  LiquidityProvisionFieldsFragment,
  LiquidityProvisionsQuery,
  LiquidityProvisionsQueryVariables,
@@ -115,42 +113,14 @@ export const marketLiquidityDataProvider = makeDataProvider<
 export const liquidityFeeShareDataProvider = makeDataProvider<
  LiquidityProviderFeeShareQuery,
  LiquidityProviderFeeShareFieldsFragment[],
-  LiquidityProviderFeeShareUpdateSubscription,
-  LiquidityProviderFeeShareUpdateSubscription['marketsData'][0]['liquidityProviderFeeShare'],
+  never,
+  never,
  LiquidityProviderFeeShareQueryVariables
 >({
  query: LiquidityProviderFeeShareDocument,
-  subscriptionQuery: LiquidityProviderFeeShareUpdateDocument,
-  update: (
-    data: LiquidityProviderFeeShareFieldsFragment[] | null,
-    deltas: LiquidityProviderFeeShareUpdateSubscription['marketsData'][0]['liquidityProviderFeeShare']
-  ) => {
-    return produce(data || [], (draft) => {
-      deltas?.forEach((delta) => {
-        const id = delta.partyId;
-        const index = draft.findIndex((a) => a.party.id === id);
-        if (index !== -1) {
-          draft[index].equityLikeShare = delta.equityLikeShare;
-          draft[index].averageEntryValuation = delta.averageEntryValuation;
-        } else {
-          draft.unshift({
-            equityLikeShare: delta.equityLikeShare,
-            averageEntryValuation: delta.averageEntryValuation,
-            party: {
-              id: delta.partyId,
-            },
-            // TODO add accounts connection to the subscription
-          });
-        }
-      });
-    });
-  },
  getData: (data) => {
    return data?.market?.data?.liquidityProviderFeeShare || [];
  },
-  getDelta: (subscriptionData: LiquidityProviderFeeShareUpdateSubscription) => {
-    return subscriptionData.marketsData[0].liquidityProviderFeeShare;
-  },
 });

 export type Filter = { partyId?: string; active?: boolean };
@@ -32,12 +32,16 @@ query OrderById($orderId: ID!) {

 query Orders(
  $partyId: ID!
+  $marketIds: [ID!]
  $pagination: Pagination
-  $filter: OrderByMarketIdsFilter
+  $filter: OrderFilter
 ) {
  party(id: $partyId) {
    id
-    ordersConnection(pagination: $pagination, filter: $filter) {
+    ordersConnection(
+      pagination: $pagination
+      filter: { order: $filter, marketIds: $marketIds }
+    ) {
      edges {
        node {
          ...OrderFields
@@ -74,8 +78,8 @@ fragment OrderUpdateFields on OrderUpdate {
  }
 }

-subscription OrdersUpdate($partyId: ID!) {
-  orders(filter: { partyIds: [$partyId] }) {
+subscription OrdersUpdate($partyId: ID!, $marketIds: [ID!]) {
+  orders(filter: { partyIds: [$partyId], marketIds: $marketIds }) {
    ...OrderUpdateFields
  }
 }
@@ -14,8 +14,9 @@ export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: '

 export type OrdersQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  marketIds?: Types.InputMaybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>;
  pagination?: Types.InputMaybe<Types.Pagination>;
-  filter?: Types.InputMaybe<Types.OrderByMarketIdsFilter>;
+  filter?: Types.InputMaybe<Types.OrderFilter>;
 }>;


@@ -25,6 +26,7 @@ export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string

 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  marketIds?: Types.InputMaybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>;
 }>;


@@ -114,10 +116,13 @@ export type OrderByIdQueryHookResult = ReturnType<typeof useOrderByIdQuery>;
 export type OrderByIdLazyQueryHookResult = ReturnType<typeof useOrderByIdLazyQuery>;
 export type OrderByIdQueryResult = Apollo.QueryResult<OrderByIdQuery, OrderByIdQueryVariables>;
 export const OrdersDocument = gql`
-    query Orders($partyId: ID!, $pagination: Pagination, $filter: OrderByMarketIdsFilter) {
+    query Orders($partyId: ID!, $marketIds: [ID!], $pagination: Pagination, $filter: OrderFilter) {
  party(id: $partyId) {
    id
-    ordersConnection(pagination: $pagination, filter: $filter) {
+    ordersConnection(
+      pagination: $pagination
+      filter: {order: $filter, marketIds: $marketIds}
+    ) {
      edges {
        node {
          ...OrderFields
@@ -148,6 +153,7 @@ export const OrdersDocument = gql`
 * const { data, loading, error } = useOrdersQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      marketIds: // value for 'marketIds'
 *      pagination: // value for 'pagination'
 *      filter: // value for 'filter'
 *   },
@@ -165,8 +171,8 @@ export type OrdersQueryHookResult = ReturnType<typeof useOrdersQuery>;
 export type OrdersLazyQueryHookResult = ReturnType<typeof useOrdersLazyQuery>;
 export type OrdersQueryResult = Apollo.QueryResult<OrdersQuery, OrdersQueryVariables>;
 export const OrdersUpdateDocument = gql`
-    subscription OrdersUpdate($partyId: ID!) {
-  orders(filter: {partyIds: [$partyId]}) {
+    subscription OrdersUpdate($partyId: ID!, $marketIds: [ID!]) {
+  orders(filter: {partyIds: [$partyId], marketIds: $marketIds}) {
    ...OrderUpdateFields
  }
 }
@@ -185,6 +191,7 @@ export const OrdersUpdateDocument = gql`
 * const { data, loading, error } = useOrdersUpdateSubscription({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      marketIds: // value for 'marketIds'
 *   },
 * });
 */
@@ -112,9 +112,7 @@ describe('order data provider', () => {
    const updatedData = update(data, delta, () => null, {
      partyId: '0x123',
      filter: {
-        order: {
-          dateRange: { end: new Date('2022-02-01').toISOString() },
-        },
+        dateRange: { end: new Date('2022-02-01').toISOString() },
      },
    });
    expect(
@@ -35,45 +35,40 @@ const orderMatchFilters = (
    return true;
  }
  if (
-    variables?.filter?.order?.status &&
-    !(order.status && variables.filter.order.status.includes(order.status))
+    variables?.filter?.status &&
+    !(order.status && variables.filter.status.includes(order.status))
  ) {
    return false;
  }
  if (
-    variables?.filter?.order?.types &&
-    !(order.type && variables.filter.order.types.includes(order.type))
+    variables?.filter?.types &&
+    !(order.type && variables.filter.types.includes(order.type))
  ) {
    return false;
  }
  if (
-    variables?.filter?.order?.timeInForce &&
-    !variables.filter.order.timeInForce.includes(order.timeInForce)
+    variables?.filter?.timeInForce &&
+    !variables.filter.timeInForce.includes(order.timeInForce)
  ) {
    return false;
  }
-  if (
-    variables?.filter?.order?.excludeLiquidity &&
-    order.liquidityProvisionId
-  ) {
+  if (variables?.filter?.excludeLiquidity && order.liquidityProvisionId) {
    return false;
  }
  if (
-    variables?.filter?.order?.dateRange?.start &&
+    variables?.filter?.dateRange?.start &&
    !(
      (order.updatedAt || order.createdAt) &&
-      variables.filter.order.dateRange.start <
-        (order.updatedAt || order.createdAt)
+      variables.filter.dateRange.start < (order.updatedAt || order.createdAt)
    )
  ) {
    return false;
  }
  if (
-    variables?.filter?.order?.dateRange?.end &&
+    variables?.filter?.dateRange?.end &&
    !(
      (order.updatedAt || order.createdAt) &&
-      variables.filter.order.dateRange.end >
-        (order.updatedAt || order.createdAt)
+      variables.filter.dateRange.end > (order.updatedAt || order.createdAt)
    )
  ) {
    return false;
@@ -243,18 +238,17 @@ export const hasActiveOrderProvider = makeDerivedDataProvider<
  { partyId: string; marketId?: string }
 >(
  [
-    (callback, client, variables) =>
+    (callback, client, { partyId, marketId }) =>
      hasActiveOrderProviderInternal(callback, client, {
+        marketIds: marketId ? [marketId] : undefined,
        filter: {
-          order: {
-            status: [OrderStatus.STATUS_ACTIVE],
-            excludeLiquidity: true,
-          },
+          status: [OrderStatus.STATUS_ACTIVE],
+          excludeLiquidity: true,
        },
        pagination: {
          first: 1,
        },
-        ...variables,
+        partyId,
      } as OrdersQueryVariables),
  ],
  (parts) => parts[0]
@@ -72,12 +72,10 @@ export const useOrderListData = ({
    const allVars: OrdersQueryVariables & OrdersUpdateSubscriptionVariables = {
      partyId,
      filter: {
-        order: {
-          dateRange: filter?.updatedAt?.value,
-          status: filter?.status?.value,
-          timeInForce: filter?.timeInForce?.value,
-          types: filter?.type?.value,
-        },
+        dateRange: filter?.updatedAt?.value,
+        status: filter?.status?.value,
+        timeInForce: filter?.timeInForce?.value,
+        types: filter?.type?.value,
      },
      pagination: {
        first: 1000,
@@ -53,14 +53,12 @@ export const useActiveOrdersVolumeAndMargin = (
    update,
    variables: {
      partyId: partyId || '',
+      marketIds: [marketId],
      filter: {
-        marketIds: [marketId],
-        order: {
-          status: [
-            OrderStatus.STATUS_ACTIVE,
-            OrderStatus.STATUS_PARTIALLY_FILLED,
-          ],
-        },
+        status: [
+          OrderStatus.STATUS_ACTIVE,
+          OrderStatus.STATUS_PARTIALLY_FILLED,
+        ],
      },
    },
    skip: !partyId,
@@ -4,7 +4,6 @@ export * from './lib/positions-data-providers';
 export * from './lib/margin-data-provider';
 export * from './lib/margin-calculator';
 export * from './lib/positions-table';
-export * from './lib/use-close-position';
 export * from './lib/use-market-margin';
 export * from './lib/use-market-position-open-volume';
 export * from './lib/use-open-volume';
@@ -1,109 +0,0 @@
-import { useEnvironment } from '@vegaprotocol/environment';
-import type { OrderFieldsFragment } from '@vegaprotocol/orders';
-import { truncateByChars } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import * as Schema from '@vegaprotocol/types';
-import { Link } from '@vegaprotocol/ui-toolkit';
-import type { TransactionResult, VegaTxState } from '@vegaprotocol/wallet';
-import type { ClosingOrder as IClosingOrder } from '../use-close-position';
-import { useRequestClosePositionData } from '../use-request-close-position-data';
-import { ClosingOrder } from './shared';
-
-interface CompleteProps {
-  partyId: string;
-  transaction: VegaTxState;
-  transactionResult?: TransactionResult;
-  closingOrder?: IClosingOrder;
-  closingOrderResult?: OrderFieldsFragment;
-}
-
-export const Complete = ({
-  partyId,
-  transaction,
-  transactionResult,
-  closingOrder,
-  closingOrderResult,
-}: CompleteProps) => {
-  const { VEGA_EXPLORER_URL } = useEnvironment();
-
-  if (!transactionResult || !closingOrderResult) return null;
-
-  return (
-    <>
-      {closingOrderResult.status === Schema.OrderStatus.STATUS_FILLED &&
-      transactionResult.status ? (
-        <Success partyId={partyId} order={closingOrder} />
-      ) : (
-        <Error
-          transactionResult={transactionResult}
-          closingOrderResult={closingOrderResult}
-        />
-      )}
-      {transaction.txHash && (
-        <>
-          <p className="font-semibold mt-4">{t('Transaction')}</p>
-          <p>
-            <Link
-              href={`${VEGA_EXPLORER_URL}/txs/${transaction.txHash}`}
-              target="_blank"
-            >
-              {truncateByChars(transaction.txHash)}
-            </Link>
-          </p>
-        </>
-      )}
-    </>
-  );
-};
-
-const Success = ({
-  partyId,
-  order,
-}: {
-  partyId: string;
-  order?: IClosingOrder;
-}) => {
-  const { market, marketData, orders } = useRequestClosePositionData(
-    order?.marketId,
-    partyId
-  );
-
-  if (!market || !marketData || !orders) {
-    return <div>{t('Loading...')}</div>;
-  }
-
-  if (!order) {
-    return (
-      <div className="text-vega-pink">{t('Could retrieve closing order')}</div>
-    );
-  }
-  return (
-    <>
-      <h2 className="font-bold">{t('Position closed')}</h2>
-      <ClosingOrder order={order} market={market} marketData={marketData} />
-    </>
-  );
-};
-
-const Error = ({
-  transactionResult,
-  closingOrderResult,
-}: {
-  transactionResult: TransactionResult;
-  closingOrderResult: OrderFieldsFragment;
-}) => {
-  const reason =
-    closingOrderResult.rejectionReason &&
-    Schema.OrderRejectionReasonMapping[closingOrderResult.rejectionReason];
-  return (
-    <div className="text-vega-pink">
-      {reason ? (
-        <p>{reason}</p>
-      ) : (
-        <p>
-          {t('Transaction failed')}: {transactionResult.error}
-        </p>
-      )}
-    </div>
-  );
-};
@@ -1,102 +0,0 @@
-import { render, screen, within } from '@testing-library/react';
-import * as Schema from '@vegaprotocol/types';
-import * as dataHook from '../use-request-close-position-data';
-import { Requested } from './requested';
-
-jest.mock('./use-request-close-position-data');
-
-describe('Close position dialog - Request', () => {
-  const props = {
-    partyId: 'party-id',
-    order: {
-      marketId: 'market-id',
-      type: Schema.OrderType.TYPE_MARKET as const,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK as const,
-      side: Schema.Side.SIDE_BUY,
-      size: '10',
-    },
-  };
-
-  it('loading state', async () => {
-    jest.spyOn(dataHook, 'useRequestClosePositionData').mockReturnValue({
-      loading: false,
-      market: null,
-      marketData: null,
-      orders: [],
-    });
-    render(<Requested {...props} />);
-    expect(screen.getByText('Loading...')).toBeInTheDocument();
-  });
-
-  it('renders message if no closing order found', async () => {
-    const orders = [
-      {
-        size: '200',
-        price: '999',
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      },
-      {
-        size: '300',
-        price: '888',
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      },
-    ];
-    jest.spyOn(dataHook, 'useRequestClosePositionData').mockReturnValue({
-      market: {
-        decimalPlaces: 2,
-        positionDecimalPlaces: 2,
-        tradableInstrument: {
-          instrument: {
-            name: 'test market',
-            product: {
-              // @ts-ignore avoiding having to add every property on the type
-              settlementAsset: {
-                symbol: 'SYM',
-              },
-            },
-          },
-        },
-      },
-      // @ts-ignore avoid all fields
-      marketData: {
-        markPrice: '100',
-      },
-      // @ts-ignore avoid all fields
-      orders,
-    });
-    render(<Requested {...props} />);
-
-    // closing order
-    const closingOrderHeader = screen.getByText('Position to be closed');
-    const closingOrderTable = within(
-      closingOrderHeader.nextElementSibling?.querySelector(
-        'tbody'
-      ) as HTMLElement
-    );
-    const closingOrderRow = closingOrderTable.getAllByRole('row');
-    expect(closingOrderRow[0].children[0]).toHaveTextContent('test market');
-    expect(closingOrderRow[0].children[1]).toHaveTextContent('+0.1');
-    expect(closingOrderRow[0].children[2]).toHaveTextContent('~1.00 SYM');
-
-    // orders
-    const ordersHeading = screen.getByText('Orders to be closed');
-    const ordersTable = within(
-      ordersHeading.nextElementSibling?.querySelector('tbody') as HTMLElement
-    );
-    const orderRows = ordersTable.getAllByRole('row');
-    expect(orderRows).toHaveLength(orders.length);
-    expect(orderRows[0].children[0]).toHaveTextContent('+2');
-    expect(orderRows[0].children[1]).toHaveTextContent('9.99 SYM');
-    expect(orderRows[0].children[2]).toHaveTextContent(
-      "Good 'til Cancelled (GTC)"
-    );
-
-    expect(orderRows[1].children[0]).toHaveTextContent('-3');
-    expect(orderRows[1].children[1]).toHaveTextContent('8.88 SYM');
-    expect(orderRows[1].children[2]).toHaveTextContent(
-      "Good 'til Cancelled (GTC)"
-    );
-  });
-});
@@ -1,37 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { ClosingOrder as IClosingOrder } from '../use-close-position';
-import { useRequestClosePositionData } from '../use-request-close-position-data';
-import { ActiveOrders, ClosingOrder } from './shared';
-
-export const Requested = ({
-  order,
-  partyId,
-}: {
-  order?: IClosingOrder;
-  partyId: string;
-}) => {
-  const { market, marketData, orders, loading } = useRequestClosePositionData(
-    order?.marketId,
-    partyId
-  );
-
-  if (loading || !market || !marketData || !orders) {
-    return <div>{t('Loading...')}</div>;
-  }
-
-  if (!order) {
-    return (
-      <div className="text-vega-pink">
-        {t('Could not create closing order')}
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <h2 className="font-bold">{t('Position to be closed')}</h2>
-      <ClosingOrder order={order} market={market} marketData={marketData} />
-      <ActiveOrders market={market} orders={orders} />
-    </>
-  );
-};
@@ -1,114 +0,0 @@
-import type { MarketData, Market } from '@vegaprotocol/market-list';
-import type { Order } from '@vegaprotocol/orders';
-import { timeInForceLabel } from '@vegaprotocol/orders';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import { Size } from '@vegaprotocol/react-helpers';
-import type { ReactNode } from 'react';
-import type { ClosingOrder as IClosingOrder } from '../use-close-position';
-
-export const ClosingOrder = ({
-  order,
-  market,
-  marketData,
-}: {
-  order: IClosingOrder;
-  market: Market;
-  marketData: MarketData;
-}) => {
-  const asset = market.tradableInstrument.instrument.product.settlementAsset;
-  const estimatedPrice =
-    marketData && market
-      ? addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
-      : '-';
-  const size = market ? (
-    <Size
-      value={order.size}
-      side={order.side}
-      positionDecimalPlaces={market.positionDecimalPlaces}
-    />
-  ) : (
-    '-'
-  );
-
-  return (
-    <BasicTable
-      headers={[t('Market'), t('Amount'), t('Est price')]}
-      rows={[
-        [
-          market.tradableInstrument.instrument.name,
-          size,
-          `~${estimatedPrice} ${asset?.symbol}`,
-        ],
-      ]}
-    />
-  );
-};
-
-export const ActiveOrders = ({
-  market,
-  orders,
-}: {
-  market: Market;
-  orders: Order[];
-}) => {
-  const asset = market.tradableInstrument.instrument.product.settlementAsset;
-
-  if (!orders.length) {
-    return null;
-  }
-
-  return (
-    <div className="mt-4">
-      <h2 className="font-bold">{t('Orders to be closed')}</h2>
-      <BasicTable
-        headers={[t('Amount'), t('Target price'), t('Time in force')]}
-        rows={orders.map((o) => {
-          return [
-            <Size
-              value={o.size}
-              side={o.side}
-              positionDecimalPlaces={market.positionDecimalPlaces}
-            />,
-            `${addDecimalsFormatNumber(o.price, market.decimalPlaces)} ${
-              asset.symbol
-            }`,
-            timeInForceLabel(o.timeInForce),
-          ];
-        })}
-      />
-    </div>
-  );
-};
-
-interface BasicTableProps {
-  headers: ReactNode[];
-  rows: ReactNode[][];
-}
-
-const BasicTable = ({ headers, rows }: BasicTableProps) => {
-  return (
-    <table className="w-full">
-      <thead>
-        <tr>
-          {headers.map((h, i) => (
-            <th key={i} className="text-left font-medium">
-              {h}
-            </th>
-          ))}
-        </tr>
-      </thead>
-      <tbody>
-        {rows.map((cells, i) => (
-          <tr key={i}>
-            {cells.map((c, i) => (
-              <td key={i} className="align-top">
-                {c}
-              </td>
-            ))}
-          </tr>
-        ))}
-      </tbody>
-    </table>
-  );
-};
@@ -349,16 +349,15 @@ export const volumeAndMarginProvider = makeDerivedDataProvider<
  PositionsQueryVariables & MarketDataQueryVariables
 >(
  [
-    (callback, client, variables) =>
+    (callback, client, { partyId, marketId }) =>
      ordersProvider(callback, client, {
-        ...variables,
+        partyId,
+        marketIds: [marketId],
        filter: {
-          order: {
-            status: [
-              OrderStatus.STATUS_ACTIVE,
-              OrderStatus.STATUS_PARTIALLY_FILLED,
-            ],
-          },
+          status: [
+            OrderStatus.STATUS_ACTIVE,
+            OrderStatus.STATUS_PARTIALLY_FILLED,
+          ],
        },
      }),
    (callback, client, variables) =>
@@ -1,211 +0,0 @@
-import type { ReactNode } from 'react';
-import type { MockedResponse } from '@apollo/client/testing';
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook, waitFor } from '@testing-library/react';
-import * as Types from '@vegaprotocol/types';
-import { useClosePosition } from './use-close-position';
-import { VegaTxStatus, VegaWalletContext } from '@vegaprotocol/wallet';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { initialState } from '@vegaprotocol/wallet';
-import type { TransactionEventSubscription } from '@vegaprotocol/wallet';
-import { TransactionEventDocument } from '@vegaprotocol/wallet';
-import { act } from 'react-dom/test-utils';
-import type { OrderSubSubscription } from '@vegaprotocol/orders';
-import { OrderSubDocument } from '@vegaprotocol/orders';
-
-const pubKey = 'test-pubkey';
-const defaultWalletContext = {
-  pubKey,
-  pubKeys: [{ publicKey: pubKey, name: 'test pubkey' }],
-  isReadOnly: false,
-  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
-  connect: jest.fn(),
-  disconnect: jest.fn(),
-  selectPubKey: jest.fn(),
-  connector: null,
-};
-const txResult = {
-  __typename: 'TransactionResult',
-  partyId: pubKey,
-  hash: '0x123',
-  status: true,
-  error: null,
-};
-
-function setup(context?: Partial<VegaWalletContextShape>) {
-  const mockTransactionResult: MockedResponse<TransactionEventSubscription> = {
-    request: {
-      query: TransactionEventDocument,
-      variables: {
-        partyId: context?.pubKey || '',
-      },
-    },
-    result: {
-      data: {
-        busEvents: [
-          {
-            type: Types.BusEventType.TransactionResult,
-            event: txResult,
-            __typename: 'BusEvent',
-          },
-        ] as TransactionEventSubscription['busEvents'],
-      },
-    },
-  };
-  const mockOrderResult: MockedResponse<OrderSubSubscription> = {
-    request: {
-      query: OrderSubDocument,
-      variables: {
-        partyId: context?.pubKey || '',
-      },
-    },
-    result: {
-      data: {
-        orders: [
-          {
-            type: Types.OrderType.TYPE_LIMIT,
-            id: '2fca514cebf9f465ae31ecb4c5721e3a6f5f260425ded887ca50ba15b81a5d50',
-            status: Types.OrderStatus.STATUS_ACTIVE,
-            rejectionReason: null,
-            createdAt: '2022-07-05T14:25:47.815283706Z',
-            expiresAt: '2022-07-05T14:25:47.815283706Z',
-            size: '10',
-            price: '300000',
-            timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_GTC,
-            side: Types.Side.SIDE_BUY,
-            marketId: 'market-id',
-            __typename: 'OrderUpdate',
-          },
-        ],
-      },
-    },
-  };
-
-  const wrapper = ({ children }: { children: ReactNode }) => (
-    <MockedProvider mocks={[mockTransactionResult, mockOrderResult]}>
-      <VegaWalletContext.Provider
-        value={{ ...defaultWalletContext, ...context }}
-      >
-        {children}
-      </VegaWalletContext.Provider>
-    </MockedProvider>
-  );
-  return renderHook(() => useClosePosition(), { wrapper });
-}
-
-describe('useClosePosition', () => {
-  const txResponse = {
-    signature:
-      'cfe592d169f87d0671dd447751036d0dddc165b9c4b65e5a5060e2bbadd1aa726d4cbe9d3c3b327bcb0bff4f83999592619a2493f9bbd251fae99ce7ce766909',
-    transactionHash: '0x123',
-  };
-
-  it('doesnt send the tx if there is no open volume', () => {
-    const mockSend = jest.fn();
-    const { result } = setup({ sendTx: mockSend });
-    expect(result.current).toEqual({
-      submit: expect.any(Function),
-      transaction: initialState,
-      Dialog: expect.any(Function),
-    });
-    result.current.submit({ marketId: 'test-market', openVolume: '0' });
-    expect(mockSend).not.toBeCalled();
-    expect(result.current.transaction.status).toEqual(VegaTxStatus.Default);
-  });
-
-  it('doesnt send the tx if there is no pubkey', () => {
-    const mockSend = jest.fn();
-    const { result } = setup({ sendTx: mockSend, pubKey: null });
-    result.current.submit({ marketId: 'test-market', openVolume: '1000' });
-    expect(mockSend).not.toBeCalled();
-    expect(result.current.transaction.status).toEqual(VegaTxStatus.Default);
-  });
-
-  it('closes long positions', async () => {
-    const marketId = 'test-market';
-    const openVolume = '1000';
-    const mockSend = jest.fn().mockResolvedValue(txResponse);
-    const { result } = setup({ sendTx: mockSend, pubKey });
-
-    act(() => {
-      result.current.submit({ marketId, openVolume });
-    });
-
-    expect(mockSend).toBeCalledWith(defaultWalletContext.pubKey, {
-      batchMarketInstructions: {
-        cancellations: [
-          {
-            marketId,
-            orderId: '',
-          },
-        ],
-        submissions: [
-          {
-            marketId,
-            type: Types.OrderType.TYPE_MARKET,
-            timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
-            side: Types.Side.SIDE_SELL,
-            size: openVolume,
-          },
-        ],
-      },
-    });
-
-    expect(result.current.transaction.status).toEqual(VegaTxStatus.Requested);
-
-    await waitFor(() => {
-      expect(result.current.transaction).toEqual({
-        status: VegaTxStatus.Complete,
-        signature: txResponse.signature,
-        txHash: txResponse.transactionHash,
-        dialogOpen: true,
-        error: null,
-      });
-      expect(result.current.transactionResult).toEqual(txResult);
-    });
-  });
-
-  it('closes short positions', async () => {
-    const marketId = 'test-market';
-    const openVolume = '-1000';
-    const mockSend = jest.fn().mockResolvedValue(txResponse);
-    const { result } = setup({ sendTx: mockSend, pubKey });
-
-    act(() => {
-      result.current.submit({ marketId, openVolume });
-    });
-
-    expect(mockSend).toBeCalledWith(defaultWalletContext.pubKey, {
-      batchMarketInstructions: {
-        cancellations: [
-          {
-            marketId,
-            orderId: '',
-          },
-        ],
-        submissions: [
-          {
-            marketId,
-            type: Types.OrderType.TYPE_MARKET,
-            timeInForce: Types.OrderTimeInForce.TIME_IN_FORCE_FOK,
-            side: Types.Side.SIDE_BUY,
-            size: openVolume.replace('-', ''),
-          },
-        ],
-      },
-    });
-
-    expect(result.current.transaction.status).toEqual(VegaTxStatus.Requested);
-
-    await waitFor(() => {
-      expect(result.current.transaction).toEqual({
-        status: VegaTxStatus.Complete,
-        signature: txResponse.signature,
-        txHash: txResponse.transactionHash,
-        dialogOpen: true,
-        error: null,
-      });
-      expect(result.current.transactionResult).toEqual(txResult);
-    });
-  });
-});
@@ -1,105 +0,0 @@
-import { useCallback, useState } from 'react';
-import type { TransactionResult } from '@vegaprotocol/wallet';
-import { determineId } from '@vegaprotocol/wallet';
-import { useVegaWallet, useTransactionResult } from '@vegaprotocol/wallet';
-import { useVegaTransaction } from '@vegaprotocol/wallet';
-import * as Sentry from '@sentry/react';
-import * as Schema from '@vegaprotocol/types';
-import { useOrderUpdate } from '@vegaprotocol/orders';
-import type { OrderSubFieldsFragment } from '@vegaprotocol/orders';
-
-export interface ClosingOrder {
-  marketId: string;
-  type: Schema.OrderType.TYPE_MARKET;
-  timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK;
-  side: Schema.Side;
-  size: string;
-}
-
-export const useClosePosition = () => {
-  const { pubKey } = useVegaWallet();
-  const { send, transaction, setComplete, Dialog } = useVegaTransaction();
-  const [closingOrder, setClosingOrder] = useState<ClosingOrder>();
-  const [closingOrderResult, setClosingOrderResult] =
-    useState<OrderSubFieldsFragment>();
-  const [transactionResult, setTransactionResult] =
-    useState<TransactionResult>();
-  const waitForTransactionResult = useTransactionResult();
-  const waitForOrder = useOrderUpdate(transaction);
-
-  const submit = useCallback(
-    async ({
-      marketId,
-      openVolume,
-    }: {
-      marketId: string;
-      openVolume: string;
-    }) => {
-      if (!pubKey || openVolume === '0') {
-        return;
-      }
-
-      setTransactionResult(undefined);
-      setClosingOrder(undefined);
-
-      try {
-        // figure out if position is long or short and make side the opposite
-        const side = openVolume.startsWith('-')
-          ? Schema.Side.SIDE_BUY
-          : Schema.Side.SIDE_SELL;
-
-        // volume could be prefixed with '-' if position is short, remove it
-        const size = openVolume.replace('-', '');
-        const closingOrder = {
-          marketId: marketId,
-          type: Schema.OrderType.TYPE_MARKET as const,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK as const,
-          side,
-          size,
-        };
-
-        setClosingOrder(closingOrder);
-
-        const command = {
-          batchMarketInstructions: {
-            cancellations: [
-              {
-                marketId,
-                orderId: '', // omit order id to cancel all active orders
-              },
-            ],
-            submissions: [closingOrder],
-          },
-        };
-
-        const res = await send(pubKey, command);
-
-        if (res) {
-          const orderId = determineId(res.signature);
-          const [txResult, orderResult] = await Promise.all([
-            waitForTransactionResult(res.transactionHash, pubKey),
-            waitForOrder(orderId, pubKey),
-          ]);
-          setTransactionResult(txResult);
-          setClosingOrderResult(orderResult);
-          setComplete();
-        }
-
-        return res;
-      } catch (e) {
-        Sentry.captureException(e);
-        return;
-      }
-    },
-    [pubKey, send, setComplete, waitForTransactionResult, waitForOrder]
-  );
-
-  return {
-    transaction,
-    transactionResult,
-    submit,
-    closingOrder,
-    closingOrderResult,
-    Dialog,
-  };
-};
@@ -1,66 +0,0 @@
-import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
-import { isOrderActive, ordersWithMarketProvider } from '@vegaprotocol/orders';
-import type { OrdersQueryVariables } from '@vegaprotocol/orders';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
-import { useMemo } from 'react';
-
-export const useRequestClosePositionData = (
-  marketId?: string,
-  partyId?: string
-) => {
-  const marketVariables = useMemo(
-    () => ({ marketId: marketId || '' }),
-    [marketId]
-  );
-  const orderVariables = useMemo<OrdersQueryVariables>(
-    () => ({ partyId: partyId || '' }),
-    [partyId]
-  );
-  const { data: market, loading: marketLoading } = useDataProvider({
-    dataProvider: marketProvider,
-    variables: marketVariables,
-    skip: !marketId,
-  });
-  const { data: marketData, loading: marketDataLoading } = useDataProvider({
-    dataProvider: marketDataProvider,
-    variables: marketVariables,
-  });
-  const { data: orderData, loading: orderDataLoading } = useDataProvider({
-    dataProvider: ordersWithMarketProvider,
-    variables: orderVariables,
-    skip: !partyId,
-  });
-
-  const orders = useMemo(() => {
-    if (!orderData || !market) return [];
-    return (
-      orderData
-        .filter((o) => {
-          // Filter out orders not on market for position
-          if (
-            !o ||
-            !o.node ||
-            !o.node.market ||
-            o.node.market.id !== market.id
-          ) {
-            return false;
-          }
-
-          if (!isOrderActive(o.node.status)) {
-            return false;
-          }
-
-          return true;
-        })
-        // @ts-ignore o is never null as its been filtered out above
-        .map((o) => o.node)
-    );
-  }, [orderData, market]);
-
-  return {
-    market,
-    marketData,
-    orders,
-    loading: marketLoading || marketDataLoading || orderDataLoading,
-  };
-};
@@ -1,6 +1,7 @@
 import { ethers } from 'ethers';
 import { hexlify } from 'ethers/lib/utils';
 import abi from '../abis/claim_abi.json';
+import { calcGasBuffer } from '../utils';

 export const UNSPENT_CODE = '0x0000000000000000000000000000000000000000';
 export const SPENT_CODE = '0x0000000000000000000000000000000000000001';
@@ -42,7 +43,7 @@ export class Claim {
   * was performed and mined beforehand
   * @return {Promise<boolean>}
   */
-  public claim({
+  public async claim({
    amount,
    tranche,
    expiry,
@@ -61,20 +62,20 @@ export class Claim {
    r: string;
    s: string;
  }): Promise<ethers.ContractTransaction> {
-    return this.contract[
-      target != null ? 'claim_targeted' : 'claim_untargeted'
-    ](
-      ...[
-        { r, s, v },
-        {
-          amount,
-          tranche,
-          expiry,
-        },
-        hexlify(country),
-        target,
-      ].filter(Boolean)
-    );
+    const method = target != null ? 'claim_targeted' : 'claim_untargeted';
+    const args = [
+      { r, s, v },
+      {
+        amount,
+        tranche,
+        expiry,
+      },
+      hexlify(country),
+      target,
+    ].filter(Boolean);
+    const res = await this.contract.estimateGas[method](...args);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract[method](...args, { gasLimit });
  }

  /**
@@ -1,6 +1,7 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import abi from '../abis/erc20_bridge_abi.json';
+import { calcGasBuffer } from '../utils';

 export class CollateralBridge {
  public contract: ethers.Contract;
@@ -13,8 +14,20 @@ export class CollateralBridge {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
  }

-  deposit_asset(assetSource: string, amount: string, vegaPublicKey: string) {
-    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey);
+  async deposit_asset(
+    assetSource: string,
+    amount: string,
+    vegaPublicKey: string
+  ) {
+    const res = await this.contract.estimateGas.deposit_asset(
+      assetSource,
+      amount,
+      vegaPublicKey
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey, {
+      gasLimit,
+    });
  }
  get_asset_source(vegaAssetId: string) {
    return this.contract.get_asset_source(vegaAssetId);
@@ -37,7 +50,7 @@ export class CollateralBridge {
  default_withdraw_delay() {
    return this.contract.default_withdraw_delay();
  }
-  list_asset(
+  async list_asset(
    address: string,
    vegaAssetId: string,
    lifetimeLimit: string,
@@ -45,7 +58,7 @@ export class CollateralBridge {
    nonce: string,
    signatures: string
  ) {
-    return this.contract.list_asset(
+    const res = await this.contract.estimateGas.list_asset(
      address,
      vegaAssetId,
      lifetimeLimit,
@@ -53,8 +66,20 @@ export class CollateralBridge {
      nonce,
      signatures
    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.list_asset(
+      address,
+      vegaAssetId,
+      lifetimeLimit,
+      withdraw_threshold,
+      nonce,
+      signatures,
+      {
+        gasLimit,
+      }
+    );
  }
-  withdraw_asset(
+  async withdraw_asset(
    assetSource: string,
    amount: string,
    target: string,
@@ -62,7 +87,7 @@ export class CollateralBridge {
    nonce: string,
    signatures: string
  ) {
-    return this.contract.withdraw_asset(
+    const res = await this.contract.estimateGas.withdraw_asset(
      assetSource,
      amount,
      target,
@@ -70,6 +95,18 @@ export class CollateralBridge {
      nonce,
      signatures
    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.withdraw_asset(
+      assetSource,
+      amount,
+      target,
+      creation,
+      nonce,
+      signatures,
+      {
+        gasLimit,
+      }
+    );
  }

  is_stopped() {
@@ -1,5 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/multisig_abi.json';
+import { calcGasBuffer } from '../utils';

 export class MultisigControl {
  public contract: ethers.Contract;
@@ -13,12 +14,20 @@ export class MultisigControl {
    this.address = address;
  }

-  add_signer(newSigner: string, nonce: string, signatures: string) {
-    return this.contract.add_signer(newSigner, nonce, signatures);
+  async add_signer(newSigner: string, nonce: string, signatures: string) {
+    const res = await this.contract.estimateGas.add_signer(
+      newSigner,
+      nonce,
+      signatures
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.add_signer(newSigner, nonce, signatures, { gasLimit });
  }

-  burn_nonce(nonce: string, signatures: string) {
-    return this.contract.burn_nonce(nonce, signatures);
+  async burn_nonce(nonce: string, signatures: string) {
+    const res = await this.contract.estimateGas.burn_nonce(nonce, signatures);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.burn_nonce(nonce, signatures, { gasLimit });
  }

  get_current_threshold() {
@@ -37,19 +46,43 @@ export class MultisigControl {
    return this.contract.is_valid_signer(signerAddress);
  }

-  remove_signer(oldSigner: string, nonce: string, signatures: string) {
-    return this.contract.remove_signer(oldSigner, nonce, signatures);
+  async remove_signer(oldSigner: string, nonce: string, signatures: string) {
+    const res = await this.contract.estimateGas.remove_signer(
+      oldSigner,
+      nonce,
+      signatures
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.remove_signer(oldSigner, nonce, signatures, {
+      gasLimit,
+    });
  }

-  set_threshold(newThreshold: string, nonce: string, signatures: string) {
-    return this.contract.set_threshold(newThreshold, nonce, signatures);
+  async set_threshold(newThreshold: string, nonce: string, signatures: string) {
+    const res = await this.contract.estimateGas.set_threshold(
+      newThreshold,
+      nonce,
+      signatures
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.set_threshold(newThreshold, nonce, signatures, {
+      gasLimit,
+    });
  }

  signers(address: string) {
    return this.contract.signers(address);
  }

-  verify_signatures(nonce: string, message: string, signatures: string) {
-    return this.contract.verify_signatures(nonce, message, signatures);
+  async verify_signatures(nonce: string, message: string, signatures: string) {
+    const res = await this.contract.estimateGas.verify_signatures(
+      nonce,
+      message,
+      signatures
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.verify_signatures(nonce, message, signatures, {
+      gasLimit,
+    });
  }
 }
@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/staking_abi.json';
-import { prepend0x } from '../utils';
+import { calcGasBuffer, prepend0x } from '../utils';

 export class StakingBridge {
  public contract: ethers.Contract;
@@ -13,20 +13,41 @@ export class StakingBridge {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
    this.address = address;
  }
+  async stake(amount: string, vegaPublicKey: string) {
+    const key = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.stake(amount, key);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.stake(amount, key, {
+      gasLimit,
+    });
+  }

-  stake(amount: string, vegaPublicKey: string) {
-    return this.contract.stake(amount, prepend0x(vegaPublicKey));
+  async remove_stake(amount: string, vegaPublicKey: string) {
+    const key = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.remove_stake(amount, key);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.remove_stake(amount, key, {
+      gasLimit,
+    });
  }
-  remove_stake(amount: string, vegaPublicKey: string) {
-    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
-  }
-  transfer_stake(amount: string, newAddress: string, vegaPublicKey: string) {
-    return this.contract.transfer_stake(
+
+  async transfer_stake(
+    amount: string,
+    newAddress: string,
+    vegaPublicKey: string
+  ) {
+    const key = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.transfer_stake(
      amount,
      newAddress,
-      prepend0x(vegaPublicKey)
+      key
    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.transfer_stake(amount, newAddress, key, {
+      gasLimit,
+    });
  }
+
  staking_token() {
    return this.contract.staking_token();
  }
@@ -1,6 +1,7 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20AbiFaucetable from '../abis/erc20_abi_faucet.json';
+import { calcGasBuffer } from '../utils';

 export class TokenFaucetable {
  public contract: ethers.Contract;
@@ -27,13 +28,17 @@ export class TokenFaucetable {
  allowance(owner: string, spender: string): Promise<BigNumber> {
    return this.contract.allowance(owner, spender);
  }
-  approve(spender: string, amount: string) {
-    return this.contract.approve(spender, amount);
+  async approve(spender: string, amount: string) {
+    const res = await this.contract.estimateGas.approve(spender, amount);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.approve(spender, amount, { gasLimit });
  }
  decimals(): Promise<number> {
    return this.contract.decimals();
  }
-  faucet() {
-    return this.contract.faucet();
+  async faucet() {
+    const res = await this.contract.estimateGas.faucet();
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.faucet({ gasLimit });
  }
 }
@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/vesting_abi.json';
-import { prepend0x } from '../utils';
+import { calcGasBuffer, prepend0x } from '../utils';

 export class TokenVesting {
  public contract: ethers.Contract;
@@ -13,12 +13,21 @@ export class TokenVesting {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
    this.address = address;
  }
-
-  stake_tokens(amount: string, vegaPublicKey: string) {
-    return this.contract.stake_tokens(amount, prepend0x(vegaPublicKey));
+  async stake_tokens(amount: string, vegaPublicKey: string) {
+    const key = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.stake_tokens(amount, key);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.stake_tokens(amount, key, {
+      gasLimit,
+    });
  }
-  remove_stake(amount: string, vegaPublicKey: string) {
-    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
+  async remove_stake(amount: string, vegaPublicKey: string) {
+    const key = prepend0x(vegaPublicKey);
+    const res = await this.contract.estimateGas.remove_stake(amount, key);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.remove_stake(amount, key, {
+      gasLimit,
+    });
  }
  stake_balance(address: string, vegaPublicKey: string) {
    return this.contract.stake_balance(address, prepend0x(vegaPublicKey));
@@ -38,7 +47,13 @@ export class TokenVesting {
  user_total_all_tranches(address: string) {
    return this.contract.user_total_all_tranches(address);
  }
-  withdraw_from_tranche(trancheId: number) {
-    return this.contract.withdraw_from_tranche(trancheId);
+  async withdraw_from_tranche(trancheId: number) {
+    const res = await this.contract.estimateGas.withdraw_from_tranche(
+      trancheId
+    );
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.withdraw_from_tranche(trancheId, {
+      gasLimit,
+    });
  }
 }
@@ -1,6 +1,7 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20Abi from '../abis/erc20_abi.json';
+import { calcGasBuffer } from '../utils';

 export class Token {
  public contract: ethers.Contract;
@@ -23,13 +24,15 @@ export class Token {
  allowance(owner: string, spender: string): Promise<BigNumber> {
    return this.contract.allowance(owner, spender);
  }
-  approve(spender: string, amount: string) {
-    return this.contract.approve(spender, amount);
+  async approve(spender: string, amount: string) {
+    const res = await this.contract.estimateGas.approve(spender, amount);
+    const gasLimit = calcGasBuffer(res);
+    return this.contract.approve(spender, amount, { gasLimit });
  }
  decimals(): Promise<number> {
    return this.contract.decimals();
  }
-  faucet() {
+  async faucet() {
    /* No op */
  }
 }
@@ -0,0 +1,5 @@
+import type { BigNumber as EthersBigNumber } from 'ethers';
+
+export function calcGasBuffer(value: EthersBigNumber): EthersBigNumber {
+  return value.mul(120).div(100);
+}
@@ -1 +1,2 @@
+export * from './calc-gas-buffer';
 export * from './prepend-0x';
Author	SHA1	Message	Date
Dariusz Majcherczyk	f387f726ac	test: added test for post and reduce test: split deal ticket tests	2023-04-06 15:06:12 +02:00
dexturr	cc72cdbe16	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-05 06:08:13 +00:00
dexturr	3fd1817e1e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-05 00:15:53 +00:00
Matthew Russell	b483c13f81	chore(trading): fix bad grammar on approval notification (#3354 )	2023-04-04 15:14:36 -07:00
Matthew Russell	bde7a9fbf9	fix(smart-contracts): add increased gas limit estimation (#3371 )	2023-04-04 11:41:11 -07:00
dexturr	5fd93ee9c8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-04 18:09:38 +00:00
botond	9ac07fd98a	fix: add missing announcement config url (#3367 )	2023-04-04 15:11:48 +00:00
dexturr	9c975ed822	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-04 12:10:23 +00:00
Edd	138bf7da00	build(explorer): update validator testnet be url (#3357 )	2023-04-04 10:53:47 +00:00
dexturr	3e7fe517f3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-04 06:07:34 +00:00
dexturr	4f960d09b3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-04 00:15:07 +00:00
Bartłomiej Głownia	351a5aaf96	chore(trading): remove not used close position code and liquidity subscription (#3350 )	2023-04-03 14:58:06 -07:00
Bartłomiej Głownia	381d9011a0	fix(orders): restore filter by marketId (#3342 )	2023-04-03 14:20:31 -07:00
Matthew Russell	861760b4f9	chore(governance): add hardcoded token vesting contract address (#3352 )	2023-04-03 21:17:32 +00:00
Matthew Russell	18f1c0014c	chore(governance,explorer,multisig-signer): delete rest of sandbox/mirror env files (#3310 )	2023-04-03 14:07:43 -07:00
m.ray	474543d91b	fix(trading): order stopped intent toasts (#3347 )	2023-04-03 19:21:56 +00:00