Skip to content

refactor: use relative paths for vendored Flare imports #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thedavidmeister merged 1 commit into from
May 14, 2026
Merged

refactor: use relative paths for vendored Flare imports #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ evm_version = "cancun"
bytecode_hash = "none"
cbor_metadata = false

# Vendored Flare interface files (MIT-licensed, under src/vendor/).
# Neither flare-smart-contracts repo is on soldeer; only these specific
# interfaces are needed, so they're checked in rather than pulled as
# submodules.
remappings = [
"flare-smart-contracts/=src/vendor/flare-smart-contracts/",
"flare-smart-contracts-v2/=src/vendor/flare-smart-contracts-v2/",
]

fs_permissions = [
{ access = "read-write", path = "src/generated" },
{ access = "read-write", path = "meta" },
Expand Down
2 changes: 1 addition & 1 deletion src/err/ErrFtso.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity ^0.8.19;

import {IFtso} from "flare-smart-contracts/userInterfaces/IFtso.sol";
import {IFtso} from "../vendor/flare-smart-contracts/userInterfaces/IFtso.sol";

/// Workaround for https://github.com/foundry-rs/foundry/issues/6572
contract ErrFtso {}
Expand Down
2 changes: 1 addition & 1 deletion src/interface/IGoverned.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity ^0.8.25;

import {IGovernanceSettings} from "flare-smart-contracts/userInterfaces/IGovernanceSettings.sol";
import {IGovernanceSettings} from "../vendor/flare-smart-contracts/userInterfaces/IGovernanceSettings.sol";

interface IGoverned {
function governance() external view returns (address);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/lts/LibFtsoV2LTS.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ pragma solidity ^0.8.19;

//forge-lint: disable-next-line(unused-import)
import {IFtsoRegistry, LibFlareContractRegistry} from "../registry/LibFlareContractRegistry.sol";
import {FtsoV2Interface} from "flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {FtsoV2Interface} from "../../vendor/flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {StalePrice} from "../../err/ErrFtso.sol";
import {IFeeCalculator} from "flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IFeeCalculator} from "../../vendor/flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";

/// @dev FTSO feed IDs.
/// https://dev.flare.network/ftso/feeds
Expand Down
2 changes: 1 addition & 1 deletion src/lib/price/LibFtsoCurrentPriceUsd.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.19;

import {IFtsoRegistry, LibFlareContractRegistry} from "../registry/LibFlareContractRegistry.sol";
import {InactiveFtso, PriceNotFinalized, StalePrice, InconsistentFtso} from "../../err/ErrFtso.sol";
import {IFtso} from "flare-smart-contracts/userInterfaces/IFtso.sol";
import {IFtso} from "../../vendor/flare-smart-contracts/userInterfaces/IFtso.sol";

library LibFtsoCurrentPriceUsd {
function ftsoCurrentPriceUsd(string memory symbol, uint256 timeout) internal view returns (uint256, uint256) {
Expand Down
10 changes: 5 additions & 5 deletions src/lib/registry/LibFlareContractRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity ^0.8.19;

import {FtsoV2Interface} from "flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {IFeeCalculator} from "flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IFtsoRegistry} from "flare-smart-contracts/userInterfaces/IFtsoRegistry.sol";
import {IFlareContractRegistry} from "flare-smart-contracts/userInterfaces/IFlareContractRegistry.sol";
import {FtsoV2Interface} from "../../vendor/flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {IFeeCalculator} from "../../vendor/flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IFtsoRegistry} from "../../vendor/flare-smart-contracts/userInterfaces/IFtsoRegistry.sol";
import {IFlareContractRegistry} from "../../vendor/flare-smart-contracts/userInterfaces/IFlareContractRegistry.sol";
//forge-lint: disable-next-line(unused-import)
import {IFtso} from "flare-smart-contracts/userInterfaces/IFtso.sol";
import {IFtso} from "../../vendor/flare-smart-contracts/userInterfaces/IFtso.sol";

// The address of the Flare contract registry.
// This is the same and immutable across all Flare networks
Expand Down
10 changes: 5 additions & 5 deletions test/prod/FlareInterfacesProd.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import {Test} from "forge-std-1.16.1/src/Test.sol";
import {LibFork} from "../fork/LibFork.sol";
import {BLOCK_NUMBER} from "../src/lib/registry/LibFlareContractRegistry.t.sol";

import {IFlareContractRegistry} from "flare-smart-contracts/userInterfaces/IFlareContractRegistry.sol";
import {IFtsoRegistry} from "flare-smart-contracts/userInterfaces/IFtsoRegistry.sol";
import {IFtso} from "flare-smart-contracts/userInterfaces/IFtso.sol";
import {FtsoV2Interface} from "flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {IFeeCalculator} from "flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IFlareContractRegistry} from "../../src/vendor/flare-smart-contracts/userInterfaces/IFlareContractRegistry.sol";
import {IFtsoRegistry} from "../../src/vendor/flare-smart-contracts/userInterfaces/IFtsoRegistry.sol";
import {IFtso} from "../../src/vendor/flare-smart-contracts/userInterfaces/IFtso.sol";
import {FtsoV2Interface} from "../../src/vendor/flare-smart-contracts-v2/userInterfaces/LTS/FtsoV2Interface.sol";
import {IFeeCalculator} from "../../src/vendor/flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";

import {
FLARE_CONTRACT_REGISTRY,
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/lts/LibFtsoV2LTS.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {LibFtsoV2LTS, ETH_USD_FEED_ID} from "src/lib/lts/LibFtsoV2LTS.sol";
import {BLOCK_NUMBER} from "../registry/LibFlareContractRegistry.t.sol";
import {LibFork} from "test/fork/LibFork.sol";
import {LibFlareContractRegistry} from "src/lib/registry/LibFlareContractRegistry.sol";
import {IFeeCalculator} from "flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IFeeCalculator} from "../../../../src/vendor/flare-smart-contracts-v2/userInterfaces/IFeeCalculator.sol";
import {IGoverned, IGovernanceSettings} from "src/interface/IGoverned.sol";
import {IGovernedFeeCalculator} from "src/interface/IGovernedFeeCalculator.sol";
import {StalePrice} from "src/err/ErrFtso.sol";
Expand Down
Loading