clustersxyz · Vectorized · Oct 10, 2024 · Oct 12, 2024 · Oct 12, 2024 · Dec 9, 2024
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,8 @@ docs/
 # Dotenv file
 .env
 
-.DS_Store
+.DS_Store
+
+# Create2 build files
+.tmp
+create2
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/solady"]
-	path = lib/solady
-	url = https://github.com/Vectorized/solady
 [submodule "lib/LayerZero-v2"]
 	path = lib/LayerZero-v2
 	url = https://github.com/clustersxyz/LayerZero-v2
@@ -17,3 +11,15 @@
 	path = lib/devtools
 	url = https://github.com/0xfoobar/devtools
 	branch = patch-1
+[submodule "lib/soledge"]
+	path = lib/soledge
+	url = https://github.com/Vectorized/soledge
+[submodule "lib/multicaller"]
+	path = lib/multicaller
+	url = https://github.com/vectorized/multicaller
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts
+[submodule "lib/solady"]
+	path = lib/solady
+	url = https://github.com/vectorized/solady
diff --git a/lib/devtools b/lib/devtools
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/multicaller b/lib/multicaller
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/solady b/lib/solady
diff --git a/lib/soledge b/lib/soledge
diff --git a/remappings.txt b/remappings.txt
@@ -5,6 +5,8 @@ forge-std/=lib/forge-std/src/
 openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
 solmate/=lib/solmate/src/
 solady/=lib/solady/src/
+multicaller/=lib/multicaller/src/
+soledge/=lib/soledge/src/
 clusters/=src/
 solidity-bytes-utils/=lib/LayerZero-v2/oapp/node_modules/solidity-bytes-utils/
 @openzeppelin/contracts/=lib/LayerZero-v2/oapp/node_modules/@openzeppelin/contracts/
+1 −1		package.json
+8 −1		src/StdChains.sol
+2 −2		src/StdCheats.sol
+9 −0		src/StdInvariant.sol
+1 −1		src/StdStorage.sol
+185 −58		src/Vm.sol
+401 −382		src/console.sol
+1 −1,555		src/console2.sol
+693 −4		src/safeconsole.sol
+3 −0		test/StdChains.t.sol
+8 −0		test/StdStorage.t.sol
+2 −2		test/Vm.t.sol
+5 −0		.changeset/fluffy-buses-jump.md
+5 −0		.changeset/great-pianos-work.md
+5 −0		.changeset/odd-lobsters-wash.md
+5 −0		.changeset/serious-carrots-provide.md
+5 −0		.changeset/spotty-queens-own.md
+5 −0		.changeset/tricky-bats-pretend.md
+3 −0		.codecov.yml
+1 −0		.githooks/pre-push
+1 −1		.github/workflows/checks.yml
+1 −1		.github/workflows/formal-verification.yml
+4 −1		CHANGELOG.md
+1 −1		LICENSE
+1 −1		contracts/governance/README.adoc
+3 −0		contracts/interfaces/README.adoc
+1 −1		contracts/metatx/ERC2771ForwarderUpgradeable.sol
+26 −0		contracts/mocks/BatchCallerUpgradeable.sol
+68 −0		contracts/mocks/MerkleProofCustomHashMockUpgradeable.sol
+2 −0		contracts/mocks/StatelessUpgradeable.sol
+28 −0		contracts/mocks/WithInit.sol
+6 −0		contracts/mocks/docs/ERC4626FeesUpgradeable.sol
+44 −0		contracts/mocks/token/ERC20GetterHelperUpgradeable.sol
+2 −0		contracts/token/ERC1155/README.adoc
+5 −0		contracts/token/ERC20/README.adoc
+4 −78		contracts/token/ERC20/extensions/ERC1363Upgradeable.sol
+126 −0		contracts/token/ERC20/extensions/draft-ERC20TemporaryApprovalUpgradeable.sol
+2 −0		contracts/token/ERC721/README.adoc
+12 −4		contracts/utils/README.adoc
+1 −1		docs/modules/ROOT/pages/erc4626.adoc
+101 −8		docs/modules/ROOT/pages/utilities.adoc
+2 −0		foundry.toml
+1 −1		fv-requirements.txt
+19 −21		hardhat.config.js
+1 −1		lib/openzeppelin-contracts
+151 −97		package-lock.json
+4 −4		package.json
+18 −0		scripts/checks/coverage.sh
+4 −1		scripts/generate/run.js
+18 −25		scripts/generate/templates/Arrays.js
+4 −4		scripts/generate/templates/Checkpoints.js
+328 −0		scripts/generate/templates/Heap.js
+13 −0		scripts/generate/templates/Heap.opts.js
+89 −0		scripts/generate/templates/Heap.t.js
+186 −0		scripts/generate/templates/MerkleProof.js
+11 −0		scripts/generate/templates/MerkleProof.opts.js
+25 −14		scripts/generate/templates/Packing.js
+3 −5		scripts/generate/templates/Packing.opts.js
+19 −13		scripts/generate/templates/Packing.t.js
+5 −0		scripts/prepare.sh
+42 −0		test/proxy/Clones.t.sol
+10 −1		test/token/ERC20/ERC20.behavior.js
+142 −0		test/token/ERC20/extensions/draft-ERC20TemporaryApproval.test.js
+3 −3		test/token/ERC20/utils/SafeERC20.test.js
+115 −0		test/utils/Packing.t.sol
+206 −166		test/utils/cryptography/MerkleProof.test.js
+135 −0		test/utils/cryptography/P256.t.sol
+156 −0		test/utils/cryptography/P256.test.js
+3,719 −0		test/utils/cryptography/ecdsa_secp256r1_sha256_p1363_test.json
+153 −0		test/utils/structs/Heap.t.sol
+131 −0		test/utils/structs/Heap.test.js