diff --git a/Cargo.lock b/Cargo.lock index 10f6ee1..223970e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "aurora-refiner" -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" dependencies = [ "actix", "anyhow", @@ -621,7 +621,7 @@ dependencies = [ [[package]] name = "aurora-refiner-app-integration-tests" -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" dependencies = [ "anyhow", "tempfile", @@ -632,7 +632,7 @@ dependencies = [ [[package]] name = "aurora-refiner-lib" -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" dependencies = [ "anyhow", "aurora-engine", @@ -666,7 +666,7 @@ dependencies = [ [[package]] name = "aurora-refiner-types" -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" dependencies = [ "aurora-engine", "aurora-engine-sdk", @@ -676,8 +676,8 @@ dependencies = [ "derive_builder 0.20.0", "fixed-hash 0.8.0", "impl-serde 0.4.0", - "near-crypto 2.2.1", - "near-primitives 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", "serde", "serde_json", "sha3", @@ -685,7 +685,7 @@ dependencies = [ [[package]] name = "aurora-standalone-engine" -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" dependencies = [ "anyhow", "aurora-engine", @@ -4063,8 +4063,8 @@ dependencies = [ [[package]] name = "near-async" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "derive_more", @@ -4072,7 +4072,7 @@ dependencies = [ "near-async-derive", "near-o11y", "near-performance-metrics", - "near-time 2.2.1", + "near-time 2.3.0-rc.1", "once_cell", "serde", "serde_json", @@ -4083,8 +4083,8 @@ dependencies = [ [[package]] name = "near-async-derive" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "proc-macro2", "quote", @@ -4093,16 +4093,16 @@ dependencies = [ [[package]] name = "near-cache" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "lru 0.12.3", ] [[package]] name = "near-chain" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "assert_matches", @@ -4120,16 +4120,17 @@ dependencies = [ "near-chain-configs", "near-chain-primitives", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-epoch-manager", "near-mainnet-res", "near-network", "near-o11y", - "near-parameters 2.2.1", + "near-parameters 2.3.0-rc.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", + "near-schema-checker-lib", "near-store", "near-vm-runner", "node-runtime", @@ -4138,6 +4139,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", + "serde", "strum 0.24.1", "tempfile", "thiserror", @@ -4148,21 +4150,20 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", - "near-config-utils 2.2.1", - "near-crypto 2.2.1", + "near-config-utils 2.3.0-rc.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-time 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "num-rational 0.3.2", - "once_cell", "serde", "serde_json", "sha2 0.10.8", @@ -4173,12 +4174,12 @@ dependencies = [ [[package]] name = "near-chain-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-crypto 2.2.1", - "near-primitives 2.2.1", - "near-time 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "thiserror", "time", "tracing", @@ -4186,8 +4187,8 @@ dependencies = [ [[package]] name = "near-chunks" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "borsh 1.5.1", @@ -4200,16 +4201,15 @@ dependencies = [ "near-chain", "near-chain-configs", "near-chunks-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-epoch-manager", "near-network", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "near-store", - "once_cell", "rand 0.8.5", "reed-solomon-erasure 6.0.0", "strum 0.24.1", @@ -4219,17 +4219,17 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-chain-primitives", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", ] [[package]] name = "near-client" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -4250,16 +4250,16 @@ dependencies = [ "near-chain-primitives", "near-chunks", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-dyn-configs", "near-epoch-manager", "near-network", "near-o11y", - "near-parameters 2.2.1", + "near-parameters 2.3.0-rc.1", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "near-store", "near-telemetry", "near-vm-runner", @@ -4286,17 +4286,17 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "chrono", "near-chain-configs", "near-chain-primitives", "near-chunks-primitives", - "near-crypto 2.2.1", - "near-primitives 2.2.1", - "near-time 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "serde", "serde_json", "strum 0.24.1", @@ -4320,8 +4320,8 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "json_comments", @@ -4356,8 +4356,8 @@ dependencies = [ [[package]] name = "near-crypto" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "blake2", "borsh 1.5.1", @@ -4367,9 +4367,9 @@ dependencies = [ "ed25519-dalek", "hex", "near-account-id", - "near-config-utils 2.2.1", - "near-stdx 2.2.1", - "once_cell", + "near-config-utils 2.3.0-rc.1", + "near-schema-checker-lib", + "near-stdx 2.3.0-rc.1", "primitive-types 0.10.1", "rand 0.8.5", "secp256k1", @@ -4381,16 +4381,15 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "near-chain-configs", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-primitives 2.2.1", - "near-time 2.2.1", - "once_cell", + "near-primitives 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "prometheus", "serde", "serde_json", @@ -4401,23 +4400,25 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "itertools 0.10.5", "near-cache", "near-chain-configs", "near-chain-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", + "near-schema-checker-lib", "near-store", + "num-bigint 0.3.3", "num-rational 0.3.2", - "once_cell", "primitive-types 0.10.1", "rand 0.8.5", "rand_hc 0.3.2", + "serde", "serde_json", "smart-default", "tracing", @@ -4434,33 +4435,32 @@ dependencies = [ [[package]] name = "near-fmt" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-primitives-core 2.2.1", + "near-primitives-core 2.3.0-rc.1", ] [[package]] name = "near-indexer" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", "futures", - "lazy_static", "near-chain-configs", "near-client", - "near-crypto 2.2.1", + "near-config-utils 2.3.0-rc.1", + "near-crypto 2.3.0-rc.1", "near-dyn-configs", - "near-indexer-primitives 2.2.1", + "near-indexer-primitives 2.3.0-rc.1", "near-o11y", - "near-parameters 2.2.1", - "near-primitives 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", "near-store", "nearcore", "node-runtime", - "once_cell", "rocksdb", "serde", "serde_json", @@ -4481,18 +4481,18 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "serde", "serde_json", ] [[package]] name = "near-jsonrpc" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -4510,9 +4510,7 @@ dependencies = [ "near-jsonrpc-primitives", "near-network", "near-o11y", - "near-primitives 2.2.1", - "near-rpc-error-macro 2.2.1", - "once_cell", + "near-primitives 2.3.0-rc.1", "serde", "serde_json", "serde_with", @@ -4523,29 +4521,29 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix-http", "awc", "futures", "near-jsonrpc-primitives", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "serde", "serde_json", ] [[package]] name = "near-jsonrpc-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "near-chain-configs", "near-client-primitives", - "near-crypto 2.2.1", - "near-primitives 2.2.1", - "near-rpc-error-macro 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-schema-checker-lib", "serde", "serde_json", "thiserror", @@ -4579,19 +4577,19 @@ dependencies = [ [[package]] name = "near-mainnet-res" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "near-account-id", "near-chain-configs", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "serde_json", ] [[package]] name = "near-network" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "anyhow", @@ -4611,14 +4609,14 @@ dependencies = [ "lru 0.12.3", "near-async", "near-chain-configs", - "near-crypto 2.2.1", - "near-fmt 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-fmt 2.3.0-rc.1", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", + "near-schema-checker-lib", "near-store", - "once_cell", "opentelemetry", "parking_lot 0.12.3", "pin-project", @@ -4642,15 +4640,14 @@ dependencies = [ [[package]] name = "near-o11y" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "base64 0.21.7", "clap", - "near-crypto 2.2.1", - "near-primitives-core 2.2.1", - "once_cell", + "near-crypto 2.3.0-rc.1", + "near-primitives-core 2.3.0-rc.1", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", @@ -4686,13 +4683,14 @@ dependencies = [ [[package]] name = "near-parameters" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", "enum-map", "near-account-id", - "near-primitives-core 2.2.1", + "near-primitives-core 2.3.0-rc.1", + "near-schema-checker-lib", "num-rational 0.3.2", "serde", "serde_repr", @@ -4703,15 +4701,14 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "bitflags 1.3.2", "bytes", "futures", "libc", - "once_cell", "tokio", "tokio-util", "tracing", @@ -4719,8 +4716,8 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "quote", "syn 2.0.72", @@ -4728,14 +4725,13 @@ dependencies = [ [[package]] name = "near-pool" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-primitives 2.2.1", - "once_cell", + "near-primitives 2.3.0-rc.1", "rand 0.8.5", ] @@ -4761,7 +4757,7 @@ dependencies = [ "near-fmt 0.23.0", "near-parameters 0.23.0", "near-primitives-core 0.23.0", - "near-rpc-error-macro 0.23.0", + "near-rpc-error-macro", "near-stdx 0.23.0", "near-time 0.23.0", "num-rational 0.3.2", @@ -4783,11 +4779,12 @@ dependencies = [ [[package]] name = "near-primitives" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", + "bitvec 1.0.1", "borsh 1.5.1", "bytes", "bytesize", @@ -4798,16 +4795,14 @@ dependencies = [ "enum-map", "hex", "itertools 0.10.5", - "near-crypto 2.2.1", - "near-fmt 2.2.1", - "near-parameters 2.2.1", - "near-primitives-core 2.2.1", - "near-rpc-error-macro 2.2.1", - "near-stdx 2.2.1", - "near-structs-checker-lib", - "near-time 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-fmt 2.3.0-rc.1", + "near-parameters 2.3.0-rc.1", + "near-primitives-core 2.3.0-rc.1", + "near-schema-checker-lib", + "near-stdx 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "num-rational 0.3.2", - "once_cell", "ordered-float", "primitive-types 0.10.1", "rand 0.8.5", @@ -4846,8 +4841,8 @@ dependencies = [ [[package]] name = "near-primitives-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "arbitrary", "base64 0.21.7", @@ -4856,7 +4851,7 @@ dependencies = [ "derive_more", "enum-map", "near-account-id", - "near-structs-checker-lib", + "near-schema-checker-lib", "num-rational 0.3.2", "serde", "serde_repr", @@ -4866,8 +4861,8 @@ dependencies = [ [[package]] name = "near-rosetta-rpc" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-cors", @@ -4881,11 +4876,11 @@ dependencies = [ "near-chain-configs", "near-client", "near-client-primitives", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-network", "near-o11y", - "near-parameters 2.2.1", - "near-primitives 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", "node-runtime", "paperclip", "serde", @@ -4906,37 +4901,36 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "near-rpc-error-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" -dependencies = [ - "quote", - "serde", - "syn 2.0.72", -] - [[package]] name = "near-rpc-error-macro" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73c7f0f12f426792dd2c9d83df43d73c3b15d80f6e99e8d0e16ff3e024d0f9ba" dependencies = [ - "near-rpc-error-core 0.23.0", + "near-rpc-error-core", "serde", "syn 2.0.72", ] [[package]] -name = "near-rpc-error-macro" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +name = "near-schema-checker-core" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" + +[[package]] +name = "near-schema-checker-lib" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "near-rpc-error-core 2.2.1", - "serde", - "syn 2.0.72", + "near-schema-checker-core", + "near-schema-checker-macro", ] +[[package]] +name = "near-schema-checker-macro" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" + [[package]] name = "near-stdx" version = "0.23.0" @@ -4945,13 +4939,13 @@ checksum = "29e1897481272eb144328abd51ca9f59b5b558e7a6dc6e2177c8c9bb18fbd818" [[package]] name = "near-stdx" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" [[package]] name = "near-store" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -4967,16 +4961,16 @@ dependencies = [ "itoa", "lru 0.12.3", "near-chain-configs", - "near-crypto 2.2.1", - "near-fmt 2.2.1", + "near-crypto 2.3.0-rc.1", + "near-fmt 2.3.0-rc.1", "near-o11y", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-stdx 2.2.1", - "near-time 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-schema-checker-lib", + "near-stdx 2.3.0-rc.1", + "near-time 2.3.0-rc.1", "near-vm-runner", "num_cpus", - "once_cell", "rand 0.8.5", "rayon", "reed-solomon-erasure 6.0.0", @@ -4992,29 +4986,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "near-structs-checker-core" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" - -[[package]] -name = "near-structs-checker-lib" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" -dependencies = [ - "near-structs-checker-core", - "near-structs-checker-macro", -] - -[[package]] -name = "near-structs-checker-macro" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" - [[package]] name = "near-telemetry" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "awc", @@ -5023,8 +4998,7 @@ dependencies = [ "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", - "near-time 2.2.1", - "once_cell", + "near-time 2.3.0-rc.1", "openssl", "serde", "serde_json", @@ -5045,10 +5019,9 @@ dependencies = [ [[package]] name = "near-time" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ - "once_cell", "serde", "time", "tokio", @@ -5056,8 +5029,8 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "enumset", "finite-wasm", @@ -5072,14 +5045,13 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", "enumset", "finite-wasm", - "lazy_static", "memoffset 0.8.0", "more-asserts", "near-vm-compiler", @@ -5093,14 +5065,13 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cfg-if 1.0.0", "enumset", "finite-wasm", - "lazy_static", "more-asserts", "near-vm-compiler", "near-vm-types", @@ -5116,8 +5087,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", "blst", @@ -5128,23 +5099,24 @@ dependencies = [ "finite-wasm", "lru 0.12.3", "memoffset 0.8.0", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-parameters 2.2.1", - "near-primitives-core 2.2.1", - "near-stdx 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives-core 2.3.0-rc.1", + "near-schema-checker-lib", + "near-stdx 2.3.0-rc.1", "near-vm-compiler", "near-vm-compiler-singlepass", "near-vm-engine", "near-vm-types", "near-vm-vm", "num-rational 0.3.2", - "once_cell", "parity-wasm 0.41.0", "parity-wasm 0.42.2", "prefix-sum-vec", "prometheus", "pwasm-utils", + "rayon", "ripemd", "rustix", "serde", @@ -5171,8 +5143,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "indexmap 1.9.3", "num-traits", @@ -5182,8 +5154,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "backtrace", "cc", @@ -5203,19 +5175,18 @@ dependencies = [ [[package]] name = "near-wallet-contract" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "anyhow", - "near-primitives-core 2.2.1", + "near-primitives-core 2.3.0-rc.1", "near-vm-runner", - "once_cell", ] [[package]] name = "nearcore" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "actix", "actix-rt", @@ -5239,8 +5210,8 @@ dependencies = [ "near-chunks", "near-client", "near-client-primitives", - "near-config-utils 2.2.1", - "near-crypto 2.2.1", + "near-config-utils 2.3.0-rc.1", + "near-crypto 2.3.0-rc.1", "near-dyn-configs", "near-epoch-manager", "near-jsonrpc", @@ -5248,17 +5219,16 @@ dependencies = [ "near-mainnet-res", "near-network", "near-o11y", - "near-parameters 2.2.1", + "near-parameters 2.3.0-rc.1", "near-performance-metrics", "near-pool", - "near-primitives 2.2.1", + "near-primitives 2.3.0-rc.1", "near-rosetta-rpc", "near-store", "near-telemetry", "near-vm-runner", "node-runtime", "num-rational 0.3.2", - "once_cell", "rand 0.8.5", "rayon", "regex", @@ -5304,21 +5274,20 @@ dependencies = [ [[package]] name = "node-runtime" -version = "2.2.1" -source = "git+https://github.com/near/nearcore?tag=2.2.1#971e76d1ee9b7ec6d7f7281db89e7b29b4cdbadc" +version = "2.3.0-rc.1" +source = "git+https://github.com/near/nearcore?tag=2.3.0-rc.1#93073d762ff377382ebf54e7cbff448b492e72c6" dependencies = [ "borsh 1.5.1", - "near-crypto 2.2.1", + "near-crypto 2.3.0-rc.1", "near-o11y", - "near-parameters 2.2.1", - "near-primitives 2.2.1", - "near-primitives-core 2.2.1", + "near-parameters 2.3.0-rc.1", + "near-primitives 2.3.0-rc.1", + "near-primitives-core 2.3.0-rc.1", "near-store", "near-vm-runner", "near-wallet-contract", "num-bigint 0.3.3", "num-traits", - "once_cell", "rand 0.8.5", "rayon", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 9015c4c..9c55cea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ resolver = "2" [workspace.package] authors = ["Aurora Labs "] -version = "0.28.2-2.2.1" +version = "0.28.2-2.3.0-rc.1" edition = "2021" homepage = "https://github.com/aurora-is-near/aurora-standalone" repository = "https://github.com/aurora-is-near/aurora-standalone" @@ -37,9 +37,9 @@ hex = "0.4" impl-serde = "0.4" lazy_static = "1" lru = "0.12" -near-crypto = { git = "https://github.com/near/nearcore", tag = "2.2.1" } -near-indexer = { git = "https://github.com/near/nearcore", tag = "2.2.1" } -near-primitives = { git = "https://github.com/near/nearcore", tag = "2.2.1" } +near-crypto = { git = "https://github.com/near/nearcore", tag = "2.3.0-rc.1" } +near-indexer = { git = "https://github.com/near/nearcore", tag = "2.3.0-rc.1" } +near-primitives = { git = "https://github.com/near/nearcore", tag = "2.3.0-rc.1" } near-lake-framework = "0.7" prometheus = "0.13" rlp = "0.5" diff --git a/refiner-lib/src/refiner_inner.rs b/refiner-lib/src/refiner_inner.rs index cd4e5ec..550b9db 100644 --- a/refiner-lib/src/refiner_inner.rs +++ b/refiner-lib/src/refiner_inner.rs @@ -116,7 +116,7 @@ impl Refiner { } impl Refiner { - pub fn on_block_skip(&mut self, height: u64, next_block: &NEARBlock) -> AuroraBlock { + pub fn on_block_skip(&self, height: u64, next_block: &NEARBlock) -> AuroraBlock { AuroraBlock { chain_id: self.chain_id, engine_account_id: self.engine_account_id.clone(), @@ -137,7 +137,7 @@ impl Refiner { } } - pub fn on_block_start(&mut self, block: &NEARBlock) { + pub fn on_block_start(&self, block: &NEARBlock) { let NEARBlock { block, shards, .. } = █ // Check if all chunks were parsed tracing::trace!(target: "block", "Processing block at height {}, hash={}", block.header.height, block.header.hash); diff --git a/refiner-lib/src/tx_hash_tracker.rs b/refiner-lib/src/tx_hash_tracker.rs index 57cf281..6a40f59 100644 --- a/refiner-lib/src/tx_hash_tracker.rs +++ b/refiner-lib/src/tx_hash_tracker.rs @@ -178,7 +178,7 @@ impl TxHashTrackerImpl { } } - fn commit_write_batch(&mut self, batch: rocksdb::WriteBatch) -> anyhow::Result<()> { + fn commit_write_batch(&self, batch: rocksdb::WriteBatch) -> anyhow::Result<()> { self.persistent_storage.write(batch)?; Ok(()) diff --git a/refiner-types/src/near_block.rs b/refiner-types/src/near_block.rs index 87eb061..3f531f8 100644 --- a/refiner-types/src/near_block.rs +++ b/refiner-types/src/near_block.rs @@ -262,7 +262,7 @@ impl Clone for Shard { StateChangeCauseView::ValidatorAccountsUpdate } StateChangeCauseView::Migration => StateChangeCauseView::Migration, - StateChangeCauseView::Resharding => StateChangeCauseView::Resharding, + StateChangeCauseView::ReshardingV2 => StateChangeCauseView::ReshardingV2, }, value: match &v.value { StateChangeValueView::AccountUpdate { diff --git a/rust-toolchain b/rust-toolchain index 927723c..d65bb08 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.79.0" +channel = "1.81.0" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ]