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

Synthetixio · Jul 13, 2023 · 6a9ca8d · 6a9ca8d
2 parents a17ffea + 7bffd13
commit 6a9ca8d
Show file tree

Hide file tree

Showing 14 changed files with 228 additions and 3,531 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -14,4 +14,8 @@ markets/*/test/generated
 *Router.sol
 .yarnrc.yml
 lerna.json
-*.hbs
+*.hbs
+**/subgraph/deployments/
+**/artifacts/
+**/cache/
+**/docs/
diff --git a/markets/perps-market/subgraph/.gitignore b/markets/perps-market/subgraph/.gitignore
@@ -1,8 +1,6 @@
-**/build
-**/dist
-**/node_modules
-
 .bin/
 tests/.bin/
 tests/.latest.json
 subgraph.yaml
+deployments/
+build/
diff --git a/markets/perps-market/subgraph/.yarn/install-state.gz b/markets/perps-market/subgraph/.yarn/install-state.gz