Merge pull request #53 from axieinfinity/feature/remove-forge-and-app…

…ly-soldeer chore: remove submodule and apply soldeer
axieinfinity · Jul 1, 2024 · 0bdd320 · 0bdd320
2 parents 07d4305 + a3bf214
commit 0bdd320
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,6 +34,9 @@ jobs:
         with:
           version: nightly
 
+      - name: Update package
+        run: forge soldeer update
+
       - name: Run Forge build
         run: |
           forge --version

diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,6 @@ docs/
 # Dotenv file
 .env
 node_modules
-.yarn
+.yarn
+
+dependencies/
diff --git a/.gitmodules b/.gitmodules
diff --git a/foundry.toml b/foundry.toml
@@ -29,3 +29,7 @@ runs = 256
 
 [invariant]
 runs = 256
+
+[dependencies]
+forge-std = { version = "1.8.2" }
+"@openzeppelin-contracts" = { version = "4.9.6" }
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,2 @@
+@forge-std-1.8.2=dependencies/forge-std-1.8.2
+@openzeppelin-contracts-4.9.6=dependencies/@openzeppelin-contracts-4.9.6
diff --git a/soldeer.lock b/soldeer.lock
@@ -0,0 +1,12 @@
+
+[[dependencies]]
+name = "forge-std"
+version = "1.8.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_8_2_19-05-2024_18:52:07_forge-std-1.8.2.zip"
+checksum = "88a37e1d79f60b8aad08c7bd50a7a5ef973fc172b1495028d0725a17f5a4976c"
+
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "4.9.6"
+source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_6_14-03-2024_06:11:55_contracts.zip"
+checksum = "57f2cae4b45b91b0847e58c36ea70aee0fb3212cc09b47279627f0764f87e5ee"
diff --git a/src/legacy/transfers/RONTransferHelper.sol b/src/legacy/transfers/RONTransferHelper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Strings } from "../../../lib/openzeppelin-contracts/contracts/utils/Strings.sol";
+import { Strings } from "../../../dependencies/@openzeppelin-contracts-4.9.6/utils/Strings.sol";
 
 /**
  * @title RONTransferHelper

diff --git a/src/legacy/transfers/TransferFromHelper.sol b/src/legacy/transfers/TransferFromHelper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Strings } from "../../../lib/openzeppelin-contracts/contracts/utils/Strings.sol";
+import { Strings } from "../../../dependencies/@openzeppelin-contracts-4.9.6/utils/Strings.sol";
 
 /**
  * @title TransferFromHelper

diff --git a/src/legacy/transfers/TransferHelper.sol b/src/legacy/transfers/TransferHelper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Strings } from "../../../lib/openzeppelin-contracts/contracts/utils/Strings.sol";
+import { Strings } from "../../../dependencies/@openzeppelin-contracts-4.9.6/utils/Strings.sol";
 
 /**
  * @title TransferHelper

diff --git a/test/transfers/LibNativeTransfer.t.sol b/test/transfers/LibNativeTransfer.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.23;
 
-import { Test } from "forge-std/Test.sol";
+import { Test } from "../../dependencies/forge-std-1.8.2/src/Test.sol";
 import { LibNativeTransfer } from "src/transfers/LibNativeTransfer.sol";
 
 contract LibNativeTransferTest is Test {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@forge-std-1.8.2=dependencies/forge-std-1.8.2
		@openzeppelin-contracts-4.9.6=dependencies/@openzeppelin-contracts-4.9.6