Updated RPC protocol

tmrlvi · Apr 1, 2022 · 572f7c2 · 572f7c2
1 parent 9ca80af
commit 572f7c2
Show file tree

Hide file tree

Showing 10 changed files with 259 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ include = [
 
 [dependencies]
 tonic = "0.6"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.17", features = ["macros", "rt-multi-thread"] }
 prost = "0.9"
 futures-util = "0.3"
 tokio-stream = {version = "0.1", features = ["net"]}
@@ -48,6 +48,7 @@ async-trait = "0.1"
 num = "0.4"
 nix = "0.23"
 kernel32-sys = "0.2"
+semver = "1.0"
 
 [features]
 default = ["parking_lot"]
@@ -65,6 +66,7 @@ codegen-units = 1
 [build-dependencies]
 tonic-build = { version = "0.6", default-features = false, features = ["prost", "transport"] }
 cc = "1"
+time = { version = "0.3", features = ["formatting"] }
 
 [dev-dependencies]
 sha3 = { git = "https://github.com/elichai/hashes", branch = "cSHAKE" }

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Build status](https://github.com/tmrlvi/kaspa-miner/workflows/ci/badge.svg)](https://github.com/tmrlvi/kaspa-miner/actions)
 [![Latest version](https://img.shields.io/crates/v/kaspa-miner.svg)](https://crates.io/crates/kaspa-miner)
 ![License](https://img.shields.io/crates/l/kaspa-miner.svg)
-[![dependency status](https://deps.rs/repo/github/elichai/kaspa-miner/status.svg)](https://deps.rs/repo/github/elichai/kaspa-miner)
+[![dependency status](https://deps.rs/repo/github/tmrlvi/kaspa-miner/status.svg)](https://deps.rs/repo/github/elichai/kaspa-miner)
 
 [![Discord](https://discordapp.com/api/guilds/599153230659846165/embed.png)](https://discord.gg/kS3SK5F36R)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/Kaspaenglish)

diff --git a/build.rs b/build.rs
@@ -1,6 +1,12 @@
 use std::env;
+use time::{format_description, OffsetDateTime};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let format = format_description::parse("[year][month][day][hour][minute][second]")?;
+    let dt = OffsetDateTime::now_utc().format(&format)?;
+    //env::set_var("PACKAGE_COMPILE_TIME", dt);
+    println!("cargo:rustc-env=PACKAGE_COMPILE_TIME={}", dt);
+
     println!("cargo:rerun-if-changed=proto");
     println!("cargo:rerun-if-changed=src/keccakf1600_x86-64.s");
     tonic_build::configure()

diff --git a/proto/messages.proto b/proto/messages.proto
@@ -44,6 +44,13 @@ message KaspadMessage {
     PruningPointsMessage pruningPoints = 47;
     RequestPruningPointProofMessage requestPruningPointProof = 48;
     PruningPointProofMessage pruningPointProof = 49;
+    ReadyMessage ready = 50;
+    BlockWithTrustedDataV4Message blockWithTrustedDataV4 = 51;
+    TrustedDataMessage trustedData = 52;
+    RequestIBDChainBlockLocatorMessage requestIBDChainBlockLocator = 53;
+    IbdChainBlockLocatorMessage ibdChainBlockLocator = 54;
+    RequestAnticoneMessage requestAnticone = 55;
+    RequestNextPruningPointAndItsAnticoneBlocksMessage requestNextPruningPointAndItsAnticoneBlocks = 56;
 
     GetCurrentNetworkRequestMessage getCurrentNetworkRequest = 1001;
     GetCurrentNetworkResponseMessage getCurrentNetworkResponse = 1002;
@@ -121,6 +128,13 @@ message KaspadMessage {
     NotifyVirtualDaaScoreChangedRequestMessage notifyVirtualDaaScoreChangedRequest = 1074;
     NotifyVirtualDaaScoreChangedResponseMessage notifyVirtualDaaScoreChangedResponse = 1075;
     VirtualDaaScoreChangedNotificationMessage virtualDaaScoreChangedNotification = 1076;
+    GetBalanceByAddressRequestMessage getBalanceByAddressRequest = 1077;
+    GetBalanceByAddressResponseMessage getBalanceByAddressResponse = 1078;
+    GetBalancesByAddressesRequestMessage getBalancesByAddressesRequest = 1079;
+    GetBalancesByAddressesResponseMessage getBalancesByAddressesResponse = 1080;
+    NotifyNewBlockTemplateRequestMessage notifyNewBlockTemplateRequest = 1081;
+    NotifyNewBlockTemplateResponseMessage notifyNewBlockTemplateResponse = 1082;
+    NewBlockTemplateNotificationMessage newBlockTemplateNotification = 1083;
   }
 }
 

diff --git a/proto/p2p.proto b/proto/p2p.proto
@@ -78,7 +78,7 @@ message BlockHeader{
 }
 
 message BlockLevelParents {
-    repeated Hash parentHashes = 1;
+  repeated Hash parentHashes = 1;
 }
 
 message Hash{
@@ -190,6 +190,20 @@ message IbdBlockLocatorMessage {
   repeated Hash blockLocatorHashes = 2;
 }
 
+message RequestIBDChainBlockLocatorMessage{
+  Hash lowHash = 1;
+  Hash highHash = 2;
+}
+
+message IbdChainBlockLocatorMessage {
+  repeated Hash blockLocatorHashes = 1;
+}
+
+message RequestAnticoneMessage{
+  Hash blockHash = 1;
+  Hash contextHash = 2;
+}
+
 message IbdBlockLocatorHighestHashMessage {
   Hash highestHash = 1;
 }
@@ -204,6 +218,9 @@ message BlockHeadersMessage {
 message RequestPruningPointAndItsAnticoneMessage {
 }
 
+message RequestNextPruningPointAndItsAnticoneBlocksMessage{
+}
+
 message BlockWithTrustedDataMessage {
   BlockMessage block = 1;
   uint64 daaScore = 2;
@@ -216,6 +233,11 @@ message DaaBlock {
   GhostdagData ghostdagData = 2;
 }
 
+message DaaBlockV4 {
+  BlockHeader header = 1;
+  GhostdagData ghostdagData = 2;
+}
+
 message BlockGhostdagDataHashPair {
   Hash hash = 1;
   GhostdagData ghostdagData = 2;
@@ -252,3 +274,17 @@ message PruningPointProofMessage {
 message PruningPointProofHeaderArray {
   repeated BlockHeader headers = 1;
 }
+
+message ReadyMessage {
+}
+
+message BlockWithTrustedDataV4Message {
+  BlockMessage block = 1;
+  repeated uint64 daaWindowIndices = 2;
+  repeated uint64 ghostdagDataIndices = 3;
+}
+
+message TrustedDataMessage {
+  repeated DaaBlockV4 daaWindow = 1;
+  repeated BlockGhostdagDataHashPair ghostdagData = 2;
+}