From 5ccd2c2dfd3bd6cd855bb99c2eda33c17ac82d5a Mon Sep 17 00:00:00 2001 From: bitful-pannul Date: Fri, 9 Feb 2024 17:03:19 -0300 Subject: [PATCH] merge new repo style --- Cargo.lock | 766 ++++++++---------- kinode/Cargo.toml | 5 + .../kns_indexer/kns_indexer/Cargo.toml | 4 +- kinode/src/eth/provider.rs | 6 +- kinode/src/register.rs | 2 +- lib/Cargo.toml | 4 +- lib/src/eth.rs | 2 - 7 files changed, 351 insertions(+), 438 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 581837a7..d78bec65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,12 +101,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] -<<<<<<< HEAD name = "alloy-eips" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-rlp", "serde", "thiserror", @@ -115,9 +114,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.2", "serde", "serde_json", "thiserror", @@ -126,26 +125,20 @@ dependencies = [ [[package]] name = "alloy-network" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-eips", "alloy-json-rpc", - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-rlp", "serde", ] [[package]] name = "alloy-primitives" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b6fb2b432ff223d513db7f908937f63c252bee0af9b82bfd25b0a5dd1eb0d8" -======= -name = "alloy-primitives" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c234f92024707f224510ff82419b2be0e1d8e1fd911defcac5a085cd7f83898" ->>>>>>> develop dependencies = [ "alloy-rlp", "bytes", @@ -154,32 +147,46 @@ dependencies = [ "derive_more", "hex-literal", "itoa", -<<<<<<< HEAD - "k256", - "keccak-asm", - "proptest", - "rand", -======= "keccak-asm", "proptest", "rand 0.8.5", ->>>>>>> develop "ruint", "serde", "tiny-keccak", ] [[package]] -<<<<<<< HEAD +name = "alloy-primitives" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4b6fb2b432ff223d513db7f908937f63c252bee0af9b82bfd25b0a5dd1eb0d8" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "hex-literal", + "itoa", + "k256", + "keccak-asm", + "proptest", + "rand 0.8.5", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] name = "alloy-providers" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-network", - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-rpc-client", "alloy-rpc-trace-types", - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", "alloy-transport", "alloy-transport-http", "async-trait", @@ -192,10 +199,10 @@ dependencies = [ [[package]] name = "alloy-pubsub" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-json-rpc", - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-transport", "bimap", "futures", @@ -207,8 +214,6 @@ dependencies = [ ] [[package]] -======= ->>>>>>> develop name = "alloy-rlp" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -231,13 +236,12 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "alloy-rpc-client" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-json-rpc", - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-pubsub", "alloy-transport", "alloy-transport-http", @@ -255,10 +259,10 @@ dependencies = [ [[package]] name = "alloy-rpc-trace-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ - "alloy-primitives", - "alloy-rpc-types", + "alloy-primitives 0.6.2", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", "serde", "serde_json", ] @@ -266,33 +270,95 @@ dependencies = [ [[package]] name = "alloy-rpc-types" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" -======= -name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=3b1c310#3b1c3108ccd33c78abd7da8191e3744b4ae9a735" ->>>>>>> develop +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.2", "alloy-rlp", "itertools 0.12.1", -<<<<<<< HEAD "serde", "serde_json", -======= - "jsonrpsee-types", - "serde", - "serde_json", - "serde_with", ->>>>>>> develop "thiserror", ] [[package]] -<<<<<<< HEAD +name = "alloy-rpc-types" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=3b1c310#3b1c3108ccd33c78abd7da8191e3744b4ae9a735" +dependencies = [ + "alloy-primitives 0.5.4", + "alloy-rlp", + "itertools 0.12.1", + "jsonrpsee-types", + "serde", + "serde_json", + "serde_with", + "thiserror", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970e5cf1ca089e964d4f7f7afc7c9ad642bfb1bdc695a20b0cba3b3c28954774" +dependencies = [ + "const-hex", + "dunce", + "heck", + "indexmap 2.2.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", + "syn-solidity 0.5.4", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0b5ab0cb07c21adf9d72e988b34e8200ce648c2bba8d009183bb1c50fb1216" +dependencies = [ + "const-hex", + "dunce", + "heck", + "indexmap 2.2.2", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", + "syn-solidity 0.6.2", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-types" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a059d4d2c78f8f21e470772c75f9abd9ac6d48c2aaf6b278d1ead06ed9ac664" +dependencies = [ + "alloy-primitives 0.5.4", + "alloy-sol-macro 0.5.4", + "const-hex", + "serde", +] + +[[package]] +name = "alloy-sol-types" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c08f62ded7ce03513bfb60ef5cad4fff5d4f67eac6feb4df80426b7b9ffb06e" +dependencies = [ + "alloy-primitives 0.6.2", + "alloy-sol-macro 0.6.2", + "const-hex", + "serde", +] + +[[package]] name = "alloy-transport" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-json-rpc", "base64 0.21.7", @@ -308,7 +374,7 @@ dependencies = [ [[package]] name = "alloy-transport-http" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -321,46 +387,17 @@ dependencies = [ [[package]] name = "alloy-transport-ws" version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git#32618e9243a761858a0843e7e55575e48fdbf500" +source = "git+https://github.com/alloy-rs/alloy?rev=098ad56#098ad5657d55bbc5fe9469ede2a9ca79def738f2" dependencies = [ "alloy-pubsub", "alloy-transport", "futures", - "http", + "http 0.2.11", "serde_json", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tracing", "ws_stream_wasm", -======= -name = "alloy-sol-macro" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970e5cf1ca089e964d4f7f7afc7c9ad642bfb1bdc695a20b0cba3b3c28954774" -dependencies = [ - "const-hex", - "dunce", - "heck", - "indexmap 2.2.2", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", - "syn-solidity", - "tiny-keccak", -] - -[[package]] -name = "alloy-sol-types" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a059d4d2c78f8f21e470772c75f9abd9ac6d48c2aaf6b278d1ead06ed9ac664" -dependencies = [ - "alloy-primitives", - "alloy-sol-macro", - "const-hex", - "serde", ->>>>>>> develop ] [[package]] @@ -400,15 +437,9 @@ dependencies = [ [[package]] name = "anstyle" -<<<<<<< HEAD version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" -======= -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" ->>>>>>> develop [[package]] name = "anstyle-parse" @@ -443,16 +474,14 @@ name = "anyhow" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" -<<<<<<< HEAD -======= [[package]] name = "app_store" version = "0.3.0" dependencies = [ - "alloy-primitives", - "alloy-rpc-types", - "alloy-sol-types", + "alloy-primitives 0.5.4", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=3b1c310)", + "alloy-sol-types 0.5.4", "anyhow", "bincode", "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", @@ -466,7 +495,6 @@ dependencies = [ "wit-bindgen", "zip", ] ->>>>>>> develop [[package]] name = "arbitrary" @@ -585,11 +613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", -<<<<<<< HEAD - "rand", -======= "rand 0.8.5", ->>>>>>> develop ] [[package]] @@ -599,11 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", -<<<<<<< HEAD - "rand", -======= "rand 0.8.5", ->>>>>>> develop ] [[package]] @@ -658,8 +678,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.48", -<<<<<<< HEAD -======= ] [[package]] @@ -669,7 +687,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ "autocfg 1.1.0", ->>>>>>> develop ] [[package]] @@ -724,12 +741,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" [[package]] -<<<<<<< HEAD -name = "bimap" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" -======= name = "beef" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -737,7 +748,12 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] ->>>>>>> develop + +[[package]] +name = "bimap" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" [[package]] name = "bincode" @@ -985,9 +1001,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -1120,9 +1136,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -1130,21 +1146,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", @@ -1154,9 +1170,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloudabi" @@ -1227,9 +1243,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "const-hex" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5104de16b218eddf8e34ffe2f86f74bfa4e61e95a1b89732fccf6325efd0557" +checksum = "18d59688ad0945eaf6b84cb44fedbe93484c81b48970e98f09db8a22832d7961" dependencies = [ "cfg-if", "cpufeatures", @@ -1505,9 +1521,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -1645,10 +1661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", -<<<<<<< HEAD -======= "serde", ->>>>>>> develop ] [[package]] @@ -2086,7 +2099,7 @@ dependencies = [ "serde", "serde_json", "syn 2.0.48", - "toml 0.8.9", + "toml 0.8.10", "walkdir", ] @@ -2207,7 +2220,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tracing", "tracing-futures", "url", @@ -2608,11 +2621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "stable_deref_trait", ] @@ -2671,19 +2680,20 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", -<<<<<<< HEAD - "http", - "indexmap", -======= "http 0.2.11", "indexmap 2.2.2", ->>>>>>> develop "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.13.2" @@ -2756,15 +2766,9 @@ dependencies = [ [[package]] name = "hermit-abi" -<<<<<<< HEAD version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" -======= -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" ->>>>>>> develop [[package]] name = "hex" @@ -2780,8 +2784,6 @@ name = "hex-literal" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" -<<<<<<< HEAD -======= [[package]] name = "hi" @@ -2792,7 +2794,6 @@ dependencies = [ "serde_json", "wit-bindgen", ] ->>>>>>> develop [[package]] name = "hkdf" @@ -2819,8 +2820,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ "windows-sys 0.52.0", -<<<<<<< HEAD -======= ] [[package]] @@ -2833,7 +2832,6 @@ dependencies = [ "serde", "serde_json", "wit-bindgen", ->>>>>>> develop ] [[package]] @@ -2841,8 +2839,6 @@ name = "http" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -<<<<<<< HEAD -======= dependencies = [ "bytes", "fnv", @@ -2854,7 +2850,6 @@ name = "http" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" ->>>>>>> develop dependencies = [ "bytes", "fnv", @@ -3074,10 +3069,8 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -<<<<<<< HEAD -======= checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg 1.1.0", @@ -3089,7 +3082,6 @@ dependencies = [ name = "indexmap" version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" ->>>>>>> develop checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", @@ -3159,12 +3151,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "fe8f25ce1159c7740ff0b9b2f5cdf4a8428742ba7c112b9f20f22cd5219c7dab" dependencies = [ "hermit-abi", - "rustix", + "libc", "windows-sys 0.52.0", ] @@ -3233,18 +3225,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -3320,27 +3312,6 @@ name = "keccak-asm" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8515fff80ed850aea4a1595f2e519c003e2a00a82fe168ebf5269196caf444" -<<<<<<< HEAD -dependencies = [ - "digest 0.10.7", - "sha3-asm", -] - -[[package]] -name = "kinode" -version = "0.5.2" -dependencies = [ - "aes-gcm", - "alloy-network", - "alloy-primitives", - "alloy-providers", - "alloy-pubsub", - "alloy-rpc-client", - "alloy-rpc-types", - "alloy-transport", - "alloy-transport-http", - "alloy-transport-ws", -======= dependencies = [ "digest 0.10.7", "sha3-asm", @@ -3351,7 +3322,11 @@ name = "kinode" version = "0.6.0" dependencies = [ "aes-gcm", ->>>>>>> develop + "alloy-providers", + "alloy-pubsub", + "alloy-rpc-client", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", + "alloy-transport-ws", "anyhow", "async-trait", "base64 0.13.1", @@ -3401,7 +3376,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "url", "uuid 1.7.0", "walkdir", @@ -3423,7 +3398,7 @@ name = "kinode_process_lib" version = "0.5.9" source = "git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha#5e705086bbd10fde89e11d3e3671f6a618a875a7" dependencies = [ - "alloy-rpc-types", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy.git?rev=3b1c310)", "anyhow", "bincode", "ethers-core", @@ -3471,10 +3446,31 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "kinode_process_lib" +version = "0.6.0" +source = "git+https://github.com/kinode-dao/process_lib?rev=8d58cfb#8d58cfba0302681b6971cac26ea3f7e49d4602ec" +dependencies = [ + "alloy-json-rpc", + "alloy-primitives 0.6.2", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", + "alloy-transport", + "anyhow", + "bincode", + "http 1.0.0", + "mime_guess", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "url", + "wit-bindgen", +] + [[package]] name = "kit" version = "0.1.0" -source = "git+https://github.com/kinode-dao/kit?rev=25b098f#25b098fab136387065d6058162d33c727d277ab8" +source = "git+https://github.com/kinode-dao/kit?rev=0c43430#0c434306fdce55e11d3309959fc4a0fe6ae28def" dependencies = [ "anyhow", "base64 0.21.7", @@ -3493,8 +3489,8 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite", - "toml 0.8.9", + "tokio-tungstenite 0.21.0", + "toml 0.8.10", "walkdir", "zip", ] @@ -3503,13 +3499,13 @@ dependencies = [ name = "kns_indexer" version = "0.2.0" dependencies = [ - "alloy-primitives", - "alloy-rpc-types", - "alloy-sol-types", + "alloy-primitives 0.6.2", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", + "alloy-sol-types 0.6.2", "anyhow", "bincode", "hex", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?rev=8d58cfb)", "rmp-serde", "serde", "serde_json", @@ -3566,8 +3562,8 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" name = "lib" version = "0.6.0" dependencies = [ - "ethers", - "ethers-providers", + "alloy-pubsub", + "alloy-rpc-types 0.1.0 (git+https://github.com/alloy-rs/alloy?rev=098ad56)", "lazy_static", "rand 0.8.5", "reqwest", @@ -3585,8 +3581,6 @@ name = "libc" version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -<<<<<<< HEAD -======= [[package]] name = "libgit2-sys" @@ -3601,7 +3595,6 @@ dependencies = [ "openssl-sys", "pkg-config", ] ->>>>>>> develop [[package]] name = "libloading" @@ -3658,17 +3651,10 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "libz-sys" -version = "1.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" -======= name = "libssh2-sys" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" ->>>>>>> develop dependencies = [ "cc", "libc", @@ -3891,8 +3877,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "nix" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3904,7 +3888,6 @@ dependencies = [ ] [[package]] ->>>>>>> develop name = "nohash-hasher" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3939,25 +3922,20 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg 1.1.0", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ -<<<<<<< HEAD - "autocfg", -======= "autocfg 1.1.0", ->>>>>>> develop "libm", ] @@ -4000,11 +3978,7 @@ checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "crc32fast", "hashbrown 0.14.3", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "memchr", ] @@ -4245,11 +4219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop ] [[package]] @@ -4366,8 +4336,6 @@ name = "platforms" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" -<<<<<<< HEAD -======= [[package]] name = "pleco" @@ -4382,7 +4350,6 @@ dependencies = [ "rand 0.6.5", "rayon", ] ->>>>>>> develop [[package]] name = "poly1305" @@ -4457,8 +4424,6 @@ checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", "toml_edit 0.19.15", -<<<<<<< HEAD -======= ] [[package]] @@ -4477,25 +4442,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ "toml_edit 0.21.1", ->>>>>>> develop ] [[package]] -name = "proc-macro-crate" -version = "2.0.0" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "toml_edit 0.20.7", + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", ] [[package]] -name = "proc-macro-crate" -version = "3.1.0" +name = "proc-macro-error-attr" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "toml_edit 0.21.1", + "proc-macro2", + "quote", + "version_check", ] [[package]] @@ -4524,15 +4494,9 @@ dependencies = [ "bitflags 2.4.2", "lazy_static", "num-traits", -<<<<<<< HEAD - "rand", - "rand_chacha", - "rand_xorshift", -======= "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift 0.3.0", ->>>>>>> develop "regex-syntax 0.8.2", "rusty-fork", "tempfile", @@ -4675,14 +4639,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -======= name = "rand_hc" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4751,7 +4707,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ "rand_core 0.6.4", ->>>>>>> develop ] [[package]] @@ -4775,11 +4730,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -======= name = "rdrand" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4792,7 +4742,6 @@ dependencies = [ name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" ->>>>>>> develop checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", @@ -5025,11 +4974,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", -<<<<<<< HEAD - "rand", -======= "rand 0.8.5", ->>>>>>> develop "rlp", "ruint-macro", "serde", @@ -5377,15 +5322,10 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -======= name = "serde_with" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ "base64 0.21.7", "chrono", @@ -5393,6 +5333,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.2.2", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5400,9 +5341,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ "darling 0.20.5", "proc-macro2", @@ -5414,7 +5355,6 @@ dependencies = [ name = "sha1" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" ->>>>>>> develop checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", @@ -5505,11 +5445,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", -<<<<<<< HEAD - "rand_core", -======= "rand_core 0.6.4", ->>>>>>> develop ] [[package]] @@ -5561,11 +5497,7 @@ dependencies = [ "blake2", "chacha20poly1305", "curve25519-dalek", -<<<<<<< HEAD - "rand_core", -======= "rand_core 0.6.4", ->>>>>>> develop "ring 0.17.7", "rustc_version 0.4.0", "sha2", @@ -5697,6 +5629,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "strum" version = "0.25.0" @@ -5768,8 +5706,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -======= name = "syn-solidity" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5782,7 +5718,18 @@ dependencies = [ ] [[package]] ->>>>>>> develop +name = "syn-solidity" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63bef2e2c735acbc06874eca3a8506f02a3c4700e6e748afc92cc2e4220e8a03" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5839,22 +5786,12 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -<<<<<<< HEAD version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", -======= -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", ->>>>>>> develop "rustix", "windows-sys 0.52.0", ] @@ -5876,7 +5813,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.6.0", + "kinode_process_lib 0.6.0 (git+https://github.com/kinode-dao/process_lib?tag=v0.6.0-alpha)", "rand 0.8.5", "regex", "serde", @@ -6057,10 +5994,22 @@ dependencies = [ "rustls", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.20.1", "webpki-roots", ] +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", +] + [[package]] name = "tokio-util" version = "0.7.10" @@ -6086,14 +6035,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.1", + "toml_edit 0.22.4", ] [[package]] @@ -6111,11 +6060,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "toml_datetime", "winnow", ] @@ -6126,11 +6071,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "toml_datetime", "winnow", ] @@ -6141,11 +6082,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +dependencies = [ + "indexmap 2.2.2", "serde", "serde_spanned", "toml_datetime", @@ -6153,7 +6101,17 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD +name = "top" +version = "0.1.0" +dependencies = [ + "anyhow", + "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", + "serde", + "serde_json", + "wit-bindgen", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6175,19 +6133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] -======= -name = "top" -version = "0.1.0" -dependencies = [ - "anyhow", - "kinode_process_lib 0.5.9 (git+https://github.com/kinode-dao/process_lib?tag=v0.5.9-alpha)", - "serde", - "serde_json", - "wit-bindgen", -] - -[[package]] ->>>>>>> develop name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6274,11 +6219,7 @@ dependencies = [ "ipnet", "lazy_static", "log", -<<<<<<< HEAD - "rand", -======= "rand 0.8.5", ->>>>>>> develop "smallvec", "thiserror", "tinyvec", @@ -6312,6 +6253,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" @@ -6373,21 +6333,15 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -======= name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" ->>>>>>> develop checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] @@ -6397,8 +6351,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] -<<<<<<< HEAD -======= name = "uninstall" version = "0.1.0" dependencies = [ @@ -6410,7 +6362,6 @@ dependencies = [ ] [[package]] ->>>>>>> develop name = "universal-hash" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6558,7 +6509,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tokio-util", "tower-service", "tracing", @@ -6615,9 +6566,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6625,9 +6576,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", @@ -6640,9 +6591,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -6652,9 +6603,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6662,9 +6613,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", @@ -6675,9 +6626,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-encoder" @@ -6690,35 +6641,27 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.41.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" +checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" dependencies = [ "leb128", ] [[package]] -<<<<<<< HEAD -name = "wasmparser" -version = "0.116.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" -dependencies = [ - "indexmap", -======= name = "wasm-encoder" -version = "0.41.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" +checksum = "6ce14de623d48dda4c10698c4dadae2366b5c2c8e81bad981d5a0625a5fcf68c" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.17" +version = "0.10.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853d3809fc9fccf3bc0ad63f4f51d8eefad0bacf88f957aa991c1d9b88b016e" +checksum = "977038054fd97977d2b7889005b5f20b62fd3563f2dc8dedfb534e3fdea6b7a7" dependencies = [ "anyhow", "indexmap 2.2.2", @@ -6726,8 +6669,8 @@ dependencies = [ "serde_derive", "serde_json", "spdx", - "wasm-encoder 0.41.0", - "wasmparser 0.121.0", + "wasm-encoder 0.41.1", + "wasmparser 0.121.1", ] [[package]] @@ -6737,44 +6680,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" dependencies = [ "indexmap 2.2.2", ->>>>>>> develop "semver 1.0.21", ] [[package]] name = "wasmparser" -version = "0.121.0" +version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ -<<<<<<< HEAD - "bitflags 2.4.2", - "indexmap", -======= "indexmap 2.2.2", "semver 1.0.21", ] [[package]] name = "wasmparser" -version = "0.121.0" +version = "0.121.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cf6a7606ab31382cb1caa5ae403e77ba70c7f8e12eeda167e7040d42bfda8" +checksum = "99ffe16b4aa1ebab8724f61c9ee38cd5481c89caf10bf1a5af9eab8f0c2e6c05" dependencies = [ "bitflags 2.4.2", "indexmap 2.2.2", ->>>>>>> develop "semver 1.0.21", ] [[package]] name = "wasmprinter" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e32c13c59fdc64d3f6998a1d52eb1d362b6904a88b754190ccb85661ad577a" +checksum = "b4a76a9228f2e6653f0b3d912b2f3a9b6ac79c690e5642c9ee2dfd914c545cf0" dependencies = [ "anyhow", - "wasmparser 0.121.0", + "wasmparser 0.121.1", ] [[package]] @@ -6790,11 +6727,7 @@ dependencies = [ "cfg-if", "encoding_rs", "fxprof-processed-profile", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "libc", "log", "object", @@ -6921,11 +6854,7 @@ dependencies = [ "anyhow", "cranelift-entity", "gimli", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "log", "object", "serde", @@ -7014,22 +6943,14 @@ dependencies = [ "cc", "cfg-if", "encoding_rs", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "libc", "log", "mach", "memfd", "memoffset", "paste", -<<<<<<< HEAD - "rand", -======= "rand 0.8.5", ->>>>>>> develop "rustix", "sptr", "wasm-encoder 0.36.2", @@ -7126,11 +7047,7 @@ checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" dependencies = [ "anyhow", "heck", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "wit-parser", ] @@ -7151,31 +7068,31 @@ dependencies = [ [[package]] name = "wast" -version = "70.0.2" +version = "71.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d5061300042ff5065123dae1e27d00c03f567d34a2937c8472255148a216dc" +checksum = "a10dad39ea4623ed4c304fb42bd455eca6d212f7e5e0cb59681fed7e4d128a2e" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.41.0", + "wasm-encoder 0.41.1", ] [[package]] name = "wat" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd7357b6cc46d46a2509c43dcb1dd4131dafbf4e75562d87017b5a05ffad2d6" +checksum = "b724419d3bffeff174745b924f6ed053095ac58f9ae72e87d2e0f8ef6df6df96" dependencies = [ - "wast 70.0.2", + "wast 71.0.0", ] [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -7419,9 +7336,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.37" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ "memchr", ] @@ -7444,8 +7361,6 @@ checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ "bitflags 2.4.2", "windows-sys 0.52.0", -<<<<<<< HEAD -======= ] [[package]] @@ -7510,22 +7425,17 @@ dependencies = [ "wasm-metadata", "wasmparser 0.118.1", "wit-parser", ->>>>>>> develop ] [[package]] name = "wit-parser" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df4913a2219096373fd6512adead1fb77ecdaa59d7fc517972a7d30b12f625be" +checksum = "316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08" dependencies = [ "anyhow", "id-arena", -<<<<<<< HEAD - "indexmap", -======= "indexmap 2.2.2", ->>>>>>> develop "log", "semver 1.0.21", "serde", diff --git a/kinode/Cargo.toml b/kinode/Cargo.toml index eaf59b10..ed140848 100644 --- a/kinode/Cargo.toml +++ b/kinode/Cargo.toml @@ -26,6 +26,11 @@ simulation-mode = [] [dependencies] aes-gcm = "0.10.2" +alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" } +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" } +alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56", features = ["ws"]} +alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" } +alloy-providers = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56" } anyhow = "1.0.71" async-trait = "0.1.71" base64 = "0.13" diff --git a/kinode/packages/kns_indexer/kns_indexer/Cargo.toml b/kinode/packages/kns_indexer/kns_indexer/Cargo.toml index a7b23579..f7bfb61b 100644 --- a/kinode/packages/kns_indexer/kns_indexer/Cargo.toml +++ b/kinode/packages/kns_indexer/kns_indexer/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] anyhow = "1.0" alloy-primitives = "0.6.2" -alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy" } +alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "098ad56"} alloy-sol-types = "0.6.2" bincode = "1.3.3" hex = "0.4.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "032bd43" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "8d58cfb" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/src/eth/provider.rs b/kinode/src/eth/provider.rs index 5cd4839b..6c6a8cb0 100644 --- a/kinode/src/eth/provider.rs +++ b/kinode/src/eth/provider.rs @@ -1,11 +1,11 @@ -use crate::eth::types::*; -use crate::types::*; use alloy_pubsub::{PubSubFrontend, RawSubscription}; use alloy_rpc_client::ClientBuilder; use alloy_rpc_types::pubsub::SubscriptionResult; use alloy_transport_ws::WsConnect; use anyhow::Result; use dashmap::DashMap; +use lib::types::core::*; +use lib::types::eth::*; use std::sync::Arc; use tokio::task::JoinHandle; use url::Url; @@ -47,7 +47,7 @@ pub async fn provider( auth: None, }; - let client = ClientBuilder::default().pubsub(connector).await?; + let client = ClientBuilder::default().ws(connector).await?; Some(alloy_providers::provider::Provider::new_with_client(client)) } else { None diff --git a/kinode/src/register.rs b/kinode/src/register.rs index 181ce37f..09f1e920 100644 --- a/kinode/src/register.rs +++ b/kinode/src/register.rs @@ -262,7 +262,7 @@ async fn get_unencrypted_info(keyfile: Option>) -> Result