refactor(conta): use toml_edit instead of hand written sed (#195)

* refactor(conta): edit versions with toml_edit

* feat(conta): trim the bump logic with toml_edit

* fix(conta): packages matching

* ci(typos): update to 1.16.25

.cargo/config.toml

@@ -1,4 +1,5 @@
 [alias]
+bb = "build --all --all-features --release"
 be = "build --examples --target wasm32-unknown-unknown --release"
 tt = "nextest run --release --all --no-fail-fast"
 te = "nextest run --workspace --no-fail-fast --release --examples"

.github/workflows/typos.yml

@@ -15,4 +15,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/[email protected].23
+      - uses: crate-ci/[email protected].25

Cargo.toml

@@ -24,10 +24,8 @@ repository = "https://github.com/clearloop/zink.git"
 anyhow = "1.0.75"
 cargo_metadata = "0.18.1"
 clap = "4.4.11"
-curl = "0.4.44"
 color-eyre = "0.6.2"
 colored = "2.1.0"
-crates-io = "0.39.0"
 etc = "0.1.16"
 ethers = "2.0.11"
 hex = "0.4.3"
@@ -39,6 +37,7 @@ postcard = { version = "1.0.8", default-features = false }
 proc-macro2 = "1.0.70"
 quote = "1.0.33"
 revm = "3.5.0"
+reqwest = { version = "0.11.22", default-features = false }
 semver = "1.0.20"
 serde = { version = "1.0.193", default-features = false }
 serde_json = "1.0.108"
@@ -49,6 +48,7 @@ target-lexicon = "0.12.12"
 thiserror = "1.0.51"
 tokio = "1.35.0"
 toml = "0.8.8"
+toml_edit = "0.21.0"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 url = "2.5.0"
@@ -62,14 +62,14 @@ sol-abi = { path = "evm/abi", version = "=0.0.1" }
 opcodes = { package = "evm-opcodes", path = "evm/opcodes", version = "=0.0.3", features = [ "data" ] }
 
 ## Zink packages
-elko = { path = "cli/elko", version = "=0.1.8" }
-zabi = { path = "abi", version = "=0.1.8" }
-zingen =  { path = "codegen", version = "=0.1.8" }
-zinkc = { path = "compiler", version = "=0.1.8" }
-filetests = { package = "zinkc-filetests", path = "compiler/filetests", version = "=0.1.8" }
-zink = { path = ".", version = "=0.1.8" }
-zink-codegen = { path = "zink/codegen", version = "=0.1.8" }
-zint = { path = "zint", version = "=0.1.8" }
+elko = { path = "cli/elko", version = "0.1.8" }
+zabi = { path = "abi", version = "0.1.8" }
+zingen =  { path = "codegen", version = "0.1.8" }
+zinkc = { path = "compiler", version = "0.1.8" }
+filetests = { package = "zinkc-filetests", path = "compiler/filetests", version = "0.1.8" }
+zink = { path = ".", version = "0.1.8" }
+zink-codegen = { path = "zink/codegen", version = "0.1.8" }
+zint = { path = "zint", version = "0.1.8" }
 
 [profile]
 dev = { panic = "abort"}

RELEASES.md

@@ -1,3 +1,13 @@
+## v0.1.9
+
+### Changes
+
+- Refactor conta with `toml_edit`
+
+### FIXED
+
+- Missing logic of adapt package alias in conta
+
 ## v0.1.8
 
 ### Added

cli/conta/Cargo.toml

@@ -11,10 +11,9 @@ repository.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-cargo_metadata.workspace = true
-clap = { workspace = true, features = [ "derive" ] }
-crates-io.workspace = true
-curl.workspace = true
+ccli.workspace = true
+reqwest = { workspace = true, features = [ "blocking", "json", "default-tls" ] }
 semver.workspace = true
 serde = { workspace = true, features = [ "derive" ] }
 toml.workspace = true
+toml_edit.workspace = true

cli/conta/src/bin/conta.rs

@@ -1,7 +1,6 @@
-use anyhow::Result;
-use clap::Parser;
+use ccli::{App, Result};
 use conta::Conta;
 
 fn main() -> Result<()> {
-    Conta::parse().run()
+    Conta::start()
 }