From 7055567ef4b50c0cce5130bc9275351ebee86bb3 Mon Sep 17 00:00:00 2001 From: Anton Yemelyanov Date: Thu, 12 Sep 2024 22:53:50 +0300 Subject: [PATCH 1/2] staging --- Cargo.toml | 67 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4652dba..1fa7039 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,40 +104,41 @@ egui-notify = { git = "https://github.com/aspectron/egui-notify", branch = "ome # kaspa-wrpc-server = "0.13.4" # kaspad = "0.13.4" -kaspa-addresses = { path = "../rusty-kaspa/crypto/addresses" } -kaspa-alloc = { path = "../rusty-kaspa/utils/alloc" } -kaspa-bip32 = { path = "../rusty-kaspa/wallet/bip32" } -kaspa-cli = { path = "../rusty-kaspa/cli" } -kaspa-consensus-core = { path = "../rusty-kaspa/consensus/core" } -kaspa-core = { path = "../rusty-kaspa/core" } -kaspa-metrics-core = { path = "../rusty-kaspa/metrics/core" } -kaspa-notify = { path = "../rusty-kaspa/notify" } -kaspa-rpc-core = { path = "../rusty-kaspa/rpc/core" } -kaspa-rpc-service = { path = "../rusty-kaspa/rpc/service" } -kaspa-utils = { path = "../rusty-kaspa/utils" } -kaspa-wallet-core = { path = "../rusty-kaspa/wallet/core" } -kaspa-wallet-keys = { path = "../rusty-kaspa/wallet/keys" } -kaspa-wrpc-client = { path = "../rusty-kaspa/rpc/wrpc/client"} -kaspa-wrpc-server = { path = "../rusty-kaspa/rpc/wrpc/server" } -kaspa-txscript = { path = "../rusty-kaspa/crypto/txscript" } -kaspad = { path = "../rusty-kaspa/kaspad" } +# kaspa-addresses = { path = "../rusty-kaspa/crypto/addresses" } +# kaspa-alloc = { path = "../rusty-kaspa/utils/alloc" } +# kaspa-bip32 = { path = "../rusty-kaspa/wallet/bip32" } +# kaspa-cli = { path = "../rusty-kaspa/cli" } +# kaspa-consensus-core = { path = "../rusty-kaspa/consensus/core" } +# kaspa-core = { path = "../rusty-kaspa/core" } +# kaspa-metrics-core = { path = "../rusty-kaspa/metrics/core" } +# kaspa-notify = { path = "../rusty-kaspa/notify" } +# kaspa-rpc-core = { path = "../rusty-kaspa/rpc/core" } +# kaspa-rpc-service = { path = "../rusty-kaspa/rpc/service" } +# kaspa-utils = { path = "../rusty-kaspa/utils" } +# kaspa-wallet-core = { path = "../rusty-kaspa/wallet/core" } +# kaspa-wallet-keys = { path = "../rusty-kaspa/wallet/keys" } +# kaspa-wrpc-client = { path = "../rusty-kaspa/rpc/wrpc/client"} +# kaspa-wrpc-server = { path = "../rusty-kaspa/rpc/wrpc/server" } +# kaspa-txscript = { path = "../rusty-kaspa/crypto/txscript" } +# kaspad = { path = "../rusty-kaspa/kaspad" } -# kaspa-alloc = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-bip32 = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-cli = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-consensus-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-metrics-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-notify = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-rpc-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-rpc-service = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-utils = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-wallet-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-wallet-keys = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-wrpc-client = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-wrpc-server = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspa-txscript = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } -# kaspad = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-addresses = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-alloc = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-bip32 = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-cli = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-consensus-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-metrics-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-notify = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-rpc-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-rpc-service = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-utils = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-wallet-core = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-wallet-keys = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-wrpc-client = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-wrpc-server = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspa-txscript = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } +kaspad = { git = "https://github.com/aspectron/rusty-kaspa.git", branch = "gamma" } # kaspa-addresses = { git = "https://github.com/kaspanet/rusty-kaspa.git", branch = "master" } # kaspa-alloc = { git = "https://github.com/kaspanet/rusty-kaspa.git", branch = "master" } From f0648850023ebda3d931dc0f6f994852279bee2c Mon Sep 17 00:00:00 2001 From: Anton Yemelyanov Date: Thu, 12 Sep 2024 22:55:44 +0300 Subject: [PATCH 2/2] staging --- Cargo.lock | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 0048b61..b355d62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3252,6 +3252,7 @@ dependencies = [ [[package]] name = "kaspa-addresses" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "borsh", "js-sys", @@ -3266,6 +3267,7 @@ dependencies = [ [[package]] name = "kaspa-addressmanager" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "borsh", "igd-next", @@ -3287,6 +3289,7 @@ dependencies = [ [[package]] name = "kaspa-alloc" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "mimalloc", ] @@ -3294,6 +3297,7 @@ dependencies = [ [[package]] name = "kaspa-bip32" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "borsh", "bs58", @@ -3320,6 +3324,7 @@ dependencies = [ [[package]] name = "kaspa-cli" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -3367,6 +3372,7 @@ dependencies = [ [[package]] name = "kaspa-connectionmanager" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "duration-string", "futures-util", @@ -3384,6 +3390,7 @@ dependencies = [ [[package]] name = "kaspa-consensus" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "arc-swap", "async-channel 2.3.1", @@ -3423,6 +3430,7 @@ dependencies = [ [[package]] name = "kaspa-consensus-client" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "ahash", "cfg-if 1.0.0", @@ -3451,6 +3459,7 @@ dependencies = [ [[package]] name = "kaspa-consensus-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -3485,6 +3494,7 @@ dependencies = [ [[package]] name = "kaspa-consensus-notify" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "cfg-if 1.0.0", @@ -3504,6 +3514,7 @@ dependencies = [ [[package]] name = "kaspa-consensus-wasm" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "cfg-if 1.0.0", "faster-hex", @@ -3528,6 +3539,7 @@ dependencies = [ [[package]] name = "kaspa-consensusmanager" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "duration-string", "futures", @@ -3546,6 +3558,7 @@ dependencies = [ [[package]] name = "kaspa-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "cfg-if 1.0.0", "ctrlc", @@ -3564,6 +3577,7 @@ dependencies = [ [[package]] name = "kaspa-daemon" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -3586,6 +3600,7 @@ dependencies = [ [[package]] name = "kaspa-database" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "bincode", "enum-primitive-derive", @@ -3608,6 +3623,7 @@ dependencies = [ [[package]] name = "kaspa-grpc-client" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-stream", @@ -3640,6 +3656,7 @@ dependencies = [ [[package]] name = "kaspa-grpc-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-stream", @@ -3669,6 +3686,7 @@ dependencies = [ [[package]] name = "kaspa-grpc-server" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-stream", @@ -3704,6 +3722,7 @@ dependencies = [ [[package]] name = "kaspa-hashes" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "blake2b_simd", "borsh", @@ -3722,6 +3741,7 @@ dependencies = [ [[package]] name = "kaspa-index-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-trait", @@ -3741,6 +3761,7 @@ dependencies = [ [[package]] name = "kaspa-index-processor" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-trait", @@ -3766,6 +3787,7 @@ dependencies = [ [[package]] name = "kaspa-math" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "borsh", "faster-hex", @@ -3785,6 +3807,7 @@ dependencies = [ [[package]] name = "kaspa-merkle" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "kaspa-hashes", ] @@ -3792,6 +3815,7 @@ dependencies = [ [[package]] name = "kaspa-metrics-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -3808,6 +3832,7 @@ dependencies = [ [[package]] name = "kaspa-mining" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "futures-util", "itertools 0.13.0", @@ -3833,6 +3858,7 @@ dependencies = [ [[package]] name = "kaspa-mining-errors" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "kaspa-consensus-core", "thiserror", @@ -3841,6 +3867,7 @@ dependencies = [ [[package]] name = "kaspa-muhash" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "kaspa-hashes", "kaspa-math", @@ -3981,6 +4008,7 @@ dependencies = [ [[package]] name = "kaspa-notify" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-trait", @@ -4012,6 +4040,7 @@ dependencies = [ [[package]] name = "kaspa-p2p-flows" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "chrono", @@ -4043,6 +4072,7 @@ dependencies = [ [[package]] name = "kaspa-p2p-lib" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "borsh", "ctrlc", @@ -4073,6 +4103,7 @@ dependencies = [ [[package]] name = "kaspa-perf-monitor" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "kaspa-core", "log", @@ -4085,6 +4116,7 @@ dependencies = [ [[package]] name = "kaspa-pow" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "js-sys", "kaspa-consensus-client", @@ -4100,6 +4132,7 @@ dependencies = [ [[package]] name = "kaspa-rpc-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "async-trait", @@ -4141,6 +4174,7 @@ dependencies = [ [[package]] name = "kaspa-rpc-macros" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "convert_case 0.6.0", "proc-macro-error", @@ -4153,6 +4187,7 @@ dependencies = [ [[package]] name = "kaspa-rpc-service" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "kaspa-addresses", @@ -4182,6 +4217,7 @@ dependencies = [ [[package]] name = "kaspa-txscript" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "blake2b_simd", "borsh", @@ -4212,6 +4248,7 @@ dependencies = [ [[package]] name = "kaspa-txscript-errors" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "secp256k1", "thiserror", @@ -4220,6 +4257,7 @@ dependencies = [ [[package]] name = "kaspa-utils" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "arc-swap", "async-channel 2.3.1", @@ -4249,6 +4287,7 @@ dependencies = [ [[package]] name = "kaspa-utils-tower" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "cfg-if 1.0.0", "futures", @@ -4263,6 +4302,7 @@ dependencies = [ [[package]] name = "kaspa-utxoindex" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "futures", "kaspa-consensus-core", @@ -4282,6 +4322,7 @@ dependencies = [ [[package]] name = "kaspa-wallet-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "aes", "ahash", @@ -4360,6 +4401,7 @@ dependencies = [ [[package]] name = "kaspa-wallet-keys" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -4392,6 +4434,7 @@ dependencies = [ [[package]] name = "kaspa-wallet-macros" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "convert_case 0.5.0", "proc-macro-error", @@ -4405,6 +4448,7 @@ dependencies = [ [[package]] name = "kaspa-wallet-pskt" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "bincode", "derive_builder", @@ -4432,6 +4476,7 @@ dependencies = [ [[package]] name = "kaspa-wasm-core" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "faster-hex", "hexplay", @@ -4443,6 +4488,7 @@ dependencies = [ [[package]] name = "kaspa-wrpc-client" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-std", "async-trait", @@ -4479,6 +4525,7 @@ dependencies = [ [[package]] name = "kaspa-wrpc-server" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-trait", "borsh", @@ -4507,6 +4554,7 @@ dependencies = [ [[package]] name = "kaspa-wrpc-wasm" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "ahash", "async-std", @@ -4537,6 +4585,7 @@ dependencies = [ [[package]] name = "kaspad" version = "0.15.1" +source = "git+https://github.com/aspectron/rusty-kaspa.git?branch=gamma#458354b4350b021f9bd5c3259c2e94bb66ebdd9d" dependencies = [ "async-channel 2.3.1", "cfg-if 1.0.0",