Merge branch 'develop' into feature/local-deploy-script-error

aragon · Apr 11, 2024 · fcf87af · fcf87af
2 parents 12f19ce + 39a3b87
commit fcf87af
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 54 deletions.
diff --git a/packages/subgraph/manifest/data/arbitrumGoerli.json b/packages/subgraph/manifest/data/arbitrumGoerli.json
diff --git a/packages/subgraph/manifest/data/baseGoerli.json b/packages/subgraph/manifest/data/baseGoerli.json
diff --git a/packages/subgraph/manifest/data/goerli.json b/packages/subgraph/manifest/data/goerli.json
diff --git a/packages/subgraph/manifest/subgraph.placeholder.yaml b/packages/subgraph/manifest/subgraph.placeholder.yaml
@@ -1,7 +1,7 @@
 {{info}}
 specVersion: 0.0.2
 description: A template for Plugin subgraphs
-repository: https://github.com/aragon/osx-plugin-subgraph
+repository: https://github.com/aragon/osx-plugin-template-hardhat
 schema:
   file: ./schema.graphql
 dataSources:

diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json
@@ -22,7 +22,7 @@
     "@graphprotocol/graph-ts": "^0.31.0",
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
-    "matchstick-as": "^0.5.2",
+    "matchstick-as": "^0.6.0",
     "mustache": "^4.2.0",
     "ts-morph": "^17.0.1",
     "ts-node": "^10.9.1",

diff --git a/packages/subgraph/schema.graphql b/packages/subgraph/schema.graphql
@@ -8,3 +8,11 @@ type DaoPlugin @entity {
   "Set plugin specific related data below:"
   number: BigInt
 }
+
+type IAction @entity {
+    id: ID! #action entity id
+    daoAddress: Bytes!
+    to: Bytes!
+    value: BigInt!
+    data: Bytes!
+}
diff --git a/packages/subgraph/yarn.lock b/packages/subgraph/yarn.lock
@@ -2702,10 +2702,10 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-matchstick-as@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/matchstick-as/-/matchstick-as-0.5.2.tgz#6a6dde02d1d939c32458bd67bac688891a07a34c"
-  integrity sha512-fb1OVphDKEvJY06Ue02Eh1CNncuW95vp6b8tNAP7UIqplICSLoU/zgN6U7ge7R0upsoO78C7CRi4EyK/7Jxz7g==
+matchstick-as@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/matchstick-as/-/matchstick-as-0.6.0.tgz#c65296b1f51b1014d605c52067d9b5321ea630e8"
+  integrity sha512-E36fWsC1AbCkBFt05VsDDRoFvGSdcZg6oZJrtIe/YDBbuFh8SKbR5FcoqDhNWqSN+F7bN/iS2u8Md0SM+4pUpw==
   dependencies:
     wabt "1.0.24"