From c79750b4527e12134a05c60a07716d3a949419d9 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Tue, 5 Nov 2024 12:43:25 +0100 Subject: [PATCH] apply proposed fix of https://github.com/foundry-rs/foundry/pull/9263 - works! --- foundry.toml | 36 ++++++++++++++++++------------------ src/Counter.sol | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/foundry.toml b/foundry.toml index c22e1f6..a7419f9 100644 --- a/foundry.toml +++ b/foundry.toml @@ -6,25 +6,25 @@ libs = ["lib"] # Diff: https://www.diffchecker.com/XpsJPeq8/ # Works: manual remapping -remappings = [ - # Same - "create2-helpers/=lib/seadrop/lib/create2-helpers/", - "create2-scripts/=lib/seadrop/lib/create2-helpers/script/", - "ds-test/=lib/seadrop/lib/ds-test/src/", - "ERC721A-Upgradeable/=lib/seadrop/lib/ERC721A-Upgradeable/contracts/", - "ERC721A/=lib/seadrop/lib/ERC721A/contracts/", - "forge-std/=lib/forge-std/src/", - "murky/=lib/seadrop/lib/murky/src/", - "operator-filter-registry/=lib/seadrop/lib/operator-filter-registry/src/", - "seadrop/=lib/seadrop/", - "solmate/=lib/seadrop/lib/solmate/src/", +# remappings = [ +# # Same +# "create2-helpers/=lib/seadrop/lib/create2-helpers/", +# "create2-scripts/=lib/seadrop/lib/create2-helpers/script/", +# "ds-test/=lib/seadrop/lib/ds-test/src/", +# "ERC721A-Upgradeable/=lib/seadrop/lib/ERC721A-Upgradeable/contracts/", +# "ERC721A/=lib/seadrop/lib/ERC721A/contracts/", +# "forge-std/=lib/forge-std/src/", +# "murky/=lib/seadrop/lib/murky/src/", +# "operator-filter-registry/=lib/seadrop/lib/operator-filter-registry/src/", +# "seadrop/=lib/seadrop/", +# "solmate/=lib/seadrop/lib/solmate/src/", - # Different - "openzeppelin-contracts-upgradeable/=lib/seadrop/lib/openzeppelin-contracts-upgradeable/contracts/", - "openzeppelin-contracts/=lib/seadrop/lib/openzeppelin-contracts/contracts/", - "openzeppelin/=lib/seadrop/lib/openzeppelin-contracts/contracts/", - "utility-contracts/=lib/seadrop/lib/utility-contracts/src/", -] +# # Different +# "openzeppelin-contracts-upgradeable/=lib/seadrop/lib/openzeppelin-contracts-upgradeable/contracts/", +# "openzeppelin-contracts/=lib/seadrop/lib/openzeppelin-contracts/contracts/", +# "openzeppelin/=lib/seadrop/lib/openzeppelin-contracts/contracts/", +# "utility-contracts/=lib/seadrop/lib/utility-contracts/src/", +# ] # Does not work: automatic remapping # remappings = [ diff --git a/src/Counter.sol b/src/Counter.sol index 47455cc..f1772a9 100644 --- a/src/Counter.sol +++ b/src/Counter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.13; -import {ERC721SeaDrop} from "seadrop/src/ERC721SeaDrop.sol"; +import {ERC721SeaDrop} from "seadrop/ERC721SeaDrop.sol"; contract Counter is ERC721SeaDrop { uint256 public number;