Merge branch 'main' into prevent-collateral-update-with-pending-orders

Synthetixio · Jul 11, 2023 · 90f485e · 90f485e
2 parents 3663cf0 + aaf47e6
commit 90f485e
Show file tree

Hide file tree

Showing 20 changed files with 322 additions and 119 deletions.
diff --git a/...outer-npm-3.1.3-813f811145-bf2d8db9f8.zip → ...outer-npm-3.1.4-97d58f1412-da369169a1.zip b/...outer-npm-3.1.3-813f811145-bf2d8db9f8.zip → ...outer-npm-3.1.4-97d58f1412-da369169a1.zip
diff --git a/...lder-npm-2.4.19-8bf1bb7f47-1ec415fa4f.zip → ...lder-npm-2.4.20-c88eae7630-342818635e.zip b/...lder-npm-2.4.19-8bf1bb7f47-1ec415fa4f.zip → ...lder-npm-2.4.20-c88eae7630-342818635e.zip
diff --git a/...-cli-npm-2.4.19-42a098c4cc-78c5691c12.zip → ...-cli-npm-2.4.20-0858c1dc0e-39fa135e5d.zip b/...-cli-npm-2.4.19-42a098c4cc-78c5691c12.zip → ...-cli-npm-2.4.20-0858c1dc0e-39fa135e5d.zip
diff --git a/.yarn/cache/cannon-plugin-router-npm-1.0.12-7be941a212-83eb3d5638.zip b/.yarn/cache/cannon-plugin-router-npm-1.0.12-7be941a212-83eb3d5638.zip
diff --git a/.yarn/cache/cannon-plugin-router-npm-1.0.15-71b2d7f40d-4b4678f8b0.zip b/.yarn/cache/cannon-plugin-router-npm-1.0.15-71b2d7f40d-4b4678f8b0.zip
diff --git a/markets/perps-market/package.json b/markets/perps-market/package.json
@@ -33,7 +33,7 @@
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/spot-market": "workspace:*",
     "@synthetixio/wei": "2.74.4",
-    "@usecannon/cli": "^2.4.17",
+    "@usecannon/cli": "^2.4.20",
     "ethers": "^5.7.2",
     "hardhat": "2.15.0",
     "solidity-docgen": "0.6.0-beta.35",

diff --git a/markets/perps-market/subgraph/package.json b/markets/perps-market/subgraph/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "version": "1.0.0",
   "scripts": {
+    "subgraphgen": "yarn prepare && graph codegen && prettier --write . && yarn codegen",
     "build": "yarn build:optimism-goerli",
     "auth": "graph auth --product hosted-service $V3_GRAPH_KEY",
     "prepare": "cp ./subgraph.base.yaml ./subgraph.yaml",

diff --git a/markets/spot-market/hardhat.config.ts b/markets/spot-market/hardhat.config.ts
@@ -25,6 +25,9 @@ const config = {
       default: 'off',
     },
   },
+  mocha: {
+    timeout: 200_000,
+  },
 };
 
 export default config;
diff --git a/markets/spot-market/package.json b/markets/spot-market/package.json
@@ -34,7 +34,7 @@
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
     "@types/node-fetch": "2.6.4",
-    "@usecannon/cli": "^2.4.17",
+    "@usecannon/cli": "^2.4.20",
     "ethers": "^5.7.2",
     "hardhat": "2.15.0",
     "node-fetch": "2.6.9",

diff --git a/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts b/markets/spot-market/subgraph/generated/SpotMarketProxy/SpotMarketProxy.ts
@@ -568,6 +568,10 @@ export class OrderSettled__Params {
   get price(): BigInt {
     return this._event.parameters[6].value.toBigInt();
   }
+
+  get orderType(): i32 {
+    return this._event.parameters[7].value.toI32();
+  }
 }
 
 export class OrderSettledFeesStruct extends ethereum.Tuple {

diff --git a/markets/spot-market/subgraph/package.json b/markets/spot-market/subgraph/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "version": "1.0.0",
   "scripts": {
+    "subgraphgen": "yarn deployments:optimism-goerli && yarn codegen",
     "deployments": "yarn deployments:optimism-mainnet && yarn deployments:optimism-goerli",
     "auth": "graph auth --product hosted-service $V3_GRAPH_KEY",
     "deployments:optimism-mainnet": "cannon inspect synthetix-spot-market:latest --chain-id 10 --write-deployments ./deployments/optimism-mainnet",
@@ -23,7 +24,7 @@
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.50.1",
     "@graphprotocol/graph-ts": "^0.30.0",
-    "@usecannon/cli": "^2.4.17",
+    "@usecannon/cli": "^2.4.20",
     "ethers": "^5.7.2",
     "prettier": "^2.8.8"
   }

diff --git a/markets/spot-market/subgraph/subgraph.base.yaml b/markets/spot-market/subgraph/subgraph.base.yaml
@@ -20,7 +20,7 @@ dataSources:
         - SettlementStrategy
         - SynthWrapped
       eventHandlers:
-        - event: OrderSettled(indexed uint128,indexed uint128,uint256,(uint256,uint256,int256,int256),uint256,indexed address,uint256)
+        - event: OrderSettled(indexed uint128,indexed uint128,uint256,(uint256,uint256,int256,int256),uint256,indexed address,uint256,uint8)
           handler: handleOrderSettled
         - event: SynthWrapped(indexed uint256,uint256,(uint256,uint256,int256,int256),uint256)
           handler: handleSynthWrapped

diff --git a/package.json b/package.json
@@ -37,7 +37,8 @@
     "publish:dev": "lerna publish --force-publish --canary --dist-tag dev --preid dev.$(git rev-parse --short HEAD)",
     "publish-contracts": "yarn workspaces foreach --verbose run publish-contracts",
     "prepublishOnly": "node ./prepublishOnly.js",
-    "docgen": "yarn workspaces foreach --verbose run docgen"
+    "docgen": "yarn workspaces foreach --verbose run docgen",
+    "subgraphgen": "yarn workspaces foreach --verbose run subgraphgen"
   },
   "devDependencies": {
     "@ethersproject/abi": "^5.7.0",
@@ -50,7 +51,7 @@
     "@types/node": "18.11.10",
     "@typescript-eslint/eslint-plugin": "5.45.0",
     "@typescript-eslint/parser": "5.45.0",
-    "@usecannon/cli": "^2.4.19",
+    "@usecannon/cli": "^2.4.20",
     "eslint": "8.29.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-no-only-tests": "3.1.0",

diff --git a/protocol/synthetix/package.json b/protocol/synthetix/package.json
@@ -32,7 +32,7 @@
     "@synthetixio/oracle-manager": "workspace:*",
     "@synthetixio/router": "^3.1.3",
     "@synthetixio/wei": "2.74.4",
-    "@usecannon/builder": "^2.4.16",
+    "@usecannon/builder": "^2.4.20",
     "ethers": "^5.7.2",
     "hardhat": "2.15.0",
     "solidity-ast": "0.4.46",