Skip to content

Commit

Permalink
chore: move containers to SONIC. Add info about it to README
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Nov 20, 2024
1 parent d0be9c4 commit 4f07e34
Show file tree
Hide file tree
Showing 16 changed files with 52 additions and 775 deletions.
40 changes: 30 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 5 additions & 23 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = [".", "cli", "inmem", "request"]
default-members = [".", "inmem", "request"]
members = [".", "cli", "inmem"]
default-members = [".", "inmem"]

[workspace.package]
version = "0.12.0-alpha.1"
Expand All @@ -19,6 +19,7 @@ strict_encoding = "~2.8.1"
strict_types = "~2.8.1"
aluvm = "0.12.0-beta.2"
ultrasonic = "0.12.0-beta.1"
sonic = "0.12.0-alpha.1"
serde = { version = "1", features = ["derive"] }

[package]
Expand All @@ -39,32 +40,12 @@ exclude = [".github"]
[lib]
name = "sonare"

[[example]]
name = "dao"

[dependencies]
amplify.workspace = true
baid64 = "0.4.0"
strict_encoding.workspace = true
strict_types.workspace = true
commit_verify = "0.12.0-alpha.3"
aluvm.workspace = true
ultrasonic.workspace = true
sonic.workspace = true
serde = { workspace = true, optional = true }

[features]
default = []
all = ["stl", "serde"]

stl = ["commit_verify/stl", "ultrasonic/stl", "strict_types/armor"]
serde = [
"dep:serde",
"amplify/serde",
"strict_encoding/serde",
"commit_verify/serde",
"ultrasonic/serde"
]

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "0.2"
rand = { version = "0.8.4", optional = true }
Expand All @@ -78,4 +59,5 @@ features = ["all"]

[patch.crates-io]
commit_verify = { git = "https://github.com/LNP-BP/client_side_validation", branch = "v0.12" }
sonic = { git = "https://github.com/AluVM/sonic" }
ultrasonic = { git = "https://github.com/AluVM/ultrasonic" }
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ SONARE is a part of a larger ecosystem used to build safe distributed software,
uses a zk-STARK-compatible subset of its instruction set architecture (called zk-AluVM);
- [UltraSONIC]: a transactional execution layer with capability-based memory access on top of
zk-AluVM;
- [SONIC]: toolchain for building SONIC contracts;
- [Cation]: a general-purpose high-level programming language made with category theory, which
features strict types, termination analysis and can be formally verified;
- [Contractum]: a domain-specific version of Cation for writing programs for SONARE.
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

use std::path::PathBuf;

use sonare::util::ContractRef;
use sonare::ContractRef;

pub enum Command {
/// Import kit
Expand Down
12 changes: 11 additions & 1 deletion inmem/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,21 @@ amplify.workspace = true
strict_encoding.workspace = true
strict_types = { workspace = true, optional = true }
ultrasonic.workspace = true
sonic.workspace = true
sonare = { version = "0.12.0-alpha.1", path = ".." }
serde = { workspace = true, optional = true }

[features]
default = ["std"]
all = ["std"]
all = ["std", "stl", "serde"]

std = []

stl = ["sonic/stl", "strict_types/armor"]
serde = [
"dep:serde",
"amplify/serde",
"strict_encoding/serde",
"ultrasonic/serde",
"sonic/serde",
]
2 changes: 1 addition & 1 deletion inmem/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//! persistence solution adapted for enterprise needs.
use amplify::confinement::{SmallOrdMap, SmallVec, TinyOrdMap};
use sonare::api::{ApiId, StateTy, StructData};
use sonic::{ApiId, StateTy, StructData};
use ultrasonic::{CellAddr, StateCell, StateData};

/// The state as it is defined in the contract. Accessed during the validation.
Expand Down
107 changes: 0 additions & 107 deletions src/containers/contract.rs

This file was deleted.

42 changes: 0 additions & 42 deletions src/containers/kit.rs

This file was deleted.

29 changes: 0 additions & 29 deletions src/containers/mod.rs

This file was deleted.

Loading

0 comments on commit 4f07e34

Please sign in to comment.