chore: do not use forge dependency system

Signed-off-by: Tomás Migone <tomas@edgeandnode.com>

Author: tmigone

.gitmodules

@@ -1,9 +1,9 @@
 [profile.default]
 src = 'contracts'
 out = 'build'
-libs = ['node_modules', 'lib']
+libs = ["node_modules"]
 test = 'test'
 cache_path  = 'cache_forge'
 fs_permissions = [{ access = "read", path = "./"}]
 optimizer = true
-optimizer_runs = 100
+optimizer_runs = 100

packages/horizon/foundry.toml

@@ -40,6 +40,7 @@
     "@nomicfoundation/ignition-core": "^0.15.9",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
+    "@openzeppelin/foundry-upgrades": "0.4.0",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
@@ -48,6 +49,7 @@
     "chai": "^4.2.0",
     "eslint": "^8.56.0",
     "ethers": "6.13.7",
+    "forge-std": "https://github.com/foundry-rs/forge-std/tarball/v1.9.7",
     "glob": "^11.0.1",
     "hardhat": "^2.22.18",
     "hardhat-contract-sizer": "^2.10.0",

packages/horizon/lib/forge-std

@@ -1,8 +1,5 @@
-@graphprotocol/contracts/=node_modules/@graphprotocol/contracts/
-forge-std/=lib/forge-std/src/
-ds-test/=lib/forge-std/lib/ds-test/src/
-eth-gas-reporter/=node_modules/eth-gas-reporter/
-hardhat/=node_modules/hardhat/
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
-openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src
+@openzeppelin/foundry-upgrades/=node_modules/@openzeppelin/foundry-upgrades/src/
+@graphprotocol/contracts/=node_modules/@graphprotocol/contracts/
+forge-std/=node_modules/forge-std/src/

packages/horizon/lib/openzeppelin-foundry-upgrades

@@ -3,7 +3,7 @@ pragma solidity 0.8.27;
 
 import { GraphBaseTest } from "../GraphBase.t.sol";
 import { DataServiceBaseUpgradeable } from "./implementations/DataServiceBaseUpgradeable.sol";
-import { UnsafeUpgrades } from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/Upgrades.sol";
 
 import { PPMMath } from "./../../../contracts/libraries/PPMMath.sol";
 

packages/horizon/package.json

@@ -3,7 +3,7 @@ pragma solidity 0.8.27;
 
 import { GraphBaseTest } from "../../GraphBase.t.sol";
 import { DataServiceImpPausableUpgradeable } from "../implementations/DataServiceImpPausableUpgradeable.sol";
-import { UnsafeUpgrades } from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/Upgrades.sol";
 
 import { PPMMath } from "./../../../../contracts/libraries/PPMMath.sol";
 

packages/horizon/remappings.txt

@@ -1,7 +1,7 @@
 [profile.default]
 src = 'contracts'
 out = 'build'
-libs = ['node_modules', 'lib']
+libs = ["node_modules"]
 test = 'test'
 cache_path  = 'cache_forge'
 fs_permissions = [{ access = "read", path = "./"}]

packages/horizon/test/unit/data-service/DataServiceUpgradeable.t.sol

@@ -41,6 +41,7 @@
     "@nomicfoundation/ignition-core": "^0.15.9",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2",
+    "@openzeppelin/foundry-upgrades": "0.4.0",
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
@@ -49,6 +50,7 @@
     "chai": "^4.2.0",
     "eslint": "^8.56.0",
     "ethers": "6.13.7",
+    "forge-std": "https://github.com/foundry-rs/forge-std/tarball/v1.9.7",
     "glob": "^11.0.1",
     "hardhat": "^2.22.18",
     "hardhat-contract-sizer": "^2.10.0",

packages/horizon/test/unit/data-service/extensions/DataServicePausableUpgradeable.t.sol

@@ -1,9 +1,6 @@
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
+@openzeppelin/foundry-upgrades/=node_modules/@openzeppelin/foundry-upgrades/src/
 @graphprotocol/contracts/=node_modules/@graphprotocol/contracts/
 @graphprotocol/horizon/=node_modules/@graphprotocol/horizon/
-forge-std/=lib/forge-std/src/
-ds-test/=lib/forge-std/lib/ds-test/src/
-eth-gas-reporter/=node_modules/eth-gas-reporter/
-hardhat/=node_modules/hardhat/
-@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
-@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src
+forge-std/=node_modules/forge-std/src/

packages/subgraph-service/foundry.toml

@@ -15,7 +15,7 @@ import { IPaymentsEscrow } from "@graphprotocol/horizon/contracts/interfaces/IPa
 import { IGraphTallyCollector } from "@graphprotocol/horizon/contracts/interfaces/IGraphTallyCollector.sol";
 import { GraphTallyCollector } from "@graphprotocol/horizon/contracts/payments/collectors/GraphTallyCollector.sol";
 import { PaymentsEscrow } from "@graphprotocol/horizon/contracts/payments/PaymentsEscrow.sol";
-import { UnsafeUpgrades } from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/Upgrades.sol";
 
 import { Constants } from "./utils/Constants.sol";
 import { DisputeManager } from "../../contracts/DisputeManager.sol";

packages/subgraph-service/lib/forge-std

@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 
 import { PPMMath } from "@graphprotocol/horizon/contracts/libraries/PPMMath.sol";
 import { GraphDirectory } from "@graphprotocol/horizon/contracts/utilities/GraphDirectory.sol";
-import { UnsafeUpgrades } from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import { UnsafeUpgrades } from "@openzeppelin/foundry-upgrades/Upgrades.sol";
 import { DisputeManager } from "../../../../contracts/DisputeManager.sol";
 import { DisputeManagerTest } from "../DisputeManager.t.sol";
 import { IDisputeManager } from "../../../../contracts/interfaces/IDisputeManager.sol";