diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eee5c7..ea8b3be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.1.13 + +* Upgrade `nearcore` to 1.29.0-rc.3 + ## 0.1.12 * Upgrade `nearcore` to 1.29.0-rc.2 diff --git a/Cargo.lock b/Cargo.lock index a116ff7..7e014ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,6 +1285,20 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" version = "0.5.4" @@ -1320,6 +1334,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.8" @@ -1415,7 +1439,7 @@ dependencies = [ [[package]] name = "delay-detector" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "cpu-time", "tracing", @@ -2450,7 +2474,7 @@ dependencies = [ [[package]] name = "near-account-id" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "serde", @@ -2459,7 +2483,7 @@ dependencies = [ [[package]] name = "near-cache" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "lru", ] @@ -2467,7 +2491,7 @@ dependencies = [ [[package]] name = "near-chain" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "ansi_term", @@ -2500,7 +2524,7 @@ dependencies = [ [[package]] name = "near-chain-configs" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "anyhow", "chrono", @@ -2518,7 +2542,7 @@ dependencies = [ [[package]] name = "near-chain-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "chrono", "near-crypto", @@ -2530,7 +2554,7 @@ dependencies = [ [[package]] name = "near-chunks" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "borsh", @@ -2555,7 +2579,7 @@ dependencies = [ [[package]] name = "near-chunks-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-chain-primitives", "near-primitives", @@ -2564,7 +2588,7 @@ dependencies = [ [[package]] name = "near-client" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "actix-rt", @@ -2606,7 +2630,7 @@ dependencies = [ [[package]] name = "near-client-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "chrono", @@ -2625,7 +2649,7 @@ dependencies = [ [[package]] name = "near-crypto" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "arrayref", "blake2", @@ -2650,7 +2674,7 @@ dependencies = [ [[package]] name = "near-epoch-manager" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "near-cache", @@ -2671,7 +2695,7 @@ dependencies = [ [[package]] name = "near-indexer" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "anyhow", @@ -2695,7 +2719,7 @@ dependencies = [ [[package]] name = "near-indexer-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-primitives", "serde", @@ -2705,7 +2729,7 @@ dependencies = [ [[package]] name = "near-jsonrpc" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "actix-cors", @@ -2734,7 +2758,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix-http", "awc", @@ -2749,7 +2773,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-chain-configs", "near-client-primitives", @@ -2764,7 +2788,7 @@ dependencies = [ [[package]] name = "near-lake" -version = "0.1.12" +version = "0.1.13" dependencies = [ "actix", "anyhow", @@ -2792,7 +2816,7 @@ dependencies = [ [[package]] name = "near-logger-utils" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-o11y", "tracing", @@ -2801,7 +2825,7 @@ dependencies = [ [[package]] name = "near-mainnet-res" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-account-id", "near-chain-configs", @@ -2812,7 +2836,7 @@ dependencies = [ [[package]] name = "near-metrics" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "prometheus", "tracing", @@ -2821,7 +2845,7 @@ dependencies = [ [[package]] name = "near-network" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "anyhow", @@ -2872,7 +2896,7 @@ dependencies = [ [[package]] name = "near-network-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "anyhow", @@ -2893,7 +2917,7 @@ dependencies = [ [[package]] name = "near-o11y" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "atty", "backtrace", @@ -2914,7 +2938,7 @@ dependencies = [ [[package]] name = "near-performance-metrics" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "bitflags", @@ -2931,7 +2955,7 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "quote", "syn", @@ -2940,7 +2964,7 @@ dependencies = [ [[package]] name = "near-pool" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "near-crypto", @@ -2953,7 +2977,7 @@ dependencies = [ [[package]] name = "near-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "byteorder", @@ -2982,7 +3006,7 @@ dependencies = [ [[package]] name = "near-primitives-core" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "base64", "borsh", @@ -2999,7 +3023,7 @@ dependencies = [ [[package]] name = "near-rate-limiter" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "bytes", @@ -3013,7 +3037,7 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "actix-cors", @@ -3041,7 +3065,7 @@ dependencies = [ [[package]] name = "near-rpc-error-core" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "quote", "serde", @@ -3051,7 +3075,7 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "near-rpc-error-core", "serde", @@ -3061,16 +3085,17 @@ dependencies = [ [[package]] name = "near-stable-hasher" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" [[package]] name = "near-store" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "byteorder", "bytesize", + "crossbeam", "derive_more", "elastic-array", "enum-map", @@ -3096,7 +3121,7 @@ dependencies = [ [[package]] name = "near-telemetry" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "awc", @@ -3115,7 +3140,7 @@ dependencies = [ [[package]] name = "near-vm-errors" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "near-account-id", @@ -3126,7 +3151,7 @@ dependencies = [ [[package]] name = "near-vm-logic" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "bs58", @@ -3147,7 +3172,7 @@ dependencies = [ [[package]] name = "near-vm-runner" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "anyhow", "borsh", @@ -3179,7 +3204,7 @@ dependencies = [ [[package]] name = "nearcore" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "actix", "actix-rt", @@ -3249,7 +3274,7 @@ dependencies = [ [[package]] name = "node-runtime" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=776efa3b65cf92f2524fd349d5d720fe69807f07#776efa3b65cf92f2524fd349d5d720fe69807f07" +source = "git+https://github.com/near/nearcore?rev=115766f3d825e07327b7d614ec723eb73b5cf160#115766f3d825e07327b7d614ec723eb73b5cf160" dependencies = [ "borsh", "byteorder", @@ -3257,6 +3282,7 @@ dependencies = [ "near-chain-configs", "near-crypto", "near-metrics", + "near-o11y", "near-primitives", "near-store", "near-vm-errors", @@ -3270,6 +3296,7 @@ dependencies = [ "rayon", "serde", "serde_json", + "sha2 0.10.2", "thiserror", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index ee48d1b..082f77f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-lake" -version = "0.1.12" +version = "0.1.13" authors = ["Near Inc "] edition = "2021" rust-version = "1.62.1" @@ -25,6 +25,6 @@ tokio-stream = { version = "0.1" } tracing = "0.1.34" tracing-subscriber = "0.2.4" -near-indexer = { git = "https://github.com/near/nearcore", rev = "776efa3b65cf92f2524fd349d5d720fe69807f07" } -near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "776efa3b65cf92f2524fd349d5d720fe69807f07" } -near-client = { git = "https://github.com/near/nearcore", rev = "776efa3b65cf92f2524fd349d5d720fe69807f07" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "115766f3d825e07327b7d614ec723eb73b5cf160" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "115766f3d825e07327b7d614ec723eb73b5cf160" } +near-client = { git = "https://github.com/near/nearcore", rev = "115766f3d825e07327b7d614ec723eb73b5cf160" }