From 81acc6edf86fcdfc3cb4834b49ada94361bcad1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20I=2E=20O?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:27:09 -0700 Subject: [PATCH 01/30] Update Cargo.toml --- sbtc-core/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index ecfe9724..787c66b4 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -24,6 +24,7 @@ once_cell.workspace = true p256k1.workspace = true regex.workspace = true stacks-core.path = "../stacks-core" +stacks-core.version = "0.1.0" strum = { workspace = true, features = ["derive"] } thiserror.workspace = true url.workspace = true From 7ead6f6ddf2a6bf55aa5625dc1c9f28b20817607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:34:57 +0200 Subject: [PATCH 02/30] sbtc-core version and folder in Cargo.toml base --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 814863ff..28fa4f9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" +sbtc-core = { version = "0.1.0", path = "./sbtc-core" } secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" From e5064ff0f61f2ba64e1976e68e5797dcb5832c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:05:46 +0200 Subject: [PATCH 03/30] publish sbtc-core module --- .github/workflows/daily.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 50fad1c9..22ab2e5a 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -69,6 +69,7 @@ jobs: - name: Publish uses: katyo/publish-crates@v2 with: + path: './sbtc-core' args: "--verbose" publish-delay: 1000 # Wait 1 second between publishing dependencies. ignore-unpublished-changes: true From 5456586082b8009798e1da67f2245610b0951fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:26:52 +0200 Subject: [PATCH 04/30] sbtc-core version in sbtc-core Cargo.toml --- .github/workflows/daily.yml | 2 +- sbtc-core/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 22ab2e5a..4640f3b4 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -59,7 +59,7 @@ jobs: run: cargo make --profile github-actions test publish: - needs: intense-tests + #needs: intense-tests runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 787c66b4..5e9108da 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -23,8 +23,8 @@ log.workspace = true once_cell.workspace = true p256k1.workspace = true regex.workspace = true -stacks-core.path = "../stacks-core" -stacks-core.version = "0.1.0" +sbtc-core = { version = "0.1.0" } +stacks-core = { version = "0.1.0", path = "./stacks-core" } strum = { workspace = true, features = ["derive"] } thiserror.workspace = true url.workspace = true From a42582f3077def9e31e2d7907bbfe7073d3a2e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:29:53 +0200 Subject: [PATCH 05/30] sbtc-core version in sbtc-core Cargo.toml --- sbtc-cli/Cargo.toml | 4 ++-- sbtc-core/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index 715cd30b..ea2b9863 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,10 +11,10 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true -sbtc-core.path = "../sbtc-core" +sbtc-core = { version = "0.1.0" } serde.workspace = true serde_json.workspace = true -stacks-core.path = "../stacks-core" +stacks-core = { version = "0.1.0" } url = { workspace = true, features = ["serde"] } [[bin]] diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 5e9108da..f7303983 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -24,7 +24,7 @@ once_cell.workspace = true p256k1.workspace = true regex.workspace = true sbtc-core = { version = "0.1.0" } -stacks-core = { version = "0.1.0", path = "./stacks-core" } +stacks-core = { version = "0.1.0" } strum = { workspace = true, features = ["derive"] } thiserror.workspace = true url.workspace = true From fda9950acca4a0cb07eb8a287a4db8443a79c0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:34:02 +0200 Subject: [PATCH 06/30] all version of sbtc-core deps --- sbtc-core/Cargo.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index f7303983..66c09440 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -17,17 +17,27 @@ version = "0.1.0" homepage = "https://www.stacks.co" [dependencies] +bdk = "0.28.1" bdk.workspace = true +hex = "0.4.3" hex.workspace = true +log = "0.4.19" log.workspace = true +once_cell = "1.18.0" once_cell.workspace = true +p256k1 = "5.1" p256k1.workspace = true +regex = "~1.8.4" regex.workspace = true sbtc-core = { version = "0.1.0" } stacks-core = { version = "0.1.0" } +strum = "0.25.0" strum = { workspace = true, features = ["derive"] } +thiserror = "1.0.43" thiserror.workspace = true +url = "2.4.1" url.workspace = true +wsts = "1.2" wsts.workspace = true [dev-dependencies] From c168e55a4bfbbd7fede69dc192b5e7b367963a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:36:17 +0200 Subject: [PATCH 07/30] update yml --- .github/workflows/daily.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 4640f3b4..6146f74c 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -69,10 +69,10 @@ jobs: - name: Publish uses: katyo/publish-crates@v2 with: - path: './sbtc-core' - args: "--verbose" + #path: './sbtc-core' + args: "--no-verify" publish-delay: 1000 # Wait 1 second between publishing dependencies. - ignore-unpublished-changes: true + #ignore-unpublished-changes: true registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} devenv: From 07197ef30dddcdc51fa9d70a85609d0500eec1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:50:25 +0200 Subject: [PATCH 08/30] some changes --- .github/workflows/daily.yml | 9 ++++++++- sbtc-core/Cargo.toml | 10 ---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 6146f74c..3596a1a0 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -59,13 +59,20 @@ jobs: run: cargo make --profile github-actions test publish: + needs: generate-lockfile-and-audit #needs: intense-tests runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: ref: ${{ env.BRANCH }} - + + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - name: Publish uses: katyo/publish-crates@v2 with: diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 66c09440..94d17921 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -18,27 +18,17 @@ homepage = "https://www.stacks.co" [dependencies] bdk = "0.28.1" -bdk.workspace = true hex = "0.4.3" -hex.workspace = true log = "0.4.19" -log.workspace = true once_cell = "1.18.0" -once_cell.workspace = true p256k1 = "5.1" -p256k1.workspace = true regex = "~1.8.4" -regex.workspace = true sbtc-core = { version = "0.1.0" } stacks-core = { version = "0.1.0" } strum = "0.25.0" -strum = { workspace = true, features = ["derive"] } thiserror = "1.0.43" -thiserror.workspace = true url = "2.4.1" -url.workspace = true wsts = "1.2" -wsts.workspace = true [dev-dependencies] rand = { workspace = true, features = ["std_rng"] } From 874a426e2e7937c5963d80d748e32da279e9239c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:56:01 +0200 Subject: [PATCH 09/30] only version, not include folder --- Cargo.toml | 2 +- sbtc-core/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 28fa4f9e..913a755e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" -sbtc-core = { version = "0.1.0", path = "./sbtc-core" } +sbtc-core = "0.1.0" secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 94d17921..8fd89725 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -23,7 +23,7 @@ log = "0.4.19" once_cell = "1.18.0" p256k1 = "5.1" regex = "~1.8.4" -sbtc-core = { version = "0.1.0" } +sbtc-core = "0.1.0" stacks-core = { version = "0.1.0" } strum = "0.25.0" thiserror = "1.0.43" From bf5436b046070a214675581e13d84de6bb49ba46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:01:13 +0200 Subject: [PATCH 10/30] only version, not include folder --- sbtc-cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index ea2b9863..01cdbf1a 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,7 +11,7 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true -sbtc-core = { version = "0.1.0" } +sbtc-core = "0.1.0" serde.workspace = true serde_json.workspace = true stacks-core = { version = "0.1.0" } From 3876dbd3b4900993a904386b8f397c394350eaa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:02:47 +0200 Subject: [PATCH 11/30] no deps for publish, debug --- .github/workflows/daily.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 3596a1a0..a90fddd8 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -59,7 +59,6 @@ jobs: run: cargo make --profile github-actions test publish: - needs: generate-lockfile-and-audit #needs: intense-tests runs-on: ubuntu-latest steps: From 066936988710f7348adaa212884ed0c7eab362bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:07:39 +0200 Subject: [PATCH 12/30] using workspace flag true to avoid duplications --- sbtc-cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index 01cdbf1a..ac1a7cb0 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,7 +11,7 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true -sbtc-core = "0.1.0" +sbtc-core.workspace = true serde.workspace = true serde_json.workspace = true stacks-core = { version = "0.1.0" } From 56672b5f848958362a66ecaef133b0dd2c30c540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:14:53 +0200 Subject: [PATCH 13/30] move local deps to dev-deps --- sbtc-cli/Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index ac1a7cb0..43288301 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,12 +11,14 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true -sbtc-core.workspace = true serde.workspace = true serde_json.workspace = true -stacks-core = { version = "0.1.0" } url = { workspace = true, features = ["serde"] } +[dev-dependencies] +sbtc-core = { version = "0.1.0", path = "../sbtc-core" } +stacks-core = { version = "0.1.0", path = "../stacks-core" } + [[bin]] name = "sbtc" path = "src/main.rs" From 981f6afa5402f9098ed3de7e24c193a6b2aed63c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:24:26 +0200 Subject: [PATCH 14/30] leave only path for workspace, are dev-deps --- Cargo.toml | 6 ++++-- sbtc-cli/Cargo.toml | 4 ++-- sbtc-core/Cargo.toml | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 913a755e..63ba4b89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,12 +22,10 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" -sbtc-core = "0.1.0" secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" sha2 = "0.10.7" -stacks-core = { version = "0.1.0", path = "./stacks-core" } strum = "0.25.0" thiserror = "1.0.43" tokio = "1.32.0" @@ -36,3 +34,7 @@ tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } url = "2.4.1" wsts = "1.2" + +[workspace.dev-dependencies] +sbtc-core = { path = "./sbtc-core" } +stacks-core = { path = "./stacks-core" } diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index 43288301..fc7c75ab 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -16,8 +16,8 @@ serde_json.workspace = true url = { workspace = true, features = ["serde"] } [dev-dependencies] -sbtc-core = { version = "0.1.0", path = "../sbtc-core" } -stacks-core = { version = "0.1.0", path = "../stacks-core" } +sbtc-core.workspace = true +stacks-core.workspace = true [[bin]] name = "sbtc" diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 8fd89725..75442375 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -23,8 +23,6 @@ log = "0.4.19" once_cell = "1.18.0" p256k1 = "5.1" regex = "~1.8.4" -sbtc-core = "0.1.0" -stacks-core = { version = "0.1.0" } strum = "0.25.0" thiserror = "1.0.43" url = "2.4.1" @@ -32,3 +30,5 @@ wsts = "1.2" [dev-dependencies] rand = { workspace = true, features = ["std_rng"] } +stacks-core.workspace = true + From fb53eb3d6bf0d7279ef75d9bc7bde097d97e911f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:28:06 +0200 Subject: [PATCH 15/30] same for romeo --- romeo/Cargo.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/romeo/Cargo.toml b/romeo/Cargo.toml index 58483c26..591e7ad4 100644 --- a/romeo/Cargo.toml +++ b/romeo/Cargo.toml @@ -14,12 +14,15 @@ futures.workspace = true hex.workspace = true rand.workspace = true reqwest = { workspace = true, features = ["json"] } -sbtc-core.path = "../sbtc-core" serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -stacks-core.path = "../stacks-core" tokio = { workspace = true, features = ["full"] } tracing-subscriber.workspace = true tracing.workspace = true url.workspace = true rs_merkle.workspace = true + +[dev-dependencies] +sbtc-core.workspace = true +stacks-core.workspace = true + From 83fe76ebe9d1a27f3ff43758089fb406acbb5604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:31:01 +0200 Subject: [PATCH 16/30] no dev-deps in workspace --- Cargo.toml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 63ba4b89..50778b59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,8 +33,4 @@ toml = "0.8.0" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } url = "2.4.1" -wsts = "1.2" - -[workspace.dev-dependencies] -sbtc-core = { path = "./sbtc-core" } -stacks-core = { path = "./stacks-core" } +wsts = "1.2" \ No newline at end of file From 96000d29094057576478bc409d81eb67d880c7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:39:45 +0200 Subject: [PATCH 17/30] using main package sbtc-core --- Cargo.toml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 50778b59..c500286f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,11 @@ [workspace] -members = ["sbtc-cli", "sbtc-core", "stacks-core", "romeo"] -resolver = "2" + +[package] +name = "sbtc-core" # the name of the package +version = "0.1.0" # the current version, obeying semve + +#members = ["sbtc-cli", "sbtc-core", "stacks-core", "romeo"] +#resolver = "2" [workspace.dependencies] anyhow = "1.0" From 4990a63092721edf694ad84c046abfd8feb7d336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:49:17 +0200 Subject: [PATCH 18/30] using only version number, no path nor dev-dep --- Cargo.toml | 9 ++------- sbtc-cli/Cargo.toml | 6 ++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c500286f..50778b59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,6 @@ [workspace] - -[package] -name = "sbtc-core" # the name of the package -version = "0.1.0" # the current version, obeying semve - -#members = ["sbtc-cli", "sbtc-core", "stacks-core", "romeo"] -#resolver = "2" +members = ["sbtc-cli", "sbtc-core", "stacks-core", "romeo"] +resolver = "2" [workspace.dependencies] anyhow = "1.0" diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index fc7c75ab..90260817 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,14 +11,12 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true +sbtc-core = "0.1.0" serde.workspace = true serde_json.workspace = true +stacks-core = "0.1.0" url = { workspace = true, features = ["serde"] } -[dev-dependencies] -sbtc-core.workspace = true -stacks-core.workspace = true - [[bin]] name = "sbtc" path = "src/main.rs" From 42820053ae2be112b6040839adbcb9171adf208c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 21:54:16 +0200 Subject: [PATCH 19/30] field ordering --- sbtc-core/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index 75442375..f63d331a 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -1,4 +1,7 @@ [package] +name = "sbtc-core" +version = "0.1.0" +edition = "2021" authors = ["Stacks Foundation "] categories = [ "cryptography::cryptocurrencies", @@ -7,13 +10,10 @@ categories = [ "finance", ] description = "Package that exposes primitives for working with the Stacks sBTC token" -edition = "2021" keywords = ["stacks", "bitcoin", "sbtc", "sdk", "blockchain"] license = "MIT" -name = "sbtc-core" readme = "README.md" repository = "https://github.com/stacks-network/sbtc" -version = "0.1.0" homepage = "https://www.stacks.co" [dependencies] From a23c7cdcbc162c3ecf96f36e76ac40c6e6af62bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:01:50 +0200 Subject: [PATCH 20/30] suggestions from cargo check --workspace --- Cargo.toml | 2 ++ romeo/Cargo.toml | 6 ++---- sbtc-cli/Cargo.toml | 4 ++-- sbtc-core/Cargo.toml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 50778b59..79ccde78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,10 +22,12 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" +sbtc-core = { path = "sbtc-core" } secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" sha2 = "0.10.7" +stacks-core = { path = "stacks-core" } strum = "0.25.0" thiserror = "1.0.43" tokio = "1.32.0" diff --git a/romeo/Cargo.toml b/romeo/Cargo.toml index 591e7ad4..1dcabd7d 100644 --- a/romeo/Cargo.toml +++ b/romeo/Cargo.toml @@ -14,15 +14,13 @@ futures.workspace = true hex.workspace = true rand.workspace = true reqwest = { workspace = true, features = ["json"] } +sbtc-core.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true +stacks-core.workspace = true tokio = { workspace = true, features = ["full"] } tracing-subscriber.workspace = true tracing.workspace = true url.workspace = true rs_merkle.workspace = true -[dev-dependencies] -sbtc-core.workspace = true -stacks-core.workspace = true - diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index 90260817..d0f23692 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -11,10 +11,10 @@ bdk = { workspace = true, features = ["keys-bip39", "rpc"] } clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true -sbtc-core = "0.1.0" +sbtc-core.workspace = true serde.workspace = true serde_json.workspace = true -stacks-core = "0.1.0" +stacks-core.workspace = true url = { workspace = true, features = ["serde"] } [[bin]] diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index f63d331a..bf3eec35 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -23,6 +23,7 @@ log = "0.4.19" once_cell = "1.18.0" p256k1 = "5.1" regex = "~1.8.4" +stacks-core.workspace = true strum = "0.25.0" thiserror = "1.0.43" url = "2.4.1" From eb594b58ead1b2a5d5c80cf8cdc28d63be56b00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:11:26 +0200 Subject: [PATCH 21/30] both path and version in workspace deps --- Cargo.toml | 7 ++++--- romeo/Cargo.toml | 2 +- sbtc-core/Cargo.toml | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 79ccde78..6de830ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,12 +22,12 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" -sbtc-core = { path = "sbtc-core" } +sbtc-core = { path = "sbtc-core", version = "0.1.0" } secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" sha2 = "0.10.7" -stacks-core = { path = "stacks-core" } +stacks-core = "0.1.0" strum = "0.25.0" thiserror = "1.0.43" tokio = "1.32.0" @@ -35,4 +35,5 @@ toml = "0.8.0" tracing = "0.1.37" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } url = "2.4.1" -wsts = "1.2" \ No newline at end of file +wsts = "1.2" + diff --git a/romeo/Cargo.toml b/romeo/Cargo.toml index 1dcabd7d..beced6f3 100644 --- a/romeo/Cargo.toml +++ b/romeo/Cargo.toml @@ -14,7 +14,7 @@ futures.workspace = true hex.workspace = true rand.workspace = true reqwest = { workspace = true, features = ["json"] } -sbtc-core.workspace = true +sbtc-core.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true stacks-core.workspace = true diff --git a/sbtc-core/Cargo.toml b/sbtc-core/Cargo.toml index bf3eec35..33c24b6b 100644 --- a/sbtc-core/Cargo.toml +++ b/sbtc-core/Cargo.toml @@ -31,5 +31,4 @@ wsts = "1.2" [dev-dependencies] rand = { workspace = true, features = ["std_rng"] } -stacks-core.workspace = true From 6e0ba6e1a3f6d748bbf1ccce529ee8c4f1654e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:14:44 +0200 Subject: [PATCH 22/30] redundant version number in submodule --- sbtc-cli/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index d0f23692..a15f4732 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -12,6 +12,7 @@ clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true sbtc-core.workspace = true +sbtc-core.version = "0.1.0" serde.workspace = true serde_json.workspace = true stacks-core.workspace = true From aba27fd5f1b0e8858b6e5d9c8910f6f7511b3cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:18:36 +0200 Subject: [PATCH 23/30] only publish sbtc-core --- .github/workflows/daily.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index a90fddd8..ab808cb2 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -75,9 +75,9 @@ jobs: - name: Publish uses: katyo/publish-crates@v2 with: - #path: './sbtc-core' + path: './sbtc-core' args: "--no-verify" - publish-delay: 1000 # Wait 1 second between publishing dependencies. + #publish-delay: 1000 # Wait 1 second between publishing dependencies. #ignore-unpublished-changes: true registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} From c9d4ac35933edd3bce881d5300cbf51e4388d978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:35:02 +0200 Subject: [PATCH 24/30] use my GH Action fork --- .github/workflows/daily.yml | 2 +- Cargo.toml | 2 +- sbtc-cli/Cargo.toml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index ab808cb2..6d6353c4 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,7 +73,7 @@ jobs: override: true - name: Publish - uses: katyo/publish-crates@v2 + uses: jo-tm/publish-crates@v2 with: path: './sbtc-core' args: "--no-verify" diff --git a/Cargo.toml b/Cargo.toml index 6de830ee..99ab1693 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ reqwest = "0.11.20" ring = "0.16.20" ripemd = "0.1.3" rs_merkle = "1.4.1" -sbtc-core = { path = "sbtc-core", version = "0.1.0" } +sbtc-core = { path = "sbtc-core"} secp256k1 = "0.27.0" serde = "1.0" serde_json = "1.0" diff --git a/sbtc-cli/Cargo.toml b/sbtc-cli/Cargo.toml index a15f4732..d0f23692 100644 --- a/sbtc-cli/Cargo.toml +++ b/sbtc-cli/Cargo.toml @@ -12,7 +12,6 @@ clap = { workspace = true, features = ["derive"] } hex.workspace = true regex.workspace = true sbtc-core.workspace = true -sbtc-core.version = "0.1.0" serde.workspace = true serde_json.workspace = true stacks-core.workspace = true From 5ac2859279238e2e460a1ce83898130c28a76557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:40:29 +0200 Subject: [PATCH 25/30] use my GH Action fork --- .github/workflows/daily.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 6d6353c4..4cab1451 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,9 +73,9 @@ jobs: override: true - name: Publish - uses: jo-tm/publish-crates@v2 + uses: jo-tm/publish-crates-workspace@v3 with: - path: './sbtc-core' + #path: './sbtc-core' args: "--no-verify" #publish-delay: 1000 # Wait 1 second between publishing dependencies. #ignore-unpublished-changes: true From 1e30a0c960b46c5dcc45c8b49548e2a0bb3746d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:44:57 +0200 Subject: [PATCH 26/30] use my GH Action fork --- .github/workflows/daily.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 4cab1451..c10d2c5a 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -72,7 +72,7 @@ jobs: toolchain: stable override: true - - name: Publish + - name: publish crates workspace uses: jo-tm/publish-crates-workspace@v3 with: #path: './sbtc-core' @@ -80,7 +80,8 @@ jobs: #publish-delay: 1000 # Wait 1 second between publishing dependencies. #ignore-unpublished-changes: true registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} - + dry-run: true + devenv: timeout-minutes: 120 runs-on: ubuntu-latest From cb009ed10f8af1c76be8a1f59c628d0b1a4be3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 22:48:54 +0200 Subject: [PATCH 27/30] use my GH Action fork --- .github/workflows/daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index c10d2c5a..19277590 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,7 +73,7 @@ jobs: override: true - name: publish crates workspace - uses: jo-tm/publish-crates-workspace@v3 + uses: jo-tm/publish-crates-workspace@v2 with: #path: './sbtc-core' args: "--no-verify" From ed2770542eacf9ba452c883f761c6fc758ae2dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 23:01:24 +0200 Subject: [PATCH 28/30] use v4 my own action --- .github/workflows/daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 19277590..e9e0b179 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,7 +73,7 @@ jobs: override: true - name: publish crates workspace - uses: jo-tm/publish-crates-workspace@v2 + uses: jo-tm/publish-crates-workspace@v4 with: #path: './sbtc-core' args: "--no-verify" From 30ecfc257811af3a5c0f14e731b9724e3fdb6498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 23:03:42 +0200 Subject: [PATCH 29/30] use v4 my own action --- .github/workflows/daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index e9e0b179..0bb34546 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,7 +73,7 @@ jobs: override: true - name: publish crates workspace - uses: jo-tm/publish-crates-workspace@v4 + uses: jo-tm/publish-crates@v4 with: #path: './sbtc-core' args: "--no-verify" From d748ee188869af9c75435c8506ec92f9ec501a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9?= <30682875+jo-tm@users.noreply.github.com> Date: Wed, 18 Oct 2023 23:04:36 +0200 Subject: [PATCH 30/30] use v4 my own action --- .github/workflows/daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 0bb34546..e9e0b179 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -73,7 +73,7 @@ jobs: override: true - name: publish crates workspace - uses: jo-tm/publish-crates@v4 + uses: jo-tm/publish-crates-workspace@v4 with: #path: './sbtc-core' args: "--no-verify"