node: update dependency to take last version from Github, add handling of new statuses and update translations

Cargo.lock

@@ -1262,28 +1262,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2 1.0.57",
- "quote 1.0.27",
- "syn 1.0.109",
- "synstructure",
-]
-
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1749,14 +1727,11 @@ dependencies = [
 
 [[package]]
 name = "grin_api"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "da268fbd0150cb77b121e22435dd920516bd17d1d3d566d291cf914218e1902c"
 dependencies = [
  "bytes 0.5.6",
  "easy-jsonrpc-mw",
- "failure",
- "failure_derive",
  "futures 0.3.28",
  "grin_chain",
  "grin_core",
@@ -1776,6 +1751,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "thiserror",
  "tokio",
  "tokio-rustls",
  "url",
@@ -1783,9 +1759,8 @@ dependencies = [
 
 [[package]]
 name = "grin_chain"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "125c3a424b3bb2730965dcba2be6889a028717a3acf1941f1aa95be3937354da"
 dependencies = [
  "bit-vec",
  "bitflags 1.3.2",
@@ -1793,8 +1768,6 @@ dependencies = [
  "chrono",
  "croaring",
  "enum_primitive",
- "failure",
- "failure_derive",
  "grin_core",
  "grin_keychain",
  "grin_store",
@@ -1804,13 +1777,13 @@ dependencies = [
  "lru-cache",
  "serde",
  "serde_derive",
+ "thiserror",
 ]
 
 [[package]]
 name = "grin_config"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "4773b76f43fd63b95f65adb8b2654fa20de93adcb18706e6c7ec5f4dbb40e05f"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -1825,9 +1798,8 @@ dependencies = [
 
 [[package]]
 name = "grin_core"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "ff261d0141bce01e68413a783cd1d34630f5fca8b0958a057c83de7fde786673"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -1835,8 +1807,6 @@ dependencies = [
  "chrono",
  "croaring",
  "enum_primitive",
- "failure",
- "failure_derive",
  "grin_keychain",
  "grin_util",
  "lazy_static",
@@ -1848,14 +1818,14 @@ dependencies = [
  "serde",
  "serde_derive",
  "siphasher",
+ "thiserror",
  "zeroize",
 ]
 
 [[package]]
 name = "grin_keychain"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "7d3a59a5bd95c9bdc6ed6b69b4289f135efd5df7e879fd6b1dd2b76650cdf657"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -1876,9 +1846,8 @@ dependencies = [
 
 [[package]]
 name = "grin_p2p"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "0d6216ab944d72967529aba141b48699b8080e063f5ae8b0f9e25e6ae6ce2915"
 dependencies = [
  "bitflags 1.3.2",
  "bytes 0.5.6",
@@ -1899,14 +1868,11 @@ dependencies = [
 
 [[package]]
 name = "grin_pool"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "92b84dc4dd654ab0e6c37f4c445b574bf907d676568d5fb1383384f6ca386c28"
 dependencies = [
  "blake2-rfc",
  "chrono",
- "failure",
- "failure_derive",
  "grin_core",
  "grin_keychain",
  "grin_util",
@@ -1914,13 +1880,14 @@ dependencies = [
  "rand 0.6.5",
  "serde",
  "serde_derive",
+ "thiserror",
 ]
 
 [[package]]
 name = "grin_secp256k1zkp"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af3c4c4829b3e2e7ee1d9a542833e4244912fbb887fabe44682558159b068a7"
+checksum = "b04798e32404c0af082b6a209ad4df1ab1d9ec3a5a5056f284cfa32f74e59ce6"
 dependencies = [
  "arrayvec 0.3.25",
  "cc",
@@ -1934,9 +1901,8 @@ dependencies = [
 
 [[package]]
 name = "grin_servers"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "ef1199e16639363d901125cfebac234f2b1ea93d391a6f4cafe15ab08d353307"
 dependencies = [
  "chrono",
  "fs2",
@@ -1965,14 +1931,11 @@ dependencies = [
 
 [[package]]
 name = "grin_store"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "24a7201e07d68eae329c08f40853a7a17491ec31ad488b6725af0b4c594a60bd"
 dependencies = [
  "byteorder",
  "croaring",
- "failure",
- "failure_derive",
  "grin_core",
  "grin_util",
  "libc",
@@ -1982,13 +1945,13 @@ dependencies = [
  "serde",
  "serde_derive",
  "tempfile",
+ "thiserror",
 ]
 
 [[package]]
 name = "grin_util"
-version = "5.1.2"
+version = "5.2.0-alpha.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/mimblewimble/grin.git#c31921f4d9b228338682068155167583f007b0d0"
-checksum = "b6b9e8230eb30b717ebaef3f238c8defbab08c232f42dc5445c9f01a1b18c98b"
 dependencies = [
  "backtrace",
  "base64 0.12.3",
@@ -4027,18 +3990,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2 1.0.57",
- "quote 1.0.27",
- "syn 1.0.109",
- "unicode-xid 0.2.4",
-]
-
 [[package]]
 name = "sys-locale"
 version = "0.3.0"

Cargo.toml

@@ -14,14 +14,14 @@ build = "src/build/build.rs"
 log = "0.4"
 #android-activity = { version = "0.4", features = ["game-activity"] }
 #grin_api = "5.1.2"
-grin_chain = "5.1.2"
+grin_chain = { git = "https://github.com/mimblewimble/grin.git" }
-grin_config = "5.1.2"
+grin_config = { git = "https://github.com/mimblewimble/grin.git" }
-grin_core = "5.1.2"
+grin_core = { git = "https://github.com/mimblewimble/grin.git" }
 #grin_keychain = "5.1.2"
 #grin_p2p = "5.1.2"
-grin_servers = "5.1.2"
+grin_servers = { git = "https://github.com/mimblewimble/grin.git" }
 #grin_store = "5.1.2"
-grin_util = "5.1.2"
+grin_util = { git = "https://github.com/mimblewimble/grin.git" }
 openssl-sys = { version = "0.9.82", features = ["vendored"] }
 #grin_wallet_api = "5.1.0"
 #grin_wallet_libwallet = "5.1.0"

locales/en.yml

@@ -8,7 +8,7 @@ network:
   enable: Enable
   disable: Disable
   restart: Restart
-  inactive_message: 'Enable server or choose/add another connection method by pressing %{dots} on top left corner of the screen.'
+  disabled_server: 'Enable server or choose another connection method by pressing %{dots} on top left corner of the screen.'
 sync_status:
   server_restarting: Server is restarting
   server_down: Server is down
@@ -17,11 +17,15 @@ sync_status:
   awaiting_peers: Waiting for peers
   header_sync: Downloading headers
   header_sync_percent: 'Downloading headers: %{percent}%'
+  tx_hashset_pibd: 'Downloading state (PIBD)'
+  tx_hashset_pibd_percent: 'Downloading state (PIBD): %{percent}%'
   tx_hashset_download: Downloading chain state
   tx_hashset_download_percent: 'Downloading chain state: %{percent}%'
+  tx_hashset_setup_history: 'Preparing state (history): %{percent}%'
+  tx_hashset_setup_position: 'Preparing state (position): %{percent}%'
   tx_hashset_setup: Preparing state for validation
-  tx_hashset_range_proofs_validation: 'Validating state - range proofs: %{percent}%'
+  tx_hashset_range_proofs_validation: 'Validating state (range proofs): %{percent}%'
-  tx_hashset_kernels_validation: 'Validating state - kernels: %{percent}%'
+  tx_hashset_kernels_validation: 'Validating state (kernels): %{percent}%'
   tx_hashset_save: Finalizing chain state
   body_sync: Downloading blockchain
   body_sync_percent: 'Downloading blocks: %{percent}%'

locales/ru.yml

@@ -8,7 +8,7 @@ network:
   enable: Включить
   disable: Выключить
   restart: Перезапустить
-  inactive_message: 'Включите сервер или выберите/добавьте другой способ подключения, нажав %{dots} в левом верхнем углу экрана.'
+  disabled_server: 'Включите сервер или выберите другой способ подключения, нажав %{dots} в левом верхнем углу экрана.'
 sync_status:
   server_restarting: Сервер перезапускается
   server_down: Сервер выключен
@@ -17,8 +17,12 @@ sync_status:
   awaiting_peers: Ожидание пиров
   header_sync: Загрузка заголовков
   header_sync_percent: 'Загрузка заголовков: %{percent}%'
+  tx_hashset_pibd: 'Загрузка состояния (PIBD)'
+  tx_hashset_pibd_percent: 'Загрузка состояния (PIBD): %{percent}%'
   tx_hashset_download: Загрузка состояния цепи
   tx_hashset_download_percent: 'Загрузка состояния цепи: %{percent}%'
+  tx_hashset_setup_history: 'Подготовка состояния (история): %{percent}%'
+  tx_hashset_setup_position: 'Подготовка состояния (позиция): %{percent}%'
   tx_hashset_setup: Подготовка состояния для проверки
   tx_hashset_range_proofs_validation: 'Проверка доказательств: %{percent}%'
   tx_hashset_kernels_validation: 'Проверка ядер: %{percent}%'

src/node/node.rs

@@ -224,6 +224,21 @@ impl Node {
                     t!("sync_status.header_sync_percent", "percent" => percent)
                 }
             }
+            SyncStatus::TxHashsetPibd {
+                aborted: _,
+                errored: _,
+                completed_leaves,
+                leaves_required,
+                completed_to_height: _,
+                required_height: _,
+            } => {
+                if completed_leaves == 0 {
+                    t!("sync_status.tx_hashset_pibd")
+                } else {
+                    let percent = completed_leaves * 100 / leaves_required;
+                    t!("sync_status.tx_hashset_pibd_percent",  "percent" => percent)
+                }
+            }
             SyncStatus::TxHashsetDownload(stat) => {
                 if stat.total_size > 0 {
                     let percent = stat.downloaded_size * 100 / stat.total_size;
@@ -232,9 +247,26 @@ impl Node {
                     t!("sync_status.tx_hashset_download")
                 }
             }
-            SyncStatus::TxHashsetSetup => {
+            SyncStatus::TxHashsetSetup {
+                headers,
+                headers_total,
+                kernel_pos,
+                kernel_pos_total,
+            } => {
+                if headers.is_some() && headers_total.is_some() {
+                    let h = headers.unwrap();
+                    let ht = headers_total.unwrap();
+                    let percent = h * 100 / ht;
+                    t!("sync_status.tx_hashset_setup_history", "percent" => percent)
+                } else if kernel_pos.is_some() && kernel_pos_total.is_some() {
+                    let k = kernel_pos.unwrap();
+                    let kt = kernel_pos_total.unwrap();
+                    let percent = k * 100 / kt;
+                    t!("sync_status.tx_hashset_setup_position", "percent" => percent)
+                } else {
                     t!("sync_status.tx_hashset_setup")
                 }
+            }
             SyncStatus::TxHashsetRangeProofsValidation {
                 rproofs,
                 rproofs_total,