1phamminh0811/neptune-explorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update to neptune-core tip

Browse Source 
adapts to some changes in neptune-core.

BlockInfo and BlockSelector location changed.
This commit is contained in:
danda 2024-05-10 17:04:11 -07:00
parent 0f9cbdf0b4
commit ac27329bda
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -921,7 +921,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_tasm_object" name = "derive_tasm_object"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/TritonVM/tasm-lib.git?rev=aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f#aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f" source = "git+https://github.com/TritonVM/tasm-lib.git?rev=694f27daf78aade0ed0dc07e3babaab036cd5572#694f27daf78aade0ed0dc07e3babaab036cd5572"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.58", "syn 2.0.58",
@ -1750,7 +1750,7 @@ dependencies = [
[[package]] [[package]]
name = "neptune-core" name = "neptune-core"
version = "0.0.5" version = "0.0.5"
source = "git+https://github.com/Neptune-Crypto/neptune-core.git?rev=9a7973259d63f148f8bf353866f260ba939d4649#9a7973259d63f148f8bf353866f260ba939d4649" source = "git+https://github.com/Neptune-Crypto/neptune-core.git?rev=5ef2423677e387387ba6b3cfb7c0ffc58f57c913#5ef2423677e387387ba6b3cfb7c0ffc58f57c913"
dependencies = [ dependencies = [
"aead", "aead",
"aes-gcm", "aes-gcm",
@ -1782,6 +1782,7 @@ dependencies = [
"proptest-arbitrary-interop", "proptest-arbitrary-interop",
"rand", "rand",
"ratatui", "ratatui",
"readonly",
"regex", "regex",
"rs-leveldb", "rs-leveldb",
"semver", "semver",
@ -1792,6 +1793,7 @@ dependencies = [
"strum 0.25.0", "strum 0.25.0",
"tarpc", "tarpc",
"tasm-lib", "tasm-lib",
"thiserror",
"tiny-bip39", "tiny-bip39",
"tokio", "tokio",
"tokio-serde", "tokio-serde",
@ -2892,7 +2894,7 @@ dependencies = [
[[package]] [[package]]
name = "tasm-lib" name = "tasm-lib"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/TritonVM/tasm-lib.git?rev=aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f#aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f" source = "git+https://github.com/TritonVM/tasm-lib.git?rev=694f27daf78aade0ed0dc07e3babaab036cd5572#694f27daf78aade0ed0dc07e3babaab036cd5572"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arbitrary", "arbitrary",
@ -2924,18 +2926,18 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.58" version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.58" version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

8
Cargo.toml
View File

@ -12,7 +12,7 @@ serde_json = "1.0.115"
tokio = { version = "1.37.0", features = ["full", "tracing"] } tokio = { version = "1.37.0", features = ["full", "tracing"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"
neptune-core = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "9a7973259d63f148f8bf353866f260ba939d4649"} neptune-core = {git = "https://github.com/Neptune-Crypto/neptune-core.git", rev = "5ef2423677e387387ba6b3cfb7c0ffc58f57c913"}
tarpc = { version = "^0.34", features = [ tarpc = { version = "^0.34", features = [
"tokio1", "tokio1",
"serde-transport", "serde-transport",
@ -20,7 +20,7 @@ tarpc = { version = "^0.34", features = [
"tcp", "tcp",
] } ] }
clap = "4.5.4" clap = "4.5.4"
thiserror = "1.0.58" thiserror = "1.0.59"
#boilerplate = { version = "1.0.0", features = ["axum"] } #boilerplate = { version = "1.0.0", features = ["axum"] }
boilerplate = { version = "1.0.0" } boilerplate = { version = "1.0.0" }
html-escaper = "0.2.0" html-escaper = "0.2.0"
@ -29,8 +29,8 @@ readonly = "0.2.12"
[patch.crates-io] [patch.crates-io]
# aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f is tip of branch: master as of 2024-04-24 # 694f27daf78aade0ed0dc07e3babaab036cd5572 is tip of branch: master as of 2024-04-30
tasm-lib = { git = "https://github.com/TritonVM/tasm-lib.git", rev = "aa759b66efa9b5ea77e96d73bf27ed1edfbcfc3f" } tasm-lib = { git = "https://github.com/TritonVM/tasm-lib.git", rev = "694f27daf78aade0ed0dc07e3babaab036cd5572" }
# 0d2cb98c0495d30e53d28e82a35de44dc655c3ea = tip of branch: master, on 2024-04-24 # 0d2cb98c0495d30e53d28e82a35de44dc655c3ea = tip of branch: master, on 2024-04-24
twenty-first = { git = "https://github.com/Neptune-Crypto/twenty-first.git", rev = "0d2cb98c0495d30e53d28e82a35de44dc655c3ea" } twenty-first = { git = "https://github.com/Neptune-Crypto/twenty-first.git", rev = "0d2cb98c0495d30e53d28e82a35de44dc655c3ea" }

2
src/html/page/block.rs
View File

@ -9,7 +9,7 @@ use axum::response::Html;
use axum::response::Response; use axum::response::Response;
use html_escaper::Escape; use html_escaper::Escape;
use html_escaper::Trusted; use html_escaper::Trusted;
use neptune_core::rpc_server::BlockInfo; use neptune_core::models::blockchain::block::block_info::BlockInfo;
use std::sync::Arc; use std::sync::Arc;
use tarpc::context; use tarpc::context;

2
src/main.rs
View File

@ -1,7 +1,7 @@
use axum::routing::get; use axum::routing::get;
use axum::routing::Router; use axum::routing::Router;
use clap::Parser; use clap::Parser;
use neptune_core::rpc_server::BlockSelector; use neptune_core::models::blockchain::block::block_selector::BlockSelector;
use neptune_core::rpc_server::RPCClient; use neptune_core::rpc_server::RPCClient;
use neptune_explorer::html::page::block::block_page; use neptune_explorer::html::page::block::block_page;
use neptune_explorer::html::page::block::block_page_with_value; use neptune_explorer::html::page::block::block_page_with_value;

2
src/model/path_block_selector.rs
View File

@ -2,9 +2,9 @@ use axum::http::StatusCode;
use axum::response::IntoResponse; use axum::response::IntoResponse;
use axum::response::Response; use axum::response::Response;
use neptune_core::models::blockchain::block::block_height::BlockHeight; use neptune_core::models::blockchain::block::block_height::BlockHeight;
use neptune_core::models::blockchain::block::block_selector::BlockSelector;
use neptune_core::prelude::tasm_lib::Digest; use neptune_core::prelude::tasm_lib::Digest;
use neptune_core::prelude::twenty_first::error::TryFromHexDigestError; use neptune_core::prelude::twenty_first::error::TryFromHexDigestError;
use neptune_core::rpc_server::BlockSelector;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::str::FromStr; use std::str::FromStr;

2
src/rpc/block_info.rs
View File

@ -2,7 +2,7 @@ use axum::extract::Path;
use axum::extract::State; use axum::extract::State;
use axum::response::Json; use axum::response::Json;
use axum::response::Response; use axum::response::Response;
use neptune_core::rpc_server::BlockInfo; use neptune_core::models::blockchain::block::block_info::BlockInfo;
use std::sync::Arc; use std::sync::Arc;
use tarpc::context; use tarpc::context;