Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: additional ordhook adjustments #362

Merged
merged 12 commits into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions components/chainhook-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chainhook"
version = "0.17.0"
version = "0.20.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -17,7 +17,7 @@ hex = "0.4.3"
rand = "0.8.5"
# tikv-client = { git = "https://github.com/tikv/client-rust.git", rev = "8f54e6114227718e256027df2577bbacdf425f86" }
# raft-proto = { git = "https://github.com/tikv/raft-rs", rev="f73766712a538c2f6eb135b455297ad6c03fc58d", version = "0.7.0"}
chainhook-sdk = { version = "0.7.5", default-features = false, features = ["zeromq"], path = "../chainhook-sdk" }
chainhook-sdk = { version = "0.8.0", default-features = false, features = ["zeromq"], path = "../chainhook-sdk" }
clarinet-files = "1.0.1"
hiro-system-kit = "0.1.0"
# clarinet-files = { path = "../../../clarinet/components/clarinet-files" }
Expand Down Expand Up @@ -48,7 +48,7 @@ features = ["lz4", "snappy"]
[dev-dependencies]
criterion = "0.3"
redis = "0.21.5"
clarity-repl = "=1.7.0"
clarity-repl = "=1.7.1"
clarity-vm = "=2.1.1"
hex = "0.4.3"
test-case = "3.1.0"
Expand Down
1 change: 1 addition & 0 deletions components/chainhook-cli/src/service/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ impl Service {
observer_command_tx,
observer_command_rx,
Some(observer_event_tx),
None,
self.ctx.clone(),
);

Expand Down
2 changes: 1 addition & 1 deletion components/chainhook-cli/src/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ pub fn get_stacks_block_at_block_height(
return Ok(Some({
let spec: StacksBlockData =
serde_json::from_slice(&entry[..]).map_err(|e| {
format!("unable to deserialize Stacks chainhook {}", e.to_string())
format!("unable to deserialize Stacks block {}", e.to_string())
})?;
spec
}))
Expand Down
7 changes: 3 additions & 4 deletions components/chainhook-sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chainhook-sdk"
version = "0.7.5"
version = "0.8.0"
description = "Stateless Transaction Indexing Engine for Stacks and Bitcoin"
license = "GPL-3.0"
edition = "2021"
Expand All @@ -12,14 +12,13 @@ serde = {version = "1", features = ["rc"]}
serde_json = { version = "1", features = ["arbitrary_precision"] }
serde-hex = "0.1.0"
serde_derive = "1"
stacks-rpc-client = "=1.0.7"
stacks-rpc-client = "=1.0.8"
clarinet-utils = "1.0.0"
hiro-system-kit = "0.1.0"
# stacks-rpc-client = { version = "1", path = "../../../clarinet/components/stacks-rpc-client" }
# clarinet-utils = { version = "1", path = "../../../clarinet/components/clarinet-utils" }
# clarity-repl = { version = "1", path = "../../../clarinet/components/clarity-repl" }
# hiro-system-kit = { version = "0.1.0", path = "../../../clarinet/components/hiro-system-kit" }
chainhook-types = { version = "1.0.8", path = "../chainhook-types-rs" }
chainhook-types = { version = "1.0.9", path = "../chainhook-types-rs" }
rocket = { version = "=0.5.0-rc.3", features = ["json"] }
bitcoincore-rpc = "0.16.0"
bitcoincore-rpc-json = "0.16.0"
Expand Down
2 changes: 1 addition & 1 deletion components/chainhook-sdk/src/chainhooks/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -580,4 +580,4 @@ fn test_stacks_hook_action_file_append() {
else {
panic!("wrong occurence type");
}
}
}
4 changes: 2 additions & 2 deletions components/chainhook-sdk/src/chainhooks/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl ChainhookSpecification {

pub fn deserialize_specification(spec: &str) -> Result<ChainhookSpecification, String> {
let spec: ChainhookSpecification = serde_json::from_str(spec)
.map_err(|e| format!("unable to deserialize Stacks chainhook {}", e.to_string()))?;
.map_err(|e| format!("unable to deserialize predicate {}", e.to_string()))?;
Ok(spec)
}

Expand Down Expand Up @@ -295,7 +295,7 @@ impl ChainhookFullSpecification {
_key: &str,
) -> Result<ChainhookFullSpecification, String> {
let spec: ChainhookFullSpecification = serde_json::from_str(spec)
.map_err(|e| format!("unable to deserialize Stacks chainhook {}", e.to_string()))?;
.map_err(|e| format!("unable to deserialize predicate {}", e.to_string()))?;
Ok(spec)
}
}
Expand Down
Loading