mirror of
https://github.com/uqbar-dao/nectar.git
synced 2024-12-20 15:11:45 +03:00
Merge branch 'v0.10.0' into bp/kvstate
This commit is contained in:
commit
38a35f4f98
912
Cargo.lock
generated
912
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -21,7 +21,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
aes-gcm = "0.10.3"
|
||||
alloy = { git = "https://github.com/kinode-dao/alloy.git", rev = "e672f3e", features = [
|
||||
alloy = { version = "0.8.1", features = [
|
||||
"consensus",
|
||||
"contract",
|
||||
"json-rpc",
|
||||
@ -37,9 +37,9 @@ alloy = { git = "https://github.com/kinode-dao/alloy.git", rev = "e672f3e", feat
|
||||
"signers",
|
||||
"signer-local",
|
||||
] }
|
||||
alloy-primitives = "0.7.6"
|
||||
alloy-sol-macro = "0.7.6"
|
||||
alloy-sol-types = "0.7.6"
|
||||
alloy-primitives = "0.8.15"
|
||||
alloy-sol-macro = "0.8.15"
|
||||
alloy-sol-types = "0.8.15"
|
||||
anyhow = "1.0.71"
|
||||
argon2 = "0.5.3"
|
||||
async-trait = "0.1.71"
|
||||
@ -73,13 +73,11 @@ rusqlite = { version = "0.31.0", features = ["bundled"] }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
sha2 = "0.10.8"
|
||||
sha3 = "0.10.8"
|
||||
# snow = { version = "0.9.5", features = ["ring-resolver"] }
|
||||
# unfortunately need to use forked version for async use and in-place encryption
|
||||
snow = { git = "https://github.com/dr-frmr/snow", branch = "dr/extract_cipherstates", features = ["ring-resolver"] }
|
||||
socket2 = "0.5.7"
|
||||
static_dir = "0.2.0"
|
||||
thiserror = "1.0"
|
||||
tokio = { version = "1.28", features = ["fs", "macros", "rt-multi-thread", "signal", "sync", "time"] }
|
||||
tokio-tungstenite = { version = "0.21.0", features = ["native-tls"] }
|
||||
unicode-segmentation = "1.11"
|
||||
|
976
kinode/packages/app-store/Cargo.lock
generated
976
kinode/packages/app-store/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -7,11 +7,11 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
alloy-primitives = "0.7.6"
|
||||
alloy-sol-types = "0.7.6"
|
||||
alloy-primitives = "0.8.15"
|
||||
alloy-sol-types = "0.8.15"
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
rand = "0.8"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -7,11 +7,11 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
alloy-primitives = "0.7.6"
|
||||
alloy-sol-types = "0.7.6"
|
||||
alloy-primitives = "0.8.15"
|
||||
alloy-sol-types = "0.8.15"
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
rand = "0.8"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -404,7 +404,7 @@ fn handle_message(our: &Address, state: &mut State, message: &Message) -> anyhow
|
||||
|
||||
if let Ok(eth::EthSub { result, .. }) = eth_result {
|
||||
if let Ok(eth::SubscriptionResult::Log(ref log)) =
|
||||
serde_json::from_value(result)
|
||||
serde_json::from_value::<eth::SubscriptionResult>(result)
|
||||
{
|
||||
// delay handling of ETH RPC subscriptions by DELAY_MS
|
||||
// to allow kns to have a chance to process block
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
rand = "0.8"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
rand = "0.8"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
992
kinode/packages/chess/Cargo.lock
generated
992
kinode/packages/chess/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
pleco = "0.5"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
990
kinode/packages/contacts/Cargo.lock
generated
990
kinode/packages/contacts/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -6,7 +6,7 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
990
kinode/packages/homepage/Cargo.lock
generated
990
kinode/packages/homepage/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
779
kinode/packages/kns-indexer/Cargo.lock
generated
779
kinode/packages/kns-indexer/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -8,8 +8,8 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
alloy-primitives = "0.7.0"
|
||||
alloy-sol-types = "0.7.0"
|
||||
alloy-primitives = "0.8.15"
|
||||
alloy-sol-types = "0.8.15"
|
||||
hex = "0.4.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0209da1" }
|
||||
process_macros = "0.1"
|
||||
|
@ -390,7 +390,9 @@ fn handle_eth_message(
|
||||
) -> anyhow::Result<()> {
|
||||
match serde_json::from_slice::<eth::EthSubResult>(body) {
|
||||
Ok(Ok(eth::EthSub { result, .. })) => {
|
||||
if let Ok(eth::SubscriptionResult::Log(log)) = serde_json::from_value(result) {
|
||||
if let Ok(eth::SubscriptionResult::Log(log)) =
|
||||
serde_json::from_value::<eth::SubscriptionResult>(result)
|
||||
{
|
||||
if let Err(e) = handle_log(state, pending_notes, &log) {
|
||||
print_to_terminal(1, &format!("log-handling error! {e:?}"));
|
||||
}
|
||||
|
990
kinode/packages/settings/Cargo.lock
generated
990
kinode/packages/settings/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -10,7 +10,7 @@ simulation-mode = []
|
||||
anyhow = "1.0"
|
||||
base64 = "0.22.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rmp-serde = "1.2.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
1014
kinode/packages/terminal/Cargo.lock
generated
1014
kinode/packages/terminal/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
wit-bindgen = "0.36.0"
|
||||
|
||||
[lib]
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
wit-bindgen = "0.36.0"
|
||||
|
||||
[lib]
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rmp-serde = "1.1.2"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -8,7 +8,7 @@ simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
clap = "4.4"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
regex = "1.10.3"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rmp-serde = "1.1.2"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rmp-serde = "1.1.2"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
||||
simulation-mode = []
|
||||
|
||||
[dependencies]
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rmp-serde = "1.1.2"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
wit-bindgen = "0.36.0"
|
||||
|
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
rand = "0.8"
|
||||
regex = "1.10.3"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
clap = "4.4"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
wit-bindgen = "0.36.0"
|
||||
|
992
kinode/packages/tester/Cargo.lock
generated
992
kinode/packages/tester/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -9,7 +9,7 @@ simulation-mode = []
|
||||
[dependencies]
|
||||
anyhow = "1.0"
|
||||
bincode = "1.3.3"
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "9c441fe" }
|
||||
kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0443ece" }
|
||||
process_macros = "0.1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
@ -17,7 +17,7 @@ sha2 = "0.10.8"
|
||||
tokio = { version = "1.28", features = ["rt-multi-thread"] }
|
||||
|
||||
[dependencies]
|
||||
alloy = { git = "https://github.com/kinode-dao/alloy.git", rev = "e672f3e", features = [
|
||||
alloy = { version = "0.8.1", features = [
|
||||
"json-rpc",
|
||||
"rpc-types",
|
||||
"rpc-types-eth",
|
||||
|
Loading…
Reference in New Issue
Block a user