From f54789b0493a02e4a57264379656166f2e620e38 Mon Sep 17 00:00:00 2001 From: colindickson Date: Mon, 6 Mar 2023 13:12:37 -0500 Subject: [PATCH] update nearcore to 1.32.0-rc.1, update proto definitions --- Cargo.lock | 796 +++++++++++++----- Cargo.toml | 8 +- firehose-pb/src/main.rs | 5 +- rust-toolchain.toml | 2 +- src/codec/mod.rs | 75 +- ....near.codec.v1.rs => sf.near.r#type.v1.rs} | 84 +- 6 files changed, 738 insertions(+), 232 deletions(-) rename src/codec/{sf.near.codec.v1.rs => sf.near.r#type.v1.rs} (90%) diff --git a/Cargo.lock b/Cargo.lock index 650c9534..5b0001ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -327,9 +327,9 @@ checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arbitrary" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0224938f92e7aef515fac2ff2d18bd1115c1394ddf4a092e0c87e8be9499ee5" +checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" dependencies = [ "derive_arbitrary", ] @@ -352,6 +352,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + [[package]] name = "assert_matches" version = "1.5.0" @@ -464,7 +470,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.29.0", + "object", "rustc-demangle", ] @@ -535,7 +541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.2", "cc", "cfg-if 0.1.10", "constant_time_eq", @@ -567,18 +573,41 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive", + "borsh-derive 0.9.3", "hashbrown 0.11.2", ] +[[package]] +name = "borsh" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40f9ca3698b2e4cb7c15571db0abc5551dca417a21ae8140460b50309bb2cc62" +dependencies = [ + "borsh-derive 0.10.2", + "hashbrown 0.12.3", +] + [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate", + "proc-macro2", + "syn", +] + +[[package]] +name = "borsh-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598b3eacc6db9c3ee57b22707ad8f6a8d2f6d442bfe24ffeb8cbb70ca59e6a35" +dependencies = [ + "borsh-derive-internal 0.10.2", + "borsh-schema-derive-internal 0.10.2", "proc-macro-crate", "proc-macro2", "syn", @@ -595,6 +624,17 @@ dependencies = [ "syn", ] +[[package]] +name = "borsh-derive-internal" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "borsh-schema-derive-internal" version = "0.9.3" @@ -606,6 +646,17 @@ dependencies = [ "syn", ] +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "brotli" version = "3.3.4" @@ -908,23 +959,27 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa7c3188913c2d11a361e0431e135742372a2709a99b103e79758e11a0a797e" +checksum = "fc952b310b24444fc14ab8b9cbe3fafd7e7329e3eec84c3a9b11d2b5cf6f3be1" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29285f70fd396a8f64455a15a6e1d390322e4a5f5186de513141313211b0a23e" +checksum = "e73470419b33011e50dbf0f6439cbccbaabe9381de172da4e1b6efcda4bb8fa7" dependencies = [ + "arrayvec 0.7.2", + "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", + "cranelift-egraph", "cranelift-entity", + "cranelift-isle", "gimli", "log", "regalloc2", @@ -934,33 +989,47 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057eac2f202ec95aebfd8d495e88560ac085f6a415b3c6c28529dc5eb116a141" +checksum = "911a1872464108a11ac9965c2b079e61bbdf1bc2e0b9001264264add2e12a38f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.84.0" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e036f3f07adb24a86fb46e977e8fe03b18bb16b1eada949cf2c48283e5f8a862" + +[[package]] +name = "cranelift-egraph" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75d93869efd18874a9341cfd8ad66bcb08164e86357a694a0e939d29e87410b9" +checksum = "2d6c623f4b5d2a6bad32c403f03765d4484a827eb93ee78f8cb6219ef118fd59" +dependencies = [ + "cranelift-entity", + "fxhash", + "hashbrown 0.12.3", + "indexmap", + "log", + "smallvec", +] [[package]] name = "cranelift-entity" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e34bd7a1fefa902c90a921b36323f17a398b788fa56a75f07a29d83b6e28808" +checksum = "74385eb5e405b3562f0caa7bcc4ab9a93c7958dd5bcd0e910bffb7765eacd6fc" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457018dd2d6ee300953978f63215b5edf3ae42dbdf8c7c038972f10394599f72" +checksum = "8a4ac920422ee36bff2c66257fec861765e3d95a125cdf58d8c0f3bba7e40e61" dependencies = [ "cranelift-codegen", "log", @@ -968,11 +1037,17 @@ dependencies = [ "target-lexicon 0.12.4", ] +[[package]] +name = "cranelift-isle" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c541263fb37ad2baa53ec8c37218ee5d02fa0984670d9419dedd8002ea68ff08" + [[package]] name = "cranelift-native" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba027cc41bf1d0eee2ddf16caba2ee1be682d0214520fff0129d2c6557fda89" +checksum = "1de5d7a063e8563d670aaca38de16591a9b70dc66cbad4d49a7b4ae8395fd1ce" dependencies = [ "cranelift-codegen", "libc", @@ -981,9 +1056,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.84.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b17639ced10b9916c9be120d38c872ea4f9888aa09248568b10056ef0559bfa" +checksum = "dfbc4dd03b713b5d71b582915b8c272f4813cdd8c99a3e03d9ba70c44468a6e0" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -991,10 +1066,25 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser 0.84.0", + "wasmparser 0.95.0", "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -1149,17 +1239,28 @@ dependencies = [ [[package]] name = "delay-detector" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "cpu-time", "tracing", ] +[[package]] +name = "derive-enum-from-into" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc2a1b7c0031fb651e9bc1fa4255da82747c187b9ac1dc36b3783d71fadd9d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "derive_arbitrary" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf460bbff5f571bfc762da5102729f59f338be7db17a21fade44c5c4f5005350" +checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" dependencies = [ "proc-macro2", "quote", @@ -1209,9 +1310,9 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] @@ -1460,11 +1561,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] @@ -1832,6 +1932,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "im" version = "15.1.0" @@ -1881,9 +1991,19 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.5.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "ipnet" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "itertools" @@ -1918,6 +2038,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json_comments" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" + [[package]] name = "keccak" version = "0.1.2" @@ -1953,9 +2079,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.131" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -1994,17 +2120,11 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" -version = "0.0.42" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "local-channel" @@ -2041,7 +2161,6 @@ checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", - "serde", ] [[package]] @@ -2117,12 +2236,30 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +[[package]] +name = "md-5" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +dependencies = [ + "rustix", +] + [[package]] name = "memmap" version = "0.7.0" @@ -2157,6 +2294,16 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2181,7 +2328,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -2217,17 +2364,32 @@ dependencies = [ [[package]] name = "near-account-id" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "arbitrary", - "borsh", + "borsh 0.10.2", "serde", ] +[[package]] +name = "near-async" +version = "0.0.0" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" +dependencies = [ + "actix", + "derive-enum-from-into", + "derive_more", + "futures", + "near-o11y", + "once_cell", + "serde", + "serde_json", +] + [[package]] name = "near-cache" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "lru", ] @@ -2235,17 +2397,18 @@ dependencies = [ [[package]] name = "near-chain" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "ansi_term", "assert_matches", - "borsh", + "borsh 0.10.2", "chrono", "crossbeam-channel", "delay-detector", "enum-map", "itertools", + "itoa", "lru", "near-cache", "near-chain-configs", @@ -2270,14 +2433,17 @@ dependencies = [ [[package]] name = "near-chain-configs" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "anyhow", "chrono", "derive_more", + "near-config-utils", "near-crypto", + "near-o11y", "near-primitives", "num-rational", + "once_cell", "serde", "serde_json", "sha2 0.10.2", @@ -2288,7 +2454,7 @@ dependencies = [ [[package]] name = "near-chain-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "chrono", "near-crypto", @@ -2300,18 +2466,20 @@ dependencies = [ [[package]] name = "near-chunks" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", - "borsh", + "borsh 0.10.2", "chrono", "futures", "lru", + "near-async", "near-chain", "near-chunks-primitives", "near-crypto", "near-network", "near-o11y", + "near-performance-metrics", "near-pool", "near-primitives", "near-store", @@ -2324,7 +2492,7 @@ dependencies = [ [[package]] name = "near-chunks-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "near-chain-primitives", "near-primitives", @@ -2333,18 +2501,20 @@ dependencies = [ [[package]] name = "near-client" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "actix-rt", "ansi_term", "async-trait", - "borsh", + "borsh 0.10.2", "chrono", "delay-detector", + "derive_more", "futures", "itertools", "lru", + "near-async", "near-chain", "near-chain-configs", "near-chain-primitives", @@ -2376,7 +2546,7 @@ dependencies = [ [[package]] name = "near-client-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "chrono", @@ -2392,19 +2562,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "near-config-utils" +version = "0.0.0" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" +dependencies = [ + "anyhow", + "json_comments", + "thiserror", + "tracing", +] + [[package]] name = "near-crypto" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "blake2", - "borsh", + "borsh 0.10.2", "bs58", "c2-chacha", "curve25519-dalek", "derive_more", "ed25519-dalek", + "hex", "near-account-id", + "near-config-utils", "near-stdx", "once_cell", "primitive-types", @@ -2419,19 +2602,27 @@ dependencies = [ [[package]] name = "near-dyn-configs" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ + "anyhow", + "near-chain-configs", "near-o11y", + "near-primitives", "once_cell", "prometheus", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", ] [[package]] name = "near-epoch-manager" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ - "borsh", + "borsh 0.10.2", "near-cache", "near-chain-configs", "near-chain-primitives", @@ -2449,7 +2640,7 @@ dependencies = [ [[package]] name = "near-firehose-indexer" -version = "1.31.1" +version = "1.32.0-rc.1" dependencies = [ "actix", "clap", @@ -2470,7 +2661,7 @@ dependencies = [ [[package]] name = "near-indexer" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "anyhow", @@ -2497,7 +2688,7 @@ dependencies = [ [[package]] name = "near-indexer-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "near-primitives", "serde", @@ -2507,7 +2698,7 @@ dependencies = [ [[package]] name = "near-jsonrpc" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "actix-cors", @@ -2535,7 +2726,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix-http", "awc", @@ -2549,7 +2740,7 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "arbitrary", "near-chain-configs", @@ -2565,7 +2756,7 @@ dependencies = [ [[package]] name = "near-mainnet-res" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "near-account-id", "near-chain-configs", @@ -2576,24 +2767,26 @@ dependencies = [ [[package]] name = "near-network" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "anyhow", "arc-swap", "assert_matches", "async-trait", - "borsh", + "borsh 0.10.2", "bytes", "bytesize", "chrono", "crossbeam-channel", "delay-detector", + "derive_more", "futures", "futures-util", "im", "itertools", "lru", + "near-async", "near-crypto", "near-o11y", "near-performance-metrics", @@ -2612,6 +2805,7 @@ dependencies = [ "serde", "smart-default", "strum", + "stun", "thiserror", "time 0.3.13", "tokio", @@ -2623,7 +2817,7 @@ dependencies = [ [[package]] name = "near-o11y" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "atty", @@ -2648,7 +2842,7 @@ dependencies = [ [[package]] name = "near-performance-metrics" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "bitflags", @@ -2665,7 +2859,7 @@ dependencies = [ [[package]] name = "near-performance-metrics-macros" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "quote", "syn", @@ -2674,9 +2868,9 @@ dependencies = [ [[package]] name = "near-pool" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ - "borsh", + "borsh 0.10.2", "near-crypto", "near-o11y", "near-primitives", @@ -2687,10 +2881,10 @@ dependencies = [ [[package]] name = "near-primitives" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "arbitrary", - "borsh", + "borsh 0.10.2", "bytesize", "cfg-if 1.0.0", "chrono", @@ -2711,6 +2905,7 @@ dependencies = [ "reed-solomon-erasure", "serde", "serde_json", + "serde_yaml", "smart-default", "strum", "thiserror", @@ -2720,11 +2915,11 @@ dependencies = [ [[package]] name = "near-primitives-core" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "arbitrary", "base64", - "borsh", + "borsh 0.10.2", "bs58", "derive_more", "enum-map", @@ -2734,12 +2929,13 @@ dependencies = [ "serde_repr", "sha2 0.10.2", "strum", + "thiserror", ] [[package]] name = "near-rosetta-rpc" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "actix-cors", @@ -2768,7 +2964,7 @@ dependencies = [ [[package]] name = "near-rpc-error-core" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "quote", "serde", @@ -2778,7 +2974,7 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "fs2", "near-rpc-error-core", @@ -2789,20 +2985,21 @@ dependencies = [ [[package]] name = "near-stable-hasher" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" [[package]] name = "near-stdx" -version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c05ded9a90c087aaebfafdf01f2801f5d31817f9a3514ce09aed270001d650e" [[package]] name = "near-store" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "anyhow", - "borsh", + "borsh 0.10.2", "byteorder", "bytesize", "crossbeam", @@ -2832,7 +3029,7 @@ dependencies = [ [[package]] name = "near-telemetry" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "awc", @@ -2851,9 +3048,9 @@ dependencies = [ [[package]] name = "near-vm-errors" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ - "borsh", + "borsh 0.10.2", "near-account-id", "near-rpc-error-macro", "serde", @@ -2864,10 +3061,9 @@ dependencies = [ [[package]] name = "near-vm-logic" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ - "borsh", - "byteorder", + "borsh 0.10.2", "ed25519-dalek", "near-account-id", "near-crypto", @@ -2886,10 +3082,10 @@ dependencies = [ [[package]] name = "near-vm-runner" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "anyhow", - "borsh", + "borsh 0.10.2", "loupe", "memoffset", "near-cache", @@ -2918,14 +3114,14 @@ dependencies = [ [[package]] name = "nearcore" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ "actix", "actix-rt", "actix-web", "anyhow", "awc", - "borsh", + "borsh 0.10.2", "byteorder", "chrono", "delay-detector", @@ -2935,11 +3131,13 @@ dependencies = [ "hyper", "hyper-tls", "indicatif", + "near-async", "near-chain", "near-chain-configs", "near-chunks", "near-client", "near-client-primitives", + "near-config-utils", "near-crypto", "near-dyn-configs", "near-epoch-manager", @@ -2985,13 +3183,24 @@ dependencies = [ "void", ] +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset", +] + [[package]] name = "node-runtime" version = "0.0.0" -source = "git+https://github.com/near/nearcore?rev=1.31.1#825bc1b44b6d5080cc610d542e2b57f329d7aed9" +source = "git+https://github.com/near/nearcore?rev=1.32.0-rc.1#a6d14feb03af14912f9c6d41857fd4013c8654b8" dependencies = [ - "borsh", - "byteorder", + "borsh 0.10.2", "hex", "near-chain-configs", "near-crypto", @@ -3101,24 +3310,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap", - "memchr", -] - [[package]] name = "object" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ + "crc32fast", + "hashbrown 0.12.3", + "indexmap", "memchr", ] @@ -3255,9 +3455,9 @@ dependencies = [ [[package]] name = "paperclip" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f399678683ec199ddca1dd54db957dd158dedb5fc90826eb2a7e6c0800c3a868" +checksum = "461c6d9997c512648e9cfd41575a3e0d3f46a1ec3c8214a32dd91b729487b1dc" dependencies = [ "anyhow", "itertools", @@ -3265,7 +3465,6 @@ dependencies = [ "paperclip-actix", "paperclip-core", "paperclip-macros", - "parking_lot 0.12.1", "semver 1.0.13", "serde", "serde_derive", @@ -3277,32 +3476,31 @@ dependencies = [ [[package]] name = "paperclip-actix" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29880bc57ef516c272d6fdd215ecaf96375d9a5dbac5412d849b9f9afd0d7298" +checksum = "f8e2adab1a71766521af58973719fb66bd7b92e6ce8a3acf1e83c7acc0e78e17" dependencies = [ "actix-service", "actix-web", "futures", + "mime_guess", "once_cell", "paperclip-core", "paperclip-macros", - "parking_lot 0.12.1", "serde_json", ] [[package]] name = "paperclip-core" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bee516533b655ba63e41e788b49a2beb1139e1eebafb143e7cb56b8cabb5da1" +checksum = "d53eecc65b19fa7884e3e6939e54ba5104ec179894728bca6f6cee67adfa145e" dependencies = [ "actix-web", "mime", "once_cell", "paperclip-macros", - "parking_lot 0.12.1", - "pin-project", + "pin-project-lite", "regex", "serde", "serde_json", @@ -3312,9 +3510,9 @@ dependencies = [ [[package]] name = "paperclip-macros" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89990be67318e3da29c92adb3377e0251a8eee10b4f91ff349cbf2da945e9d1" +checksum = "a0e23a129dc95a45661cbbfac1b8f865094131da7937738a343d00f47d87fada" dependencies = [ "heck 0.4.0", "http", @@ -3384,7 +3582,7 @@ dependencies = [ "libc", "redox_syscall 0.2.16", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -3401,9 +3599,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" @@ -3970,9 +4168,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.1.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904196c12c9f55d3aea578613219f493ced8e05b3d0c6a42d11cb4142d8b4879" +checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" dependencies = [ "fxhash", "log", @@ -4006,18 +4204,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] - [[package]] name = "region" version = "3.0.0" @@ -4048,6 +4234,21 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "ripemd" version = "0.1.1" @@ -4139,16 +4340,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.33.7" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -4170,7 +4371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4332,14 +4533,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ "indexmap", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -4515,6 +4717,25 @@ dependencies = [ "syn", ] +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + [[package]] name = "subtle" version = "2.4.1" @@ -4696,11 +4917,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "autocfg", "bytes", "libc", "memchr", @@ -5059,6 +5279,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.8" @@ -5098,15 +5327,26 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +[[package]] +name = "unsafe-libyaml" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", ] @@ -5116,7 +5356,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" dependencies = [ - "idna", + "idna 0.2.3", "lazy_static", "regex", "serde", @@ -5301,7 +5541,7 @@ dependencies = [ "cfg-if 1.0.0", "enumset", "leb128", - "region 3.0.0", + "region", "rkyv", "thiserror", "wasmer-compiler-near", @@ -5319,7 +5559,7 @@ checksum = "5a3fac37da3c625e98708c5dd92d3f642aaf700fd077168d3d0fff277ec6a165" dependencies = [ "bincode", "blake3", - "borsh", + "borsh 0.9.3", "cc", "digest 0.8.1", "errno", @@ -5327,7 +5567,7 @@ dependencies = [ "indexmap", "lazy_static", "libc", - "nix", + "nix 0.15.0", "page_size", "parking_lot 0.10.2", "rustc_version 0.2.3", @@ -5362,13 +5602,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6edd0ba6c0bcf9b279186d4dbe81649dda3e5ef38f586865943de4dcd653f8" dependencies = [ "bincode", - "borsh", + "borsh 0.9.3", "byteorder", "dynasm", "dynasmrt", "lazy_static", "libc", - "nix", + "nix 0.15.0", "serde", "serde_derive", "smallvec", @@ -5399,7 +5639,7 @@ dependencies = [ "libc", "memoffset", "more-asserts", - "region 3.0.0", + "region", "rkyv", "thiserror", "wasmer-types-near", @@ -5420,47 +5660,54 @@ checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wasmparser" -version = "0.84.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dc97c22bb5ce49a47b745bed8812d30206eff5ef3af31424f2c1820c0974b2" +checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" dependencies = [ "indexmap", + "url", ] [[package]] name = "wasmtime" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdd1101bdfa0414a19018ec0a091951a20b695d4d04f858d49f6c4cc53cd8dd" +checksum = "4abddf11816dd8f5e7310f6ebe5a2503b43f20ab2bf050b7d63f5b1bb96a81d9" dependencies = [ "anyhow", - "backtrace", "bincode", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log", - "object 0.28.4", + "object", "once_cell", "paste", "psm", - "region 2.2.0", "serde", "target-lexicon 0.12.4", - "wasmparser 0.84.0", + "wasmparser 0.95.0", "wasmtime-cranelift", "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi", + "windows-sys 0.42.0", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1f5206486f0467ba86e84d35996c4048b077cec2c9e5b322e7b853bdbe79334" +dependencies = [ + "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cranelift" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e78edcfb0daa9a9579ac379d00e2d5a5b2a60c0d653c8c95e8412f2166acb9" +checksum = "9e5bcb1d5ef211726b11e1286fe96cb40c69044c3632e1d6c67805d88a2e1a34" dependencies = [ "anyhow", "cranelift-codegen", @@ -5470,39 +5717,37 @@ dependencies = [ "cranelift-wasm", "gimli", "log", - "more-asserts", - "object 0.28.4", + "object", "target-lexicon 0.12.4", "thiserror", - "wasmparser 0.84.0", + "wasmparser 0.95.0", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4201389132ec467981980549574b33fc70d493b40f2c045c8ce5c7b54fbad97e" +checksum = "dcab3fac5a2ff68ce9857166a7d7c0e5251b554839b9dda7ed3b5528e191936e" dependencies = [ "anyhow", "cranelift-entity", "gimli", "indexmap", "log", - "more-asserts", - "object 0.28.4", + "object", "serde", "target-lexicon 0.12.4", "thiserror", - "wasmparser 0.84.0", + "wasmparser 0.95.0", "wasmtime-types", ] [[package]] name = "wasmtime-jit" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1587ca7752d00862faa540d00fd28e5ccf1ac61ba19756449193f1153cb2b127" +checksum = "a7d866e2a84ee164739b7ed7bd7cc9e1f918639d2ec5e2817a31e24c148cab20" dependencies = [ "addr2line", "anyhow", @@ -5511,62 +5756,101 @@ dependencies = [ "cpp_demangle", "gimli", "log", - "object 0.28.4", - "region 2.2.0", + "object", "rustc-demangle", - "rustix", "serde", "target-lexicon 0.12.4", - "thiserror", "wasmtime-environ", + "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-jit-debug" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27233ab6c8934b23171c64f215f902ef19d18c1712b46a0674286d1ef28d5dd" +checksum = "0104c2b1ce443f2a2806216fcdf6dce09303203ec5797a698d313063b31e5bc8" dependencies = [ - "lazy_static", + "once_cell", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22d9c2e92b0fc124d2cad6cb497a4c840580a7dd2414a37109e8c7cfe699c0ea" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-runtime" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d3b0b8f13db47db59d616e498fe45295819d04a55f9921af29561827bdb816" +checksum = "0a1f0f99297a94cb20c511d1d4e864d9b54794644016d2530dc797cacfa7224a" dependencies = [ "anyhow", - "backtrace", "cc", "cfg-if 1.0.0", "indexmap", "libc", "log", "mach", + "memfd", "memoffset", - "more-asserts", + "paste", "rand 0.8.5", - "region 2.2.0", "rustix", - "thiserror", + "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "wasmtime-types" -version = "0.37.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1630d9dca185299bec7f557a7e73b28742fe5590caf19df001422282a0a98ad1" +checksum = "62f3d8ee409447cae51651fd812437a0047ed8d7f44e94171ee05ce7cb955c96" dependencies = [ "cranelift-entity", "serde", "thiserror", - "wasmparser 0.84.0", + "wasmparser 0.95.0", +] + +[[package]] +name = "web-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.24.3", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", ] [[package]] @@ -5617,43 +5901,124 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + [[package]] name = "xz2" version = "0.1.7" @@ -5663,15 +6028,6 @@ dependencies = [ "lzma-sys", ] -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zeroize" version = "1.3.0" @@ -5699,7 +6055,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71e61de68ede9ffdd69c01664f65a178c5188b73f78faa21f0936016a888ff7c" dependencies = [ - "borsh", + "borsh 0.9.3", "byteorder", "crunchy", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 94679c69..716bd462 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["firehose-pb"] [package] name = "near-firehose-indexer" -version = "1.31.1" +version = "1.32.0-rc.1" authors = ["StreamingFast Developers "] edition = "2021" @@ -21,9 +21,9 @@ rkyv = "=0.7.38" tracing = { version = "0.1.36", features = ["std"] } tracing-subscriber = { version = "0.3.15", features = ["env-filter", "fmt", "registry", "std"] } -near-indexer = { git = "https://github.com/near/nearcore", rev="1.31.1" } -near-crypto = { git = "https://github.com/near/nearcore", rev="1.31.1" } -near-vm-errors = { git = "https://github.com/near/nearcore", rev="1.31.1" } +near-indexer = { git = "https://github.com/near/nearcore", rev="1.32.0-rc.1" } +near-crypto = { git = "https://github.com/near/nearcore", rev="1.32.0-rc.1" } +near-vm-errors = { git = "https://github.com/near/nearcore", rev="1.32.0-rc.1" } [build-dependencies] tonic-build = "0.8.4" diff --git a/firehose-pb/src/main.rs b/firehose-pb/src/main.rs index 269c969d..6a88dc2e 100644 --- a/firehose-pb/src/main.rs +++ b/firehose-pb/src/main.rs @@ -2,9 +2,6 @@ fn main() { tonic_build::configure() .out_dir("./src/codec") .format(true) - .compile( - &["sf/near/codec/v1/codec.proto"], - &["../proto", "../proto-near"], - ) + .compile(&["sf/near/type/v1/type.proto"], &["../sf-near/proto/"]) .unwrap_or_else(|e| panic!("Failed to compile near NEAR firehose proto(s) {:?}", e)); } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b1825785..54c202c5 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.65.0" +channel = "1.67.1" components = [ "rustfmt" ] targets = [ "wasm32-unknown-unknown" ] \ No newline at end of file diff --git a/src/codec/mod.rs b/src/codec/mod.rs index 117c066e..e96717c0 100644 --- a/src/codec/mod.rs +++ b/src/codec/mod.rs @@ -1,4 +1,4 @@ -#[path = "sf.near.codec.v1.rs"] +#[path = "sf.near.r#type.v1.rs"] mod codec; pub use codec::*; @@ -14,6 +14,7 @@ use near_indexer::near_primitives::views::{ use near_indexer::StreamerMessage; use hex; +use near_indexer::near_primitives::delegate_action::NonDelegateAction; use std::fmt::{Display, Formatter}; impl From<&near_indexer::StreamerMessage> for Block { @@ -454,6 +455,48 @@ impl From for execution_outcome::Status { account_id: account_id.to_string(), }, }, + ActionErrorKind::DelegateActionInvalidSignature => { + action_error::Kind::DelegateActionInvalidSignature { + 0: Default::default(), + } + } + ActionErrorKind::DelegateActionSenderDoesNotMatchTxReceiver { + sender_id, + receiver_id, + } => { + action_error::Kind::DelegateActionSenderDoesNotMatchTxReceiver { + 0: DelegateActionSenderDoesNotMatchTxReceiverKind { + sender_id: sender_id.to_string(), + receiver_id: receiver_id.to_string() + }, + } + } + ActionErrorKind::DelegateActionExpired => { + action_error::Kind::DelegateActionExpired { + 0: Default::default(), + } + } + ActionErrorKind::DelegateActionAccessKeyError(_) => { + action_error::Kind::DelegateActionAccessKeyError { + 0: Default::default(), + } + } + ActionErrorKind::DelegateActionInvalidNonce { delegate_nonce, ak_nonce} => { + action_error::Kind::DelegateActionInvalidNonce { + 0: DelegateActionInvalidNonceKind { + delegate_nonce: delegate_nonce.into(), + ak_nonce: ak_nonce.into(), + }, + } + } + ActionErrorKind::DelegateActionNonceTooLarge { delegate_nonce, upper_bound } => { + action_error::Kind::DelegateActionNonceTooLarge { + 0: DelegateActionNonceTooLargeKind { + delegate_nonce: delegate_nonce.into(), + upper_bound: upper_bound.into(), + }, + } + } }), }, }) @@ -612,10 +655,40 @@ impl From for Action { }, }), }, + near_views::ActionView::Delegate { + delegate_action, + signature, + } => Action { + action: Some(action::Action::Delegate { + 0: SignedDelegateAction { + delegate_action: Some(DelegateAction { + sender_id: delegate_action.sender_id.to_string(), + receiver_id: delegate_action.receiver_id.to_string(), + actions: delegate_action + .actions + .into_iter() + .map(|a| a.into()) + .collect(), + nonce: delegate_action.nonce.into(), + max_block_height: delegate_action.max_block_height.into(), + public_key: Some(PublicKey::from(delegate_action.public_key)), + }), + signature: Some(signature.into()), + }, + }), + }, } } } +impl From for Action { + fn from(value: near_primitives::delegate_action::NonDelegateAction) -> Self { + let near_act: near_primitives::transaction::Action = value.into(); + let near_act_view: near_views::ActionView = near_act.into(); + near_act_view.into() + } +} + impl From for AccessKey { fn from(k: near_views::AccessKeyView) -> Self { AccessKey { diff --git a/src/codec/sf.near.codec.v1.rs b/src/codec/sf.near.r#type.v1.rs similarity index 90% rename from src/codec/sf.near.codec.v1.rs rename to src/codec/sf.near.r#type.v1.rs index 8307252f..f4796cd6 100644 --- a/src/codec/sf.near.codec.v1.rs +++ b/src/codec/sf.near.r#type.v1.rs @@ -11,6 +11,17 @@ pub struct Block { #[prost(message, repeated, tag = "5")] pub state_changes: ::prost::alloc::vec::Vec, } +/// HeaderOnlyBlock is a standard [Block] structure where all other fields are +/// removed so that hydrating that object from a [Block] bytes payload will +/// drastically reduced allocated memory required to hold the full block. +/// +/// This can be used to unpack a [Block] when only the [BlockHeader] information +/// is required and greatly reduced required memory. +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct HeaderOnlyBlock { + #[prost(message, optional, tag = "2")] + pub header: ::core::option::Option, +} #[derive(Clone, PartialEq, ::prost::Message)] pub struct StateChangeWithCause { #[prost(message, optional, tag = "1")] @@ -508,7 +519,7 @@ pub struct ActionError { pub index: u64, #[prost( oneof = "action_error::Kind", - tags = "21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36" + tags = "21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42" )] pub kind: ::core::option::Option, } @@ -548,6 +559,20 @@ pub mod action_error { OnlyImplicitAccountCreationAllowed(super::OnlyImplicitAccountCreationAllowedErrorKind), #[prost(message, tag = "36")] DeleteAccountWithLargeState(super::DeleteAccountWithLargeStateErrorKind), + #[prost(message, tag = "37")] + DelegateActionInvalidSignature(super::DelegateActionInvalidSignatureKind), + #[prost(message, tag = "38")] + DelegateActionSenderDoesNotMatchTxReceiver( + super::DelegateActionSenderDoesNotMatchTxReceiverKind, + ), + #[prost(message, tag = "39")] + DelegateActionExpired(super::DelegateActionExpiredKind), + #[prost(message, tag = "40")] + DelegateActionAccessKeyError(super::DelegateActionAccessKeyErrorKind), + #[prost(message, tag = "41")] + DelegateActionInvalidNonce(super::DelegateActionInvalidNonceKind), + #[prost(message, tag = "42")] + DelegateActionNonceTooLarge(super::DelegateActionNonceTooLargeKind), } } #[derive(Clone, PartialEq, ::prost::Message)] @@ -656,6 +681,37 @@ pub struct DeleteAccountWithLargeStateErrorKind { pub account_id: ::prost::alloc::string::String, } #[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionInvalidSignatureKind {} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionSenderDoesNotMatchTxReceiverKind { + #[prost(string, tag = "1")] + pub sender_id: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub receiver_id: ::prost::alloc::string::String, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionExpiredKind {} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionAccessKeyErrorKind { + /// InvalidAccessKeyError + #[prost(enumeration = "InvalidTxError", tag = "1")] + pub error: i32, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionInvalidNonceKind { + #[prost(uint64, tag = "1")] + pub delegate_nonce: u64, + #[prost(uint64, tag = "2")] + pub ak_nonce: u64, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateActionNonceTooLargeKind { + #[prost(uint64, tag = "1")] + pub delegate_nonce: u64, + #[prost(uint64, tag = "2")] + pub upper_bound: u64, +} +#[derive(Clone, PartialEq, ::prost::Message)] pub struct MerklePath { #[prost(message, repeated, tag = "1")] pub path: ::prost::alloc::vec::Vec, @@ -669,7 +725,7 @@ pub struct MerklePathItem { } #[derive(Clone, PartialEq, ::prost::Message)] pub struct Action { - #[prost(oneof = "action::Action", tags = "1, 2, 3, 4, 5, 6, 7, 8")] + #[prost(oneof = "action::Action", tags = "1, 2, 3, 4, 5, 6, 7, 8, 9")] pub action: ::core::option::Option, } /// Nested message and enum types in `Action`. @@ -692,6 +748,8 @@ pub mod action { DeleteKey(super::DeleteKeyAction), #[prost(message, tag = "8")] DeleteAccount(super::DeleteAccountAction), + #[prost(message, tag = "9")] + Delegate(super::SignedDelegateAction), } } #[derive(Clone, PartialEq, ::prost::Message)] @@ -742,6 +800,28 @@ pub struct DeleteAccountAction { pub beneficiary_id: ::prost::alloc::string::String, } #[derive(Clone, PartialEq, ::prost::Message)] +pub struct SignedDelegateAction { + #[prost(message, optional, tag = "1")] + pub signature: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub delegate_action: ::core::option::Option, +} +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct DelegateAction { + #[prost(string, tag = "1")] + pub sender_id: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub receiver_id: ::prost::alloc::string::String, + #[prost(message, repeated, tag = "3")] + pub actions: ::prost::alloc::vec::Vec, + #[prost(uint64, tag = "4")] + pub nonce: u64, + #[prost(uint64, tag = "5")] + pub max_block_height: u64, + #[prost(message, optional, tag = "6")] + pub public_key: ::core::option::Option, +} +#[derive(Clone, PartialEq, ::prost::Message)] pub struct AccessKey { #[prost(uint64, tag = "1")] pub nonce: u64,