Skip to content

Commit

Permalink
apply proposed fix of foundry-rs/foundry#9263 - works!
Browse files Browse the repository at this point in the history
  • Loading branch information
zerosnacks committed Nov 5, 2024
1 parent 579cc02 commit c79750b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
36 changes: 18 additions & 18 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion src/Counter.sol
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit c79750b

Please sign in to comment.