From cd5d74d1731f6bbd94509dcf1a0fccf691e5e526 Mon Sep 17 00:00:00 2001 From: Xiangyi Zheng Date: Mon, 3 Jun 2024 15:00:56 +0800 Subject: [PATCH] near-sdk version: move to the commit with yield_resume merged --- contract/Cargo.lock | 235 ++++++++---------- contract/Cargo.toml | 2 +- crypto-shared/Cargo.lock | 11 +- crypto-shared/Cargo.toml | 3 +- integration-tests/chain-signatures/Cargo.lock | 57 ++++- node/Cargo.lock | 57 ++++- 6 files changed, 215 insertions(+), 150 deletions(-) diff --git a/contract/Cargo.lock b/contract/Cargo.lock index ff3ecf1d4..050a6f0f9 100644 --- a/contract/Cargo.lock +++ b/contract/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ "futures-util", "log", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "smallvec", "tokio", @@ -258,16 +258,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -310,17 +310,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if 1.0.0", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.1", "rustix 0.38.34", "slab", "tracing", @@ -338,12 +338,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -377,12 +377,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", @@ -632,12 +632,11 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -656,11 +655,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ - "borsh-derive 1.5.0", + "borsh-derive 1.5.1", "cfg_aliases", ] @@ -679,9 +678,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a8646f94ab393e43e8b35a2558b1624bed28b97ee09c5d15456e3c9463f46d" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", "proc-macro-crate 3.1.0", @@ -931,9 +930,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -1317,7 +1316,7 @@ dependencies = [ "crossterm_winapi", "libc", "mio", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi", @@ -1394,10 +1393,10 @@ dependencies = [ [[package]] name = "crypto-shared" -version = "0.0.0" +version = "0.1.0" dependencies = [ "anyhow", - "borsh 1.5.0", + "borsh 1.5.1", "getrandom 0.2.15", "k256", "near-account-id", @@ -1734,9 +1733,9 @@ checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" [[package]] name = "easy-ext" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49457524c7e65648794c98283282a0b7c73b10018e7091f1cdcfff314fd7ae59" +checksum = "cc5d6d6a8504f8caedd7de14576464383900cd3840b7033a7a3dce5ac00121ca" [[package]] name = "ecdsa" @@ -1980,43 +1979,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -3202,7 +3180,7 @@ name = "mpc-contract" version = "0.2.0" dependencies = [ "anyhow", - "borsh 1.5.0", + "borsh 1.5.1", "crypto-shared", "k256", "near-sdk", @@ -3230,11 +3208,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3252,7 +3229,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c49593c9e94454a2368a4c0a511bf4bf1413aff4d23f16e1d8f4e64b5215351" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "schemars", "semver 1.0.23", "serde", @@ -3304,7 +3281,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "serde", ] @@ -3377,7 +3354,7 @@ dependencies = [ "color-eyre", "derive_more", "dirs", - "easy-ext 1.0.1", + "easy-ext 1.0.2", "ed25519-dalek 1.0.1", "futures", "hex 0.4.3", @@ -3442,7 +3419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2991d2912218a80ec0733ac87f84fa803accea105611eea209d4419271957667" dependencies = [ "blake2", - "borsh 1.5.0", + "borsh 1.5.1", "bs58 0.4.0", "c2-chacha", "curve25519-dalek 4.1.2", @@ -3469,7 +3446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d927e95742aea981b9fd60996fbeba3b61e90acafd54c2c3c2a4ed40065ff03" dependencies = [ "blake2", - "borsh 1.5.0", + "borsh 1.5.1", "bs58 0.4.0", "c2-chacha", "curve25519-dalek 4.1.2", @@ -3513,7 +3490,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e75c875026229902d065e4435804497337b631ec69ba746b102954273e9ad1" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "interactive-clap", "schemars", "serde", @@ -3525,7 +3502,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18ad81e015f7aced8925d5b9ba3f369b36da9575c15812cfd0786bc1213284ca" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "lazy_static", "log", "near-chain-configs 0.20.1", @@ -3544,7 +3521,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5225c0f97a61fd4534dee3169959dd91bb812be7d0573c1130a3cf86fd16b3e" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "lazy_static", "log", "near-chain-configs 0.21.2", @@ -3652,7 +3629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f16a59b6c3e69b0585be951af6fe42a0ba86c0e207cb8c63badd19efd16680" dependencies = [ "assert_matches", - "borsh 1.5.0", + "borsh 1.5.1", "enum-map", "near-account-id", "near-primitives-core 0.20.1", @@ -3671,7 +3648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a996c8654020f7eb3c11039cb39123fd4cd78654fde4c9e7c3fd6d092c84f342" dependencies = [ "assert_matches", - "borsh 1.5.0", + "borsh 1.5.1", "enum-map", "near-account-id", "near-primitives-core 0.21.2", @@ -3691,7 +3668,7 @@ checksum = "0462b067732132babcc89d5577db3bfcb0a1bcfbaaed3f2db4c11cd033666314" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "bytesize", "cfg-if 1.0.0", "chrono", @@ -3733,7 +3710,7 @@ checksum = "7c880397c022d3b8f592cef18f85fd6e79181a2a04c31154afb1730f9fa21098" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "bytesize", "cfg-if 1.0.0", "chrono", @@ -3775,7 +3752,7 @@ checksum = "8443eb718606f572c438be6321a097a8ebd69f8e48d953885b4f16601af88225" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "bs58 0.4.0", "derive_more", "enum-map", @@ -3797,7 +3774,7 @@ checksum = "082b1d3f6c7e273ec5cd9588e00bdbfc51be6cc9a3a7ec31fc899b4b7d2d3f9d" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "bs58 0.4.0", "derive_more", "enum-map", @@ -3873,11 +3850,10 @@ dependencies = [ [[package]] name = "near-sdk" version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" dependencies = [ "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "bs58 0.5.1", "near-account-id", "near-crypto 0.20.1", @@ -3898,8 +3874,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" dependencies = [ "Inflector", "darling", @@ -3908,7 +3883,7 @@ dependencies = [ "serde", "serde_json", "strum 0.26.2", - "strum_macros 0.26.2", + "strum_macros 0.26.3", "syn 2.0.66", ] @@ -3944,8 +3919,7 @@ checksum = "73a697f311c110d0fabae6c8c49ab0a8eff0ec37df82cc860deba92156e77c43" [[package]] name = "near-sys" version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" [[package]] name = "near-token" @@ -3953,7 +3927,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b68f3f8a2409f72b43efdbeff8e820b81e70824c49fee8572979d789d1683fb" dependencies = [ - "borsh 1.5.0", + "borsh 1.5.1", "interactive-clap", "serde", ] @@ -4029,7 +4003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c56c80bdb1954808f59bd36a9112377197b38d424991383bf05f52d0fe2e0da5" dependencies = [ "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "ed25519-dalek 2.1.1", "enum-map", "memoffset 0.8.0", @@ -4060,7 +4034,7 @@ checksum = "20569500ca56e161c6ed81da9a24c7bf7b974c4238b2f08b2582113b66fa0060" dependencies = [ "anyhow", "base64 0.21.7", - "borsh 1.5.0", + "borsh 1.5.1", "ed25519-dalek 2.1.1", "enum-map", "finite-wasm", @@ -4593,9 +4567,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api 0.4.12", "parking_lot_core 0.9.10", @@ -4733,9 +4707,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -4788,9 +4762,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -4913,9 +4887,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -4930,7 +4904,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "protobuf", "thiserror", ] @@ -5430,14 +5404,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] @@ -5449,13 +5425,20 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -5545,16 +5528,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -5663,9 +5636,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -5691,9 +5664,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -6062,7 +6035,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "phf_shared", "precomputed-hash", "serde", @@ -6104,11 +6077,11 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -6150,7 +6123,7 @@ dependencies = [ "lazycell", "nom", "nom-supreme", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pdb", "regex", "scroll 0.11.0", @@ -6363,19 +6336,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.10", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -6392,9 +6365,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -6790,15 +6763,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", "rustls-webpki", "url", "webpki-roots", @@ -7432,9 +7406,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "wee_alloc" diff --git a/contract/Cargo.toml b/contract/Cargo.toml index eea844251..a7efec1ee 100644 --- a/contract/Cargo.toml +++ b/contract/Cargo.toml @@ -8,7 +8,7 @@ crate-type = ["cdylib", "lib"] [dependencies] borsh = "1.5.0" -near-sdk = { version = "=5.1.0", features = ["legacy", "unit-testing"] } +near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "5a9acaedc95c5721d2088f263bc99e3de574decf", features = ["legacy", "unit-testing"] } serde = { version = "1", features = ["derive"] } serde_json = "1" schemars = "0.8" diff --git a/crypto-shared/Cargo.lock b/crypto-shared/Cargo.lock index f52bc56f3..110a3c0ac 100644 --- a/crypto-shared/Cargo.lock +++ b/crypto-shared/Cargo.lock @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "crypto-shared" -version = "0.0.0" +version = "0.1.0" dependencies = [ "anyhow", "borsh", @@ -388,8 +388,7 @@ dependencies = [ [[package]] name = "near-sdk" version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520234cfdf04a805ac2f04715889d096eb83fdd5b99ca7d0f8027ae473f891a8" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" dependencies = [ "base64", "borsh", @@ -408,8 +407,7 @@ dependencies = [ [[package]] name = "near-sdk-macros" version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2fe3fc30068c5f20e89b0985d6104c5cc1c6742dbc6efbf352be4189b9bbf7" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" dependencies = [ "Inflector", "darling", @@ -425,8 +423,7 @@ dependencies = [ [[package]] name = "near-sys" version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" [[package]] name = "near-token" diff --git a/crypto-shared/Cargo.toml b/crypto-shared/Cargo.toml index 3c5ce986c..766d7f45f 100644 --- a/crypto-shared/Cargo.toml +++ b/crypto-shared/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "crypto-shared" +version = "0.1.0" edition = "2021" [dependencies] @@ -9,7 +10,7 @@ serde = "1" borsh = "1.3.0" near-account-id = "1" serde_json = "1" -near-sdk = {version = "=5.1.0", features = ["unstable"]} +near-sdk = { git = "https://github.com/near/near-sdk-rs.git", rev = "5a9acaedc95c5721d2088f263bc99e3de574decf", features = ["unstable"] } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2.12", features = ["custom"] } diff --git a/integration-tests/chain-signatures/Cargo.lock b/integration-tests/chain-signatures/Cargo.lock index 66809537c..60fadbbfe 100644 --- a/integration-tests/chain-signatures/Cargo.lock +++ b/integration-tests/chain-signatures/Cargo.lock @@ -2086,14 +2086,14 @@ dependencies = [ [[package]] name = "crypto-shared" -version = "0.0.0" +version = "0.1.0" dependencies = [ "anyhow", "borsh 1.5.0", "getrandom 0.2.15", "k256", "near-account-id", - "near-sdk", + "near-sdk 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "serde", "serde_json", ] @@ -4565,7 +4565,7 @@ dependencies = [ "borsh 1.5.0", "crypto-shared", "k256", - "near-sdk", + "near-sdk 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "schemars", "serde", "serde_json", @@ -4614,7 +4614,7 @@ dependencies = [ "near-lake-framework", "near-lake-primitives", "near-primitives 0.21.2", - "near-sdk", + "near-sdk 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "prometheus", "rand 0.8.5", @@ -5381,8 +5381,32 @@ dependencies = [ "near-parameters 0.20.1", "near-primitives 0.20.1", "near-primitives-core 0.20.1", - "near-sdk-macros", - "near-sys", + "near-sdk-macros 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "near-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "near-token", + "near-vm-runner 0.20.1", + "once_cell", + "serde", + "serde_json", + "wee_alloc", +] + +[[package]] +name = "near-sdk" +version = "5.1.0" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" +dependencies = [ + "base64 0.21.7", + "borsh 1.5.0", + "bs58 0.5.1", + "near-account-id", + "near-crypto 0.20.1", + "near-gas", + "near-parameters 0.20.1", + "near-primitives 0.20.1", + "near-primitives-core 0.20.1", + "near-sdk-macros 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", + "near-sys 0.2.1 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "near-token", "near-vm-runner 0.20.1", "once_cell", @@ -5408,6 +5432,22 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "near-sdk-macros" +version = "5.1.0" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" +dependencies = [ + "Inflector", + "darling 0.20.9", + "proc-macro2", + "quote", + "serde", + "serde_json", + "strum 0.26.2", + "strum_macros 0.26.2", + "syn 2.0.65", +] + [[package]] name = "near-socialdb-client" version = "0.2.2" @@ -5443,6 +5483,11 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" +[[package]] +name = "near-sys" +version = "0.2.1" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" + [[package]] name = "near-token" version = "0.2.0" diff --git a/node/Cargo.lock b/node/Cargo.lock index e29674b2c..47d82f843 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -1646,14 +1646,14 @@ dependencies = [ [[package]] name = "crypto-shared" -version = "0.0.0" +version = "0.1.0" dependencies = [ "anyhow", "borsh 1.5.0", "getrandom 0.2.15", "k256", "near-account-id", - "near-sdk", + "near-sdk 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "serde", "serde_json", ] @@ -3343,7 +3343,7 @@ dependencies = [ "borsh 1.5.0", "crypto-shared", "k256", - "near-sdk", + "near-sdk 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "schemars", "serde", "serde_json", @@ -3392,7 +3392,7 @@ dependencies = [ "near-lake-framework", "near-lake-primitives", "near-primitives 0.21.2", - "near-sdk", + "near-sdk 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "prometheus", "rand 0.8.5", @@ -3978,8 +3978,32 @@ dependencies = [ "near-parameters 0.20.1", "near-primitives 0.20.1", "near-primitives-core 0.20.1", - "near-sdk-macros", - "near-sys", + "near-sdk-macros 5.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "near-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "near-token", + "near-vm-runner 0.20.1", + "once_cell", + "serde", + "serde_json", + "wee_alloc", +] + +[[package]] +name = "near-sdk" +version = "5.1.0" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" +dependencies = [ + "base64 0.21.7", + "borsh 1.5.0", + "bs58 0.5.1", + "near-account-id", + "near-crypto 0.20.1", + "near-gas", + "near-parameters 0.20.1", + "near-primitives 0.20.1", + "near-primitives-core 0.20.1", + "near-sdk-macros 5.1.0 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", + "near-sys 0.2.1 (git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf)", "near-token", "near-vm-runner 0.20.1", "once_cell", @@ -4005,6 +4029,22 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "near-sdk-macros" +version = "5.1.0" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" +dependencies = [ + "Inflector", + "darling 0.20.9", + "proc-macro2", + "quote", + "serde", + "serde_json", + "strum 0.26.2", + "strum_macros 0.26.2", + "syn 2.0.66", +] + [[package]] name = "near-stdx" version = "0.20.1" @@ -4023,6 +4063,11 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397688591acf8d3ebf2c2485ba32d4b24fc10aad5334e3ad8ec0b7179bfdf06b" +[[package]] +name = "near-sys" +version = "0.2.1" +source = "git+https://github.com/near/near-sdk-rs.git?rev=5a9acaedc95c5721d2088f263bc99e3de574decf#5a9acaedc95c5721d2088f263bc99e3de574decf" + [[package]] name = "near-token" version = "0.2.0"