From f24bde945226e82be7239ff3240d59b3e0a2b667 Mon Sep 17 00:00:00 2001 From: Yurii Koba Date: Tue, 18 Jun 2024 12:40:29 +0300 Subject: [PATCH] chore(release): Release 1.2.0 (#97) * fix s3 endpoint resolver * update nearcore to 1.40.0-7dd0b59 * update changelog --------- Co-authored-by: Yurii Koba --- .cargo/config.toml | 2 +- CHANGELOG.md | 6 ++ Cargo.lock | 178 ++++++++++++++++++++++----------------------- Cargo.toml | 10 +-- Dockerfile | 2 +- src/main.rs | 22 +----- 6 files changed, 106 insertions(+), 114 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4b613b5..720dd35 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "1.40.0-rc.1-08941a3" +NEARCORE_VERSION = "1.40.0-7dd0b59" diff --git a/CHANGELOG.md b/CHANGELOG.md index db9cc0f..f2a4333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.2.0 + +* Upgrade Indexer Framework to be based on [nearcore 1.40.0](https://github.com/near/nearcore/releases/tag/1.40.0) +* Fix s3 endpoint resolver +* Fix docker build + ## 1.2.0-rc.1 * Upgrade Indexer Framework to be based on [nearcore 1.40.0-rc.1](https://github.com/near/nearcore/releases/tag/1.40.0-rc.1) diff --git a/Cargo.lock b/Cargo.lock index 595cd24..b7bc61e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3338,8 +3338,8 @@ dependencies = [ [[package]] name = "near-async" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "derive_more", @@ -3356,8 +3356,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "proc-macro2", "quote", @@ -3366,16 +3366,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "lru 0.7.5", ] [[package]] name = "near-chain" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "assert_matches", @@ -3420,8 +3420,8 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "anyhow", "bytesize", @@ -3445,8 +3445,8 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-async", "near-crypto", @@ -3458,8 +3458,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "borsh 1.0.0", @@ -3491,8 +3491,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-chain-primitives", "near-primitives", @@ -3500,8 +3500,8 @@ dependencies = [ [[package]] name = "near-client" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "actix-rt", @@ -3557,8 +3557,8 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "chrono", @@ -3579,8 +3579,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "anyhow", "json_comments", @@ -3590,8 +3590,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "blake2", "borsh 1.0.0", @@ -3614,8 +3614,8 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "anyhow", "near-async", @@ -3633,8 +3633,8 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "borsh 1.0.0", "itertools 0.10.3", @@ -3657,16 +3657,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "anyhow", @@ -3693,8 +3693,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-primitives", "serde", @@ -3703,8 +3703,8 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "actix-cors", @@ -3735,8 +3735,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix-http", "awc", @@ -3749,8 +3749,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "arbitrary", "near-chain-configs", @@ -3766,7 +3766,7 @@ dependencies = [ [[package]] name = "near-lake" -version = "1.2.0-rc.1" +version = "1.2.0" dependencies = [ "actix", "anyhow", @@ -3795,8 +3795,8 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-account-id", "near-chain-configs", @@ -3806,8 +3806,8 @@ dependencies = [ [[package]] name = "near-network" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "anyhow", @@ -3855,8 +3855,8 @@ dependencies = [ [[package]] name = "near-o11y" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "base64 0.21.0", @@ -3881,8 +3881,8 @@ dependencies = [ [[package]] name = "near-parameters" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "borsh 1.0.0", "enum-map", @@ -3898,8 +3898,8 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "bitflags 1.3.2", @@ -3914,8 +3914,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "quote", "syn 2.0.32", @@ -3923,8 +3923,8 @@ dependencies = [ [[package]] name = "near-pool" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "borsh 1.0.0", "near-crypto", @@ -3936,8 +3936,8 @@ dependencies = [ [[package]] name = "near-primitives" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "arbitrary", "base64 0.21.0", @@ -3979,8 +3979,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "arbitrary", "base64 0.21.0", @@ -3998,8 +3998,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "actix-cors", @@ -4029,8 +4029,8 @@ dependencies = [ [[package]] name = "near-rpc-error-core" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "quote", "serde", @@ -4039,8 +4039,8 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "near-rpc-error-core", "serde", @@ -4049,13 +4049,13 @@ dependencies = [ [[package]] name = "near-stdx" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" [[package]] name = "near-store" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "actix-rt", @@ -4096,8 +4096,8 @@ dependencies = [ [[package]] name = "near-telemetry" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "awc", @@ -4115,8 +4115,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "enumset", "finite-wasm", @@ -4131,8 +4131,8 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -4152,8 +4152,8 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "backtrace", "cfg-if 1.0.0", @@ -4175,8 +4175,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "anyhow", "base64 0.21.0", @@ -4227,8 +4227,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "indexmap 1.9.2", "num-traits", @@ -4238,8 +4238,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "backtrace", "cc", @@ -4259,8 +4259,8 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "anyhow", "near-primitives-core", @@ -4269,8 +4269,8 @@ dependencies = [ [[package]] name = "nearcore" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "actix", "actix-rt", @@ -4359,8 +4359,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "1.40.0-rc.1" -source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +version = "1.40.0" +source = "git+https://github.com/near/nearcore?rev=7dd0b5993577f592be15eb102e5a3da37be66271#7dd0b5993577f592be15eb102e5a3da37be66271" dependencies = [ "borsh 1.0.0", "hex", diff --git a/Cargo.toml b/Cargo.toml index 84f21c2..c0a754e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-lake" -version = "1.2.0-rc.1" +version = "1.2.0" authors = ["Near Inc "] edition = "2021" @@ -29,7 +29,7 @@ tracing = "0.1.40" tracing-subscriber = "0.3.18" # Please, update the supported nearcore version in .cargo/config.toml file -near-indexer = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } -near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } -near-client = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "7dd0b5993577f592be15eb102e5a3da37be66271" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "7dd0b5993577f592be15eb102e5a3da37be66271" } +near-client = { git = "https://github.com/near/nearcore", rev = "7dd0b5993577f592be15eb102e5a3da37be66271" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "7dd0b5993577f592be15eb102e5a3da37be66271" } diff --git a/Dockerfile b/Dockerfile index c9dba02..b5b66d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.71 AS builder +FROM rust:1.77 AS builder WORKDIR /tmp/ # Copy from nearcore: diff --git a/src/main.rs b/src/main.rs index 72cccbf..9abb6b4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ use std::error::Error; use std::sync::Arc; use aws_config::meta::region::RegionProviderChain; -use aws_sdk_s3::config::endpoint::{Endpoint, EndpointFuture, Params, ResolveEndpoint}; use clap::Parser; use configs::{Opts, SubCommand}; use futures::StreamExt; @@ -15,17 +14,6 @@ mod utils; const INDEXER: &str = "near_lake"; -#[derive(Debug)] -struct CustomS3EndpointResolver { - url: String, -} - -impl ResolveEndpoint for CustomS3EndpointResolver { - fn resolve_endpoint(&self, _params: &Params) -> EndpointFuture<'_> { - EndpointFuture::ready(Ok(Endpoint::builder().url(self.url.clone()).build())) - } -} - #[derive(Debug, Clone)] struct Stats { pub block_heights_processing: std::collections::BTreeSet, @@ -200,10 +188,7 @@ async fn listen_blocks( // Owerride S3 endpoint in case you want to use custom solution // like Minio or Localstack as a S3 compatible storage if let Some(s3_endpoint) = endpoint { - let endpoint_resolver = CustomS3EndpointResolver { - url: s3_endpoint.to_string(), - }; - s3_conf = s3_conf.endpoint_resolver(endpoint_resolver); + s3_conf = s3_conf.endpoint_url(s3_endpoint.to_string()); tracing::info!(target: INDEXER, "Custom S3 endpoint used: {}", s3_endpoint); } @@ -293,8 +278,9 @@ async fn put_object_or_retry( metrics::RETRY_COUNT.inc(); tracing::warn!( target: INDEXER, - "Failed to put {} to S3, retrying", - &filename + "Failed to put {} to S3, retrying. Error: {:?}", + &filename, + err ); } }