Skip to content

Commit

Permalink
feat(workspace): move out ccli and conta (#202)
Browse files Browse the repository at this point in the history
* chore(deps): upgrade dependencies

* chore(manifest): add release config to manifest

* chore(cli): moveout ccli and conta

* chore(deps): remove unused dependencies

* feat(zint): remove unused result

* docs(README): use cuation tip in README

* feat(release): append release note

* fix(RELEASES): typos

* chore(lock): update Cargo.lock
  • Loading branch information
clearloop authored Dec 23, 2023
1 parent cb24cb1 commit e7a060f
Show file tree
Hide file tree
Showing 30 changed files with 60 additions and 1,218 deletions.
737 changes: 36 additions & 701 deletions Cargo.lock

Large diffs are not rendered by default.

44 changes: 20 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
[profile]
dev = { panic = "abort"}
release = { panic = "unwind" }

[workspace]
members = [
"abi",
"cli/*",
"codegen",
"compiler",
"compiler/filetests",
"elko",
"evm/opcodes",
"evm/abi",
"zink/codegen",
Expand All @@ -13,62 +17,54 @@ members = [
resolver = "2"

[workspace.package]
version = "0.1.8"
version = "0.1.9"
authors = ["clearloop"]
edition = "2021"
license = "GPL-3.0-only"
homepage = "https://github.com/clearloop/zink"
repository = "https://github.com/clearloop/zink.git"

[workspace.dependencies]
anyhow = "1.0.75"
anyhow = "1.0.76"
cargo_metadata = "0.18.1"
ccli = "0.0.1"
clap = "4.4.11"
color-eyre = "0.6.2"
colored = "2.1.0"
etc = "0.1.16"
hex = "0.4.3"
indexmap = "2.1.0"
paste = "1.0.14"
postcard = { version = "1.0.8", default-features = false }
proc-macro2 = "1.0.70"
proc-macro2 = "1.0.71"
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"
sha3 = "0.10.8"
smallvec = "1.11.2"
syn = { version = "2.0.41", features = [ "full" ] }
syn = { version = "2.0.42", features = [ "full" ] }
thiserror = "1.0.51"
toml = "0.8.8"
toml_edit = "0.21.0"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
url = "2.5.0"
wasm-opt = "0.116.0"
wasmparser = "0.118.1"
wat = "1.0.82"

## Local packages
ccli = { path = "cli/cli", version = "=0.0.1" }
sol-abi = { path = "evm/abi", version = "=0.0.1" }
## EVM packages
opcodes = { package = "evm-opcodes", path = "evm/opcodes", version = "=0.0.3", features = [ "data" ] }
sol-abi = { path = "evm/abi", version = "=0.0.1" }

## 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" }

[profile]
dev = { panic = "abort"}
release = { panic = "unwind" }
elko = { path = "elko", version = "0.1.9" }
filetests = { package = "zinkc-filetests", path = "compiler/filetests", version = "0.1.9" }
zabi = { path = "abi", version = "0.1.9" }
zingen = { path = "codegen", version = "0.1.9" }
zink = { path = ".", version = "0.1.9" }
zink-codegen = { path = "zink/codegen", version = "0.1.9" }
zinkc = { path = "compiler", version = "0.1.9" }
zint = { path = "zint", version = "0.1.9" }

# Zink Programming Language
# -------------------------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# The Zink Project

> **Warning**
> [!CAUTION]
>
> This project is still under active development, plz DO NOT use it in production.
Expand Down
3 changes: 3 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
- Refactor conta with `toml_edit`
- Optional exports wasm-opt from zinkc
- Use full revm instead of ethers in zint
- Remove ethers
- Move out ccli and conta
- Use `anyhow::Result` instead for the result of `zint`

### FIXED

Expand Down
16 changes: 0 additions & 16 deletions cli/cli/Cargo.toml

This file was deleted.

44 changes: 0 additions & 44 deletions cli/cli/README.md

This file was deleted.

33 changes: 0 additions & 33 deletions cli/cli/src/lib.rs

This file was deleted.

19 changes: 0 additions & 19 deletions cli/conta/Cargo.toml

This file was deleted.

8 changes: 0 additions & 8 deletions cli/conta/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions cli/conta/src/bin/conta.rs

This file was deleted.

52 changes: 0 additions & 52 deletions cli/conta/src/cmd/bump.rs

This file was deleted.

76 changes: 0 additions & 76 deletions cli/conta/src/cmd/mod.rs

This file was deleted.

Loading

0 comments on commit e7a060f

Please sign in to comment.