From 00b1466f162a43d1b843c30f680c107c86e22e24 Mon Sep 17 00:00:00 2001 From: Andrei Silviu Dragnea Date: Tue, 17 Oct 2023 12:44:50 +0300 Subject: [PATCH] NDEV-2321: Upgrade Solana to v1.16.17 (#217) --- .github/workflows/deploy.py | 4 +- evm_loader/Cargo.lock | 152 +++++++++++++++++----------------- evm_loader/api/Cargo.toml | 4 +- evm_loader/cli/Cargo.toml | 8 +- evm_loader/lib/Cargo.toml | 12 +-- evm_loader/program/Cargo.toml | 2 +- 6 files changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py index 85ab8d573..65edb8c3d 100644 --- a/.github/workflows/deploy.py +++ b/.github/workflows/deploy.py @@ -30,8 +30,8 @@ DOCKER_USER = os.environ.get("DHUBU") DOCKER_PASSWORD = os.environ.get("DHUBP") IMAGE_NAME = 'neonlabsorg/evm_loader' -SOLANA_NODE_VERSION = 'v1.16.16' -SOLANA_BPF_VERSION = 'v1.16.16' +SOLANA_NODE_VERSION = 'v1.16.17' +SOLANA_BPF_VERSION = 'v1.16.17' VERSION_BRANCH_TEMPLATE = r"[vt]{1}\d{1,2}\.\d{1,2}\.x.*" docker_client = docker.APIClient() diff --git a/evm_loader/Cargo.lock b/evm_loader/Cargo.lock index 158ce6b22..6787d170d 100644 --- a/evm_loader/Cargo.lock +++ b/evm_loader/Cargo.lock @@ -2724,8 +2724,8 @@ dependencies = [ "num-traits", "shank", "solana-program", - "spl-associated-token-account 1.1.3", - "spl-token 3.5.0", + "spl-associated-token-account 2.2.0", + "spl-token 4.0.0", "thiserror", ] @@ -4266,9 +4266,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52aec62a85932e26d1085864b0f7b99b31934aec8dd132429bfef6d7fb1d3a6" +checksum = "121e55656c2094950f374247e1303dd09517f1ed49c91bf60bf114760b286eb4" dependencies = [ "Inflector", "base64 0.21.4", @@ -4291,9 +4291,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee0bd25f4ba0a15fc16c57b41b1e1b14f5271b83214fda158fdedb58758d394e" +checksum = "3ccb31f7f14d5876acd9ec38f5bf6097bfb4b350141d81c7ff2bf684db3ca815" dependencies = [ "bincode", "bytemuck", @@ -4312,9 +4312,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fb3284ae3a51bd173c7f61fcd9d6c1a10cfe46b082ce3189dec9f86120c245" +checksum = "6302bcae9ca7cddffc5af54c9407abbbb14b94539300aca01d879a3f23379f42" dependencies = [ "bincode", "byteorder", @@ -4331,9 +4331,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e963043668c640183d48472b281ebb9f713e0c36df0271961d23e6a394e09070" +checksum = "47a8150d4ff694d9587496a5976d33e6ebdb16cc61c6338bdfe3b2fc2c7c4986" dependencies = [ "chrono", "clap 2.34.0", @@ -4349,9 +4349,9 @@ dependencies = [ [[package]] name = "solana-cli" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f30e53107537d92eed3a0f933905b3d5cc4c224d29df89460f971a58de8bf0c" +checksum = "2b209b925e75e6080f019ed44d134ec9d687eede1156641e1723e808f2a62dec" dependencies = [ "bincode", "bs58", @@ -4400,9 +4400,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "febecf05517593d6da0592fc6039b069e659a1e062b114eeaf4c22d44293b2db" +checksum = "6017eea88d739fae5f6f4f3f2779a68ad16cadf2f714baccad9714400cf93460" dependencies = [ "dirs-next", "lazy_static", @@ -4416,9 +4416,9 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864c328349439ea0f451d722d804392741b66a7237d05cd69dea0bb23d74f5cb" +checksum = "e049558c43fc0c9e8faf5d6aba3d4c56d0491c139f55427be4a9c5f26aec6a78" dependencies = [ "Inflector", "base64 0.21.4", @@ -4443,9 +4443,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ccf7bb34fb81c74582a9011babaa2e0220da56c71186e77f45a6f352017fdb" +checksum = "35d7582847ab4d60652ff640ca574647789461c1630e8c7580ff770738c3d7f4" dependencies = [ "async-trait", "bincode", @@ -4476,9 +4476,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd0fc1efb91a1661aeb1ff6a691156c3b1bffdaed0aa096589499dd83f9e50b" +checksum = "94dc0f4463daf1c6155f20eac948ea4ced705e5f5520546aef4e11e746a6d95d" dependencies = [ "bincode", "chrono", @@ -4490,9 +4490,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8759e9cb9b1e92a94c31812169ecb5e65b5e215fb70fb68691e03655de5b7b6c" +checksum = "758587d44e05a4abdf82b9514d1c8b7d35637ad65f7af7c3e3e02417aaae3c9e" dependencies = [ "async-trait", "bincode", @@ -4511,9 +4511,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24d2bd1a6f5834700d6bbef9abfebad37dd31a11156867bb5bb39b635f2a7f6" +checksum = "e0b7dfac6dd9a1cd3829fc230ed348f4972934800d754db73e2b434c16dafafd" dependencies = [ "bincode", "byteorder", @@ -4535,9 +4535,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02eb4f0ed3eade20f4abdcc0031167344237cd6e16808bd0f33945f9db7861fe" +checksum = "d266bf0311bb403d31206aa2904b8741f57c7f5e27580b6810ad5e22fc7c3282" dependencies = [ "ahash 0.8.3", "blake3", @@ -4568,9 +4568,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28514761a285944cbad5b3d7930546369b80a713ba37d84bcf6ed2753611765" +checksum = "6dfe18c5155015dcb494c6de84a03b725fcf90ec2006a047769018b94c2cf0de" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.32", @@ -4580,9 +4580,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c310c6749435ce1ea25a9ae3edfb2fd2c2aed2aa4d4f7e0487a8077a0b1ee30" +checksum = "4f76fe25c2d06dcf621befd1e8d5655143e8a059c7e20fcb71736bc80ed779d6" dependencies = [ "env_logger", "lazy_static", @@ -4591,9 +4591,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d171357580e62aa4ca19c780e25f4e74de064e2780cb8b9f6b6901d986fcd23" +checksum = "db165b8a7f5d840abef011c78a18ffe63cad9192d676b07d94f469b6b5dc6cf6" dependencies = [ "log", "solana-sdk", @@ -4601,9 +4601,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013cbb3c82588278d2be18d3317ece5286cb54a3a06d5d38fc31e2a76a6d5e2d" +checksum = "aa01731bb3952904962d49a1ea1205db54e93f3a56f4006d32e02a7c85d60546" dependencies = [ "crossbeam-channel", "gethostname", @@ -4615,9 +4615,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50d7cac0694b1fe07499de25404a0c7d6836457e359aba3b08c3983c3dc5eb6" +checksum = "fd7ab67329dcebe4a40673fd0da27373282b1359ec7945e0fb81a9c594bcd057" dependencies = [ "bincode", "clap 3.2.23", @@ -4637,9 +4637,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395d559e5be2c439551298e9fa95561807f24921fd9a1e08bb82a3dc05c02dea" +checksum = "f900c1015844087cd4f10ba9d2d26a9859f2f5ca07427865cc74942595abc0a7" dependencies = [ "ahash 0.8.3", "bincode", @@ -4664,9 +4664,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff2aa5434a77413e9d43e971ceb47bdb003f2e8bbc0365a25b684aca2605c25" +checksum = "1bb16998986492de307eef503ce47e84503d35baa92dc60832b22476948b1c16" dependencies = [ "ark-bn254", "ark-ec", @@ -4719,9 +4719,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1832fefc2187142dac169812518ec20da68b09abad86e4a78f8ae1787e4f56" +checksum = "036d6ecf67a3a7c6dc74d4f7fa6ab321e7ce8feccb7c9dff8384a41d0a12345b" dependencies = [ "base64 0.21.4", "bincode", @@ -4747,9 +4747,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89388addbc3192407d948634f82c95c4dbe1efbe578582abfd136720e059556e" +checksum = "70e318f46bedb39374e98f299266a155b2c81c9d920f3c90f761261267c275c1" dependencies = [ "crossbeam-channel", "futures-util", @@ -4772,9 +4772,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7897b876a6df2d97b3a5ddfd764155c0591e3497e863fd7fdf32b54de4e2644" +checksum = "61db18a804642f8eb37369e903774a85d7949a55bd204ec090ebe0742fd2fe32" dependencies = [ "async-mutex", "async-trait", @@ -4800,9 +4800,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba17a930f9974a17a9a6c6e82e7f89b40127e9cc0f9c17cfc29fc5b149d2c38" +checksum = "805377478f2d413f6cfcba6924c81ac4988ac0f96cdb045a8a9d81c430e6622a" dependencies = [ "lazy_static", "num_cpus", @@ -4810,9 +4810,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80fb35e3fa78ef1d08a6a1d852e2c357e6ae388cb307d24fad359f57c34429f0" +checksum = "7a1148dcd76f76ad0399c1d9abf05cb32a0e545c5bee47ebe6d3b3e800c7fa7c" dependencies = [ "console", "dialoguer", @@ -4830,9 +4830,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c512944689d747a87f76936c89bb59f5be6c9a3189631857f49746cfa47d5bd1" +checksum = "dc51a85c6ff03bb4a3e1fde1e36dcb553b990f2b3e66aed941a31a6a7c20fa33" dependencies = [ "async-trait", "base64 0.21.4", @@ -4856,9 +4856,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e918b75f8ac4c358a6b512bf8b7dafc8166ddcb52ded5164c6235e0693ccb09" +checksum = "6756a1f89f509154644a958869c7cc6c70cc622f44faddf9b94612d8d2d8eed5" dependencies = [ "base64 0.21.4", "bs58", @@ -4878,9 +4878,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e360ea2f3a756bdf6256c1f6ef13f8b01b5d2a7855b4f16cafb4a4017f0557" +checksum = "4850e8db607525a36d330f073703e78e908a54ac66aa323a44cfc12c14c16699" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4891,9 +4891,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1002048941cedbd7dd6a96fdaa3dc5238b998aaa70b81946b1e3ec108cc2be" +checksum = "4106cda3d10833ba957dbd25fb841b50aeca7480ccf8f54859294716f54bcd4b" dependencies = [ "assert_matches", "base64 0.21.4", @@ -4944,9 +4944,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b41b63b2da4a37ce323aba108db21f4c7bfa638dd1bf58fdc870f83bdce48ba" +checksum = "1e560806a3859717eb2220b26e2cd68bb757b63affa3e79c3f1d8d853b5ee78f" dependencies = [ "bs58", "proc-macro2 1.0.66", @@ -4957,9 +4957,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00e575f2bd5ae2776870fbd1d7379d4ad392c015e2a4e2a328953b821a9d36d" +checksum = "78f142cbb497d257e70253c158a4c34037e310d24a055fae7dbc5c396b7611aa" dependencies = [ "async-channel", "bytes", @@ -4990,9 +4990,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df328e2624cce68c9949a53eac317a264eceb997131cb9bd22175698a5f5dc74" +checksum = "e0e41ce715b34749d2c0d3181dd910d2b99fa2142a0aaf3cd44926cb02edd60d" dependencies = [ "bincode", "log", @@ -5005,9 +5005,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8ce6fe221c0e1fd8aa3078b8fcb0cc3f4c27942f1256b57a60608d81ae5348" +checksum = "84ec99361a39e17a2bffe2a59b97b3d20ddef323f9166929783ce49f340c200d" dependencies = [ "async-trait", "bincode", @@ -5030,9 +5030,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0b811793e78a908119cc02edca3ff8b54d5660104ebd06cc0e2e7e2f66900b" +checksum = "236dd4e43b8a7402bce250228e04c0c68d9493a3e19c71b377ccc7c4390fd969" dependencies = [ "Inflector", "base64 0.21.4", @@ -5056,9 +5056,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897ff303a15ba956e80573dee4cf96d94d41a69adc5362898b98851e347505ad" +checksum = "16b438036719e5c1201aba2336a5dc1caa8c8eefafd7110b7a3818ae199b54da" dependencies = [ "async-trait", "solana-connection-cache", @@ -5071,9 +5071,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9513754d3b2203a0e1045a211c5d68e72e4ed135e477344c21d096897fd2bf70" +checksum = "62847d7ef409e3b410f65e726bf7816d8f8d0330918e78537e940bdf1ca061ae" dependencies = [ "log", "rustc_version", @@ -5087,9 +5087,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b6bfc5302ce0383eb129aa3a916705a20d22c4ad448144ef684b7b028d4053f" +checksum = "fb0c3e5ee7bd03b249c6b80eead5620af62bc7ef1af8ea4f499b8054b00e9c7d" dependencies = [ "bincode", "log", @@ -5109,9 +5109,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.16" +version = "1.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1fe77918563768a65fd5d6cd2fa06cf0aeb11e529a1ef8c230b0fe018600e3" +checksum = "278c08e13bc04b6940997602909052524a375154b00cf0bfa934359a3bb7e6f0" dependencies = [ "aes-gcm-siv", "base64 0.21.4", diff --git a/evm_loader/api/Cargo.toml b/evm_loader/api/Cargo.toml index c116aefb6..9613951de 100644 --- a/evm_loader/api/Cargo.toml +++ b/evm_loader/api/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] clap = "2.33.3" evm-loader = { path = "../program", default-features = false, features = ["log"] } -solana-sdk = "=1.16.16" -solana-client = "=1.16.16" +solana-sdk = "=1.16.17" +solana-client = "=1.16.17" serde = "1.0.186" serde_json = { version = "1.0.107", features = ["preserve_order"] } ethnum = { version = "1.4", default-features = false, features = ["serde"] } diff --git a/evm_loader/cli/Cargo.toml b/evm_loader/cli/Cargo.toml index 63585f473..e7b671d96 100644 --- a/evm_loader/cli/Cargo.toml +++ b/evm_loader/cli/Cargo.toml @@ -8,10 +8,10 @@ edition = "2021" [dependencies] clap = "2.33.3" evm-loader = { path = "../program", default-features = false, features = ["log"] } -solana-sdk = "=1.16.16" -solana-client = "=1.16.16" -solana-clap-utils = "=1.16.16" -solana-cli-config = "=1.16.16" +solana-sdk = "=1.16.17" +solana-client = "=1.16.17" +solana-clap-utils = "=1.16.17" +solana-cli-config = "=1.16.17" hex = "0.4.2" serde = "1.0.186" serde_json = { version = "1.0.107", features = ["preserve_order"] } diff --git a/evm_loader/lib/Cargo.toml b/evm_loader/lib/Cargo.toml index 5dcf73d02..cb3d166e6 100644 --- a/evm_loader/lib/Cargo.toml +++ b/evm_loader/lib/Cargo.toml @@ -10,12 +10,12 @@ thiserror = "1.0" anyhow = "1.0" bincode = "1.3.1" evm-loader = { path = "../program", default-features = false, features = ["log", "async-trait", "serde_json"] } -solana-sdk = "=1.16.16" -solana-client = "=1.16.16" -solana-clap-utils = "=1.16.16" -solana-cli-config = "=1.16.16" -solana-cli = "=1.16.16" -solana-transaction-status = "=1.16.16" +solana-sdk = "=1.16.17" +solana-client = "=1.16.17" +solana-clap-utils = "=1.16.17" +solana-cli-config = "=1.16.17" +solana-cli = "=1.16.17" +solana-transaction-status = "=1.16.17" spl-token = { version = "~3.5", default-features = false, features = ["no-entrypoint"] } spl-associated-token-account = { version = "~1.1", default-features = false, features = ["no-entrypoint"] } bs58 = "0.4.0" diff --git a/evm_loader/program/Cargo.toml b/evm_loader/program/Cargo.toml index 159ef55a6..34fea24d7 100644 --- a/evm_loader/program/Cargo.toml +++ b/evm_loader/program/Cargo.toml @@ -37,7 +37,7 @@ default = ["custom-heap"] [dependencies] linked_list_allocator = { version = "0.10", default-features = false } evm-loader-macro = { path = "../program-macro" } -solana-program = { version = "=1.16.16", default-features = false } +solana-program = { version = "=1.16.17", default-features = false } spl-token = { version = "~3.5", default-features = false, features = ["no-entrypoint"] } spl-associated-token-account = { version = "~1.1", default-features = false, features = ["no-entrypoint"] } mpl-token-metadata = { version = "1.13.2", default-features = false, features = ["no-entrypoint"] }