Merge remote-tracking branch 'origin/develop' into feat/maci-v1-deplo…

…yer-subgraph
clrfund · Mar 25, 2024 · d232bf4 · d232bf4
2 parents b2ce143 + 6fb1b72
commit d232bf4
Show file tree

Hide file tree

Showing 47 changed files with 185 additions and 3,636 deletions.
diff --git a/.github/workflows/cancel-round.yml b/.github/workflows/cancel-round.yml
@@ -1,12 +1,23 @@
 name: Cancel current round
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      clrfund:
+        description: 'Clrfund contract address'
+        required: true
+        default: '0x87790498127ff044f43b9230506833ca89113757'
+      network:
+        description: 'Network'
+        required: true
+        default: 'arbitrum-sepolia'
+      jsonrpc_url:
+        description: jsonrpc url to node
+        required: false
 
 env:
   NODE_VERSION: 20.x
-  SUBGRPAH_URL: "https://api.thegraph.com/subgraphs/name/clrfund/clrfund-testnet"
   WALLET_PRIVATE_KEY: ${{ secrets.ARBITRUM_GOERLI_COORDINATOR_WALLET_PRIVATE_KEY }}
-  NETWORK: "arbitrum-sepolia"
 
 jobs:
   cancel-round:
@@ -26,6 +37,6 @@ jobs:
     - name: Run the cancel round script
       run: |
         cd contracts
-        export CLRFUND=$(curl -X POST -d '{"query":"{clrFunds {id}}"}' $SUBGRPAH_URL)
-        export CLRFUND_ADDRESS=$(node -e 'console.log(JSON.parse(process.env.CLRFUND).data.clrFunds[0].id)')
-        yarn hardhat cancel-round --clrfund "${CLRFUND_ADDRESS}" --network ${NETWORK}
+        yarn hardhat cancel-round \
+        --clrfund ${{ github.event.inputs.clrfund }} \
+        --network ${{ github.event.inputs.network }}
diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml
@@ -12,8 +12,8 @@ on:
         - major
 
 env:
-  NODE_VERSION: 18.x
-  VITE_CLRFUND_FACTORY_ADDRESS: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
+  NODE_VERSION: 20.x
+  VITE_CLRFUND_ADDRESS: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
   VITE_ETHEREUM_API_CHAINID: 1
   VITE_ETHEREUM_API_URL: "dummy"
   VITE_IPFS_PINNING_JWT: "dummy"

diff --git a/.github/workflows/mantle_cancel_round.yml b/.github/workflows/mantle_cancel_round.yml
diff --git a/.github/workflows/mantle_create_new_round.yml b/.github/workflows/mantle_create_new_round.yml
diff --git a/.github/workflows/mantle_finalize_round.yml b/.github/workflows/mantle_finalize_round.yml
diff --git a/.github/workflows/mantle_new_recipient_registry.yml b/.github/workflows/mantle_new_recipient_registry.yml
diff --git a/.github/workflows/mantle_set_duration.yml b/.github/workflows/mantle_set_duration.yml
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -2,7 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"
 
 # set these params so git push will work without .env
-export VITE_CLRFUND_FACTORY_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
+export VITE_CLRFUND_ADDRESS=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
 export VITE_ETHEREUM_API_CHAINID=1
 export VITE_ETHEREUM_API_URL=x
 export VITE_IPFS_PINNING_JWT=x

diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ In a future version, we plan to address this by routing ETH and token contributi
 
 ## Development
 
-### Install Node v18 with nvm
+### Install Node v20 with nvm
 
 ```sh
 nvm install 20