diff --git a/Cargo.lock b/Cargo.lock index d2b0ad9d048afe..bfec838724500b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10109,7 +10109,6 @@ dependencies = [ "solana-reward-info", "solana-runtime", "solana-runtime-transaction", - "solana-sdk", "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-program", diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 83e40d5ff1f94d..d9420749e7ac60 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -35,7 +35,7 @@ solana-pubkey = { workspace = true } solana-quic-client = { workspace = true } solana-rpc = { workspace = true } solana-rpc-client = { workspace = true } -solana-signature = { workspace = true } +solana-signature = { workspace = true, features = ["rand"] } solana-signer = { workspace = true } solana-stake-interface = { workspace = true } solana-streamer = { workspace = true } diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index ce33cd230896b1..d16a95163e661d 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -86,6 +86,7 @@ serial_test = { workspace = true } solana-net-utils = { workspace = true, features = ["dev-context-only-utils"] } solana-perf = { workspace = true, features = ["dev-context-only-utils"] } solana-runtime = { workspace = true, features = ["dev-context-only-utils"] } +solana-signature = { version = "=2.3.0", features = ["rand"] } solana-system-transaction = { workspace = true } solana-vote-interface = { workspace = true } static_assertions = { workspace = true } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 9b600c4346b617..231ea6d52a8557 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -125,6 +125,7 @@ solana-perf = { workspace = true, features = ["dev-context-only-utils"] } solana-program-option = { workspace = true } solana-program-pack = { workspace = true } solana-runtime = { workspace = true, features = ["dev-context-only-utils"] } +solana-signature = { workspace = true, features = ["rand"] } solana-vote = { workspace = true, features = ["dev-context-only-utils"] } spl-generic-token = { workspace = true } spl-pod = { workspace = true } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index c11a0050dcdbee..741c5c2cc3eaad 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -5934,8 +5934,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" dependencies = [ "borsh 1.5.7", - "serde", - "serde_derive", "solana-instruction", "solana-sdk-ids", ] @@ -7003,7 +7001,6 @@ dependencies = [ "num_enum", "solana-hash", "solana-packet", - "solana-pubkey", "solana-sanitize", "solana-sha256-hasher", "solana-signature", @@ -7106,23 +7103,6 @@ dependencies = [ "solana-decode-error", ] -[[package]] -name = "solana-precompiles" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a460ab805ec063802105b463ecb5eb02c3ffe469e67a967eea8a6e778e0bc06" -dependencies = [ - "lazy_static", - "solana-ed25519-program", - "solana-feature-set", - "solana-message", - "solana-precompile-error", - "solana-pubkey", - "solana-sdk-ids", - "solana-secp256k1-program", - "solana-secp256r1-program", -] - [[package]] name = "solana-presigner" version = "2.2.1" @@ -7827,7 +7807,6 @@ dependencies = [ "solana-rent-debits", "solana-reward-info", "solana-runtime-transaction", - "solana-sdk", "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-program", @@ -8452,61 +8431,37 @@ dependencies = [ "getrandom 0.1.14", "js-sys", "serde", - "serde_json", "solana-account", "solana-bn254", - "solana-client-traits", - "solana-cluster-type", - "solana-commitment-config", - "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", - "solana-ed25519-program", "solana-epoch-info", "solana-epoch-rewards-hasher", "solana-feature-set", "solana-fee-structure", - "solana-genesis-config", - "solana-hard-forks", "solana-inflation", "solana-instruction", - "solana-keypair", "solana-message", "solana-native-token", "solana-nonce-account", - "solana-offchain-message", "solana-packet", "solana-poh-config", - "solana-precompile-error", - "solana-precompiles", - "solana-presigner", "solana-program", "solana-program-memory", "solana-pubkey", - "solana-quic-definitions", - "solana-rent-collector", "solana-rent-debits", "solana-reserved-account-keys", "solana-reward-info", "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", - "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", - "solana-seed-derivable", - "solana-seed-phrase", "solana-serde", "solana-serde-varint", "solana-short-vec", - "solana-shred-version", - "solana-signature", - "solana-signer", - "solana-system-transaction", "solana-time-utils", - "solana-transaction", "solana-transaction-context 2.2.1", - "solana-transaction-error", "solana-validator-exit", "thiserror 2.0.12", "wasm-bindgen", @@ -8539,16 +8494,11 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0a1caa972414cc78122c32bdae65ac5fe89df7db598585a5cde19d16a20280a" dependencies = [ - "bincode", "digest 0.10.7", "libsecp256k1 0.6.0", "serde", "serde_derive", "sha3", - "solana-feature-set", - "solana-instruction", - "solana-precompile-error", - "solana-sdk-ids", ] [[package]] @@ -8696,7 +8646,6 @@ checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" dependencies = [ "ed25519-dalek", "five8", - "rand 0.8.5", "serde", "serde-big-array", "serde_derive", @@ -9263,12 +9212,10 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-feature-set", "solana-hash", "solana-instruction", "solana-keypair", "solana-message", - "solana-precompiles", "solana-pubkey", "solana-sanitize", "solana-sdk-ids", @@ -9293,7 +9240,6 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-rent", - "solana-signature", ] [[package]] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index d89d22030e33e2..77c4fa465b676b 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -71,7 +71,7 @@ solana-epoch-schedule = { workspace = true } solana-feature-gate-interface = { workspace = true } solana-fee = { workspace = true } solana-fee-calculator = { workspace = true } -solana-fee-structure = { workspace = true } +solana-fee-structure = { workspace = true, features = ["serde"] } solana-frozen-abi = { workspace = true, optional = true, features = [ "frozen-abi", ] } @@ -79,11 +79,11 @@ solana-frozen-abi-macro = { workspace = true, optional = true, features = [ "frozen-abi", ] } solana-genesis-config = { workspace = true } -solana-hard-forks = { workspace = true } +solana-hard-forks = { workspace = true, features = ["serde"] } solana-hash = { workspace = true } solana-inflation = { workspace = true } solana-instruction = { workspace = true } -solana-keypair = { workspace = true } +solana-keypair = { workspace = true, features = ["seed-derivable"] } solana-lattice-hash = { workspace = true } solana-loader-v3-interface = { workspace = true, features = ["bincode"] } solana-loader-v4-interface = { workspace = true, features = ["serde"] } @@ -100,14 +100,13 @@ solana-poh-config = { workspace = true } solana-precompile-error = { workspace = true } solana-program = { workspace = true } solana-program-runtime = { workspace = true, features = ["metrics"] } -solana-pubkey = { workspace = true } +solana-pubkey = { workspace = true, features = ["rand"] } solana-rayon-threadlimit = { workspace = true } solana-rent = { workspace = true } -solana-rent-collector = { workspace = true } +solana-rent-collector = { workspace = true, features = ["serde"] } solana-rent-debits = { workspace = true } solana-reward-info = { workspace = true } solana-runtime-transaction = { workspace = true } -solana-sdk = { workspace = true, features = ["full"] } solana-sdk-ids = { workspace = true } solana-sdk-macro = { workspace = true } solana-secp256k1-program = { workspace = true } @@ -131,7 +130,7 @@ solana-sysvar = { workspace = true } solana-sysvar-id = { workspace = true } solana-time-utils = { workspace = true } solana-timings = { workspace = true } -solana-transaction = { workspace = true } +solana-transaction = { workspace = true, features = ["verify"] } solana-transaction-context = { workspace = true } solana-transaction-error = { workspace = true } solana-transaction-status-client-types = { workspace = true } @@ -164,13 +163,14 @@ rand_chacha = { workspace = true } solana-accounts-db = { workspace = true, features = ["dev-context-only-utils"] } solana-builtins = { workspace = true, features = ["dev-context-only-utils"] } solana-logger = { workspace = true } +solana-rent-debits = { workspace = true, features = ["dev-context-only-utils"] } # See order-crates-for-publishing.py for using this unusual `path = "."` solana-runtime = { path = ".", features = ["dev-context-only-utils"] } solana-runtime-transaction = { workspace = true, features = [ "dev-context-only-utils", ] } -solana-sdk = { workspace = true, features = ["full","dev-context-only-utils"] } solana-sdk-ids = { workspace = true } +solana-signature = { workspace = true, features = ["std"] } solana-svm = { workspace = true, features = ["dev-context-only-utils"] } solana-transaction-context = { workspace = true, features = ["dev-context-only-utils"] } static_assertions = { workspace = true } @@ -194,7 +194,6 @@ frozen-abi = [ "solana-cost-model/frozen-abi", "solana-perf/frozen-abi", "solana-program-runtime/frozen-abi", - "solana-sdk/frozen-abi", "solana-svm/frozen-abi", "solana-version/frozen-abi", "solana-vote/frozen-abi", diff --git a/runtime/src/non_circulating_supply.rs b/runtime/src/non_circulating_supply.rs index 900be03102cdc9..b931dc51fa0ffb 100644 --- a/runtime/src/non_circulating_supply.rs +++ b/runtime/src/non_circulating_supply.rs @@ -79,138 +79,138 @@ pub fn calculate_non_circulating_supply(bank: &Bank) -> ScanResult Vec { [ - "9huDUZfxoJ7wGMTffUE7vh1xePqef7gyrLJu9NApncqA", - "GK2zqSsXLA2rwVZk347RYhh6jJpRsCA69FjLW93ZGi3B", - "CWeRmXme7LmbaUWTZWFLt6FMnpzLCHaQLuR2TdgFn4Lq", - "HCV5dGFJXRrJ3jhDYA4DCeb9TEDTwGGYXtT3wHksu2Zr", - "14FUT96s9swbmH7ZjpDvfEDywnAYy9zaNhv4xvezySGu", - "HbZ5FfmKWNHC7uwk6TF1hVi6TCs7dtYfdjEcuPGgzFAg", - "C7C8odR8oashR5Feyrq2tJKaXL18id1dSj2zbkDGL2C2", - "Eyr9P5XsjK2NUKNCnfu39eqpGoiLFgVAv1LSQgMZCwiQ", - "DE1bawNcRJB9rVm3buyMVfr8mBEoyyu73NBovf2oXJsJ", - "CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S", - "7Np41oeYqPefeNQEHSv1UDhYrehxin3NStELsSKCT4K2", - "GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ", - "Mc5XB47H3DKJHym5RLa9mPzWv5snERsF3KNv5AauXK8", - "7cvkjYAkUYs4W8XcXsca7cBrEGFeSUjeZmKoNBvEwyri", - "AG3m2bAibcY8raMt4oXEGqRHwX4FWKPPJVjZxn1LySDX", - "5XdtyEDREHJXXW1CTtCsVjJRjBapAwK78ZquzvnNVRrV", - "6yKHERk8rsbmJxvMpPuwPs1ct3hRiP7xaJF2tvnGU6nK", - "CHmdL15akDcJgBkY6BP3hzs98Dqr6wbdDC5p8odvtSbq", - "FR84wZQy3Y3j2gWz6pgETUiUoJtreMEuWfbg6573UCj9", - "5q54XjQ7vDx4y6KphPeE97LUNiYGtP55spjvXAWPGBuf", - "3o6xgkJ9sTmDeQWyfj3sxwon18fXJB9PV5LDc8sfgR4a", - "GumSE5HsMV5HCwBTv2D2D81yy9x17aDkvobkqAfTRgmo", - "AzVV9ZZDxTgW4wWfJmsG6ytaHpQGSe1yz76Nyy84VbQF", - "8CUUMKYNGxdgYio5CLHRHyzMEhhVRMcqefgE6dLqnVRK", - "CQDYc4ET2mbFhVpgj41gXahL6Exn5ZoPcGAzSHuYxwmE", - "5PLJZLJiRR9vf7d1JCCg7UuWjtyN9nkab9uok6TqSyuP", - "7xJ9CLtEAcEShw9kW2gSoZkRWL566Dg12cvgzANJwbTr", - "BuCEvc9ze8UoAQwwsQLy8d447C8sA4zeVtVpc6m5wQeS", - "8ndGYFjav6NDXvzYcxs449Aub3AxYv4vYpk89zRDwgj7", - "8W58E8JVJjH1jCy5CeHJQgvwFXTyAVyesuXRZGbcSUGG", - "GNiz4Mq886bTNDT3pijGsu2gbw6it7sqrwncro45USeB", - "GhsotwFMH6XUrRLJCxcx62h7748N2Uq8mf87hUGkmPhg", - "Fgyh8EeYGZtbW8sS33YmNQnzx54WXPrJ5KWNPkCfWPot", - "8UVjvYyoqP6sqcctTso3xpCdCfgTMiv3VRh7vraC2eJk", - "BhvLngiqqKeZ8rpxch2uGjeCiC88zzewoWPRuoxpp1aS", - "63DtkW7zuARcd185EmHAkfF44bDcC2SiTSEj2spLP3iA", - "GvpCiTgq9dmEeojCDBivoLoZqc4AkbUDACpqPMwYLWKh", - "7Y8smnoUrYKGGuDq2uaFKVxJYhojgg7DVixHyAtGTYEV", - "DUS1KxwUhUyDKB4A81E8vdnTe3hSahd92Abtn9CXsEcj", - "F9MWFw8cnYVwsRq8Am1PGfFL3cQUZV37mbGoxZftzLjN", - "8vqrX3H2BYLaXVintse3gorPEM4TgTwTFZNN1Fm9TdYs", - "CUageMFi49kzoDqtdU8NvQ4Bq3sbtJygjKDAXJ45nmAi", - "5smrYwb1Hr2T8XMnvsqccTgXxuqQs14iuE8RbHFYf2Cf", - "xQadXQiUTCCFhfHjvQx1hyJK6KVWr1w2fD6DT3cdwj7", - "8DE8fqPfv1fp9DHyGyDFFaMjpopMgDeXspzoi9jpBJjC", - "3itU5ME8L6FDqtMiRoUiT1F7PwbkTtHBbW51YWD5jtjm", - "AsrYX4FeLXnZcrjcZmrASY2Eq1jvEeQfwxtNTxS5zojA", - "8rT45mqpuDBR1vcnDc9kwP9DrZAXDR4ZeuKWw3u1gTGa", - "nGME7HgBT6tAJN1f6YuCCngpqT5cvSTndZUVLjQ4jwA", - "CzAHrrrHKx9Lxf6wdCMrsZkLvk74c7J2vGv8VYPUmY6v", - "AzHQ8Bia1grVVbcGyci7wzueSWkgvu7YZVZ4B9rkL5P6", - "FiWYY85b58zEEcPtxe3PuqzWPjqBJXqdwgZeqSBmT9Cn", - "GpxpMVhrBBBEYbEJxdR62w3daWz444V7m6dxYDZKH77D", - "3bTGcGB9F98XxnrBNftmmm48JGfPgi5sYxDEKiCjQYk3", - "8pNBEppa1VcFAsx4Hzq9CpdXUXZjUXbvQwLX2K7QsCwb", - "HKJgYGTTYYR2ZkfJKHbn58w676fKueQXmvbtpyvrSM3N", - "3jnknRabs7G2V9dKhxd2KP85pNWXKXiedYnYxtySnQMs", - "4sxwau4mdqZ8zEJsfryXq4QFYnMJSCp3HWuZQod8WU5k", - "Fg12tB1tz8w6zJSQ4ZAGotWoCztdMJF9hqK8R11pakog", - "GEWSkfWgHkpiLbeKaAnwvqnECGdRNf49at5nFccVey7c", - "CND6ZjRTzaCFVdX7pSSWgjTfHZuhxqFDoUBqWBJguNoA", - "2WWb1gRzuXDd5viZLQF7pNRR6Y7UiyeaPpaL35X6j3ve", - "BUnRE27mYXN9p8H1Ay24GXhJC88q2CuwLoNU2v2CrW4W", - "CsUqV42gVQLJwQsKyjWHqGkfHarxn9hcY4YeSjgaaeTd", - "5khMKAcvmsFaAhoKkdg3u5abvKsmjUQNmhTNP624WB1F", - "GpYnVDgB7dzvwSgsjQFeHznjG6Kt1DLBFYrKxjGU1LuD", - "DQQGPtj7pphPHCLzzBuEyDDQByUcKGrsJdsH7SP3hAug", - "FwfaykN7ACnsEUDHANzGHqTGQZMcGnUSsahAHUqbdPrz", - "JCwT5Ygmq3VeBEbDjL8s8E82Ra2rP9bq45QfZE7Xyaq7", - "H3Ni7vG1CsmJZdTvxF7RkAf9UM5qk4RsohJsmPvtZNnu", - "CVgyXrbEd1ctEuvq11QdpnCQVnPit8NLdhyqXQHLprM2", - "EAJJD6nDqtXcZ4DnQb19F9XEz8y8bRDHxbWbahatZNbL", - "6o5v1HC7WhBnLfRHp8mQTtCP2khdXXjhuyGyYEoy2Suy", - "3ZrsTmNM6AkMcqFfv3ryfhQ2jMfqP64RQbqVyAaxqhrQ", - "6zw7em7uQdmMpuS9fGz8Nq9TLHa5YQhEKKwPjo5PwDK4", - "CuatS6njAcfkFHnvai7zXCs7syA9bykXWsDCJEWfhjHG", - "Hz9nydgN1k15wnwffKX7CSmZp4VFTnTwLXAEdomFGNXy", - "Ep5Y58PaSyALPrdFxDVAdfKtVdP55vApvsWjb3jSmXsG", - "EziVYi3Sv5kJWxmU77PnbrT8jmkVuqwdiFLLzZpLVEn7", - "H1rt8KvXkNhQExTRfkY8r9wjZbZ8yCih6J4wQ5Fz9HGP", - "6nN69B4uZuESZYxr9nrLDjmKRtjDZQXrehwkfQTKw62U", - "Hm9JW7of5i9dnrboS8pCUCSeoQUPh7JsP1rkbJnW7An4", - "5D5NxsNVTgXHyVziwV7mDFwVDS6voaBsyyGxUbhQrhNW", - "EMAY24PrS6rWfvpqffFCsTsFJypeeYYmtUc26wdh3Wup", - "Br3aeVGapRb2xTq17RU2pYZCoJpWA7bq6TKBCcYtMSmt", - "BUjkdqUuH5Lz9XzcMcR4DdEMnFG6r8QzUMBm16Rfau96", - "Es13uD2p64UVPFpEWfDtd6SERdoNR2XVgqBQBZcZSLqW", - "AVYpwVou2BhdLivAwLxKPALZQsY7aZNkNmGbP2fZw7RU", - "DrKzW5koKSZp4mg4BdHLwr72MMXscd2kTiWgckCvvPXz", - "9hknftBZAQL4f48tWfk3bUEV5YSLcYYtDRqNmpNnhCWG", - "GLUmCeJpXB8veNcchPwibkRYwCwvQbKodex5mEjrgToi", - "9S2M3UYPpnPZTBtbcUvehYmiWFK3kBhwfzV2iWuwvaVy", - "HUAkU5psJXZuw54Lrg1ksbXzHv2fzczQ9sNbmisVMeJU", - "GK8R4uUmrawcREZ5xJy5dAzVV5V7aFvYg77id37pVTK", - "4vuWt1oHRqLMhf8Nv1zyEXZsYaeK7dipwrfKLoYU9Riq", - "EMhn1U3TMimW3bvWYbPUvN2eZnCfsuBN4LGWhzzYhiWR", - "BsKsunvENxAraBrL77UfAn1Gi7unVEmQAdCbhsjUN6tU", - "CTvhdUVf8KNyMbyEdnvRrBCHJjBKtQwkbj6zwoqcEssG", - "3fV2GaDKa3pZxyDcpMh5Vrh2FVAMUiWUKbYmnBFv8As3", - "4pV47TiPzZ7SSBPHmgUvSLmH9mMSe8tjyPhQZGbi1zPC", - "P8aKfWQPeRnsZtpBrwWTYzyAoRk74KMz56xc6NEpC4J", - "HuqDWJodFhAEWh6aWdsDVUqsjRket5DYXMYyDYtD8hdN", - "Ab1UcdsFXZVnkSt1Z3vcYU65GQk5MvCbs54SviaiaqHb", - "Dc2oHxFXQaC2QfLStuU7txtD3U5HZ82MrCSGDooWjbsv", - "3iPvAS4xdhYr6SkhVDHCLr7tJjMAFK4wvvHWJxFQVg15", - "GmyW1nqYcrw7P7JqrcyP9ivU9hYNbrgZ1r5SYJJH41Fs", - "E8jcgWvrvV7rwYHJThwfiBeQ8VAH4FgNEEMG9aAuCMAq", - "CY7X5o3Wi2eQhTocLmUS6JSWyx1NinBfW7AXRrkRCpi8", - "HQJtLqvEGGxgNYfRXUurfxV8E1swvCnsbC3456ik27HY", - "9xbcBZoGYFnfJZe81EDuDYKUm8xGkjzW8z4EgnVhNvsv", + solana_pubkey::pubkey!("9huDUZfxoJ7wGMTffUE7vh1xePqef7gyrLJu9NApncqA"), + solana_pubkey::pubkey!("GK2zqSsXLA2rwVZk347RYhh6jJpRsCA69FjLW93ZGi3B"), + solana_pubkey::pubkey!("CWeRmXme7LmbaUWTZWFLt6FMnpzLCHaQLuR2TdgFn4Lq"), + solana_pubkey::pubkey!("HCV5dGFJXRrJ3jhDYA4DCeb9TEDTwGGYXtT3wHksu2Zr"), + solana_pubkey::pubkey!("14FUT96s9swbmH7ZjpDvfEDywnAYy9zaNhv4xvezySGu"), + solana_pubkey::pubkey!("HbZ5FfmKWNHC7uwk6TF1hVi6TCs7dtYfdjEcuPGgzFAg"), + solana_pubkey::pubkey!("C7C8odR8oashR5Feyrq2tJKaXL18id1dSj2zbkDGL2C2"), + solana_pubkey::pubkey!("Eyr9P5XsjK2NUKNCnfu39eqpGoiLFgVAv1LSQgMZCwiQ"), + solana_pubkey::pubkey!("DE1bawNcRJB9rVm3buyMVfr8mBEoyyu73NBovf2oXJsJ"), + solana_pubkey::pubkey!("CakcnaRDHka2gXyfbEd2d3xsvkJkqsLw2akB3zsN1D2S"), + solana_pubkey::pubkey!("7Np41oeYqPefeNQEHSv1UDhYrehxin3NStELsSKCT4K2"), + solana_pubkey::pubkey!("GdnSyH3YtwcxFvQrVVJMm1JhTS4QVX7MFsX56uJLUfiZ"), + solana_pubkey::pubkey!("Mc5XB47H3DKJHym5RLa9mPzWv5snERsF3KNv5AauXK8"), + solana_pubkey::pubkey!("7cvkjYAkUYs4W8XcXsca7cBrEGFeSUjeZmKoNBvEwyri"), + solana_pubkey::pubkey!("AG3m2bAibcY8raMt4oXEGqRHwX4FWKPPJVjZxn1LySDX"), + solana_pubkey::pubkey!("5XdtyEDREHJXXW1CTtCsVjJRjBapAwK78ZquzvnNVRrV"), + solana_pubkey::pubkey!("6yKHERk8rsbmJxvMpPuwPs1ct3hRiP7xaJF2tvnGU6nK"), + solana_pubkey::pubkey!("CHmdL15akDcJgBkY6BP3hzs98Dqr6wbdDC5p8odvtSbq"), + solana_pubkey::pubkey!("FR84wZQy3Y3j2gWz6pgETUiUoJtreMEuWfbg6573UCj9"), + solana_pubkey::pubkey!("5q54XjQ7vDx4y6KphPeE97LUNiYGtP55spjvXAWPGBuf"), + solana_pubkey::pubkey!("3o6xgkJ9sTmDeQWyfj3sxwon18fXJB9PV5LDc8sfgR4a"), + solana_pubkey::pubkey!("GumSE5HsMV5HCwBTv2D2D81yy9x17aDkvobkqAfTRgmo"), + solana_pubkey::pubkey!("AzVV9ZZDxTgW4wWfJmsG6ytaHpQGSe1yz76Nyy84VbQF"), + solana_pubkey::pubkey!("8CUUMKYNGxdgYio5CLHRHyzMEhhVRMcqefgE6dLqnVRK"), + solana_pubkey::pubkey!("CQDYc4ET2mbFhVpgj41gXahL6Exn5ZoPcGAzSHuYxwmE"), + solana_pubkey::pubkey!("5PLJZLJiRR9vf7d1JCCg7UuWjtyN9nkab9uok6TqSyuP"), + solana_pubkey::pubkey!("7xJ9CLtEAcEShw9kW2gSoZkRWL566Dg12cvgzANJwbTr"), + solana_pubkey::pubkey!("BuCEvc9ze8UoAQwwsQLy8d447C8sA4zeVtVpc6m5wQeS"), + solana_pubkey::pubkey!("8ndGYFjav6NDXvzYcxs449Aub3AxYv4vYpk89zRDwgj7"), + solana_pubkey::pubkey!("8W58E8JVJjH1jCy5CeHJQgvwFXTyAVyesuXRZGbcSUGG"), + solana_pubkey::pubkey!("GNiz4Mq886bTNDT3pijGsu2gbw6it7sqrwncro45USeB"), + solana_pubkey::pubkey!("GhsotwFMH6XUrRLJCxcx62h7748N2Uq8mf87hUGkmPhg"), + solana_pubkey::pubkey!("Fgyh8EeYGZtbW8sS33YmNQnzx54WXPrJ5KWNPkCfWPot"), + solana_pubkey::pubkey!("8UVjvYyoqP6sqcctTso3xpCdCfgTMiv3VRh7vraC2eJk"), + solana_pubkey::pubkey!("BhvLngiqqKeZ8rpxch2uGjeCiC88zzewoWPRuoxpp1aS"), + solana_pubkey::pubkey!("63DtkW7zuARcd185EmHAkfF44bDcC2SiTSEj2spLP3iA"), + solana_pubkey::pubkey!("GvpCiTgq9dmEeojCDBivoLoZqc4AkbUDACpqPMwYLWKh"), + solana_pubkey::pubkey!("7Y8smnoUrYKGGuDq2uaFKVxJYhojgg7DVixHyAtGTYEV"), + solana_pubkey::pubkey!("DUS1KxwUhUyDKB4A81E8vdnTe3hSahd92Abtn9CXsEcj"), + solana_pubkey::pubkey!("F9MWFw8cnYVwsRq8Am1PGfFL3cQUZV37mbGoxZftzLjN"), + solana_pubkey::pubkey!("8vqrX3H2BYLaXVintse3gorPEM4TgTwTFZNN1Fm9TdYs"), + solana_pubkey::pubkey!("CUageMFi49kzoDqtdU8NvQ4Bq3sbtJygjKDAXJ45nmAi"), + solana_pubkey::pubkey!("5smrYwb1Hr2T8XMnvsqccTgXxuqQs14iuE8RbHFYf2Cf"), + solana_pubkey::pubkey!("xQadXQiUTCCFhfHjvQx1hyJK6KVWr1w2fD6DT3cdwj7"), + solana_pubkey::pubkey!("8DE8fqPfv1fp9DHyGyDFFaMjpopMgDeXspzoi9jpBJjC"), + solana_pubkey::pubkey!("3itU5ME8L6FDqtMiRoUiT1F7PwbkTtHBbW51YWD5jtjm"), + solana_pubkey::pubkey!("AsrYX4FeLXnZcrjcZmrASY2Eq1jvEeQfwxtNTxS5zojA"), + solana_pubkey::pubkey!("8rT45mqpuDBR1vcnDc9kwP9DrZAXDR4ZeuKWw3u1gTGa"), + solana_pubkey::pubkey!("nGME7HgBT6tAJN1f6YuCCngpqT5cvSTndZUVLjQ4jwA"), + solana_pubkey::pubkey!("CzAHrrrHKx9Lxf6wdCMrsZkLvk74c7J2vGv8VYPUmY6v"), + solana_pubkey::pubkey!("AzHQ8Bia1grVVbcGyci7wzueSWkgvu7YZVZ4B9rkL5P6"), + solana_pubkey::pubkey!("FiWYY85b58zEEcPtxe3PuqzWPjqBJXqdwgZeqSBmT9Cn"), + solana_pubkey::pubkey!("GpxpMVhrBBBEYbEJxdR62w3daWz444V7m6dxYDZKH77D"), + solana_pubkey::pubkey!("3bTGcGB9F98XxnrBNftmmm48JGfPgi5sYxDEKiCjQYk3"), + solana_pubkey::pubkey!("8pNBEppa1VcFAsx4Hzq9CpdXUXZjUXbvQwLX2K7QsCwb"), + solana_pubkey::pubkey!("HKJgYGTTYYR2ZkfJKHbn58w676fKueQXmvbtpyvrSM3N"), + solana_pubkey::pubkey!("3jnknRabs7G2V9dKhxd2KP85pNWXKXiedYnYxtySnQMs"), + solana_pubkey::pubkey!("4sxwau4mdqZ8zEJsfryXq4QFYnMJSCp3HWuZQod8WU5k"), + solana_pubkey::pubkey!("Fg12tB1tz8w6zJSQ4ZAGotWoCztdMJF9hqK8R11pakog"), + solana_pubkey::pubkey!("GEWSkfWgHkpiLbeKaAnwvqnECGdRNf49at5nFccVey7c"), + solana_pubkey::pubkey!("CND6ZjRTzaCFVdX7pSSWgjTfHZuhxqFDoUBqWBJguNoA"), + solana_pubkey::pubkey!("2WWb1gRzuXDd5viZLQF7pNRR6Y7UiyeaPpaL35X6j3ve"), + solana_pubkey::pubkey!("BUnRE27mYXN9p8H1Ay24GXhJC88q2CuwLoNU2v2CrW4W"), + solana_pubkey::pubkey!("CsUqV42gVQLJwQsKyjWHqGkfHarxn9hcY4YeSjgaaeTd"), + solana_pubkey::pubkey!("5khMKAcvmsFaAhoKkdg3u5abvKsmjUQNmhTNP624WB1F"), + solana_pubkey::pubkey!("GpYnVDgB7dzvwSgsjQFeHznjG6Kt1DLBFYrKxjGU1LuD"), + solana_pubkey::pubkey!("DQQGPtj7pphPHCLzzBuEyDDQByUcKGrsJdsH7SP3hAug"), + solana_pubkey::pubkey!("FwfaykN7ACnsEUDHANzGHqTGQZMcGnUSsahAHUqbdPrz"), + solana_pubkey::pubkey!("JCwT5Ygmq3VeBEbDjL8s8E82Ra2rP9bq45QfZE7Xyaq7"), + solana_pubkey::pubkey!("H3Ni7vG1CsmJZdTvxF7RkAf9UM5qk4RsohJsmPvtZNnu"), + solana_pubkey::pubkey!("CVgyXrbEd1ctEuvq11QdpnCQVnPit8NLdhyqXQHLprM2"), + solana_pubkey::pubkey!("EAJJD6nDqtXcZ4DnQb19F9XEz8y8bRDHxbWbahatZNbL"), + solana_pubkey::pubkey!("6o5v1HC7WhBnLfRHp8mQTtCP2khdXXjhuyGyYEoy2Suy"), + solana_pubkey::pubkey!("3ZrsTmNM6AkMcqFfv3ryfhQ2jMfqP64RQbqVyAaxqhrQ"), + solana_pubkey::pubkey!("6zw7em7uQdmMpuS9fGz8Nq9TLHa5YQhEKKwPjo5PwDK4"), + solana_pubkey::pubkey!("CuatS6njAcfkFHnvai7zXCs7syA9bykXWsDCJEWfhjHG"), + solana_pubkey::pubkey!("Hz9nydgN1k15wnwffKX7CSmZp4VFTnTwLXAEdomFGNXy"), + solana_pubkey::pubkey!("Ep5Y58PaSyALPrdFxDVAdfKtVdP55vApvsWjb3jSmXsG"), + solana_pubkey::pubkey!("EziVYi3Sv5kJWxmU77PnbrT8jmkVuqwdiFLLzZpLVEn7"), + solana_pubkey::pubkey!("H1rt8KvXkNhQExTRfkY8r9wjZbZ8yCih6J4wQ5Fz9HGP"), + solana_pubkey::pubkey!("6nN69B4uZuESZYxr9nrLDjmKRtjDZQXrehwkfQTKw62U"), + solana_pubkey::pubkey!("Hm9JW7of5i9dnrboS8pCUCSeoQUPh7JsP1rkbJnW7An4"), + solana_pubkey::pubkey!("5D5NxsNVTgXHyVziwV7mDFwVDS6voaBsyyGxUbhQrhNW"), + solana_pubkey::pubkey!("EMAY24PrS6rWfvpqffFCsTsFJypeeYYmtUc26wdh3Wup"), + solana_pubkey::pubkey!("Br3aeVGapRb2xTq17RU2pYZCoJpWA7bq6TKBCcYtMSmt"), + solana_pubkey::pubkey!("BUjkdqUuH5Lz9XzcMcR4DdEMnFG6r8QzUMBm16Rfau96"), + solana_pubkey::pubkey!("Es13uD2p64UVPFpEWfDtd6SERdoNR2XVgqBQBZcZSLqW"), + solana_pubkey::pubkey!("AVYpwVou2BhdLivAwLxKPALZQsY7aZNkNmGbP2fZw7RU"), + solana_pubkey::pubkey!("DrKzW5koKSZp4mg4BdHLwr72MMXscd2kTiWgckCvvPXz"), + solana_pubkey::pubkey!("9hknftBZAQL4f48tWfk3bUEV5YSLcYYtDRqNmpNnhCWG"), + solana_pubkey::pubkey!("GLUmCeJpXB8veNcchPwibkRYwCwvQbKodex5mEjrgToi"), + solana_pubkey::pubkey!("9S2M3UYPpnPZTBtbcUvehYmiWFK3kBhwfzV2iWuwvaVy"), + solana_pubkey::pubkey!("HUAkU5psJXZuw54Lrg1ksbXzHv2fzczQ9sNbmisVMeJU"), + solana_pubkey::pubkey!("GK8R4uUmrawcREZ5xJy5dAzVV5V7aFvYg77id37pVTK"), + solana_pubkey::pubkey!("4vuWt1oHRqLMhf8Nv1zyEXZsYaeK7dipwrfKLoYU9Riq"), + solana_pubkey::pubkey!("EMhn1U3TMimW3bvWYbPUvN2eZnCfsuBN4LGWhzzYhiWR"), + solana_pubkey::pubkey!("BsKsunvENxAraBrL77UfAn1Gi7unVEmQAdCbhsjUN6tU"), + solana_pubkey::pubkey!("CTvhdUVf8KNyMbyEdnvRrBCHJjBKtQwkbj6zwoqcEssG"), + solana_pubkey::pubkey!("3fV2GaDKa3pZxyDcpMh5Vrh2FVAMUiWUKbYmnBFv8As3"), + solana_pubkey::pubkey!("4pV47TiPzZ7SSBPHmgUvSLmH9mMSe8tjyPhQZGbi1zPC"), + solana_pubkey::pubkey!("P8aKfWQPeRnsZtpBrwWTYzyAoRk74KMz56xc6NEpC4J"), + solana_pubkey::pubkey!("HuqDWJodFhAEWh6aWdsDVUqsjRket5DYXMYyDYtD8hdN"), + solana_pubkey::pubkey!("Ab1UcdsFXZVnkSt1Z3vcYU65GQk5MvCbs54SviaiaqHb"), + solana_pubkey::pubkey!("Dc2oHxFXQaC2QfLStuU7txtD3U5HZ82MrCSGDooWjbsv"), + solana_pubkey::pubkey!("3iPvAS4xdhYr6SkhVDHCLr7tJjMAFK4wvvHWJxFQVg15"), + solana_pubkey::pubkey!("GmyW1nqYcrw7P7JqrcyP9ivU9hYNbrgZ1r5SYJJH41Fs"), + solana_pubkey::pubkey!("E8jcgWvrvV7rwYHJThwfiBeQ8VAH4FgNEEMG9aAuCMAq"), + solana_pubkey::pubkey!("CY7X5o3Wi2eQhTocLmUS6JSWyx1NinBfW7AXRrkRCpi8"), + solana_pubkey::pubkey!("HQJtLqvEGGxgNYfRXUurfxV8E1swvCnsbC3456ik27HY"), + solana_pubkey::pubkey!("9xbcBZoGYFnfJZe81EDuDYKUm8xGkjzW8z4EgnVhNvsv"), ] -); + .into() +} // Withdraw authority for autostaked accounts on mainnet-beta -solana_sdk_macro::pubkeys!( - withdraw_authority, +pub fn withdraw_authority() -> Vec { [ - "8CUUMKYNGxdgYio5CLHRHyzMEhhVRMcqefgE6dLqnVRK", - "3FFaheyqtyAXZSYxDzsr5CVKvJuvZD1WE1VEsBtDbRqB", - "FdGYQdiRky8NZzN9wZtczTBcWLYYRXrJ3LMDhqDPn5rM", - "4e6KwQpyzGQPfgVr5Jn3g5jLjbXB4pKPa2jRLohEb1QA", - "FjiEiVKyMGzSLpqoB27QypukUfyWHrwzPcGNtopzZVdh", - "DwbVjia1mYeSGoJipzhaf4L5hfer2DJ1Ys681VzQm5YY", - "GeMGyvsTEsANVvcT5cme65Xq5MVU8fVVzMQ13KAZFNS2", - "Bj3aQ2oFnZYfNR1njzRjmWizzuhvfcYLckh76cqsbuBM", - "4ZJhPQAgUseCsWhKvJLTmmRRUV74fdoTpQLNfKoekbPY", - "HXdYQ5gixrY2H6Y9gqsD8kPM2JQKSaRiohDQtLbZkRWE", + solana_pubkey::pubkey!("8CUUMKYNGxdgYio5CLHRHyzMEhhVRMcqefgE6dLqnVRK"), + solana_pubkey::pubkey!("3FFaheyqtyAXZSYxDzsr5CVKvJuvZD1WE1VEsBtDbRqB"), + solana_pubkey::pubkey!("FdGYQdiRky8NZzN9wZtczTBcWLYYRXrJ3LMDhqDPn5rM"), + solana_pubkey::pubkey!("4e6KwQpyzGQPfgVr5Jn3g5jLjbXB4pKPa2jRLohEb1QA"), + solana_pubkey::pubkey!("FjiEiVKyMGzSLpqoB27QypukUfyWHrwzPcGNtopzZVdh"), + solana_pubkey::pubkey!("DwbVjia1mYeSGoJipzhaf4L5hfer2DJ1Ys681VzQm5YY"), + solana_pubkey::pubkey!("GeMGyvsTEsANVvcT5cme65Xq5MVU8fVVzMQ13KAZFNS2"), + solana_pubkey::pubkey!("Bj3aQ2oFnZYfNR1njzRjmWizzuhvfcYLckh76cqsbuBM"), + solana_pubkey::pubkey!("4ZJhPQAgUseCsWhKvJLTmmRRUV74fdoTpQLNfKoekbPY"), + solana_pubkey::pubkey!("HXdYQ5gixrY2H6Y9gqsD8kPM2JQKSaRiohDQtLbZkRWE"), ] -); + .into() +} #[cfg(test)] mod tests { diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 7ee2fffaf51a7b..e3b711e1709674 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -5781,8 +5781,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" dependencies = [ "borsh 1.5.7", - "serde", - "serde_derive", "solana-instruction", "solana-sdk-ids", ] @@ -6815,7 +6813,6 @@ dependencies = [ "num_enum", "solana-hash", "solana-packet", - "solana-pubkey", "solana-sanitize", "solana-sha256-hasher", "solana-signature", @@ -6918,23 +6915,6 @@ dependencies = [ "solana-decode-error", ] -[[package]] -name = "solana-precompiles" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a460ab805ec063802105b463ecb5eb02c3ffe469e67a967eea8a6e778e0bc06" -dependencies = [ - "lazy_static", - "solana-ed25519-program", - "solana-feature-set", - "solana-message", - "solana-precompile-error", - "solana-pubkey", - "solana-sdk-ids", - "solana-secp256k1-program", - "solana-secp256r1-program", -] - [[package]] name = "solana-presigner" version = "2.2.1" @@ -7639,7 +7619,6 @@ dependencies = [ "solana-rent-debits", "solana-reward-info", "solana-runtime-transaction", - "solana-sdk", "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-program", @@ -7735,61 +7714,37 @@ dependencies = [ "getrandom 0.1.16", "js-sys", "serde", - "serde_json", "solana-account", "solana-bn254", - "solana-client-traits", - "solana-cluster-type", - "solana-commitment-config", - "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", - "solana-ed25519-program", "solana-epoch-info", "solana-epoch-rewards-hasher", "solana-feature-set", "solana-fee-structure", - "solana-genesis-config", - "solana-hard-forks", "solana-inflation", "solana-instruction", - "solana-keypair", "solana-message", "solana-native-token", "solana-nonce-account", - "solana-offchain-message", "solana-packet", "solana-poh-config", - "solana-precompile-error", - "solana-precompiles", - "solana-presigner", "solana-program", "solana-program-memory", "solana-pubkey", - "solana-quic-definitions", - "solana-rent-collector", "solana-rent-debits", "solana-reserved-account-keys", "solana-reward-info", "solana-sanitize", "solana-sdk-ids", "solana-sdk-macro", - "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", - "solana-seed-derivable", - "solana-seed-phrase", "solana-serde", "solana-serde-varint", "solana-short-vec", - "solana-shred-version", - "solana-signature", - "solana-signer", - "solana-system-transaction", "solana-time-utils", - "solana-transaction", "solana-transaction-context 2.2.1", - "solana-transaction-error", "solana-validator-exit", "thiserror 2.0.12", "wasm-bindgen", @@ -7822,16 +7777,11 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0a1caa972414cc78122c32bdae65ac5fe89df7db598585a5cde19d16a20280a" dependencies = [ - "bincode", "digest 0.10.7", "libsecp256k1", "serde", "serde_derive", "sha3", - "solana-feature-set", - "solana-instruction", - "solana-precompile-error", - "solana-sdk-ids", ] [[package]] @@ -7979,7 +7929,6 @@ checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" dependencies = [ "ed25519-dalek", "five8", - "rand 0.8.5", "serde", "serde-big-array", "serde_derive", @@ -8581,12 +8530,10 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-feature-set", "solana-hash", "solana-instruction", "solana-keypair", "solana-message", - "solana-precompiles", "solana-pubkey", "solana-sanitize", "solana-sdk-ids", @@ -8611,7 +8558,6 @@ dependencies = [ "solana-instruction", "solana-pubkey", "solana-rent", - "solana-signature", ] [[package]]