Merge branch 'master' into revert-4457-rmasl-fix-windows-ub-corosense…

…i-stack-precommit
gear-tech · Jan 28, 2025 · 9f4c7a2 · 9f4c7a2
2 parents 8b45d63 + b1aa585
commit 9f4c7a2
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -44,11 +44,7 @@ jobs:
         run: |
           npm cache clean --force
           # version from ethexe/contracts/lib/openzeppelin-foundry-upgrades/src/internal/Versions.sol
-          # npx @openzeppelin/upgrades-core@^1.37.0
-
-          # temp fix for CI
-          npx @openzeppelin/upgrades-core@=1.41.0
-          sed -i 's/\^1\.37\.0/=1.41.0/' ethexe/contracts/lib/openzeppelin-foundry-upgrades/src/internal/Versions.sol
+          npx @openzeppelin/upgrades-core@^1.37.0
 
           cd ethexe/contracts
           forge fmt --check

diff --git a/.gitmodules b/.gitmodules
@@ -5,18 +5,20 @@
 [submodule "ethexe/contracts/lib/openzeppelin-contracts"]
 	path = ethexe/contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-	branch = "release-v5.1"
+	branch = "release-v5.2"
 [submodule "ethexe/contracts/lib/openzeppelin-foundry-upgrades"]
 	path = ethexe/contracts/lib/openzeppelin-foundry-upgrades
 	url = https://github.com/OpenZeppelin/openzeppelin-foundry-upgrades
 	branch = "main"
 [submodule "ethexe/contracts/lib/openzeppelin-contracts-upgradeable"]
 	path = ethexe/contracts/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-	branch = "release-v5.1"
+	branch = "release-v5.2"
 [submodule "ethexe/contracts/lib/symbiotic-core"]
 	path = ethexe/contracts/lib/symbiotic-core
-	url = https://github.com/grishasobol/symbiotic-core
+	url = https://github.com/gear-tech/symbiotic-core
+	branch = "gear-main"
 [submodule "ethexe/contracts/lib/frost-secp256k1-evm"]
 	path = ethexe/contracts/lib/frost-secp256k1-evm
 	url = https://github.com/StackOverflowExcept1on/frost-secp256k1-evm
+	branch = "master"
diff --git a/ethexe/contracts/lib/forge-std b/ethexe/contracts/lib/forge-std
diff --git a/ethexe/contracts/lib/openzeppelin-contracts b/ethexe/contracts/lib/openzeppelin-contracts
diff --git a/ethexe/contracts/lib/openzeppelin-contracts-upgradeable b/ethexe/contracts/lib/openzeppelin-contracts-upgradeable
diff --git a/ethexe/contracts/lib/openzeppelin-foundry-upgrades b/ethexe/contracts/lib/openzeppelin-foundry-upgrades
diff --git a/ethexe/contracts/lib/symbiotic-core b/ethexe/contracts/lib/symbiotic-core
diff --git a/ethexe/ethereum/Mirror.json b/ethexe/ethereum/Mirror.json
diff --git a/ethexe/ethereum/MirrorProxy.json b/ethexe/ethereum/MirrorProxy.json
diff --git a/ethexe/ethereum/Router.json b/ethexe/ethereum/Router.json
diff --git a/ethexe/ethereum/TransparentUpgradeableProxy.json b/ethexe/ethereum/TransparentUpgradeableProxy.json
diff --git a/ethexe/ethereum/WrappedVara.json b/ethexe/ethereum/WrappedVara.json
+1 −1		package.json
+2 −2		src/StdCheats.sol
+177 −10		src/Vm.sol
+2 −3		test/StdChains.t.sol
+2 −2		test/Vm.t.sol
+1 −0		.codecov.yml
+0 −20		.eslintrc
+6 −2		.github/workflows/checks.yml
+1 −1		.github/workflows/formal-verification.yml
+1 −1		.gitmodules
+43 −1		CHANGELOG.md
+8 −1		GUIDELINES.md
+ −		audits/2024-10-v5.1.pdf
+1 −0		audits/README.md
+12 −0		contracts/account/README.adoc
+6 −1		contracts/finance/VestingWalletUpgradeable.sol
+38 −57		contracts/governance/GovernorUpgradeable.sol
+6 −0		contracts/governance/README.adoc
+250 −0		contracts/governance/extensions/GovernorCountingOverridableUpgradeable.sol
+4 −14		contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
+106 −0		contracts/governance/utils/VotesExtendedUpgradeable.sol
+12 −11		contracts/governance/utils/VotesUpgradeable.sol
+1 −1		contracts/mocks/DummyImplementationUpgradeable.sol
+1 −1		contracts/mocks/MerkleTreeMockUpgradeable.sol
+8 −1		contracts/mocks/StatelessUpgradeable.sol
+53 −0		contracts/mocks/VotesExtendedMockUpgradeable.sol
+50 −1		contracts/mocks/WithInit.sol
+29 −0		contracts/mocks/account/utils/ERC7579UtilsMockUpgradeable.sol
+0 −0		contracts/mocks/docs/access-control/AccessControlNonRevokableAdminUpgradeable.sol
+24 −0		contracts/mocks/governance/GovernorCountingOverridableMockUpgradeable.sol
+2 −8		contracts/mocks/governance/GovernorPreventLateQuorumMockUpgradeable.sol
+1 −1		contracts/mocks/governance/GovernorStorageMockUpgradeable.sol
+1 −1		contracts/mocks/proxy/UUPSUpgradeableMockUpgradeable.sol
+42 −0		contracts/mocks/token/ERC20VotesAdditionalCheckpointsMockUpgradeable.sol
+2 −2		contracts/package.json
+2 −2		contracts/proxy/utils/UUPSUpgradeable.sol
+2 −2		contracts/token/ERC20/ERC20Upgradeable.sol
+6 −3		contracts/token/ERC20/extensions/ERC1363Upgradeable.sol
+94 −0		contracts/utils/NoncesKeyedUpgradeable.sol
+6 −1		contracts/utils/README.adoc
+1 −1		docs/modules/ROOT/pages/erc1155.adoc
+2 −2		docs/modules/ROOT/pages/erc4626.adoc
+1 −1		docs/modules/ROOT/pages/extending-contracts.adoc
+1 −1		docs/modules/ROOT/pages/governance.adoc
+26 −0		eslint.config.mjs
+1 −0		foundry.toml
+1 −1		fv-requirements.txt
+1 −1		lib/forge-std
+1 −1		lib/openzeppelin-contracts
+402 −311		package-lock.json
+9 −6		package.json
+5 −4		scripts/checks/inheritance-ordering.js
+49 −0		scripts/checks/pragma-consistency.js
+1 −1		scripts/generate/run.js
+0 −1		scripts/generate/templates/Checkpoints.js
+0 −1		scripts/generate/templates/Checkpoints.t.js
+0 −2		scripts/generate/templates/EnumerableMap.js
+0 −2		scripts/generate/templates/EnumerableSet.js
+0 −2		scripts/generate/templates/MerkleProof.js
+1 −1		scripts/generate/templates/Packing.opts.js
+2 −2		scripts/generate/templates/Packing.t.js
+0 −2		scripts/generate/templates/SafeCast.js
+2 −2		scripts/release/workflow/state.js
+1 −1		scripts/update-docs-branch.js
+1 −1		slither.config.json
+288 −0		test/account/utils/draft-ERC4337Utils.test.js
+421 −0		test/account/utils/draft-ERC7579Utils.t.sol
+353 −0		test/account/utils/draft-ERC7579Utils.test.js
+1 −0		test/bin/EntryPoint070.abi
+ −		test/bin/EntryPoint070.bytecode
+1 −0		test/bin/SenderCreator070.abi
+ −		test/bin/SenderCreator070.bytecode
+346 −0		test/governance/extensions/GovernorCountingOverridable.test.js
+11 −8		test/governance/utils/ERC6372.behavior.js
+152 −0		test/governance/utils/VotesExtended.test.js
+109 −0		test/helpers/chains.js
+7 −0		test/helpers/eip712-types.js
+31 −0		test/helpers/erc4337-entrypoint.js
+111 −0		test/helpers/erc4337.js
+58 −0		test/helpers/erc7579.js
+17 −0		test/helpers/governance.js
+1 −1		test/helpers/storage.js
+192 −78		test/metatx/ERC2771Forwarder.t.sol
+0 −77		test/metatx/ERC2771Forwarder.test.js
+34 −2		test/proxy/Clones.t.sol
+151 −71		test/proxy/Clones.test.js
+2 −2		test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
+8 −8		test/token/ERC721/extensions/ERC721Consecutive.test.js
+3 −2		test/utils/Address.test.js
+88 −0		test/utils/Bytes.test.js
+53 −0		test/utils/CAIP.test.js
+2 −2		test/utils/Create2.test.js
+189 −0		test/utils/Nonces.behavior.js
+3 −62		test/utils/Nonces.test.js
+17 −0		test/utils/NoncesKeyed.test.js
+402 −90		test/utils/Packing.t.sol
+50 −0		test/utils/Strings.t.sol
+174 −12		test/utils/Strings.test.js
+3 −5		test/utils/cryptography/ECDSA.test.js
+5 −100		test/utils/cryptography/P256.t.sol
+2 −2		test/utils/introspection/SupportsInterface.behavior.js
+3 −0		.gitignore
+0 −3		.gitmodules
+16 −0		CHANGELOG.md
+1 −1		LICENSE
+26 −3		README.md
+29 −3		docs/modules/pages/foundry-upgrades.adoc
+1 −1		lib/forge-std
+0 −1		lib/solidity-stringutils
+15 −4		package.json
+1 −1		src/Options.sol
+30 −13		src/internal/Core.sol
+47 −35		src/internal/DefenderDeploy.sol
+46 −0		src/internal/StringFinder.sol
+23 −34		src/internal/Utils.sol
+1 −1		src/internal/Versions.sol
+4 −4		test-profiles/build-info-v2-bad/test/Upgrades.t.sol
+19 −9		test/Upgrades.t.sol
+20 −28		test/UpgradesUseDefenderDeploy.t.sol
+9 −0		test/contracts/Validations.sol
+13 −11		test/internal/DefenderDeploy.t.sol
+56 −0		test/internal/StringFinder.t.sol
+5 −4		test/internal/Utils.t.sol
+970 −33		yarn.lock