Maybe fix Defender imports.

BillSchumacher · Apr 12, 2024 · 1ee3525 · 1ee3525
1 parent 3cd757b
commit 1ee3525
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/packages/foundry/remappings.txt b/packages/foundry/remappings.txt
@@ -1,2 +1,4 @@
 @openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+@openzeppelin/foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/
+@solidity-bytes-utils/=lib/solidity-bytes-utils/contracts/
diff --git a/packages/foundry/script/DefenderDeployChillyDog.s.sol b/packages/foundry/script/DefenderDeployChillyDog.s.sol
@@ -4,7 +4,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 
 import "./DeployHelpers.s.sol";
-import {Defender} from "openzeppelin-foundry-upgrades/Defender.sol";
+import {Defender} from "@openzeppelin/foundry-upgrades/Defender.sol";
 
 contract DefenderScript is ScaffoldETHDeploy {
     function setUp() public {}

diff --git a/packages/foundry/script/DefenderDeployFreshBurn.s.sol b/packages/foundry/script/DefenderDeployFreshBurn.s.sol
@@ -4,7 +4,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 
 import "./DeployHelpers.s.sol";
-import {Defender} from "openzeppelin-foundry-upgrades/Defender.sol";
+import {Defender} from "@openzeppelin/foundry-upgrades/Defender.sol";
 
 contract DefenderScript is ScaffoldETHDeploy {
     function run() public {

diff --git a/packages/foundry/script/DefenderDeployHotDog.s.sol b/packages/foundry/script/DefenderDeployHotDog.s.sol
@@ -4,7 +4,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 
 import "./DeployHelpers.s.sol";
-import {Defender} from "openzeppelin-foundry-upgrades/Defender.sol";
+import {Defender} from "@openzeppelin/foundry-upgrades/Defender.sol";
 
 contract DefenderScript is ScaffoldETHDeploy {
     function setUp() public {}

diff --git a/packages/foundry/script/DefenderDeployRegistry.s.sol b/packages/foundry/script/DefenderDeployRegistry.s.sol
@@ -4,7 +4,7 @@ import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
 
 import "./DeployHelpers.s.sol";
-import {Defender} from "openzeppelin-foundry-upgrades/Defender.sol";
+import {Defender} from "@openzeppelin/foundry-upgrades/Defender.sol";
 
 contract DefenderScript is ScaffoldETHDeploy {
     function run() public {

diff --git a/packages/foundry/script/VerifyAll.s.sol b/packages/foundry/script/VerifyAll.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import "forge-std/Script.sol";
 import "forge-std/Vm.sol";
-import "solidity-bytes-utils/BytesLib.sol";
+import "@solidity-bytes-utils/BytesLib.sol";
 
 /**
  * @dev Temp Vm implementation