71: updated docs and deployment locations, restored deployment for fu…

…ll contract
collectivexyz · Jul 9, 2023 · 4c60415 · 4c60415
1 parent 8aa8eef
commit 4c60415
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 17 deletions.
diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml
@@ -13,6 +13,9 @@ env:
   RPC_URL: ${{ secrets.RPC_URL }}
   PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
   ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
+  COMMUNIITY_BUILDER_ADDRESS: "0xa36e161361A16D75534d565480e62cE474BaC9f3"
+  GOVERNANCE_BUILDER_ADDRESS: "0x9fB5a925E61c31617129B5D030808939DADA99f7"
+  TREASURY_BUILDER_ADDRESS: "0x49753b58270ae454d4ec555ff88294a4fab01660"
   ECDSA_LIB_ADDRESS: "0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338"
 
 jobs:
@@ -59,8 +62,26 @@ jobs:
         run: |
           forge create --json --contracts contracts/Constant.sol --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} Constant | tee Constant.sol.json
 
-      - name: Deploy to Treasury Builder to Testnet
+      - name: Deploy Community Builder to Testnet
         run: |
           export DEPLOYED_LIBRARY=$(bin/library.py Constant.sol.json)
           echo "Using library ${DEPLOYED_LIBRARY}"
-          forge script ./script/DeployTreasuryBuilder.sol --sig 'deploy()' --libraries ./lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol:ECDSA:${ECDSA_LIB_ADDRESS} --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY}
+          forge script ./script/DeployCommunityBuilder.sol --sig 'upgrade()' --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY}
+        env:
+          BUILDER_ADDRESS: ${COMMUNITY_BUILDER_ADDRESS}
+
+      - name: Deploy Collective Governance to Testnet
+        run: |
+          export DEPLOYED_LIBRARY=$(bin/library.py Constant.sol.json)
+          echo "Using library ${DEPLOYED_LIBRARY}"
+          forge script ./script/DeployCollective.sol --sig 'upgrade()' --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY}
+        env:
+          BUILDER_ADDRESS: ${GOVERNANCE_BUILDER_ADDRESS}
+
+      - name: Deploy Treasury Builder to Testnet
+        run: |
+          export DEPLOYED_LIBRARY=$(bin/library.py Constant.sol.json)
+          echo "Using library ${DEPLOYED_LIBRARY}"
+          forge script ./script/DeployTreasuryBuilder.sol --sig 'upgrade()' --libraries ./lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol:ECDSA:${ECDSA_LIB_ADDRESS} --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY}
+        env:
+          BUILDER_ADDRESS: ${TREASURY_BUILDER_ADDRESS}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -149,7 +149,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "ECDSA_LIB_ADDRESS": "0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338"
         }
       },
@@ -166,7 +166,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "ECDSA_LIB_ADDRESS": "0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338",
           "BUILDER_ADDRESS": "0xA143ba3361973B785A103fAb2AADFf073fae627a"
         }
@@ -184,7 +184,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466"
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c"
         }
       },
       "dependsOn": "test",
@@ -200,7 +200,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "BUILDER_ADDRESS": "0x8e7e39f6E46a27106F6C18933F4Cb296e320B40f"
         }
       },
@@ -217,7 +217,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "CLASS_PROXY": "0x0Ee183DEA88Be769fD1CAb473fDaCdd16791163A",
           "TARGET_PROTOTYPE": "0xe7879fdb66b6107709502D2ad362fa43BC278DbE"
         }
@@ -235,7 +235,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466"
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c"
         }
       },
       "dependsOn": "test",
@@ -251,7 +251,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "BUILDER_ADDRESS": "0x25f2Ef43D4b8A764Ae1C85b715AC80E32BBEb0Db"
         }
       },
@@ -268,7 +268,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "GOVERNANCE_ADDRESS": "0xd5b0183f6d56c5ED73f69eD927E8D36cC2cA0604",
           "STORAGE_ADDRESS": "0x6548b950363c9dc612DE72BBffeb979fb3Dbc829",
           "META_ADDRESS": "0x942Dc3d685b73Bd77532804b053FeFeDd814AC83"
@@ -287,7 +287,7 @@
       "options": {
         "cwd": "${workspaceFolder}",
         "env": {
-          "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466",
+          "CONSTANT_LIB_ADDRESS": "0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c",
           "BUILDER_ADDRESS": "",
           "GOVERNANCE_ADDRESS": "0xa2f50e55ac910ba030b3e4cab92da8de5b38ef2d",
           "STORAGE_ADDRESS": "0xe0c76c1621738b870eac5a37447fdadc8c077c21",

diff --git a/Dockerfile b/Dockerfile
@@ -14,5 +14,3 @@ RUN yarn prettier:check
 RUN yarn hint
 RUN forge test -v --fail-fast
 RUN forge geiger --check contracts/*
-
-
diff --git a/README.md b/README.md
@@ -32,9 +32,10 @@ Collective Governance has been designed from the ground up to be very easy to us
 | Contract          | Ethereum Address                           | Version |
 | ----------------- | ------------------------------------------ | ------- |
 | ECDSA             | 0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338 | 4.9.0   |
-| Constant          | 0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466 | 0.9.11  |
+| Constant          | 0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c | 0.9.19  |
 | CommunityBuilder  | 0xa36e161361A16D75534d565480e62cE474BaC9f3 | LATEST  |
 | GovernanceBuilder | 0x9fB5a925E61c31617129B5D030808939DADA99f7 | LATEST  |
+| TreasuryBuilder   | 0x49753b58270ae454d4ec555ff88294a4fab01660 | LATEST  |
 
 #### Görli TestNet
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "collective-governance-v1",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "Open Source Community Governance Smart Contract",
   "main": "index.js",
   "directories": {

diff --git a/site/index.rst b/site/index.rst
@@ -40,9 +40,10 @@ _____________
 Contract               Ethereum Address                            Version     Description
 =====================  ==========================================  =========== ===========================
 ECDSA                  0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338  4.9.0       OpenZeppelin signature module
-`Constant`_            0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466  0.9.11       Constant library
+`Constant`_            0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c  0.9.19      Constant library
 `CommunityBuilder`_    0xa36e161361A16D75534d565480e62cE474BaC9f3  LATEST      CommunityBuilder Factory
 `GovernanceBuilder`_   0x9fB5a925E61c31617129B5D030808939DADA99f7  LATEST      Governance Contract Builder
+`TreasuryBuilder`_     0x49753b58270AE454d4ec555Ff88294a4FAb01660  LATEST      Treasury Contract Builder
 =====================  ==========================================  =========== ===========================
 
 
@@ -66,9 +67,10 @@ Project Links
 .. _GitHub: https://github.com/collectivexyz/collective-governance-v1
 .. _JavaScript API: https://github.com/collectivexyz/governance
 .. _JavaScript Reference: https://github.com/collectivexyz/collective_governance_js
-.. _Constant: https://sepolia.etherscan.io/address/0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466 
+.. _Constant: https://sepolia.etherscan.io/address/0x532bdBAa513194B446F49c70b104a0Ab61b9bB7c 
 .. _CommunityBuilder: https://sepolia.etherscan.io/address/0xa36e161361A16D75534d565480e62cE474BaC9f3  
 .. _GovernanceBuilder: https://sepolia.etherscan.io/address/0x9fB5a925E61c31617129B5D030808939DADA99f7
+.. _TreasuryBuilder: https://sepolia.etherscan.io/address/0x49753b58270ae454d4ec555ff88294a4fab01660
 
 
 Indices and tables