Merge pull request #244 from 1Hive/upgradable-contract-first

Upgradable contract first
1Hive · Aug 1, 2024 · f1d8c2f · f1d8c2f
2 parents 733909e + 6b2368d
commit f1d8c2f
Show file tree

Hide file tree

Showing 68 changed files with 10,899 additions and 1,215 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,6 +17,7 @@ jobs:
       SCORER_ID: ${{ secrets.SCORER_ID }}
       GITCOIN_PASSPORT_API_KEY: ${{ secrets.GITCOIN_PASSPORT_API_KEY }}
       LIST_MANAGER_PRIVATE_KEY: ${{ secrets.LIST_MANAGER_PRIVATE_KEY }}
+      FOUNDRY_OUT: pkg/contracts/out
 
     steps:
       - name: Check out code

diff --git a/apps/web/wagmi.config.ts b/apps/web/wagmi.config.ts
@@ -3,7 +3,7 @@ import { actions } from "@wagmi/cli/plugins";
 import { Abi } from "viem";
 import { abi as alloABI } from "#/contracts/out/Allo.sol/Allo.json";
 import { abi as CVStrategyABI } from "#/contracts/out/CVStrategy.sol/CVStrategy.json";
-import { abi as mockERC20ABI } from "#/contracts/out/ERC20.sol/ERC20.json";
+import { abi as mockERC20ABI } from "#/contracts/out/TERC20.sol/TERC20.json";
 import { abi as SafeABI } from "#/contracts/out/ISafe.sol/ISafe.json";
 import { abi as PassportScorerABI } from "#/contracts/out/PassportScorer.sol/PassportScorer.json";
 import { abi as registryCommunityABI } from "#/contracts/out/RegistryCommunity.sol/RegistryCommunity.json";

diff --git a/foundry.toml b/foundry.toml
@@ -5,11 +5,16 @@ src = 'pkg/contracts'
 test = 'pkg/contracts/test'
 out = 'pkg/contracts/out'
 libs = ['lib']
+ffi = true
+ast = true
+build_info = true
+extra_output = ["storageLayout"]
 
 optimizer = true
 optimizer-runs = 1_000
 # prompt_timeout = 120
 fs_permissions = [{ access = "read", path = "./"}]
+# fs_permissions = []
 # auto_detect_remappings = true # recursive auto-detection of remappings
 # remappings = ["ds-test/=lib/forge-std/lib/ds-test/src/",
 # "forge-std/=lib/forge-std/src/",

diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/lib/openzeppelin-foundry-upgrades b/lib/openzeppelin-foundry-upgrades
diff --git a/pkg/contracts/Makefile b/pkg/contracts/Makefile
@@ -105,6 +105,15 @@ deploy-testnet-multi-sep:
 	--legacy \
 	-vvv
 
+deploy-testnet-multi-sep-v0: 
+	-forge script script/DeployCVMultiChain.s.sol:DeployCVMultiChain \
+	--rpc-url $(RPC_URL_SEP_TESTNET) \
+	--account pk1 \
+	--sig "run(string)" 'sepolia' \
+	--ffi \
+	--etherscan-api-key $(ETHERSCAN_API_KEY_ETH_SEP) \
+	--legacy \
+	-vvv
 deploy-verify-multi-sep: 
 	-forge script script/DeployCVMultiChain.s.sol:DeployCVMultiChain \
 	--rpc-url $(RPC_URL_SEP_TESTNET) \

diff --git a/pkg/contracts/example.env b/pkg/contracts/example.env
@@ -1,3 +1,5 @@
+FOUNDRY_OUT=pkg/contracts/out
+
 RPC_URL=
 ALLO_PROXY=0x1133eA7Af70876e64665ecD07C0A0476d09465a1
 ALLO_IMPL=0xB087535DB0df98fC4327136e897A5985E5Cfbd66
+1 −1		.github/actions/setup/action.yml
+5 −3		.github/workflows/checks.yml
+2 −6		.github/workflows/release-cycle.yml
+0 −26		CHANGELOG.md
+3 −89		contracts/governance/Governor.sol
+10 −21		contracts/metatx/ERC2771Context.sol
+0 −19		contracts/mocks/Base64Dirty.sol
+0 −6		contracts/mocks/ContextMock.sol
+1 −6		contracts/mocks/ERC2771ContextMock.sol
+23 −36		contracts/mocks/docs/ERC4626Fees.sol
+0 −88		contracts/mocks/docs/governance/MyGovernor.sol
+0 −24		contracts/mocks/docs/governance/MyToken.sol
+0 −35		contracts/mocks/docs/governance/MyTokenTimestampBased.sol
+0 −31		contracts/mocks/docs/governance/MyTokenWrapped.sol
+10 −10		contracts/mocks/token/ERC4646FeesMock.sol
+1 −1		contracts/mocks/wizard/MyGovernor3.sol
+1 −1		contracts/package.json
+3 −5		contracts/token/ERC20/README.adoc
+4 −4		contracts/token/ERC20/extensions/ERC20Permit.sol
+1 −31		contracts/token/ERC20/extensions/IERC20Permit.sol
+3 −3		contracts/token/ERC20/utils/SafeERC20.sol
+10 −19		contracts/utils/Base64.sol
+1 −5		contracts/utils/Context.sol
+3 −17		contracts/utils/Multicall.sol
+3 −7		contracts/utils/cryptography/MerkleProof.sol
+1 −0		docs/modules/ROOT/nav.adoc
+1 −1		docs/modules/ROOT/pages/crosschain.adoc
+195 −4		docs/modules/ROOT/pages/governance.adoc
+0 −2		docs/modules/ROOT/pages/index.adoc
+15 −0		docs/modules/ROOT/pages/wizard.adoc
+22 −12		hardhat/task-test-get-files.js
+2 −2		package-lock.json
+1 −1		package.json
+5 −8		scripts/prepare-docs.sh
+24 −0		scripts/release/workflow/prepare-release-merge.sh
+2 −8		scripts/release/workflow/publish.sh
+0 −55		test/governance/Governor.t.sol
+0 −83		test/governance/Governor.test.js
+0 −74		test/metatx/ERC2771Context.test.js
+3 −3		test/token/ERC20/extensions/ERC4626.test.js
+1 −11		test/utils/Base64.test.js
+4 −24		test/utils/cryptography/MerkleProof.test.js