chore: apply soldeer

axieinfinity · Jul 1, 2024 · 3265c58 · 3265c58
1 parent 07d4305
commit 3265c58
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,6 @@ docs/
 # Dotenv file
 .env
 node_modules
-.yarn
+.yarn
+
+dependencies/
diff --git a/foundry.toml b/foundry.toml
@@ -1,7 +1,9 @@
 [profile.default]
+script = "script"
 src = "src"
+test = "test"
 out = "out"
-libs = ["lib"]
+libs = ["lib","dependencies"]
 ffi = true
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
@@ -20,7 +22,7 @@ bracket_spacing = true
 [rpc_endpoints]
 localhost = "http://localhost:8545"
 ethereum = "https://eth.llamarpc.com"
-ronin-mainnet = "https://api.roninchain.com/rpc"
+ronin-mainnet = "https://api-archived.roninchain.com/rpc"
 goerli = "https://ethereum-goerli.publicnode.com"
 ronin-testnet = "https://saigon-archive.roninchain.com/rpc"
 
@@ -29,3 +31,7 @@ runs = 256
 
 [invariant]
 runs = 256
+
+[dependencies]
+"@openzeppelin-contracts" = { version = "4.9.6" }
+forge-std = { version = "1.8.2" }
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,2 @@
+@openzeppelin-contracts-4.9.6=dependencies/@openzeppelin-contracts-4.9.6
+@forge-std-1.8.2=dependencies/forge-std-1.8.2/src
diff --git a/soldeer.lock b/soldeer.lock
@@ -0,0 +1,12 @@
+
+[[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"
+
+[[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"
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 "@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 "@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 "@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 "@forge-std-1.8.2/Test.sol";
 import { LibNativeTransfer } from "src/transfers/LibNativeTransfer.sol";
 
 contract LibNativeTransferTest is Test {