From bd94fcef06a1fe1e3a568335a367d5f8b36c44b8 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Tue, 10 Dec 2024 19:03:54 -0600 Subject: [PATCH 1/3] fix: improved build script --- Cargo.toml | 1 + build.rs | 4 ++++ cargo-generate.toml | 13 ------------- contracts/soldeer.lock | 1 - soldeer.lock | 4 ++-- 5 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 cargo-generate.toml delete mode 100644 contracts/soldeer.lock diff --git a/Cargo.toml b/Cargo.toml index f598a4b..547c60e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ gennaro-dkg = { version = "0.8.0", features = ["curve25519"]} [build-dependencies] blueprint-metadata = { git = "https://github.com/tangle-network/gadget.git" } +blueprint-build-utils = { git = "https://github.com/tangle-network/gadget.git" } [dev-dependencies] blueprint-test-utils = { git = "https://github.com/tangle-network/gadget.git" } diff --git a/build.rs b/build.rs index acb638b..521ce31 100644 --- a/build.rs +++ b/build.rs @@ -2,4 +2,8 @@ fn main() { println!("cargo:rerun-if-changed=src/lib.rs"); println!("cargo:rerun-if-changed=src/main.rs"); blueprint_metadata::generate_json(); + + let contract_dirs: Vec<&str> = vec!["./contracts"]; + blueprint_build_utils::soldeer_update(); + blueprint_build_utils::build_contracts(contract_dirs); } diff --git a/cargo-generate.toml b/cargo-generate.toml deleted file mode 100644 index fdc2ba3..0000000 --- a/cargo-generate.toml +++ /dev/null @@ -1,13 +0,0 @@ -[template] -cargo_generate_version = ">=0.17.4" -ignore = [".git", "blueprint.json", "blueprint.lock", ".github/workflows/verify-template.yml"] - -[placeholders.gh-username] -type = "string" -prompt = "Your GitHub username (or organization)" -# The username cannot end with a hyphen, too, but -# this requirement is not captured by the regex at the moment. -regex = "^[A-Za-z0-9][A-Za-z0-9-]{0,38}$" - -[hooks] -pre = ["hooks/pre.rhai"] \ No newline at end of file diff --git a/contracts/soldeer.lock b/contracts/soldeer.lock deleted file mode 100644 index 4177f1a..0000000 --- a/contracts/soldeer.lock +++ /dev/null @@ -1 +0,0 @@ -dependencies = [] diff --git a/soldeer.lock b/soldeer.lock index 75ff4b0..5b0485f 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -1,6 +1,6 @@ [[dependencies]] name = "tnt-core" version = "0.1.0" -source = "https://soldeer-revisions.s3.amazonaws.com/tnt-core/0_1_0_10-12-2024_20:51:20_tnt-core.zip" +url = "https://soldeer-revisions.s3.amazonaws.com/tnt-core/0_1_0_10-12-2024_20:51:20_tnt-core.zip" checksum = "628b2475c4d629c1cb2578b41b2e10daa3711d711aa5f5b0dd6153959808620f" -integrity = "c50fcfff192fe4e78a0fb521ee6a7412ebd1975fb6c47978ea38666249608cc7" +integrity = "c380cd3e1def40cd40d70db357afdca4efba79d2561f850f05f395dc634a774e" From ff15627b677cbfae4ef65263e2fc222442f38b09 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Thu, 12 Dec 2024 09:31:08 -0600 Subject: [PATCH 2/3] fix(ci): debugging --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 547c60e..7f382fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ gennaro-dkg = { version = "0.8.0", features = ["curve25519"]} [build-dependencies] blueprint-metadata = { git = "https://github.com/tangle-network/gadget.git" } -blueprint-build-utils = { git = "https://github.com/tangle-network/gadget.git" } +blueprint-build-utils = { git = "https://github.com/tangle-network/gadget.git", branch = "donovan/build-improvements" } [dev-dependencies] blueprint-test-utils = { git = "https://github.com/tangle-network/gadget.git" } From 7a5a05384cf8cef29f81aee63dac16d805cdabdf Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Thu, 12 Dec 2024 12:56:35 -0600 Subject: [PATCH 3/3] fix: use main gadget branch for build utils --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7f382fe..547c60e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ gennaro-dkg = { version = "0.8.0", features = ["curve25519"]} [build-dependencies] blueprint-metadata = { git = "https://github.com/tangle-network/gadget.git" } -blueprint-build-utils = { git = "https://github.com/tangle-network/gadget.git", branch = "donovan/build-improvements" } +blueprint-build-utils = { git = "https://github.com/tangle-network/gadget.git" } [dev-dependencies] blueprint-test-utils = { git = "https://github.com/tangle-network/gadget.git" }