Update to work with new eventParam

Co-authored-by: Jason Smythe <[email protected]>
wildcards-world · Sep 10, 2020 · 6249bce · 6249bce
1 parent 4e34a41
commit 6249bce
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 36 deletions.
diff --git a/graphql-connection-utils/graphql_schema.json b/graphql-connection-utils/graphql_schema.json
@@ -8994,7 +8994,7 @@
             "deprecationReason": null,
             "description": null,
             "isDeprecated": false,
-            "name": "txEventParamList",
+            "name": "txEventParamListDeprecated",
             "type": {
               "kind": "NON_NULL",
               "name": null,
@@ -9634,7 +9634,7 @@
           {
             "defaultValue": null,
             "description": null,
-            "name": "txEventParamList",
+            "name": "txEventParamListDeprecated",
             "type": {
               "kind": "LIST",
               "name": null,
@@ -9652,7 +9652,7 @@
           {
             "defaultValue": null,
             "description": null,
-            "name": "txEventParamList_not",
+            "name": "txEventParamListDeprecated_not",
             "type": {
               "kind": "LIST",
               "name": null,
@@ -9670,7 +9670,7 @@
           {
             "defaultValue": null,
             "description": null,
-            "name": "txEventParamList_contains",
+            "name": "txEventParamListDeprecated_contains",
             "type": {
               "kind": "LIST",
               "name": null,
@@ -9688,7 +9688,7 @@
           {
             "defaultValue": null,
             "description": null,
-            "name": "txEventParamList_not_contains",
+            "name": "txEventParamListDeprecated_not_contains",
             "type": {
               "kind": "LIST",
               "name": null,
@@ -9890,7 +9890,7 @@
             "deprecationReason": null,
             "description": null,
             "isDeprecated": false,
-            "name": "txEventParamList"
+            "name": "txEventParamListDeprecated"
           },
           {
             "deprecationReason": null,

diff --git a/graphql-connection-utils/src/Test.bs.js b/graphql-connection-utils/src/Test.bs.js
diff --git a/graphql-connection-utils/src/Test.re b/graphql-connection-utils/src/Test.re
@@ -17,7 +17,7 @@ module AllStateChanges = [%graphql
         blockNumber
         contractVersion
         txEventList
-        txEventParamList
+        txEventParamListDeprecated
         patronChanges {
           id
         }
@@ -175,7 +175,7 @@ describe("Graph Test", done_ => {
                   Js.log2("event", event);
                   let argumentsJson =
                     Js.Json.parseExn(
-                      stateChange.txEventParamList[index]
+                      stateChange.txEventParamListDeprecated[index]
                       ->Option.getWithDefault("THIS SHOULD NEVER HAPPEN"),
                     );
                   // let argumentsJson = Js.Json.parseExn("[\"Hello\"]");

diff --git a/start_script.sh b/start_script.sh
@@ -20,6 +20,42 @@ function killAndExit {
     exit 0
 }
 
+function graphCreate {
+    echo '####### DEPLOYING GRAPH #######'
+    cd wildcards-subgraph && yarn codegen && yarn build && yarn create-local && yarn deploy-local
+    if [ "$?" -ne 0 ];
+    then
+        echo "ERROR: Could not deploy graph successfully"
+        killAndExit
+    fi
+    cd ..
+}
+
+function graphRedeploy {
+    echo '####### REDEPLOYING GRAPH #######'
+    cd wildcards-subgraph && yarn codegen && yarn build && yarn deploy-local
+    if [ "$?" -ne 0 ];
+    then
+        echo "ERROR: Could not redeploy graph successfully"
+        # killAndExit
+    fi
+    cd ..
+}
+
+function doneLoop {
+    echo "######################"
+    echo "######## DONE ########"
+    if [ $WAIT_FOR_INPUT = true ]; then
+        echo "####### PRESS R to RESTART ######"
+        echo "# PRESS G to REDEPLOY the graph #"
+        echo "######## PRESS Q to QUIT ########"
+    fi
+    echo "######################"
+    if [ $WAIT_FOR_INPUT = true ]; then
+        waitForInput
+    fi
+}
+
 function start {
     echo "####### CLEANUP #######"
     rm -rf data ganache-data
@@ -49,40 +85,28 @@ function start {
         echo "ERROR: Could not deploy contracts successfully"
         killAndExit
     fi
-
-    echo '####### DEPLOYING GRAPH #######'
-    cd ../wildcards-subgraph && yarn codegen && yarn build && yarn create-local && yarn deploy-local
     cd ..
 
-    if [ "$?" -ne 0 ];
-    then
-        echo "ERROR: Could not deploy graph successfully"
-        killAndExit
-    fi
-
-
-    echo "######################"
-    echo "######## DONE ########"
-    if [ $WAIT_FOR_INPUT = true ]; then
-        echo "# PRESS R to RESTART #"
-        echo "### PRESS Q to QUIT ##"
-    fi
-    echo "######################"
-    if [ $WAIT_FOR_INPUT = true ]; then
-        waitForInput
-    fi
+    graphCreate
+    doneLoop
 }
 
 function waitForInput {
     while [ true ] ; do
         read -n 1 k <&1
         if [[ $k == "q" || $k == "Q" ]]; then
+            echo ""
             killAndExit
         elif [[ $k == "r" || $k == "R" ]]; then
-            echo "######## RESTARTING ########"
+            echo ""
+            echo "######## RESTARTING ALL ########"
             killCompose
             sleep 3
             start
+        elif [[ $k == "g" || $k == "G" ]]; then
+            echo ""
+            graphRedeploy
+            doneLoop
         fi
     done
 }

diff --git a/wildcards-subgraph b/wildcards-subgraph
+1 −0		package.json
+16 −1		schema.graphql
+30 −1		src/CONSTANTS.ts
+2 −2		src/LoyaltyToken.ts
+3 −2		src/rewrite/steward.ts
+2 −1		src/steward.ts
+25 −17		src/token.ts
+4 −3		src/util/hacky.ts
+53 −37		src/util/index.ts
+5 −3		src/v0/helpers.ts
+38 −16		src/v0/steward.ts
+2 −1		src/v0/vitalikHandlers.ts
+99 −48		src/v1/steward.ts
+2 −1		src/v2/steward.ts
+13 −6		src/v3/steward.ts
+28 −14		src/vitalikStewardLegacy.ts
+10 −6		src/vitalikTokenLegacy.ts
+109 −0		subgraph.mumbai.yaml