Merge branch 'main' into max-oi-cap

Synthetixio · Jun 28, 2023 · 60c76c4 · 60c76c4
2 parents c57fec9 + b481ab2
commit 60c76c4
Show file tree

Hide file tree

Showing 40 changed files with 8,847 additions and 55 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -53,7 +53,11 @@ module.exports = {
     },
 
     {
-      files: ['protocol/synthetix/subgraph/**/*', 'markets/spot-market/subgraph/**/*'],
+      files: [
+        'protocol/synthetix/subgraph/**/*',
+        'markets/spot-market/subgraph/**/*',
+        'markets/perps-market/subgraph/**/*',
+      ],
       env: {},
       globals: {
         changetype: true,

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,6 +27,7 @@ jobs:
             perps-market,
             core-subgraph,
             spot-market-subgraph,
+            perps-market-subgraph,
           ]
         include:
           - package: core-contracts
@@ -52,6 +53,8 @@ jobs:
             workspace: "@synthetixio/core-subgraph"
           - package: spot-market-subgraph
             workspace: "@synthetixio/spot-market-subgraph"
+          - package: perps-market-subgraph
+            workspace: "@synthetixio/perps-market-subgraph"
     steps:
       - name: Install Foundry (Cannon)
         uses: foundry-rs/foundry-toolchain@v1

diff --git a/.yarn/cache/@lerna-lite-exec-npm-1.17.0-b6e97ef8b6-28f39983c9.zip b/.yarn/cache/@lerna-lite-exec-npm-1.17.0-b6e97ef8b6-28f39983c9.zip
diff --git a/.yarn/cache/@lerna-lite-filter-packages-npm-1.17.0-046f2ee87d-90c2e4f77b.zip b/.yarn/cache/@lerna-lite-filter-packages-npm-1.17.0-046f2ee87d-90c2e4f77b.zip
diff --git a/.yarn/cache/@lerna-lite-profiler-npm-1.17.0-8c4a8db943-499de0f370.zip b/.yarn/cache/@lerna-lite-profiler-npm-1.17.0-8c4a8db943-499de0f370.zip
diff --git a/.yarn/cache/upath-npm-2.0.1-f0ea260247-2db04f24a0.zip b/.yarn/cache/upath-npm-2.0.1-f0ea260247-2db04f24a0.zip
diff --git a/markets/perps-market/storage.dump.sol b/markets/perps-market/storage.dump.sol
@@ -610,6 +610,7 @@ library PerpsMarketConfiguration {
         uint256 maxLiquidationLimitAccumulationMultiplier;
         uint256 maxSecondsInLiquidationWindow;
         uint256 liquidationRewardRatioD18;
+        uint256 minimumPositionMargin;
     }
     function load(uint128 marketId) internal pure returns (Data storage store) {
         bytes32 s = keccak256(abi.encode("io.synthetix.perps-market.PerpsMarketConfiguration", marketId));

diff --git a/markets/perps-market/subgraph/.gitignore b/markets/perps-market/subgraph/.gitignore
@@ -0,0 +1,8 @@
+**/build
+**/dist
+**/node_modules
+
+.bin/
+tests/.bin/
+tests/.latest.json
+subgraph.yaml
diff --git a/markets/perps-market/subgraph/.yarn/install-state.gz b/markets/perps-market/subgraph/.yarn/install-state.gz