Project refactoring proposal (#27)

* README: dummy commit - needed to open a draft PR * Moved the to * forge install: forge-std v1.7.1 * Foundry: Updated remappings * Removed from git tracking * Cargo.lock deletion * Returned to git tracking * Removed obsolete './hardhat' project * Foundry.toml: set 'vendor' as a lib
filecoin-project · Nov 8, 2023 · 0755d80 · 0755d80
1 parent cee55f7
commit 0755d80
Show file tree

Hide file tree

Showing 71 changed files with 651 additions and 7,974 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ out/
 testing/*.csv
 package-lock.json
 
-vendor/solidity-BigNumber/cache/
+contracts/vendor/solidity-BigNumber/cache/
 artifacts
 cache
 yarn.lock

diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "lib/openzeppelin-contracts-upgradeable"]
 	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/contracts/v0.8/mocks/MarketMockAPI.sol b/contracts/v0.8/mocks/MarketMockAPI.sol
@@ -23,7 +23,7 @@ import "../types/MarketTypes.sol";
 import "../types/CommonTypes.sol";
 import "./types/MockTypes.sol";
 
-import "vendor/solidity-BigNumber/src/BigNumbers.sol";
+import "../../vendor/solidity-BigNumber/src/BigNumbers.sol";
 
 /// @title This library is a proxy to the singleton Storage Market actor (address: f05). Calling one of its methods will result in a cross-actor call being performed. However, in this mock library, no actual call is performed.
 /// @author Zondax AG

diff --git a/contracts/v0.8/mocks/MinerMockAPI.sol b/contracts/v0.8/mocks/MinerMockAPI.sol
@@ -19,7 +19,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.17;
 
-import "vendor/solidity-BigNumber/src/BigNumbers.sol";
+import "../../vendor/solidity-BigNumber/src/BigNumbers.sol";
 
 import "../types/MinerTypes.sol";
 import "../types/CommonTypes.sol";

diff --git a/contracts/v0.8/tests/bigints.test.sol b/contracts/v0.8/tests/bigints.test.sol
@@ -19,7 +19,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.17;
 
-import "vendor/solidity-BigNumber/src/BigNumbers.sol";
+import "../../vendor/solidity-BigNumber/src/BigNumbers.sol";
 
 import "../types/CommonTypes.sol";
 import "../utils/BigInts.sol";

diff --git a/contracts/v0.8/utils/BigInts.sol b/contracts/v0.8/utils/BigInts.sol
@@ -18,7 +18,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.17;
 
-import "vendor/solidity-BigNumber/src/BigNumbers.sol";
+import "../../vendor/solidity-BigNumber/src/BigNumbers.sol";
 
 import "../types/CommonTypes.sol";
 import "../utils/Misc.sol";

diff --git a/vendor/solidity-BigNumber/LICENSE → contracts/vendor/solidity-BigNumber/LICENSE b/vendor/solidity-BigNumber/LICENSE → contracts/vendor/solidity-BigNumber/LICENSE
diff --git a/vendor/solidity-BigNumber/README.md → ...racts/vendor/solidity-BigNumber/README.md b/vendor/solidity-BigNumber/README.md → ...racts/vendor/solidity-BigNumber/README.md
diff --git a/...lib/forge-std/.github/workflows/tests.yml → ...lib/forge-std/.github/workflows/tests.yml b/...lib/forge-std/.github/workflows/tests.yml → ...lib/forge-std/.github/workflows/tests.yml
diff --git a/...lidity-BigNumber/lib/forge-std/.gitignore → ...lidity-BigNumber/lib/forge-std/.gitignore b/...lidity-BigNumber/lib/forge-std/.gitignore → ...lidity-BigNumber/lib/forge-std/.gitignore
diff --git a/...idity-BigNumber/lib/forge-std/.gitmodules → ...idity-BigNumber/lib/forge-std/.gitmodules b/...idity-BigNumber/lib/forge-std/.gitmodules → ...idity-BigNumber/lib/forge-std/.gitmodules
diff --git a/...ty-BigNumber/lib/forge-std/LICENSE-APACHE → ...ty-BigNumber/lib/forge-std/LICENSE-APACHE b/...ty-BigNumber/lib/forge-std/LICENSE-APACHE → ...ty-BigNumber/lib/forge-std/LICENSE-APACHE
diff --git a/...idity-BigNumber/lib/forge-std/LICENSE-MIT → ...idity-BigNumber/lib/forge-std/LICENSE-MIT b/...idity-BigNumber/lib/forge-std/LICENSE-MIT → ...idity-BigNumber/lib/forge-std/LICENSE-MIT
diff --git a/...olidity-BigNumber/lib/forge-std/README.md → ...olidity-BigNumber/lib/forge-std/README.md b/...olidity-BigNumber/lib/forge-std/README.md → ...olidity-BigNumber/lib/forge-std/README.md
diff --git a/...dity-BigNumber/lib/forge-std/foundry.toml → ...dity-BigNumber/lib/forge-std/foundry.toml b/...dity-BigNumber/lib/forge-std/foundry.toml → ...dity-BigNumber/lib/forge-std/foundry.toml
diff --git a/...mber/lib/forge-std/lib/ds-test/.gitignore → ...mber/lib/forge-std/lib/ds-test/.gitignore b/...mber/lib/forge-std/lib/ds-test/.gitignore → ...mber/lib/forge-std/lib/ds-test/.gitignore
diff --git a/...gNumber/lib/forge-std/lib/ds-test/LICENSE → ...gNumber/lib/forge-std/lib/ds-test/LICENSE b/...gNumber/lib/forge-std/lib/ds-test/LICENSE → ...gNumber/lib/forge-std/lib/ds-test/LICENSE
diff --git a/...Number/lib/forge-std/lib/ds-test/Makefile → ...Number/lib/forge-std/lib/ds-test/Makefile b/...Number/lib/forge-std/lib/ds-test/Makefile → ...Number/lib/forge-std/lib/ds-test/Makefile
diff --git a/...ber/lib/forge-std/lib/ds-test/default.nix → ...ber/lib/forge-std/lib/ds-test/default.nix b/...ber/lib/forge-std/lib/ds-test/default.nix → ...ber/lib/forge-std/lib/ds-test/default.nix
diff --git a/...r/lib/forge-std/lib/ds-test/demo/demo.sol → ...r/lib/forge-std/lib/ds-test/demo/demo.sol b/...r/lib/forge-std/lib/ds-test/demo/demo.sol → ...r/lib/forge-std/lib/ds-test/demo/demo.sol
diff --git a/...er/lib/forge-std/lib/ds-test/src/test.sol → ...er/lib/forge-std/lib/ds-test/src/test.sol b/...er/lib/forge-std/lib/ds-test/src/test.sol → ...er/lib/forge-std/lib/ds-test/src/test.sol
diff --git a/...ty-BigNumber/lib/forge-std/src/Script.sol → ...ty-BigNumber/lib/forge-std/src/Script.sol b/...ty-BigNumber/lib/forge-std/src/Script.sol → ...ty-BigNumber/lib/forge-std/src/Script.sol
diff --git a/...y-BigNumber/lib/forge-std/src/StdJson.sol → ...y-BigNumber/lib/forge-std/src/StdJson.sol b/...y-BigNumber/lib/forge-std/src/StdJson.sol → ...y-BigNumber/lib/forge-std/src/StdJson.sol
diff --git a/...dity-BigNumber/lib/forge-std/src/Test.sol → ...dity-BigNumber/lib/forge-std/src/Test.sol b/...dity-BigNumber/lib/forge-std/src/Test.sol → ...dity-BigNumber/lib/forge-std/src/Test.sol
diff --git a/...lidity-BigNumber/lib/forge-std/src/Vm.sol → ...lidity-BigNumber/lib/forge-std/src/Vm.sol b/...lidity-BigNumber/lib/forge-std/src/Vm.sol → ...lidity-BigNumber/lib/forge-std/src/Vm.sol
diff --git a/...y-BigNumber/lib/forge-std/src/console.sol → ...y-BigNumber/lib/forge-std/src/console.sol b/...y-BigNumber/lib/forge-std/src/console.sol → ...y-BigNumber/lib/forge-std/src/console.sol
diff --git a/...-BigNumber/lib/forge-std/src/console2.sol → ...-BigNumber/lib/forge-std/src/console2.sol b/...-BigNumber/lib/forge-std/src/console2.sol → ...-BigNumber/lib/forge-std/src/console2.sol
diff --git a/...umber/lib/forge-std/src/test/Script.t.sol → ...umber/lib/forge-std/src/test/Script.t.sol b/...umber/lib/forge-std/src/test/Script.t.sol → ...umber/lib/forge-std/src/test/Script.t.sol
diff --git a/...ib/forge-std/src/test/StdAssertions.t.sol → ...ib/forge-std/src/test/StdAssertions.t.sol b/...ib/forge-std/src/test/StdAssertions.t.sol → ...ib/forge-std/src/test/StdAssertions.t.sol
diff --git a/...er/lib/forge-std/src/test/StdCheats.t.sol → ...er/lib/forge-std/src/test/StdCheats.t.sol b/...er/lib/forge-std/src/test/StdCheats.t.sol → ...er/lib/forge-std/src/test/StdCheats.t.sol
diff --git a/...ber/lib/forge-std/src/test/StdError.t.sol → ...ber/lib/forge-std/src/test/StdError.t.sol b/...ber/lib/forge-std/src/test/StdError.t.sol → ...ber/lib/forge-std/src/test/StdError.t.sol
diff --git a/...mber/lib/forge-std/src/test/StdMath.t.sol → ...mber/lib/forge-std/src/test/StdMath.t.sol b/...mber/lib/forge-std/src/test/StdMath.t.sol → ...mber/lib/forge-std/src/test/StdMath.t.sol
diff --git a/...r/lib/forge-std/src/test/StdStorage.t.sol → ...r/lib/forge-std/src/test/StdStorage.t.sol b/...r/lib/forge-std/src/test/StdStorage.t.sol → ...r/lib/forge-std/src/test/StdStorage.t.sol
diff --git a/...-std/src/test/fixtures/broadcast.log.json → ...-std/src/test/fixtures/broadcast.log.json b/...-std/src/test/fixtures/broadcast.log.json → ...-std/src/test/fixtures/broadcast.log.json
diff --git a/vendor/solidity-BigNumber/src/BigNumbers.sol → ...dor/solidity-BigNumber/src/BigNumbers.sol b/vendor/solidity-BigNumber/src/BigNumbers.sol → ...dor/solidity-BigNumber/src/BigNumbers.sol
diff --git a/...r/solidity-BigNumber/src/utils/Crypto.sol → ...r/solidity-BigNumber/src/utils/Crypto.sol b/...r/solidity-BigNumber/src/utils/Crypto.sol → ...r/solidity-BigNumber/src/utils/Crypto.sol
diff --git a/.../solidity-BigNumber/test/BigNumbers.t.sol → .../solidity-BigNumber/test/BigNumbers.t.sol b/.../solidity-BigNumber/test/BigNumbers.t.sol → .../solidity-BigNumber/test/BigNumbers.t.sol
diff --git a/...umber/test/differential/BigNumbers.dt.sol → ...umber/test/differential/BigNumbers.dt.sol b/...umber/test/differential/BigNumbers.dt.sol → ...umber/test/differential/BigNumbers.dt.sol
diff --git a/...test/differential/scripts/differential.js → ...test/differential/scripts/differential.js b/...test/differential/scripts/differential.js → ...test/differential/scripts/differential.js
diff --git a/...test/differential/scripts/differential.ts → ...test/differential/scripts/differential.ts b/...test/differential/scripts/differential.ts → ...test/differential/scripts/differential.ts
diff --git a/...er/test/differential/scripts/package.json → ...er/test/differential/scripts/package.json b/...er/test/differential/scripts/package.json → ...er/test/differential/scripts/package.json
diff --git a/...Number/test/differential/util/Strings.sol → ...Number/test/differential/util/Strings.sol b/...Number/test/differential/util/Strings.sol → ...Number/test/differential/util/Strings.sol
diff --git a/foundry.toml b/foundry.toml
@@ -2,7 +2,7 @@
 src = 'contracts'
 solc = '0.8.18'
 out = 'out'
-libs = ['lib', 'vendor']
+libs = ['lib', 'contracts/vendor']
 test = 'contracts/v0.8/test'
 cache_path = 'foundry-cache'
 optimizer = true

diff --git a/hardhat/.env.local b/hardhat/.env.local
diff --git a/hardhat/.gitattributes b/hardhat/.gitattributes
diff --git a/hardhat/.gitignore b/hardhat/.gitignore
diff --git a/hardhat/.gitpod.yml b/hardhat/.gitpod.yml
diff --git a/hardhat/.npmignore b/hardhat/.npmignore
diff --git a/hardhat/.prettierignore b/hardhat/.prettierignore
diff --git a/hardhat/.prettierrc b/hardhat/.prettierrc
diff --git a/hardhat/.solcover.js b/hardhat/.solcover.js
diff --git a/hardhat/.solhint.json b/hardhat/.solhint.json
diff --git a/hardhat/.solhintignore b/hardhat/.solhintignore
diff --git a/hardhat/contracts/SimpleCoin.sol b/hardhat/contracts/SimpleCoin.sol
diff --git a/hardhat/deploy/market.js b/hardhat/deploy/market.js