Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disputable registry community #432

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

Disputable registry community #432

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
57a0990
RegistryCommunityV0_1
rperez89 Sep 16, 2024
14d93be
Merge branch 'dev' into disputable-registry
Corantin Sep 17, 2024
0258e5c
change status before
rperez89 Sep 17, 2024
3e13ded
Merge remote-tracking branch 'origin/disputable-registry' into disput…
rperez89 Sep 17, 2024
13e3473
reduce number of hashes
rperez89 Sep 17, 2024
3942a8e
remove function decided to not use
rperez89 Sep 17, 2024
a00f67d
Merge branch 'dev' into disputable-registry
Corantin Sep 17, 2024
44a317c
Merge branch 'dev' into disputable-registry
Corantin Sep 18, 2024
f9ceb0c
Merge branch 'dev' into disputable-registry
Corantin Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts updated 42 files
+1 −1 .github/actions/setup/action.yml
+3 −5 .github/workflows/checks.yml
+6 −2 .github/workflows/release-cycle.yml
+26 −0 CHANGELOG.md
+89 −3 contracts/governance/Governor.sol
+21 −10 contracts/metatx/ERC2771Context.sol
+19 −0 contracts/mocks/Base64Dirty.sol
+6 −0 contracts/mocks/ContextMock.sol
+6 −1 contracts/mocks/ERC2771ContextMock.sol
+36 −23 contracts/mocks/docs/ERC4626Fees.sol
+88 −0 contracts/mocks/docs/governance/MyGovernor.sol
+24 −0 contracts/mocks/docs/governance/MyToken.sol
+35 −0 contracts/mocks/docs/governance/MyTokenTimestampBased.sol
+31 −0 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
+5 −3 contracts/token/ERC20/README.adoc
+4 −4 contracts/token/ERC20/extensions/ERC20Permit.sol
+31 −1 contracts/token/ERC20/extensions/IERC20Permit.sol
+3 −3 contracts/token/ERC20/utils/SafeERC20.sol
+19 −10 contracts/utils/Base64.sol
+5 −1 contracts/utils/Context.sol
+17 −3 contracts/utils/Multicall.sol
+7 −3 contracts/utils/cryptography/MerkleProof.sol
+0 −1 docs/modules/ROOT/nav.adoc
+1 −1 docs/modules/ROOT/pages/crosschain.adoc
+4 −195 docs/modules/ROOT/pages/governance.adoc
+2 −0 docs/modules/ROOT/pages/index.adoc
+0 −15 docs/modules/ROOT/pages/wizard.adoc
+12 −22 hardhat/task-test-get-files.js
+2 −2 package-lock.json
+1 −1 package.json
+8 −5 scripts/prepare-docs.sh
+0 −24 scripts/release/workflow/prepare-release-merge.sh
+8 −2 scripts/release/workflow/publish.sh
+55 −0 test/governance/Governor.t.sol
+83 −0 test/governance/Governor.test.js
+74 −0 test/metatx/ERC2771Context.test.js
+3 −3 test/token/ERC20/extensions/ERC4626.test.js
+11 −1 test/utils/Base64.test.js
+24 −4 test/utils/cryptography/MerkleProof.test.js
2 changes: 1 addition & 1 deletion lib/safe-smart-account
Open in desktop
Submodule safe-smart-account updated 140 files
2 changes: 1 addition & 1 deletion pkg/contracts/out/Allo.sol/Allo.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/CVStrategyHelpersV0_0.sol/CVStrategyHelpersV0_0.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/CVStrategyV0_0.sol/StrategyStruct.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/ERC20.sol/ERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/ERC20/IERC20.sol/IERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/FAllo.sol/FAllo.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/GV2ERC20.sol/GV2ERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IAllo.sol/IAllo.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IArbitrator.sol/IArbitrator.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IERC20.sol/IERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IERC20Metadata.sol/IERC20Metadata.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IERC20Permit.sol/IERC20Permit.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IERC20Upgradeable.sol/IERC20Upgradeable.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IRegistry.sol/IRegistry.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/IRegistryFactory.sol/IRegistryFactory.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/ISafe.sol/Enum.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/ISafe.sol/ISafe.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/ISafe.sol/SafeProxyFactory.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/MockERC20.sol/MockERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/PassportScorer.sol/PassportScorer.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/PassportScorerTest.t.sol/PassportScorerTest.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/Registry.sol/Registry.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/RegistryCommunityV0_0.sol/RegistryCommunityV0_0.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/RegistryCommunityV0_1.sol/RegistryCommunityV0_1.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/RegistryFactoryV0_0.sol/RegistryFactoryV0_0.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/RegistryFactoryV0_1.sol/RegistryFactoryV0_1.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/RegistrySetup.sol/RegistrySetup.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/RegistrySetup.sol/RegistrySetupFull.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/SafeArbitrator.sol/SafeArbitrator.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/SafeArbitratorTest.t.sol/SafeArbitratorTest.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/SafeERC20.sol/SafeERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/contracts/out/TERC20.sol/TERC20.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/contracts/out/UpgradeCVMultichain.s.sol/UpgradeCVMultichain.json
View file
Open in desktop

Large diffs are not rendered by default.

363 changes: 363 additions & 0 deletions pkg/contracts/src/RegistryCommunity/RegistryCommunityV0_1.sol
View file
Open in desktop

Large diffs are not rendered by default.

Loading