From 7b0203346eea5f7010fa791e3b1403df2140d88c Mon Sep 17 00:00:00 2001 From: John Cairns Date: Thu, 6 Jul 2023 16:20:24 -0500 Subject: [PATCH] 71: remove fastbuild profile, fix deployment of treasury builder, 0.9.12 --- .github/workflows/build-ci.yml | 4 +-- .github/workflows/testnet.yml | 4 +-- .vscode/tasks.json | 25 ++++++++----------- CHANGELOG.md | 8 ++++++ Dockerfile | 2 +- README.md | 2 +- .../community/ScheduledCommunityClass.sol | 6 +++-- foundry.toml | 8 ++---- package.json | 4 +-- site/index.rst | 4 +-- 10 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 280b7fc..50157b3 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -35,9 +35,7 @@ jobs: - name: Run Forge tests run: | - forge test -vvv - env: - FOUNDRY_PROFILE: fastbuild + forge test -v --fail-fast id: test - name: Run Forge geiger diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml index 0147488..7144150 100644 --- a/.github/workflows/testnet.yml +++ b/.github/workflows/testnet.yml @@ -40,7 +40,7 @@ jobs: - name: Run Forge tests run: | - forge test -vvv + forge test -v --fail-fast id: test - name: GitHub Release @@ -64,4 +64,4 @@ jobs: echo "Using library ${DEPLOYED_LIBRARY}" 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} - 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 contracts/Constant.sol:Constant:${CONSTANT_LIB_ADDRESS} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} + 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 contracts/Constant.sol:Constant:${DEPLOYED_LIBRARY} --slow --broadcast --rpc-url ${RPC_URL} --private-key ${PRIVATE_KEY} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 63d1a4f..1df621b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -56,10 +56,7 @@ "type": "shell", "command": "forge test -vvv", "options": { - "cwd": "${workspaceFolder}", - "env": { - "FOUNDRY_PROFILE": "fastbuild" - } + "cwd": "${workspaceFolder}" }, "dependsOn": "hint", "group": { @@ -70,7 +67,7 @@ { "label": "gastest", "type": "shell", - "command": "forge test -vvv --gas-report", + "command": "forge test --gas-report", "options": { "cwd": "${workspaceFolder}" }, @@ -152,7 +149,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "ECDSA_LIB_ADDRESS": "0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338" } }, @@ -169,7 +166,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "ECDSA_LIB_ADDRESS": "0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338", "BUILDER_ADDRESS": "0xA143ba3361973B785A103fAb2AADFf073fae627a" } @@ -187,7 +184,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66" + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466" } }, "dependsOn": "test", @@ -203,7 +200,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "BUILDER_ADDRESS": "0x8e7e39f6E46a27106F6C18933F4Cb296e320B40f" } }, @@ -220,7 +217,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "CLASS_PROXY": "0x0Ee183DEA88Be769fD1CAb473fDaCdd16791163A", "TARGET_PROTOTYPE": "0xe7879fdb66b6107709502D2ad362fa43BC278DbE" } @@ -238,7 +235,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66" + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466" } }, "dependsOn": "test", @@ -254,7 +251,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "BUILDER_ADDRESS": "0x25f2Ef43D4b8A764Ae1C85b715AC80E32BBEb0Db" } }, @@ -271,7 +268,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "GOVERNANCE_ADDRESS": "0xd5b0183f6d56c5ED73f69eD927E8D36cC2cA0604", "STORAGE_ADDRESS": "0x6548b950363c9dc612DE72BBffeb979fb3Dbc829", "META_ADDRESS": "0x942Dc3d685b73Bd77532804b053FeFeDd814AC83" @@ -290,7 +287,7 @@ "options": { "cwd": "${workspaceFolder}", "env": { - "CONSTANT_LIB_ADDRESS": "0xdF39280F8CAF0B8F4864954195F2E97770D32E66", + "CONSTANT_LIB_ADDRESS": "0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466", "BUILDER_ADDRESS": "", "GOVERNANCE_ADDRESS": "0xa2f50e55ac910ba030b3e4cab92da8de5b38ef2d", "STORAGE_ADDRESS": "0xe0c76c1621738b870eac5a37447fdadc8c077c21", diff --git a/CHANGELOG.md b/CHANGELOG.md index ebce229..85ce851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 0.9.12 (2023-07-06) + +- fix deployment for treasury builder + +# 0.9.11 (2023-07-06) + +- add treasury and treasury builder + # 0.9.10 (2023-05-11) - issue #69: Upgrade not working diff --git a/Dockerfile b/Dockerfile index ae68e3c..8850cd4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV PATH=${PATH}:~/.cargo/bin RUN yarn install RUN yarn prettier:check RUN yarn hint -RUN FOUNDRY_PROFILE=fastbuild forge test -vvv --fail-fast +RUN forge test -v --fail-fast RUN forge geiger --check contracts/* diff --git a/README.md b/README.md index ab9a0c6..605be1b 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ 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 | 0xdF39280F8CAF0B8F4864954195F2E97770D32E66 | 0.9.11 | +| Constant | 0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466 | 0.9.11 | | CommunityBuilder | 0xa36e161361A16D75534d565480e62cE474BaC9f3 | LATEST | | GovernanceBuilder | 0x9fB5a925E61c31617129B5D030808939DADA99f7 | LATEST | diff --git a/contracts/community/ScheduledCommunityClass.sol b/contracts/community/ScheduledCommunityClass.sol index 2f015f3..20b92a1 100644 --- a/contracts/community/ScheduledCommunityClass.sol +++ b/contracts/community/ScheduledCommunityClass.sol @@ -218,8 +218,10 @@ abstract contract ScheduledCommunityClass is requireMaximumBaseFeeRebate(_baseFeeRebate) requireNonEmptySupervisorList(_supervisorList) { - if (_minimumDelay > _maximumDelay) revert MinimumDelayExceedsMaximum(_minimumDelay, _maximumDelay); - if (_minimumDuration >= _maximumDuration) revert MinimumDurationExceedsMaximum(_minimumDuration, _maximumDuration); + { + if (_minimumDelay > _maximumDelay) revert MinimumDelayExceedsMaximum(_minimumDelay, _maximumDelay); + if (_minimumDuration >= _maximumDuration) revert MinimumDurationExceedsMaximum(_minimumDuration, _maximumDuration); + } _weight = _voteWeight; _minimumVoteDelay = _minimumDelay; diff --git a/foundry.toml b/foundry.toml index 381379c..b779ae4 100644 --- a/foundry.toml +++ b/foundry.toml @@ -3,20 +3,16 @@ src = 'contracts' out = 'out' libs = ['lib'] optimizer = true -optimizer_runs = 500 +optimizer_runs = 200 via-ir = true block_number = 1 # 101 gwei gas_price = 101000000000 block_timestamp = 100 -[profile.fastbuild] -optimizer_runs = 50 -fuzz.runs = 10 - [profile.default.optimizer_details] inliner = true -jumpdest_remover = true +jumpdest_remover = true order_literals = true deduplicate = true cse = true diff --git a/package.json b/package.json index a397e24..ec13dd4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "collective-governance-v1", - "version": "0.9.11", + "version": "0.9.12", "description": "Open Source Community Governance Smart Contract", "main": "index.js", "directories": { @@ -36,4 +36,4 @@ "url": "https://github.com/collectivexyz/collective-governance-v1/issues" }, "homepage": "https://collectivexyz.github.io/collective-governance-v1" -} \ No newline at end of file +} diff --git a/site/index.rst b/site/index.rst index ab61e08..cd3154e 100644 --- a/site/index.rst +++ b/site/index.rst @@ -40,7 +40,7 @@ _____________ Contract Ethereum Address Version Description ===================== ========================================== =========== =========================== ECDSA 0xe9e21aaEaEad9c57C1F4c622915fFB54f9Ebe338 4.9.0 OpenZeppelin signature module -`Constant`_ 0xdF39280F8CAF0B8F4864954195F2E97770D32E66 0.9.11 Constant library +`Constant`_ 0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466 0.9.11 Constant library `CommunityBuilder`_ 0xa36e161361A16D75534d565480e62cE474BaC9f3 LATEST CommunityBuilder Factory `GovernanceBuilder`_ 0x9fB5a925E61c31617129B5D030808939DADA99f7 LATEST Governance Contract Builder ===================== ========================================== =========== =========================== @@ -66,7 +66,7 @@ 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/0xdF39280F8CAF0B8F4864954195F2E97770D32E66 +.. _Constant: https://sepolia.etherscan.io/address/0xfF71192dcCBC5f4C3Cb2bBcB4f8885d6ba8b1466 .. _CommunityBuilder: https://sepolia.etherscan.io/address/0xa36e161361A16D75534d565480e62cE474BaC9f3 .. _GovernanceBuilder: https://sepolia.etherscan.io/address/0x9fB5a925E61c31617129B5D030808939DADA99f7