From 50afc0bce309d04a74f43b20813d7b772a854113 Mon Sep 17 00:00:00 2001 From: John Cairns Date: Fri, 7 Jul 2023 12:02:55 -0500 Subject: [PATCH] 71: restore governance deployment, treasury deployment is now upgrade --- .github/workflows/testnet.yml | 11 +++++++++-- package.json | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml index 15c479c..f854c24 100644 --- a/.github/workflows/testnet.yml +++ b/.github/workflows/testnet.yml @@ -58,8 +58,15 @@ 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 + - name: Deploy Collective Governance to Testnet run: | export DEPLOYED_LIBRARY=$(bin/library.py Constant.sol.json) echo "Using library ${DEPLOYED_LIBRARY}" - ECDSA_LIB_ADDRESS=0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338 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} + BUILDER_ADDRESS=0xa36e161361A16D75534d565480e62cE474BaC9f3 forge script ./script/DeployCommunityBuilder.sol --sig 'upgrade()' --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} + BUILDER_ADDRESS=0x9fB5a925E61c31617129B5D030808939DADA99f7 forge script ./script/DeployCollective.sol --sig 'upgrade()' --libraries ${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} + + - name: Deploy to Treasury Builder to Testnet + run: | + export DEPLOYED_LIBRARY=$(bin/library.py Constant.sol.json) + echo "Using library ${DEPLOYED_LIBRARY}" + ECDSA_LIB_ADDRESS=0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338 forge script ./script/DeployTreasuryBuilder.sol --sig 'upgrade()' --libraries ./lib/openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol:ECDSA:${ECDSA_LIB_ADDRESS} --libraries contracts/Constant.sol:Constant:${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} diff --git a/package.json b/package.json index 7a91c3b..3382574 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "collective-governance-v1", - "version": "0.9.14", + "version": "0.9.15", "description": "Open Source Community Governance Smart Contract", "main": "index.js", "directories": {