diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8b6ece6..4a4784d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,9 +10,3 @@ updates: schedule: interval: "daily" open-pull-requests-limit: 5 - - package-ecosystem: "gitsubmodule" - directory: "/" - allow: - - dependency-name: "contracts/lib/tnt-core" - schedule: - interval: "daily" diff --git a/contracts/.gitignore b/contracts/.gitignore index 85198aa..27de333 100644 --- a/contracts/.gitignore +++ b/contracts/.gitignore @@ -12,3 +12,6 @@ docs/ # Dotenv file .env + +# Soldeer dependencies +dependencies/ diff --git a/foundry.toml b/contracts/foundry.toml similarity index 57% rename from foundry.toml rename to contracts/foundry.toml index 07b2bf2..bffa05d 100644 --- a/foundry.toml +++ b/contracts/foundry.toml @@ -1,15 +1,17 @@ [profile.default] -src = "contracts/src" -test = "contracts/test" -out = "contracts/out" -script = "contracts/script" -cache_path = "contracts/cache" -broadcast = "contracts/broadcast" -libs = ["contracts/lib"] +src = "./src" +test = "./test" +out = "./out" +script = "./script" +cache_path = "./cache" +broadcast = "./broadcast" +libs = ["dependencies"] auto_detect_remappings = true +remappings = ["tnt-core-0.1.0/=dependencies/tnt-core-0.1.0/src"] [soldeer] recursive_deps = true +remappings_location = "config" [dependencies] tnt-core = { version = "0.1.0", git = "https://github.com/tangle-network/tnt-core.git", branch = "main" } diff --git a/soldeer.lock b/contracts/soldeer.lock similarity index 100% rename from soldeer.lock rename to contracts/soldeer.lock diff --git a/contracts/src/HelloBlueprint.sol b/contracts/src/HelloBlueprint.sol index 1f94913..731402f 100644 --- a/contracts/src/HelloBlueprint.sol +++ b/contracts/src/HelloBlueprint.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSE pragma solidity >=0.8.13; -import "contracts/lib/tnt-core/src/BlueprintServiceManagerBase.sol"; +import "tnt-core-0.1.0/src/BlueprintServiceManagerBase.sol"; /** * @title HelloBlueprint