Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove submodule and apply soldeer #53

Merged
merged 4 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
with:
version: nightly

- name: Update package
run: forge soldeer update

- name: Run Forge build
run: |
forge --version
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ docs/
# Dotenv file
.env
node_modules
.yarn
.yarn

dependencies/
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

4 changes: 4 additions & 0 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ runs = 256

[invariant]
runs = 256

[dependencies]
forge-std = { version = "1.8.2" }
"@openzeppelin-contracts" = { version = "4.9.6" }
1 change: 0 additions & 1 deletion lib/forge-std
Submodule forge-std deleted from b6a506
1 change: 0 additions & 1 deletion lib/openzeppelin-contracts
Submodule openzeppelin-contracts deleted from 6b4ec6
2 changes: 2 additions & 0 deletions remappings.txt
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
12 changes: 12 additions & 0 deletions soldeer.lock
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/legacy/transfers/RONTransferHelper.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/transfers/TransferFromHelper.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/transfers/TransferHelper.sol
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/transfers/LibNativeTransfer.t.sol
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Loading