From 4126796adf5a347d5d6b2bc6a0f07fd8d9918864 Mon Sep 17 00:00:00 2001 From: Ivan Frolov <59515280+frolvanya@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:59:44 -0500 Subject: [PATCH] feat: handle gas estimation error (#193) * feat: handle gas estimation error * fix: estimate gas in a correct place * chore: fmt --- omni-relayer/Cargo.lock | 602 ++++++++++++++++--------------- omni-relayer/Cargo.toml | 22 +- omni-relayer/src/workers/near.rs | 19 +- 3 files changed, 329 insertions(+), 314 deletions(-) diff --git a/omni-relayer/Cargo.lock b/omni-relayer/Cargo.lock index 00f4bd7c..fc71b4aa 100644 --- a/omni-relayer/Cargo.lock +++ b/omni-relayer/Cargo.lock @@ -108,9 +108,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59febb24956a41c29bb5f450978fbe825bd6456b3f80586c8bd558dc882e7b6a" +checksum = "bbcc41e8a11a4975b18ec6afba2cc48d591fa63336a4c526dacb50479a8d6b35" dependencies = [ "alloy-consensus", "alloy-contract", @@ -144,9 +144,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88e1edea70787c33e11197d3f32ae380f3db19e6e061e539a5bcf8184a6b326" +checksum = "f4138dc275554afa6f18c4217262ac9388790b2fc393c2dfe03c51d357abf013" dependencies = [ "alloy-eips", "alloy-primitives", @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b1bb53f40c0273cd1975573cd457b39213e68584e36d1401d25fd0398a1d65" +checksum = "0fa04e1882c31288ce1028fdf31b6ea94cfa9eafa2e497f903ded631c8c6a42c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -175,9 +175,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b668c78c4b1f12f474ede5a85e8ce550d0aa1ef7d49fd1d22855a43b960e725" +checksum = "5f21886c1fea0626f755a49b2ac653b396fb345233f6170db2da3d0ada31560c" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "alloy-eip7702" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" +checksum = "cabf647eb4650c91a9d38cb6f972bb320009e7e9d61765fb688a86f1563b33e8" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -249,9 +249,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9fadfe089e9ccc0650473f2d4ef0a28bc015bbca5631d9f0f09e49b557fdb3" +checksum = "52dd5869ed09e399003e0e0ec6903d981b2a92e74c5d37e6b40890bad2517526" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -267,10 +267,11 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2a4cf7b70f3495788e74ce1c765260ffe38820a2a774ff4aacb62e31ea73f9" +checksum = "e7d2a7fe5c1a9bd6793829ea21a636f30fc2b3f5d2e7418ba86d96e41dd1f460" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-serde", "alloy-trie", @@ -291,9 +292,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29040b9d5fe2fb70415531882685b64f8efd08dfbd6cc907120650504821105" +checksum = "2008bedb8159a255b46b7c8614516eda06679ea82f620913679afbd8031fea72" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -305,9 +306,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510cc00b318db0dfccfdd2d032411cfae64fc144aef9679409e014145d3dacc4" +checksum = "4556f01fe41d0677495df10a648ddcf7ce118b0e8aa9642a0e2b6dd1fb7259de" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -330,9 +331,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9081c099e798b8a2bba2145eb82a9a146f01fc7a35e9ab6e7b43305051f97550" +checksum = "f31c3c6b71340a1d076831823f09cb6e02de01de5c6630a9631bdb36f947ff80" dependencies = [ "alloy-consensus", "alloy-eips", @@ -343,9 +344,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef9849fb8bbb28f69f2cbdb4b0dac2f0e35c04f6078a00dfb8486469aed02de" +checksum = "4520cd4bc5cec20c32c98e4bc38914c7fb96bf4a712105e44da186a54e65e3ba" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -371,7 +372,7 @@ dependencies = [ "derive_more 1.0.0", "foldhash", "hashbrown 0.15.2", - "indexmap 2.7.0", + "indexmap 2.7.1", "itoa", "k256", "keccak-asm", @@ -387,9 +388,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2dfaddd9a30aa870a78a4e1316e3e115ec1e12e552cbc881310456b85c1f24" +checksum = "5a22c4441b3ebe2d77fa9cf629ba68c3f713eb91779cff84275393db97eddd82" dependencies = [ "alloy-chains", "alloy-consensus", @@ -430,9 +431,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695809e743628d54510c294ad17a4645bd9f465aeb0d20ee9ce9877c9712dc9c" +checksum = "2269fd635f7b505f27c63a3cb293148cd02301efce4c8bdd9ff54fbfc4a20e23" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -471,9 +472,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531137b283547d5b9a5cafc96b006c64ef76810c681d606f28be9781955293b6" +checksum = "d06a292b37e182e514903ede6e623b9de96420e8109ce300da288a96d88b7e4b" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -496,9 +497,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3410a472ce26c457e9780f708ee6bd540b30f88f1f31fdab7a11d00bd6aa1aee" +checksum = "9383845dd924939e7ab0298bbfe231505e20928907d7905aa3bf112287305e06" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -508,9 +509,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed06bd8a5fc57b352a6cbac24eec52a4760f08ae2c1eb56ac49c8ed4b02c351" +checksum = "11495cb8c8d3141fc27556a4c9188b81531ad5ec3076a0394c61a6dcfbce9f34" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -520,9 +521,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed98e1af55a7d856bfa385f30f63d8d56be2513593655c904a8f4a7ec963aa3e" +checksum = "ca445cef0eb6c2cf51cfb4e214fbf1ebd00893ae2e6f3b944c8101b07990f988" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -531,9 +532,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8737d7a6e37ca7bba9c23e9495c6534caec6760eb24abc9d5ffbaaba147818e1" +checksum = "0938bc615c02421bd86c1733ca7205cc3d99a122d9f9bff05726bd604b76a5c2" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -543,17 +544,17 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "derive_more 1.0.0", "itertools 0.13.0", "serde", "serde_json", + "thiserror 2.0.11", ] [[package]] name = "alloy-serde" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5851bf8d5ad33014bd0c45153c603303e730acc8a209450a7ae6b4a12c2789e2" +checksum = "ae0465c71d4dced7525f408d84873aeebb71faf807d22d74c4a426430ccd9b55" dependencies = [ "alloy-primitives", "serde", @@ -562,9 +563,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e10ca565da6500cca015ba35ee424d59798f2e1b85bc0dd8f81dafd401f029a" +checksum = "9bfa395ad5cc952c82358d31e4c68b27bf4a89a5456d9b27e226e77dac50e4ff" dependencies = [ "alloy-primitives", "async-trait", @@ -576,9 +577,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fababf5a745133490cde927d48e50267f97d3d1209b9fc9f1d1d666964d172" +checksum = "fbdc63ce9eda1283fcbaca66ba4a414b841c0e3edbeef9c86a71242fc9e84ccc" dependencies = [ "alloy-consensus", "alloy-network", @@ -613,7 +614,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck 0.5.0", - "indexmap 2.7.0", + "indexmap 2.7.1", "proc-macro-error2", "proc-macro2", "quote", @@ -662,9 +663,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "538a04a37221469cac0ce231b737fd174de2fdfcdd843bdd068cb39ed3e066ad" +checksum = "d17722a198f33bbd25337660787aea8b8f57814febb7c746bc30407bdfc39448" dependencies = [ "alloy-json-rpc", "base64 0.22.1", @@ -682,9 +683,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed40eb1e1265b2911512f6aa1dcece9702d078f5a646730c45e39e2be00ac1c" +checksum = "6e1509599021330a31c4a6816b655e34bf67acb1cc03c564e09fd8754ff6c5de" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -697,9 +698,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba0e39d181d13c266dbb8ca54ed584a2c66d6e9279afca89c7a6b1825e98abb" +checksum = "58011745b2f17b334db40df9077d75b181f78360a5bc5c35519e15d4bfce15e2" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1755,11 +1756,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb65153674e51d3a42c8f27b05b9508cea85edfaade8aa46bc8fc18cecdfef3" +checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc" dependencies = [ - "borsh-derive 1.5.4", + "borsh-derive 1.5.5", "cfg_aliases", ] @@ -1778,9 +1779,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a396e17ad94059c650db3d253bb6e25927f1eb462eede7e7a153bb6e75dce0a7" +checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", @@ -1814,13 +1815,15 @@ dependencies = [ [[package]] name = "bridge-connector-common" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ "eth-proof", "ethers", "near-light-client-on-eth", "near-rpc-client", "serde_json", + "solana-bridge-client", + "solana-client", "thiserror 2.0.11", ] @@ -2009,7 +2012,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "thiserror 1.0.69", @@ -2023,7 +2026,7 @@ checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "clap", "heck 0.4.1", - "indexmap 2.7.0", + "indexmap 2.7.1", "log", "proc-macro2", "quote", @@ -2118,9 +2121,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" +checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" dependencies = [ "clap_builder", "clap_derive", @@ -2128,9 +2131,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.26" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -3180,9 +3183,9 @@ dependencies = [ [[package]] name = "eth-proof" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "cita_trie", "ethereum-types 0.14.1", "hasher", @@ -3397,7 +3400,7 @@ dependencies = [ "chrono", "ethers-core", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "thiserror 1.0.69", @@ -3506,7 +3509,7 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "solang-parser", @@ -3549,9 +3552,9 @@ dependencies = [ [[package]] name = "evm-bridge-client" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bridge-connector-common", "derive_builder 0.20.2", "eth-proof", @@ -3981,7 +3984,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.7.0", + "indexmap 2.7.1", "slab", "tokio", "tokio-util", @@ -4000,7 +4003,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap 2.7.0", + "indexmap 2.7.1", "slab", "tokio", "tokio-util", @@ -4574,9 +4577,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -4616,9 +4619,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "is-terminal" @@ -5053,16 +5056,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35cbb989542587b47205e608324ddd391f0cee1c22b4b64ae49f458334b95907" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "serde", ] [[package]] name = "near-bridge-client" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bridge-connector-common", "derive_builder 0.20.2", "near-contract-standards", @@ -5141,7 +5144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b17944c8d0f274c684227d79fcd46d583b1e36064b597c53a9ebec187a86f3" dependencies = [ "blake2", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.4.0", "curve25519-dalek 4.1.3", "derive_more 0.99.18", @@ -5166,7 +5169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4374804fdd45ac84c9e7cc3183312c98560c5518d81e6d8e2d92b77587e5a9f3" dependencies = [ "blake2", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.4.0", "curve25519-dalek 4.1.3", "derive_more 0.99.18", @@ -5209,7 +5212,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180edcc7dc2fac41f93570d0c7b759c1b6d492f6ad093d749d644a40b4310a97" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "serde", ] @@ -5230,7 +5233,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e66a0c4c47f2fbbfa11ea8317fce2288d70d4aa8231e77fd213721ffcc1c334f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "lazy_static", "log", "near-chain-configs", @@ -5289,7 +5292,7 @@ dependencies = [ [[package]] name = "near-light-client-on-eth" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ "ethereum-types 0.14.1", "ethers", @@ -5303,7 +5306,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d4b4d014ac9f46baf0eeac7214567a08db97d5fd26157ea13edfbb8ffc5fd8c" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "enum-map", "near-account-id", "near-primitives-core 0.27.0", @@ -5322,7 +5325,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1279baa276725971d5e2b80c524d1aa42d5ad8bccf8901466fd579374cf58a14" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "enum-map", "near-account-id", "near-primitives-core 0.28.0", @@ -5344,7 +5347,7 @@ dependencies = [ "arbitrary", "base64 0.21.7", "bitvec", - "borsh 1.5.4", + "borsh 1.5.5", "bytes", "bytesize", "cfg-if 1.0.0", @@ -5383,7 +5386,7 @@ dependencies = [ "arbitrary", "base64 0.21.7", "bitvec", - "borsh 1.5.4", + "borsh 1.5.5", "bytes", "bytesize", "cfg-if 1.0.0", @@ -5424,7 +5427,7 @@ checksum = "0de2c9da5de096b5cd4786a270900ff32a49d267e442a2e7f271fb23eb925c87" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.4.0", "derive_more 0.99.18", "enum-map", @@ -5445,7 +5448,7 @@ checksum = "d597af103bb7881d1fb9031fb126cfe6c1acb9c9a6c8296dca45b5b3beb0893d" dependencies = [ "arbitrary", "base64 0.21.7", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.4.0", "derive_more 0.99.18", "enum-map", @@ -5461,9 +5464,9 @@ dependencies = [ [[package]] name = "near-rpc-client" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "lazy_static", "near-crypto 0.28.0", "near-jsonrpc-client", @@ -5526,7 +5529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "befb9df6da1a6a0b6656388c0db76084867062a87f1cbc066c188a8e360b6463" dependencies = [ "base64 0.22.1", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "near-account-id", "near-gas", @@ -5600,7 +5603,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd3e60aa26a74dc514b1b6408fdd06cefe2eb0ff029020956c1c6517594048fd" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "serde", ] @@ -5854,9 +5857,9 @@ dependencies = [ [[package]] name = "omni-connector" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bridge-connector-common", "derive_builder 0.20.2", "eth-proof", @@ -5885,7 +5888,8 @@ version = "0.1.0" dependencies = [ "alloy", "anyhow", - "borsh 1.5.4", + "borsh 1.5.5", + "bridge-connector-common", "chrono", "clap", "dotenv", @@ -5927,7 +5931,7 @@ dependencies = [ "alloy-rlp", "alloy-sol-macro", "alloy-sol-types", - "borsh 1.5.4", + "borsh 1.5.5", "ethereum-types 0.15.1", "hex", "near-contract-standards", @@ -6041,7 +6045,7 @@ version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "num-traits", "rand 0.8.5", "serde", @@ -6206,7 +6210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.7.0", + "indexmap 2.7.1", ] [[package]] @@ -7036,7 +7040,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.24", + "semver 1.0.25", ] [[package]] @@ -7389,9 +7393,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" dependencies = [ "serde", ] @@ -7448,9 +7452,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" dependencies = [ "itoa", "memchr", @@ -7500,7 +7504,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.7.0", + "indexmap 2.7.1", "serde", "serde_derive", "serde_json", @@ -7526,7 +7530,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.7.1", "itoa", "ryu", "serde", @@ -7694,9 +7698,9 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e5bfd02090b1a054b907dc21853789008c11f104ab06a5b671a2e25cca785c" +checksum = "8557558040a6bf34101ea0ded1647bafc21c2a9ea0913034fa6794a304ba6791" dependencies = [ "bincode", "serde", @@ -7708,9 +7712,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe596e5bc809e6a0788612fd7e25d6c1dcdfc71c45e1e3d2d54ff8286101b710" +checksum = "2353887223851d07071e790a6508d8df61032a5e01bb6f990d7abe7f58dde3aa" dependencies = [ "Inflector", "base64 0.22.1", @@ -7734,9 +7738,9 @@ dependencies = [ [[package]] name = "solana-account-decoder-client-types" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d380d316c01b4ecadcd4df39f00e4ad69cd88b93baad776aa4a74f0ec533079c" +checksum = "435bb722c456f78dd3ac33a1b4641c46d5d41de5b072422ae5b0dc9f486c0928" dependencies = [ "base64 0.22.1", "bs58 0.5.1", @@ -7750,9 +7754,9 @@ dependencies = [ [[package]] name = "solana-account-info" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9a5a802bc6ab2ba6a9d77580b038e7c2409932074f14fe35eaa64894a53c1e" +checksum = "abeb32e8dbead1f920a919d8c781fe058cf657313aa237566fa812d2288f2aab" dependencies = [ "bincode", "serde", @@ -7763,18 +7767,18 @@ dependencies = [ [[package]] name = "solana-atomic-u64" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bd7099cc7b9450feee5cefa9481af12b2671eceb09218738e242bdb6c25e4d" +checksum = "70ceb7242711300b8d67933a3cd1c9b2cd7c4e98de529356ecddf340c98c457d" dependencies = [ "parking_lot", ] [[package]] name = "solana-bincode" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed7814b4f749c62973781a3d490af7b42b496b2b725cacb0a5477931cb27ef3" +checksum = "e154567b6846f4721c713afdd14c56892800fb940793ef529a68d6db6cf1beef" dependencies = [ "bincode", "serde", @@ -7783,9 +7787,9 @@ dependencies = [ [[package]] name = "solana-bn254" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418ef1dd3ae61a70543d2487d029e7bac2ff4fd2684bfb8e0350356808bac81c" +checksum = "44c42ad3282999ef7df859e7ed03a6e6a4187ff4931f9814ddcd0477dba2be15" dependencies = [ "ark-bn254", "ark-ec", @@ -7798,20 +7802,20 @@ dependencies = [ [[package]] name = "solana-borsh" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d1d3a9cd527faf389b47736e48580585d4f216705197c09b36affa1f5afdb1" +checksum = "5b2428671e99134c97990d2b466c33779f785376b7934e6bddb635929c54208f" dependencies = [ "borsh 0.10.4", - "borsh 1.5.4", + "borsh 1.5.5", ] [[package]] name = "solana-bridge-client" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "derive_builder 0.20.2", "mpl-token-metadata", "sha2 0.10.8", @@ -7824,16 +7828,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6c973380a8970007f85795131c32b770213213fa48b5f37d1bb6d60e1f0480" +checksum = "73d3a06371c4b63efa8d2dde9890b658891943807c529144eac6d2345538077d" dependencies = [ "async-trait", "bincode", "dashmap 5.5.3", "futures", "futures-util", - "indexmap 2.7.0", + "indexmap 2.7.1", "indicatif", "log", "quinn", @@ -7856,9 +7860,9 @@ dependencies = [ [[package]] name = "solana-clock" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f3beb4770cd15cdc4793cf10cb4ec502c51d944b64e32e34a116051dcbf5c2" +checksum = "1d639043cefcd061c31a342364adcb204406ebbd91ef86dfde88b74352b688cf" dependencies = [ "serde", "serde_derive", @@ -7868,18 +7872,18 @@ dependencies = [ [[package]] name = "solana-compute-budget" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7781a28477ec2269de84c96b77360db5c140c274549da54bf3dce2457ad07c" +checksum = "a6c885192c0afe6f7beac13e1c8eb51ce36bc60e8f0b7631f9cbf72d8ca6aa03" dependencies = [ "solana-sdk", ] [[package]] name = "solana-config-program" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc7b003aac6c1b2d9b71ba50482557eab5dc01c498be80ca08fe1f806d0cea1" +checksum = "056ce3a28f5e22677e0db1fc976294041571c4d471a752bfc9f1b06f8828c488" dependencies = [ "bincode", "chrono", @@ -7893,15 +7897,15 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175181cb7cb0d100beb8d23891b77c73bca9f68ad454a95ae76e0069a5539fa8" +checksum = "52912ec1eb7b40af2a81269d0bb2cefba01f303383cba32067d0dc5020556e38" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.7.0", + "indexmap 2.7.1", "log", "rand 0.8.5", "rayon", @@ -7914,9 +7918,9 @@ dependencies = [ [[package]] name = "solana-cpi" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b66925890e4108d10df357940da32ae01eea68d07b8da816eec4b93519db9d" +checksum = "5b87b387931f41422be3d82190e29c8414bbb4e8517dd94afb838012260d7a60" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -7928,9 +7932,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73bc9e6fa982335c964ca18bc6721b26a604a993ceb7ad434d78548b2244c343" +checksum = "71b91a6c7db7874ab0721ba2ad49c34614c6af5bfa1a02f18ee471d28416b1fc" dependencies = [ "bytemuck", "bytemuck_derive", @@ -7941,24 +7945,24 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925822f929d56870b2cbee5e00548de65043a1b5dc1021a2a0f6ca663227e96c" +checksum = "64b93163519c0b7419d3ac206207594d4b43e00267496996b898345ff3b31ed1" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d145184b5a9ada39c4cf1f5610cb33d342767c58f7fc87bd3b5ea51f183c2937" +checksum = "88d1b215d56d29f71782df6880d71b5a46cf9a4035046414488c7de6906899ba" [[package]] name = "solana-derivation-path" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d914fc833a4345226bb8a87b2ed898117c74f141c854369b1defa36f39896b7b" +checksum = "a31edf5d285689b469471a1a0200f0c9196be7df155860bd83dfd735439172bd" dependencies = [ "derivation-path", "qstring", @@ -7967,9 +7971,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0cf1615ea23ac98ffcec061c05f59b295913fa7b96de63c9cbb9a5800697b65" +checksum = "88aa6588f178c32258eb616ef1428f2c86beae370d6486843313f6320e055190" dependencies = [ "serde", "serde_derive", @@ -7979,9 +7983,9 @@ dependencies = [ [[package]] name = "solana-feature-set" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe1cc20d938b4eb12ae8704c771ce8badd934a90bb7885f949a66084d659790" +checksum = "1736c5f6cb5d65e684a1daf425dd1479849e0793ffe877feedb602642ee5deb0" dependencies = [ "lazy_static", "solana-clock", @@ -7993,9 +7997,9 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bfb0e586a88e566cf76425e04e0fe4cb1a268ac318ccc64417751a5fa96145" +checksum = "d2ef28a47c3fcfd4ef8b19468531e32a431f6589f359cdbb927fc5e7fb859413" dependencies = [ "log", "serde", @@ -8004,11 +8008,11 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3831f21dfc426f7da989712ee52372584967452fd299f700a7615670a4203b3" +checksum = "ad865143587f6173d0bd15ec66b749fd2682c865467ffd2bb725705e33f0c8fa" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -8022,9 +8026,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500b21d44ebc7437392d821eb04e7ca6e175b6a397c91ec67634528ee5bace38" +checksum = "a205cb59db7fa1afc89ad5d960ac5afb997ba231cdc943451811746c84b7776d" dependencies = [ "serde", "serde_derive", @@ -8032,9 +8036,9 @@ dependencies = [ [[package]] name = "solana-inline-spl" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c4919a0297f62759609ded57516071cebb4ce25c34ba896708fcc94eda336c" +checksum = "a47d825ad3f7d3eede036d2c3b11eb385912eb3e01872bc98901802f942eab8a" dependencies = [ "bytemuck", "solana-pubkey", @@ -8042,12 +8046,12 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211353fe5133e13d0772520b410311d52b68de0482c7e8643095b90174df3f57" +checksum = "af795f16bef3ae76e97978e35724ea88d2b9eba67a9e233adf48ccefeaa6e6b8" dependencies = [ "bincode", - "borsh 1.5.4", + "borsh 1.5.5", "getrandom 0.2.15", "js-sys", "num-traits", @@ -8060,9 +8064,9 @@ dependencies = [ [[package]] name = "solana-last-restart-slot" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aadfa60fa22080d7abb7fac2c5c172e9e4a3b4525164866e2b521a4eb81e450" +checksum = "f88c8171167f1fd4ef1e5a083fd0e8f35ac60aacd1ffe163a1ef7053a28524be" dependencies = [ "serde", "serde_derive", @@ -8072,24 +8076,24 @@ dependencies = [ [[package]] name = "solana-log-collector" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6923b6b68c36f4f0c082a7f633cc94a2d209837a5af017c47fd3ac9eb8ea03" +checksum = "7922b879e4c03e00bf6ed21b1f8579ac71f6743d95c22306bd1ba8994e4f90e8" dependencies = [ "log", ] [[package]] name = "solana-measure" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19b1784996736f7786ed65a675c4b820c31e5e8c49a53bb16e6fde9a75bff5c" +checksum = "13208871c6d000a0c7b7546ae605934f5eda3745f80f6926da1b6097c08f2de2" [[package]] name = "solana-metrics" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd21ab7eb1c984cee70df89587a57f19cd925fe73baad4304d2c3081085d987e" +checksum = "555986e126fe32ad94217c5d87c94f79b7f13abf96ef9d8de20dacbcf1c407e5" dependencies = [ "crossbeam-channel", "gethostname", @@ -8102,24 +8106,24 @@ dependencies = [ [[package]] name = "solana-msg" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4818fcc8b1fa46f1d0c698a0645e0cf693baf4ab5654001fcaff4623187016cf" +checksum = "5aefec09cb47fb67b8f8c448e03491d4148c1749f27dcb74d1cfae6337695f94" dependencies = [ "solana-define-syscall", ] [[package]] name = "solana-native-token" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f974b363f72ce60a0ea1015592b6494b9e61f1692355f2536fb0202eb667bf" +checksum = "81520eff9f776e62faa36a07250fcc467e54ca31ca9c87ab566a88b2f2691c05" [[package]] name = "solana-net-utils" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f808e6720ef8928f8aa44241b1832e57bdeb0ed77f7450318d536a99f282fc" +checksum = "6b409b10fee2d0cbb2a721fa3ce7d7f6f32e0d3ae1f5807b1d6bc91d75970c72" dependencies = [ "bincode", "crossbeam-channel", @@ -8136,9 +8140,9 @@ dependencies = [ [[package]] name = "solana-packet" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d850d00ae006f165509d64b4506e1906071711d5ef11cc4231a1eae84fe2a8ae" +checksum = "a1f8c6e8a2cb0839ef49d8c6e34e89a5bc5ed97da855bf49528bae8c57eb39ed" dependencies = [ "bincode", "bitflags 2.8.0", @@ -8150,9 +8154,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2deaf151dff638b700c814904cacea319de3f44db95d4d62ecaa889b84d7243" +checksum = "7fa10dd492bee710d0e231a3ff48c52d6e24f5339d97decaf1f0ddbde996f834" dependencies = [ "ahash", "bincode", @@ -8177,9 +8181,9 @@ dependencies = [ [[package]] name = "solana-precompile-error" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36924a10546f27619e0fbbcf6167376f4ea3a0dd9ec57a2727a4f4e5a6a7e8e0" +checksum = "83c01aefc15c451b4f573c1e4552f34ee8af53db285ee2f7ece17ef8b70d6c0a" dependencies = [ "num-traits", "solana-decode-error", @@ -8187,16 +8191,16 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ac6b4fe091557c72625c32a4f5e52999bd4065c5d994bb5bb7109cc491744d" +checksum = "4d3a72c5eafd348bc5e5b731b40ad8dfde3023632e34e5ca9e52a655266ffae7" dependencies = [ "base64 0.22.1", "bincode", "bitflags 2.8.0", "blake3", "borsh 0.10.4", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "bv", "bytemuck", @@ -8260,9 +8264,9 @@ dependencies = [ [[package]] name = "solana-program-entrypoint" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f296f87584dbc684ed1fb00f849803358d97f663ec2829165052d50c2d30de3" +checksum = "269ccabf1f3aff504a97aca0f8b72e6d3e1b7fb621cc18a2d21a28b17d52e112" dependencies = [ "solana-account-info", "solana-msg", @@ -8272,11 +8276,11 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776a7291be6ed77d34c6e637e8efdaf70315bde371532428d8b17da78b1a60aa" +checksum = "02f7a81eeb5c3d44b2953c46215af390ca2951a0b8069836ffbf3d368b012b35" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "num-traits", "serde", "serde_derive", @@ -8288,9 +8292,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247aba89bb78002423229ac0c78d954f82ac02f493dbdecacaf94627fa18bdd1" +checksum = "1debcdd14cee4dbc2761c1e267e8888188fb469956df0e2144cd6e2962c2532a" dependencies = [ "num-traits", "solana-define-syscall", @@ -8298,24 +8302,24 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5245d595c64114a5c973aede3ab03e14d5ad74f471c755251977e9d3591e7ad6" +checksum = "78b49ce216cce72eb0607610d2040b1979d999fe204f73ae2a669c2f4480d3c0" [[package]] name = "solana-program-pack" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a1acbe8f1e2895659b06440f036cf3dd9949dbef0a123cefb3394a6d4192b2" +checksum = "88ff47a5dd9881187e85a45641405d9d1c57e9ebdc813e2ff74a1aa1f1ec9042" dependencies = [ "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3893e28738a678954a51dd986bbe8b6f63eaaa6e43d9b5c0222d3b729033881" +checksum = "6d4647f4dfed31aaa307d8c4924fec3fc981e88dd340eec45273afa84f3d01a4" dependencies = [ "base64 0.22.1", "bincode", @@ -8343,12 +8347,12 @@ dependencies = [ [[package]] name = "solana-pubkey" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc62c030963895f98b50bfbea6fe443200596be1b3009103e59d815248666f0" +checksum = "02016ff5f98314c886e219c023bffba188ad8d70dec007247bd7a9da50423ac0" dependencies = [ "borsh 0.10.4", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -8370,15 +8374,15 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fad1f43c3f4c5bc92c392eefe1dc7f40e766477c9888c81810ef517270b6e2d" +checksum = "af610bc169985b016e1f66bc9f0cc19559c9da5fb6ee0b8984ea69b1302e6619" dependencies = [ "crossbeam-channel", "futures-util", "log", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_derive", "serde_json", @@ -8395,9 +8399,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df2c0258dafa383000bbceb45f69159cd90920382cbe151c48c82a90d27f70" +checksum = "5fa9aed25872d9af165499a9a2167d489ceb832d5e6eaa1aafa982286f62e06d" dependencies = [ "async-lock", "async-trait", @@ -8421,9 +8425,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706679793106ab0c114427e03208645a130fc05e33cafae4f5a7cec9c88cfcde" +checksum = "7d0ea6818ea3ae2067b18ba8f82577de19094d7abbb918ffb5cf5d7b0a6ffe88" dependencies = [ "lazy_static", "num_cpus", @@ -8431,9 +8435,9 @@ dependencies = [ [[package]] name = "solana-rent" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d8893f797f09049e9c798dbc0aa58e489c42c51e553de7d1fa2504987b8a23" +checksum = "544fab48aacd3b9c740ef5206f30e8a44ef8bfe5676a9d7b1eed385265ec1265" dependencies = [ "serde", "serde_derive", @@ -8443,9 +8447,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dcb6fa914bc6fdda7506ec699553ead8b38a70ea32bf722c68b7fdaade1de9" +checksum = "1ff2d4562f555ed4ca406d88483f2b8ad0248e41ea19721227ffb5c64529bff2" dependencies = [ "async-trait", "base64 0.22.1", @@ -8455,7 +8459,7 @@ dependencies = [ "log", "reqwest 0.11.27", "reqwest-middleware", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_derive", "serde_json", @@ -8470,9 +8474,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a2fb795a984724988d01e16ed9b20fa41be0d52896bb56192ad46483f34bf2" +checksum = "6a50f6a180457400c9843980f1dd5db32b1153c295005ca85edb84bb7625acae" dependencies = [ "anyhow", "base64 0.22.1", @@ -8480,7 +8484,7 @@ dependencies = [ "jsonrpc-core", "reqwest 0.11.27", "reqwest-middleware", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_derive", "serde_json", @@ -8494,9 +8498,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb8c63357d884f4d606f844d2bf6703774eacd5d1cfe6ee2c87941aab4a6960" +checksum = "5fa3be2840d3b8ebbdab96f62f59e0a9e6f9ba10f27b96a7d80d6897b15ff21a" dependencies = [ "solana-rpc-client", "solana-sdk", @@ -8505,19 +8509,19 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf852dfabddab832d6268fe69b5112a359a0085e1bebde0d4b97ff235bc31ae7" +checksum = "9677531dd4098d078515c66d69a04bfa0389d364a5c768561c719030b368a9db" [[package]] name = "solana-sdk" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2862fdadb9c6035bb7f8c74e5631064df36ee499bd10aae6146394ad218b5ebf" +checksum = "bf93cfd5f5af23b59789eba96b6a6afd92a3a18a3fc6652259bfa1f32743caf4" dependencies = [ "bincode", "bitflags 2.8.0", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -8575,9 +8579,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec1a8efb928767da37e058ffcedce0e78b4c4fb865d99b713fabb1430e11bf0" +checksum = "3bded40f70accbe97030e5f7163017605e51a2631425229ec2b0a4339bd1163a" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -8587,11 +8591,11 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a3642a378c45f5d6110048ef88848c1835ad079affc4804b833f9692906f24" +checksum = "ee25b962814dec3c141e8182474046bae231f0521ed62c9bfdfb6722999ddc18" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "libsecp256k1", "solana-define-syscall", "thiserror 1.0.69", @@ -8599,9 +8603,9 @@ dependencies = [ [[package]] name = "solana-secp256r1-program" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af36984053fd8bfaae93721bf6b66b2de287b30570a705c9dbf8f2c3adf25a9" +checksum = "3ec53eff8861ab398b9ca4da7ef8c8da5d4170f8ea26557fc1581638b56326c1" dependencies = [ "bytemuck", "openssl", @@ -8619,18 +8623,18 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-serde-varint" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a7f5a744d43c5377b59eff9ec8b356dc2a2b716d442efc06ef10f92002c4d3" +checksum = "4ff77c37cb995cc53ce1a4b78e5e9961957098677de6fdc6a4783ed37a8b0fcd" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af95bad9c4cff358d959a8c210d5b7599e0c0b5f423c1510d086539438d77ad" +checksum = "57a10eb6e3177828145beaba85d352a4dbc47798fd95c5f86145e1a732684d6d" dependencies = [ "solana-instruction", "solana-pubkey", @@ -8639,9 +8643,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "700bb300ed088d6c216fa32a2f383d290a9981b52620f7a39b37963a78d0fedb" +checksum = "98c4229293979bf8bda7db2243ae75e13695341375577a4c44b07e4f0b7a5d9e" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -8650,18 +8654,18 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7cebf9572316822eb5aa18a0b80d38b1019a8d50e95e1c3de1d9cba9525635e" +checksum = "fc6a2a88d56e6771329970059bcab0fde9a719c8edae173fb26b2c08e427495a" dependencies = [ "serde", ] [[package]] name = "solana-signature" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b4b471b990a124e49241e451f01bcdbdfb9402614e8305cd5434d92d4703a7" +checksum = "f1e8a078879d8430cdfbee8e3c1cdf17da74c19d304662580fc463dc91e17699" dependencies = [ "bs58 0.5.1", "ed25519-dalek 1.0.1", @@ -8674,9 +8678,9 @@ dependencies = [ [[package]] name = "solana-slot-hashes" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25b7a24f410863eb9d2e69c19e412204c44cbaa338f45848a10111e0e100c94" +checksum = "88fa2a6e60f2d7016cf95429e0f60cf4a04d4eed167abd1a5f8b08cbda695893" dependencies = [ "serde", "serde_derive", @@ -8686,9 +8690,9 @@ dependencies = [ [[package]] name = "solana-slot-history" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86af3c9471bded9a0d495e57f731fe98f888c69ce38486e10376b150435e99f3" +checksum = "c0fa66272c308c39a3ce1ca2a9c422de4bdedc28cfe706d6f2c68727bb626eb7" dependencies = [ "bv", "serde", @@ -8698,9 +8702,9 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b30fdf9ed421722d929b391e002a62006e87551befadd22c10affcc9a5056e3" +checksum = "2243571ebf8c0c9915c7e71b17469e173c6755fa58af8eb529db3dda84e3e19a" dependencies = [ "solana-instruction", "solana-pubkey", @@ -8708,9 +8712,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464652b6e4b9be1212c0c67b4b3310257d7858a074587e35ec9a06851fb58794" +checksum = "fddc2b38975c25199456ff46307c484affb459b84aedefe9618aece2a92326a9" dependencies = [ "async-channel", "bytes", @@ -8720,7 +8724,7 @@ dependencies = [ "futures-util", "governor", "histogram", - "indexmap 2.7.0", + "indexmap 2.7.1", "itertools 0.12.1", "libc", "log", @@ -8746,18 +8750,18 @@ dependencies = [ [[package]] name = "solana-sysvar-id" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7bc21f82be2eedceb3e97ce80013ddb377b95ee14fbb6f76310757f5515af" +checksum = "5822b63dd59f124e4920df8d87640a288bb40f4016fd275d028fee0b94a5a51e" dependencies = [ "solana-pubkey", ] [[package]] name = "solana-thin-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfb191062bc8b2b1634092ef358cb5a8bbd3b17650565f823fda7050fda44c1" +checksum = "1915dcb44dd5763a30aa32a687057e6a3b16781eb9f5db2800548990560272c3" dependencies = [ "bincode", "log", @@ -8770,9 +8774,9 @@ dependencies = [ [[package]] name = "solana-timings" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434a264d3062a5f95caeb3cc7930bfb93fef96ded85d4ff25632081369b7cc74" +checksum = "088c4507c8fd4f81c4039d78baf1ea7d68c8b80b2a973ba60838d33d2f7e752d" dependencies = [ "eager", "enum-iterator", @@ -8781,14 +8785,14 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bb24a851403e2f7c2c1492b2c0a0893f53c398debaaed1037856d0d21a6b08" +checksum = "3f944cd29eb540ca7e8df03c4e6043d5b8042eadab29b1848245c847a7c7c555" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.7.0", + "indexmap 2.7.1", "indicatif", "log", "rayon", @@ -8804,9 +8808,9 @@ dependencies = [ [[package]] name = "solana-transaction-error" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961d75c50c2343ed9b609deac4e7e0fd25c76291a57b2760e3ce025a487b69b8" +checksum = "7bd92caae17b4b828864b85cecf6dba6a87ad0ac433606b8bbd58334c74d0251" dependencies = [ "serde", "serde_derive", @@ -8816,9 +8820,9 @@ dependencies = [ [[package]] name = "solana-transaction-metrics-tracker" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b383d4534287bd61e3546ef1cb97a43e011068a69a74137ca621bf96ae6fec4" +checksum = "551dc5dad276919d24287e14e410759e93b801f2ca47dd9ad6c75eb49af26607" dependencies = [ "base64 0.22.1", "bincode", @@ -8832,14 +8836,14 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43b7e564dd4ff391f8b639aa9538bf0a346aecccb978760ec3a4166d7576065" +checksum = "f73cd35a23e9d6e289a9bf7bf32c1e972bb88bbb5ec434f43b445286b6ea3079" dependencies = [ "Inflector", "base64 0.22.1", "bincode", - "borsh 1.5.4", + "borsh 1.5.5", "bs58 0.5.1", "lazy_static", "log", @@ -8860,9 +8864,9 @@ dependencies = [ [[package]] name = "solana-transaction-status-client-types" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4506c41e5026fd98e803dfd4ab020c6f080c580e22b3fd932d96b8f882b089b2" +checksum = "897c0015c246cb9b98cfaee15921c89cd7c1503bd368e9a3fd9336c17cd6be25" dependencies = [ "base64 0.22.1", "bincode", @@ -8878,9 +8882,9 @@ dependencies = [ [[package]] name = "solana-type-overrides" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b12afd31af03e5e9320880b3b9c27618f44d4049e86ae8edf2ab53c3c2aed7e" +checksum = "1f8e0b8916e7d78678428ca5d669950f6259ac332eab953ed0c8c2c88eebd3d2" dependencies = [ "lazy_static", "rand 0.8.5", @@ -8888,9 +8892,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42c0713df61e50a4ee2e98eb16d73af1d236ed812b176227c5b372ae3a601f2c" +checksum = "6f5c6096b155fb1fb73d03fec2264a9671cbe208f71c4c32521ee9c979d91c75" dependencies = [ "async-trait", "solana-connection-cache", @@ -8903,11 +8907,11 @@ dependencies = [ [[package]] name = "solana-version" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455bfe6c86895ff8d2d092e201fcaf05e639d56e055cfaac913c87d557f1bee5" +checksum = "ae093290bf86006e323e883b9df845e4bdf84f23c37067cfa9837918ed04c87d" dependencies = [ - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_derive", "solana-feature-set", @@ -8917,9 +8921,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270f1a92ac92bbbcd687bbe97dfe44d80ffaeaaa44ead99eaa3907598ce16825" +checksum = "8421891f95fe3b8291205e37043396c0fb26c2896cc94d53b153e1ba180992fa" dependencies = [ "itertools 0.12.1", "log", @@ -8931,9 +8935,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f5c7ba6e55a88c0438c9e89603dd2488a3281de832326efaccaf4d68f2c2ba" +checksum = "fcf72a022dbb24dcfe1588aa09679042866eb7c0796ea479500ebe9355a7017f" dependencies = [ "bincode", "log", @@ -8951,9 +8955,9 @@ dependencies = [ [[package]] name = "solana-zk-sdk" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df42f1c4eb9c2a15ac382f6ef2561e98bf9e06deb27a8c9d7f2176069a6920d5" +checksum = "9c19f36d9e5227b4d94e651501a1ab15d58480d93e03d8340cc8593758e50530" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -8983,9 +8987,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "2.1.9" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9960a7af4243d493559f12849477b30bb9671c8f895268ee2f48a791df6c607b" +checksum = "3b8cc94d7eddf6606c22504889b6528734db56ed3c2f651641453d13c9b233d7" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -9093,7 +9097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ "assert_matches", - "borsh 1.5.4", + "borsh 1.5.5", "num-derive 0.4.2", "num-traits", "solana-program", @@ -9108,7 +9112,7 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76fee7d65013667032d499adc3c895e286197a35a0d3a4643c80e7fd3e9969e3" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "num-derive 0.4.2", "num-traits", "solana-program", @@ -9177,9 +9181,9 @@ dependencies = [ [[package]] name = "spl-elgamal-registry" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a157622a63a4d12fbd8b347fd75ee442cb913137fa98647824c992fb049a15b" +checksum = "ce0f668975d2b0536e8a8fd60e56a05c467f06021dae037f1d0cfed0de2e231d" dependencies = [ "bytemuck", "solana-program", @@ -9217,7 +9221,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bytemuck", "bytemuck_derive", "solana-program", @@ -9231,7 +9235,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41a7d5950993e1ff2680bd989df298eeb169367fb2f9deeef1f132de6e4e8016" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "bytemuck", "bytemuck_derive", "num-derive 0.4.2", @@ -9403,9 +9407,9 @@ dependencies = [ [[package]] name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1bf731fc65546330a7929a9735679add70f828dd076a4e69b59d3afb5423c" +checksum = "170378693c5516090f6d37ae9bad2b9b6125069be68d9acd4865bbe9fc8499fd" dependencies = [ "base64 0.22.1", "bytemuck", @@ -9415,16 +9419,16 @@ dependencies = [ [[package]] name = "spl-token-confidential-transfer-proof-extraction" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383937e637ccbe546f736d5115344351ebd4d2a076907582335261da58236816" +checksum = "eff2d6a445a147c9d6dd77b8301b1e116c8299601794b558eafa409b342faf96" dependencies = [ "bytemuck", "solana-curve25519", "solana-program", "solana-zk-sdk", "spl-pod 0.5.0", - "thiserror 1.0.69", + "thiserror 2.0.11", ] [[package]] @@ -9476,7 +9480,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "solana-program", "spl-discriminator 0.3.0", "spl-pod 0.3.1", @@ -9490,7 +9494,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb9c89dbc877abd735f05547dcf9e6e12c00c11d6d74d8817506cab4c99fdbb" dependencies = [ - "borsh 1.5.4", + "borsh 1.5.5", "num-derive 0.4.2", "num-traits", "solana-borsh", @@ -9675,7 +9679,7 @@ dependencies = [ "hex", "once_cell", "reqwest 0.11.27", - "semver 1.0.24", + "semver 1.0.25", "serde", "serde_json", "sha2 0.10.8", @@ -10112,7 +10116,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.7.1", "serde", "serde_spanned", "toml_datetime", @@ -10865,7 +10869,7 @@ dependencies = [ [[package]] name = "wormhole-bridge-client" version = "0.1.0" -source = "git+https://github.com/Near-One/rainbow-bridge-sdk-rs#a55de6b675fe8f9d198df3c94f0dc9c3b84d2c25" +source = "git+https://github.com/Near-One/bridge-sdk-rs?branch=feat%2Fadded-gas-estimation#bfffa661b94b0f59de3ddd8bceaf67f26f4c673f" dependencies = [ "bridge-connector-common", "derive_builder 0.20.2", diff --git a/omni-relayer/Cargo.toml b/omni-relayer/Cargo.toml index 90bac622..6ed6226b 100644 --- a/omni-relayer/Cargo.toml +++ b/omni-relayer/Cargo.toml @@ -22,9 +22,9 @@ borsh = "1.5.1" tokio = { version = "1", features = ["sync", "time", "macros", "rt-multi-thread"] } tokio-stream = { version = "0.1" } -solana-sdk = "2.1.5" -solana-client = "2.1.5" -solana-transaction-status = "2.1.5" +solana-sdk = "2.1.9" +solana-client = "2.1.9" +solana-transaction-status = "2.1.9" ethereum-types = "0.14.1" omni-types = { git = "https://github.com/near-one/omni-bridge", package = "omni-types", rev = "b0ca4e1fb6a34086076511d1162747b154fa8a55" } @@ -36,19 +36,21 @@ near-primitives = "0.28.0" near-crypto = "0.28.0" hex = "0.4.3" -alloy = { version = "0.8", features = ["node-bindings", "providers", "rpc-types", "sol-types", "provider-ws", "signers", "signer-local"] } +alloy = { version = "0.9", features = ["node-bindings", "providers", "rpc-types", "sol-types", "provider-ws", "signers", "signer-local"] } redis = { version = "0.28.1", features = ["aio", "tokio-comp"] } reqwest = "0.12" -eth-proof = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "eth-proof" } +eth-proof = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "eth-proof", branch = "feat/added-gas-estimation" } -near-bridge-client = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "near-bridge-client" } -evm-bridge-client = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "evm-bridge-client" } -solana-bridge-client = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "solana-bridge-client" } -wormhole-bridge-client = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "wormhole-bridge-client" } +bridge-connector-common = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "bridge-connector-common", branch = "feat/added-gas-estimation" } -omni-connector = { git = "https://github.com/Near-One/rainbow-bridge-sdk-rs", package = "omni-connector" } +near-bridge-client = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "near-bridge-client", branch = "feat/added-gas-estimation" } +evm-bridge-client = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "evm-bridge-client", branch = "feat/added-gas-estimation" } +solana-bridge-client = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "solana-bridge-client", branch = "feat/added-gas-estimation" } +wormhole-bridge-client = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "wormhole-bridge-client", branch = "feat/added-gas-estimation" } + +omni-connector = { git = "https://github.com/Near-One/bridge-sdk-rs", package = "omni-connector", branch = "feat/added-gas-estimation" } [features] disable_fee_check = [] diff --git a/omni-relayer/src/workers/near.rs b/omni-relayer/src/workers/near.rs index eeebfd00..7dfe0845 100644 --- a/omni-relayer/src/workers/near.rs +++ b/omni-relayer/src/workers/near.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use anyhow::Result; +use bridge_connector_common::result::BridgeSdkError; use futures::future::join_all; use log::{error, info, warn}; @@ -11,9 +12,8 @@ use solana_sdk::pubkey::Pubkey; use omni_connector::OmniConnector; use omni_types::{ - locker_args::ClaimFeeArgs, near_events::OmniBridgeEvent, - prover_args::WormholeVerifyProofArgs, prover_result::ProofKind, ChainKind, OmniAddress, - TransferId, + locker_args::ClaimFeeArgs, near_events::OmniBridgeEvent, prover_args::WormholeVerifyProofArgs, + prover_result::ProofKind, ChainKind, OmniAddress, TransferId, }; use crate::{config, utils}; @@ -94,9 +94,9 @@ pub async fn sign_transfer( #[cfg(not(feature = "disable_fee_check"))] match utils::fee::is_fee_sufficient( &config, - transfer_message.fee.clone(), + transfer_message.fee.clone(), &transfer_message.sender, - &transfer_message.recipient, + &transfer_message.recipient, &transfer_message.token ).await { Ok(true) => {} @@ -269,6 +269,15 @@ pub async fn finalize_transfer( .await; } Err(err) => { + if let BridgeSdkError::EvmGasEstimateError(_) = err { + utils::redis::remove_event( + &mut redis_connection, + utils::redis::NEAR_SIGN_TRANSFER_EVENTS, + &key, + ) + .await; + } + warn!("Failed to finalize deposit: {}", err); } }