From d577604df710eaa2a9086d02f71745baa7f7922a Mon Sep 17 00:00:00 2001 From: Ludo Galabru Date: Mon, 14 Aug 2023 16:04:06 +0200 Subject: [PATCH] chore: update chainhook-sdk --- relayer/Cargo.lock | 245 +++++--------------------------------- relayer/Cargo.toml | 4 +- relayer/src/config/mod.rs | 2 +- relayer/src/service.rs | 9 +- 4 files changed, 39 insertions(+), 221 deletions(-) diff --git a/relayer/Cargo.lock b/relayer/Cargo.lock index de24860..f664786 100644 --- a/relayer/Cargo.lock +++ b/relayer/Cargo.lock @@ -370,9 +370,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chainhook-sdk" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54290fb4f2a139c559e94e8212eadeeae5658abc4bcad1935edb244f0c4d5d0b" +checksum = "7abe64f892f4f7df13856ac4b12a1a06a122b7e9279883713871be36a451a3ab" dependencies = [ "base58 0.2.0", "base64 0.13.1", @@ -387,6 +387,7 @@ dependencies = [ "hex", "hiro-system-kit", "hyper", + "lazy_static", "rand 0.8.5", "reqwest", "rocket", @@ -402,9 +403,9 @@ dependencies = [ [[package]] name = "chainhook-types" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e205711f1d01227cd9239754309c9ff2ef6a637faaf737b4642570753980ee5" +checksum = "8128537ccd9c8f85c77b3d9096b04462b6784b67f6c7760e8d3f56c9d4128bdd" dependencies = [ "hex", "schemars", @@ -525,37 +526,26 @@ dependencies = [ [[package]] name = "clarity-repl" -version = "1.6.4" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0deb0194874c1759dab6b6df926980d1de17a5317b22bacd21b00e213b0d8d" +checksum = "6fbc2179431d853889075f92b984a56c3c988b944ca6682ff840b2792bb155bf" dependencies = [ "ansi_term", "atty", - "bytes", "chrono", "clarity-vm", - "debug_types", - "futures", "getrandom 0.2.10", "hiro-system-kit", - "httparse", "integer-sqrt", "lazy_static", - "log", - "memchr", - "pico-args", - "prettytable-rs", "rand 0.7.3", "regex", "reqwest", - "rustyline", "serde", "serde_derive", "serde_json", "sha2 0.10.6", "sha3 0.9.1", - "tokio", - "tokio-util", ] [[package]] @@ -590,17 +580,6 @@ dependencies = [ "cc", ] -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - [[package]] name = "colorchoice" version = "1.0.0" @@ -704,34 +683,13 @@ dependencies = [ "subtle 2.5.0", ] -[[package]] -name = "csv" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "ctrlc" version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.26.2", + "nix", "windows-sys 0.48.0", ] @@ -762,17 +720,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "debug_types" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2613f33760bd27a70ee84f5a8c0bd97e874fa6f89e205356ef8325786dd22cef" -dependencies = [ - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "devise" version = "0.4.1" @@ -887,12 +834,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - [[package]] name = "encoding_rs" version = "0.8.32" @@ -902,12 +843,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - [[package]] name = "errno" version = "0.3.1" @@ -929,16 +864,6 @@ dependencies = [ "libc", ] -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -966,17 +891,6 @@ dependencies = [ "instant", ] -[[package]] -name = "fd-lock" -version = "3.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "figment" version = "0.10.10" @@ -1701,15 +1615,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memzero" version = "0.1.0" @@ -1772,28 +1677,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec 1.10.0", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.26.2" @@ -2009,12 +1892,6 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "pico-args" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" - [[package]] name = "pin-project-lite" version = "0.2.9" @@ -2039,20 +1916,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2090,27 +1953,6 @@ dependencies = [ "cc", ] -[[package]] -name = "pyth-stacks-relayer" -version = "0.1.0" -dependencies = [ - "base64 0.21.2", - "chainhook-sdk", - "clap 4.3.2", - "clap_generate", - "crossbeam-channel", - "ctrlc", - "hex", - "hiro-system-kit", - "libsecp256k1 0.7.1", - "rand 0.8.5", - "reqwest", - "serde", - "serde_derive", - "sha3 0.10.8", - "toml 0.5.11", -] - [[package]] name = "quote" version = "1.0.28" @@ -2120,16 +1962,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - [[package]] name = "rand" version = "0.7.3" @@ -2550,30 +2382,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" -[[package]] -name = "rustyline" -version = "9.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix 0.23.2", - "radix_trie", - "scopeguard", - "smallvec 1.10.0", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - [[package]] name = "ryu" version = "1.0.13" @@ -3057,11 +2865,32 @@ dependencies = [ "time 0.2.27", ] +[[package]] +name = "stacks-pyth-relayer" +version = "0.1.0" +dependencies = [ + "base64 0.21.2", + "chainhook-sdk", + "clap 4.3.2", + "clap_generate", + "crossbeam-channel", + "ctrlc", + "hex", + "hiro-system-kit", + "libsecp256k1 0.7.1", + "rand 0.8.5", + "reqwest", + "serde", + "serde_derive", + "sha3 0.10.8", + "toml 0.5.11", +] + [[package]] name = "stacks-rpc-client" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417254594e89666f68c76267a620d3751ae6604e39c97f3abb57a845390bc1a0" +checksum = "4903f6164688594cb80856abc27d7a76fa7b6ac84c6fc70a45e414d097c191ab" dependencies = [ "clarity-repl", "hmac 0.12.1", @@ -3148,12 +2977,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strsim" version = "0.10.0" @@ -3650,12 +3473,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "unicode-xid" version = "0.2.4" diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index 845dc43..ed863ff 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pyth-stacks-relayer" +name = "stacks-pyth-relayer" version = "0.1.0" edition = "2021" @@ -8,7 +8,7 @@ serde = "1" serde_derive = "1" hex = "0.4.3" rand = "0.8.5" -chainhook-sdk = { version = "0.7.3", default-features = false, features = ["log"] } +chainhook-sdk = { version = "0.8.2", default-features = false, features = ["log"] } hiro-system-kit = { version = "0.1.0", features = ["log"] } toml = { version = "0.5.11", features = ["preserve_order"] } ctrlc = { version = "3.2.2", optional = true } diff --git a/relayer/src/config/mod.rs b/relayer/src/config/mod.rs index 4179d3e..8697ed2 100644 --- a/relayer/src/config/mod.rs +++ b/relayer/src/config/mod.rs @@ -1,10 +1,10 @@ pub mod file; pub mod generator; -use chainhook_sdk::chainhook_types::StacksNetwork; use chainhook_sdk::observer::EventObserverConfig; use chainhook_sdk::stacks_rpc_client::clarity::vm::types::QualifiedContractIdentifier; use chainhook_sdk::stacks_rpc_client::crypto::Wallet; +use chainhook_sdk::types::StacksNetwork; use file::ConfigFile; use std::fs::File; diff --git a/relayer/src/service.rs b/relayer/src/service.rs index 5276d34..e4ecdf0 100644 --- a/relayer/src/service.rs +++ b/relayer/src/service.rs @@ -9,8 +9,8 @@ use chainhook_sdk::stacks_rpc_client::clarity::codec::{ use chainhook_sdk::stacks_rpc_client::clarity::vm::types::Value; use chainhook_sdk::stacks_rpc_client::{self, StacksRpc}; use chainhook_sdk::{ - chainhook_types::{BlockIdentifier, StacksChainEvent}, observer::{start_event_observer, ObserverEvent}, + types::{BlockIdentifier, StacksChainEvent}, utils::Context, }; use libsecp256k1::{recover, Message, PublicKey, RecoveryId, Signature}; @@ -46,14 +46,15 @@ pub fn start_bridge_service(config: &Config, ctx: &Context) -> Result<(), String let context_logs_disabled = Context::empty(); let observer_cmd_tx_moved = observer_cmd_tx.clone(); let _ = std::thread::spawn(move || { - let future = start_event_observer( + start_event_observer( event_observer_config, observer_cmd_tx_moved, observer_cmd_rx, Some(observer_event_tx), + None, context_logs_disabled, - ); - let _ = hiro_system_kit::nestable_block_on(future); + ) + .expect("unable to start Stacks chain observer"); }); let context_cloned = ctx.clone();