Move to soldeer package manager (#58)

haider-rs · web-flow · commit 3cf2f574f2b8 · 2025-05-30T16:43:51.000+05:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,6 +29,9 @@ jobs:
         with:
           version: nightly
 
+      - name: Install Soldeer dependencies
+        run: forge soldeer update
+
       - name: Run Forge build
         run: |
           forge --version
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,7 @@ docs/
 
 # built artifacts
 src/artifacts/
+
+
+# Soldeer
+/dependencies
diff --git a/.gitmodules b/.gitmodules
diff --git a/foundry.toml b/foundry.toml
@@ -2,7 +2,8 @@
 src = "src"
 test = "test"
 out = "out"
-libs = ["lib"]
+libs = ["dependencies"]
+auto_detect_remappings = false
 # Permissions
 fs_permissions = [{ access = "read", path = "./lib/universal-factory/abi" }]
 
@@ -73,3 +74,10 @@ shibuya = "https://evm.shibuya.astar.network"
 amoy = "https://rpc-amoy.polygon.technology"
 arbitrum_sepolia = "https://arbitrum-sepolia.gateway.tenderly.co"
 bnb_testnet = "https://bsc-testnet-rpc.publicnode.com"
+
+[dependencies]
+forge-std = "1.9.7"
+"@openzeppelin-contracts-upgradeable" = "5.3.0"
+"@openzeppelin-contracts" = "5.3.0"
+frost-evm = { version = "0.1.0", git = "https://github.com/Analog-Labs/frost-evm.git", rev = "63a217a8d0a6f186dab69f070ea45c28099885df" }
+gmp = "0.0.1"
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/frost-evm b/lib/frost-evm
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/remappings.txt b/remappings.txt
@@ -0,0 +1,6 @@
+@openzeppelin/contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.3.0/
+@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.3.0/
+forge-std/=dependencies/forge-std-1.9.7/src
+frost-evm/=dependencies/frost-evm-0.1.0/
+gmp/=dependencies/gmp-0.0.1/
+src/=src/
diff --git a/soldeer.lock b/soldeer.lock
@@ -0,0 +1,33 @@
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "5.3.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_3_0_10-04-2025_10:51:50_contracts.zip"
+checksum = "fa2bc3db351137c4d5eb32b738a814a541b78e87fbcbfeca825e189c4c787153"
+integrity = "d69addf252dfe0688dcd893a7821cbee2421f8ce53d95ca0845a59530043cfd1"
+
+[[dependencies]]
+name = "@openzeppelin-contracts-upgradeable"
+version = "5.3.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/5_3_0_10-04-2025_10:51:56_contracts-upgradeable.zip"
+checksum = "4bd92f87af0cac7226b12ce367e7327f13431735fa6010508d8c8177f9d3d10f"
+integrity = "fa195a69ef4dfec7fec7fbbb77f424258c821832fdd355b0a6e5fe34d2986a16"
+
+[[dependencies]]
+name = "forge-std"
+version = "1.9.7"
+url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_9_7_28-04-2025_15:55:08_forge-std-1.9.zip"
+checksum = "8d9e0a885fa8ee6429a4d344aeb6799119f6a94c7c4fe6f188df79b0dce294ba"
+integrity = "9e60fdba82bc374df80db7f2951faff6467b9091873004a3d314cf0c084b3c7d"
+
+[[dependencies]]
+name = "frost-evm"
+version = "0.1.0"
+git = "https://github.com/Analog-Labs/frost-evm.git"
+rev = "63a217a8d0a6f186dab69f070ea45c28099885df"
+
+[[dependencies]]
+name = "gmp"
+version = "0.0.1"
+url = "https://soldeer-revisions.s3.amazonaws.com/gmp/0_0_1_30-05-2025_11:25:21_gmp.zip"
+checksum = "b9129cb011edbc9d42a854ccf676620dd23868df78af8be2c773b710b4758e2b"
+integrity = "e639345d453405977661ab67f1941a824be8257717b3db4385c8019bc88b1130"
diff --git a/src/Gateway.sol b/src/Gateway.sol
@@ -3,12 +3,12 @@
 
 pragma solidity >=0.8.0;
 
-import {Schnorr} from "../lib/frost-evm/sol/Schnorr.sol";
+import {Schnorr} from "frost-evm/sol/Schnorr.sol";
 import {GasUtils} from "./GasUtils.sol";
 import {RouteStore} from "./storage/Routes.sol";
 import {ShardStore} from "./storage/Shards.sol";
-import {IGateway} from "./interfaces/IGateway.sol";
-import {IGmpReceiver} from "./interfaces/IGmpReceiver.sol";
+import {IGateway} from "gmp/src/IGateway.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 import {
     Command,
     Batch,
diff --git a/src/GmpProxy.sol b/src/GmpProxy.sol
@@ -3,8 +3,8 @@
 
 pragma solidity >=0.8.0;
 
-import {IGmpReceiver} from "../../src/interfaces/IGmpReceiver.sol";
-import {IGateway} from "../../src/interfaces/IGateway.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGateway} from "gmp/src/IGateway.sol";
 import {console} from "forge-std/console.sol";
 
 contract GmpProxy is IGmpReceiver {
diff --git a/src/interfaces/IGateway.sol b/src/interfaces/IGateway.sol
diff --git a/src/interfaces/IGmpReceiver.sol b/src/interfaces/IGmpReceiver.sol
diff --git a/test/Batching.t.sol b/test/Batching.t.sol
@@ -5,12 +5,12 @@ pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
-import {Signer} from "../lib/frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/sol/Signer.sol";
 import {TestUtils} from "./TestUtils.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
-import {IGmpReceiver} from "../src/interfaces/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 import {
     Batch,
     GatewayOp,
diff --git a/test/GasSpender.sol b/test/GasSpender.sol
@@ -3,7 +3,7 @@
 
 pragma solidity >=0.8.0;
 
-import {IGmpReceiver} from "../../src/interfaces/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 
 contract GasSpender is IGmpReceiver {
     // Following a contract implements the IGmpReceiver interface and wastes the exact amount of gas you send to it in the payload field.
diff --git a/test/GasSpender.t.sol b/test/GasSpender.t.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.8.0;
 
 import {Test} from "forge-std/Test.sol";
 import {GasSpender} from "./GasSpender.sol";
-import {IGmpReceiver} from "../../src/interfaces/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 
 contract GasSpenderTest is Test {
     IGmpReceiver internal receiver;
diff --git a/test/GasUtils.t.sol b/test/GasUtils.t.sol
@@ -10,7 +10,7 @@ import {TestUtils} from "./TestUtils.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
-import {IGmpReceiver} from "../src/interfaces/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 import {
     GmpMessage, Signature, TssKey, GmpStatus, PrimitiveUtils, Batch, MAX_PAYLOAD_SIZE
 } from "../src/Primitives.sol";
diff --git a/test/Gateway.t.sol b/test/Gateway.t.sol
@@ -6,12 +6,12 @@ pragma solidity >=0.8.0;
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
 import {TestUtils} from "./TestUtils.sol";
-import {Signer} from "../lib/frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/sol/Signer.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
-import {IGateway} from "../src/interfaces/IGateway.sol";
-import {IGmpReceiver} from "../src/interfaces/IGmpReceiver.sol";
+import {IGateway} from "gmp/src/IGateway.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
 import {
     Batch,
     GmpMessage,
diff --git a/test/GmpProxy.t.sol b/test/GmpProxy.t.sol
@@ -3,9 +3,9 @@
 pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
-import {IGateway} from "../../src/interfaces/IGateway.sol";
-import {IGmpReceiver} from "../../src/interfaces/IGmpReceiver.sol";
-import {GmpProxy} from "../../src/GmpProxy.sol";
+import {IGateway} from "gmp/src/IGateway.sol";
+import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {GmpProxy} from "src/GmpProxy.sol";
 
 contract MockGateway is IGateway {
     uint16 _networkId;
diff --git a/test/Shards.t.sol b/test/Shards.t.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 import {Test, console} from "forge-std/Test.sol";
 import {ShardStore} from "../src/storage/Shards.sol";
 import {TssKey} from "../src/Primitives.sol";
-import {Signer} from "../lib/frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/sol/Signer.sol";
 
 contract ShardStoreTest is Test {
     using ShardStore for ShardStore.MainStorage;
diff --git a/test/TestUtils.sol b/test/TestUtils.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.8.0;
 
 import {VmSafe, Vm} from "forge-std/Vm.sol";
 import {console} from "forge-std/console.sol";
-import {Signer} from "../lib/frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/sol/Signer.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
 import {
