Skip to content

Commit

Permalink
sdk: Bump all SDK crates for relaxed dependencies (#4969)
Browse files Browse the repository at this point in the history
* sdk: Bump all SDK crates for relaxed dependencies

#### Problem

The SDK relaxed its internal dependencies in
anza-xyz/solana-sdk#27, but the monorepo is
still using the pinned versions.

#### Summary of changes

Update all SDK crates to their next version. For almost all of them,
that's v2.2.1

Otherwise, the address-lookup-table-interface crates goes to v2.2.2, and
the loader-v3-interface goes to v3.0.0 due to a breaking change.

To keep this PR small, the logic changes required for v3.0.0 are not
implemented, and must be done in follow-up work, which essentially means
reapplying the changes from #4661.

* Return errors instead of panicking
  • Loading branch information
joncinque authored Feb 13, 2025
1 parent 0006e6e commit a1ed2b1
Show file tree
Hide file tree
Showing 8 changed files with 687 additions and 681 deletions.
388 changes: 194 additions & 194 deletions Cargo.lock

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -355,24 +355,24 @@ smallvec = "1.13.2"
smpl_jwt = "0.7.1"
socket2 = "0.5.8"
soketto = "0.7"
solana-account = "=2.2.0"
solana-account = "=2.2.1"
solana-account-decoder = { path = "account-decoder", version = "=2.2.0" }
solana-account-decoder-client-types = { path = "account-decoder-client-types", version = "=2.2.0" }
solana-account-info = "=2.2.0"
solana-account-info = "=2.2.1"
solana-accounts-db = { path = "accounts-db", version = "=2.2.0" }
solana-address-lookup-table-interface = "=2.2.1"
solana-address-lookup-table-interface = "=2.2.2"
solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.2.0" }
solana-atomic-u64 = "=2.2.0"
solana-atomic-u64 = "=2.2.1"
solana-banks-client = { path = "banks-client", version = "=2.2.0" }
solana-banks-interface = { path = "banks-interface", version = "=2.2.0" }
solana-banks-server = { path = "banks-server", version = "=2.2.0" }
solana-bench-tps = { path = "bench-tps", version = "=2.2.0" }
solana-big-mod-exp = "=2.2.0"
solana-bincode = "=2.2.0"
solana-blake3-hasher = "=2.2.0"
solana-big-mod-exp = "=2.2.1"
solana-bincode = "=2.2.1"
solana-blake3-hasher = "=2.2.1"
solana-bloom = { path = "bloom", version = "=2.2.0" }
solana-bn254 = "=2.2.0"
solana-borsh = "=2.2.0"
solana-bn254 = "=2.2.1"
solana-borsh = "=2.2.1"
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.2.0" }
solana-bucket-map = { path = "bucket_map", version = "=2.2.0" }
solana-builtins = { path = "builtins", version = "=2.2.0" }
Expand All @@ -385,120 +385,120 @@ solana-cli = { path = "cli", version = "=2.2.0" }
solana-cli-config = { path = "cli-config", version = "=2.2.0" }
solana-cli-output = { path = "cli-output", version = "=2.2.0" }
solana-client = { path = "client", version = "=2.2.0" }
solana-client-traits = "=2.2.0"
solana-clock = "=2.2.0"
solana-cluster-type = "=2.2.0"
solana-commitment-config = "=2.2.0"
solana-client-traits = "=2.2.1"
solana-clock = "=2.2.1"
solana-cluster-type = "=2.2.1"
solana-commitment-config = "=2.2.1"
solana-compute-budget = { path = "compute-budget", version = "=2.2.0" }
solana-compute-budget-instruction = { path = "compute-budget-instruction", version = "=2.2.0" }
solana-compute-budget-interface = "=2.2.0"
solana-compute-budget-interface = "=2.2.1"
solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.2.0" }
solana-config-program = { path = "programs/config", version = "=2.2.0" }
solana-connection-cache = { path = "connection-cache", version = "=2.2.0", default-features = false }
solana-core = { path = "core", version = "=2.2.0" }
solana-cost-model = { path = "cost-model", version = "=2.2.0" }
solana-cpi = "=2.2.0"
solana-cpi = "=2.2.1"
solana-curve25519 = { path = "curves/curve25519", version = "=2.2.0" }
solana-decode-error = "=2.2.0"
solana-define-syscall = "=2.2.0"
solana-derivation-path = "=2.2.0"
solana-decode-error = "=2.2.1"
solana-define-syscall = "=2.2.1"
solana-derivation-path = "=2.2.1"
solana-download-utils = { path = "download-utils", version = "=2.2.0" }
solana-ed25519-program = "=2.2.0"
solana-ed25519-program = "=2.2.1"
solana-entry = { path = "entry", version = "=2.2.0" }
solana-program-entrypoint = "=2.2.0"
solana-epoch-info = "=2.2.0"
solana-epoch-rewards = "=2.2.0"
solana-epoch-rewards-hasher = "=2.2.0"
solana-epoch-schedule = "=2.2.0"
solana-example-mocks = "=2.2.0"
solana-program-entrypoint = "=2.2.1"
solana-epoch-info = "=2.2.1"
solana-epoch-rewards = "=2.2.1"
solana-epoch-rewards-hasher = "=2.2.1"
solana-epoch-schedule = "=2.2.1"
solana-example-mocks = "=2.2.1"
solana-faucet = { path = "faucet", version = "=2.2.0" }
solana-feature-gate-client = "0.0.2"
solana-feature-gate-interface = "=2.2.0"
solana-feature-set = "=2.2.0"
solana-fee-calculator = "=2.2.0"
solana-feature-gate-interface = "=2.2.1"
solana-feature-set = "=2.2.1"
solana-fee-calculator = "=2.2.1"
solana-fee = { path = "fee", version = "=2.2.0" }
solana-fee-structure = "=2.2.0"
solana-frozen-abi = "=2.2.0"
solana-frozen-abi-macro = "=2.2.0"
solana-fee-structure = "=2.2.1"
solana-frozen-abi = "=2.2.1"
solana-frozen-abi-macro = "=2.2.1"
solana-tps-client = { path = "tps-client", version = "=2.2.0" }
solana-file-download = "=2.2.0"
solana-file-download = "=2.2.1"
solana-genesis = { path = "genesis", version = "=2.2.0" }
solana-genesis-config = "=2.2.0"
solana-genesis-config = "=2.2.1"
solana-genesis-utils = { path = "genesis-utils", version = "=2.2.0" }
agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.2.0" }
solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.2.0" }
solana-gossip = { path = "gossip", version = "=2.2.0" }
solana-hard-forks = "=2.2.0"
solana-hash = "=2.2.0"
solana-inflation = "=2.2.0"
solana-hard-forks = "=2.2.1"
solana-hash = "=2.2.1"
solana-inflation = "=2.2.1"
solana-inline-spl = { path = "inline-spl", version = "=2.2.0" }
solana-instruction = "=2.2.0"
solana-instructions-sysvar = "=2.2.0"
solana-keccak-hasher = "=2.2.0"
solana-keypair = "=2.2.0"
solana-last-restart-slot = "=2.2.0"
solana-instruction = "=2.2.1"
solana-instructions-sysvar = "=2.2.1"
solana-keccak-hasher = "=2.2.1"
solana-keypair = "=2.2.1"
solana-last-restart-slot = "=2.2.1"
solana-lattice-hash = { path = "lattice-hash", version = "=2.2.0" }
solana-ledger = { path = "ledger", version = "=2.2.0" }
solana-loader-v2-interface = "=2.2.0"
solana-loader-v3-interface = "=2.2.0"
solana-loader-v4-interface = "=2.2.0"
solana-loader-v2-interface = "=2.2.1"
solana-loader-v3-interface = "=3.0.0"
solana-loader-v4-interface = "=2.2.1"
solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.0" }
solana-local-cluster = { path = "local-cluster", version = "=2.2.0" }
solana-log-collector = { path = "log-collector", version = "=2.2.0" }
solana-logger = "=2.2.0"
solana-logger = "=2.2.1"
solana-measure = { path = "measure", version = "=2.2.0" }
solana-merkle-tree = { path = "merkle-tree", version = "=2.2.0" }
solana-message = "=2.2.0"
solana-message = "=2.2.1"
solana-metrics = { path = "metrics", version = "=2.2.0" }
solana-msg = "=2.2.0"
solana-native-token = "=2.2.0"
solana-msg = "=2.2.1"
solana-native-token = "=2.2.1"
solana-net-utils = { path = "net-utils", version = "=2.2.0" }
solana-nohash-hasher = "0.2.1"
solana-nonce = "=2.2.0"
solana-nonce-account = "=2.2.0"
solana-nonce = "=2.2.1"
solana-nonce-account = "=2.2.1"
solana-notifier = { path = "notifier", version = "=2.2.0" }
solana-offchain-message = "=2.2.0"
solana-package-metadata = "=2.2.0"
solana-package-metadata-macro = "=2.2.0"
solana-packet = "=2.2.0"
solana-offchain-message = "=2.2.1"
solana-package-metadata = "=2.2.1"
solana-package-metadata-macro = "=2.2.1"
solana-packet = "=2.2.1"
solana-perf = { path = "perf", version = "=2.2.0" }
solana-poh = { path = "poh", version = "=2.2.0" }
solana-poh-config = "=2.2.0"
solana-poh-config = "=2.2.1"
solana-poseidon = { path = "poseidon", version = "=2.2.0" }
solana-precompile-error = "=2.2.0"
solana-precompiles = "=2.2.0"
solana-presigner = "=2.2.0"
solana-program = "=2.2.0"
solana-program-error = "=2.2.0"
solana-program-memory = "=2.2.0"
solana-program-option = "=2.2.0"
solana-program-pack = "=2.2.0"
solana-precompile-error = "=2.2.1"
solana-precompiles = "=2.2.1"
solana-presigner = "=2.2.1"
solana-program = "=2.2.1"
solana-program-error = "=2.2.1"
solana-program-memory = "=2.2.1"
solana-program-option = "=2.2.1"
solana-program-pack = "=2.2.1"
solana-program-runtime = { path = "program-runtime", version = "=2.2.0" }
solana-program-test = { path = "program-test", version = "=2.2.0" }
solana-pubkey = "=2.2.0"
solana-pubkey = "=2.2.1"
solana-pubsub-client = { path = "pubsub-client", version = "=2.2.0" }
solana-quic-client = { path = "quic-client", version = "=2.2.0" }
solana-quic-definitions = "=2.2.0"
solana-quic-definitions = "=2.2.1"
solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.2.0" }
solana-remote-wallet = { path = "remote-wallet", version = "=2.2.0", default-features = false }
solana-rent = "=2.2.0"
solana-rent-collector = "=2.2.0"
solana-rent-debits = "=2.2.0"
solana-reserved-account-keys = "=2.2.0"
solana-reward-info = "=2.2.0"
solana-sanitize = "=2.2.0"
solana-secp256r1-program = "=2.2.0"
solana-seed-derivable = "=2.2.0"
solana-seed-phrase = "=2.2.0"
solana-serde = "=2.2.0"
solana-serde-varint = "=2.2.0"
solana-serialize-utils = "=2.2.0"
solana-sha256-hasher = "=2.2.0"
solana-signature = "=2.2.0"
solana-signer = "=2.2.0"
solana-slot-hashes = "=2.2.0"
solana-slot-history = "=2.2.0"
solana-time-utils = "=2.2.0"
solana-rent = "=2.2.1"
solana-rent-collector = "=2.2.1"
solana-rent-debits = "=2.2.1"
solana-reserved-account-keys = "=2.2.1"
solana-reward-info = "=2.2.1"
solana-sanitize = "=2.2.1"
solana-secp256r1-program = "=2.2.1"
solana-seed-derivable = "=2.2.1"
solana-seed-phrase = "=2.2.1"
solana-serde = "=2.2.1"
solana-serde-varint = "=2.2.1"
solana-serialize-utils = "=2.2.1"
solana-sha256-hasher = "=2.2.1"
solana-signature = "=2.2.1"
solana-signer = "=2.2.1"
solana-slot-hashes = "=2.2.1"
solana-slot-history = "=2.2.1"
solana-time-utils = "=2.2.1"
solana-timings = { path = "timings", version = "=2.2.0" }
solana-tls-utils = { path = "tls-utils", version = "=2.2.0" }
solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.2.0" }
Expand All @@ -510,15 +510,15 @@ solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2
solana-runtime = { path = "runtime", version = "=2.2.0" }
solana-runtime-transaction = { path = "runtime-transaction", version = "=2.2.0" }
solana-sbpf = "=0.10.0"
solana-sdk = "=2.2.0"
solana-sdk-ids = "=2.2.0"
solana-sdk-macro = "=2.2.0"
solana-secp256k1-program = "=2.2.0"
solana-secp256k1-recover = "=2.2.0"
solana-sdk = "=2.2.1"
solana-sdk-ids = "=2.2.1"
solana-sdk-macro = "=2.2.1"
solana-secp256k1-program = "=2.2.1"
solana-secp256k1-recover = "=2.2.1"
solana-send-transaction-service = { path = "send-transaction-service", version = "=2.2.0" }
solana-short-vec = "=2.2.0"
solana-shred-version = "=2.2.0"
solana-stable-layout = "=2.2.0"
solana-short-vec = "=2.2.1"
solana-shred-version = "=2.2.1"
solana-stable-layout = "=2.2.1"
solana-stake-interface = { version = "1.2.1" }
solana-stake-program = { path = "programs/stake", version = "=2.2.0" }
solana-storage-bigtable = { path = "storage-bigtable", version = "=2.2.0" }
Expand All @@ -530,26 +530,26 @@ solana-svm-rent-collector = { path = "svm-rent-collector", version = "=2.2.0" }
solana-svm-transaction = { path = "svm-transaction", version = "=2.2.0" }
solana-system-interface = "1.0"
solana-system-program = { path = "programs/system", version = "=2.2.0" }
solana-system-transaction = "=2.2.0"
solana-sysvar = "=2.2.0"
solana-sysvar-id = "=2.2.0"
solana-system-transaction = "=2.2.1"
solana-sysvar = "=2.2.1"
solana-sysvar-id = "=2.2.1"
solana-test-validator = { path = "test-validator", version = "=2.2.0" }
solana-thin-client = { path = "thin-client", version = "=2.2.0" }
solana-transaction = "=2.2.0"
solana-transaction-error = "=2.2.0"
solana-transaction = "=2.2.1"
solana-transaction-error = "=2.2.1"
solana-tpu-client = { path = "tpu-client", version = "=2.2.0", default-features = false }
solana-tpu-client-next = { path = "tpu-client-next", version = "=2.2.0" }
solana-transaction-context = "=2.2.0"
solana-transaction-context = "=2.2.1"
solana-transaction-status = { path = "transaction-status", version = "=2.2.0" }
solana-transaction-status-client-types = { path = "transaction-status-client-types", version = "=2.2.0" }
solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.2.0" }
solana-turbine = { path = "turbine", version = "=2.2.0" }
solana-type-overrides = { path = "type-overrides", version = "=2.2.0" }
solana-udp-client = { path = "udp-client", version = "=2.2.0" }
solana-validator-exit = "=2.2.0"
solana-validator-exit = "=2.2.1"
solana-version = { path = "version", version = "=2.2.0" }
solana-vote = { path = "vote", version = "=2.2.0" }
solana-vote-interface = "=2.2.0"
solana-vote-interface = "=2.2.1"
solana-vote-program = { path = "programs/vote", version = "=2.2.0", default-features = false }
solana-wen-restart = { path = "wen-restart", version = "=2.2.0" }
solana-zk-elgamal-proof-program = { path = "programs/zk-elgamal-proof", version = "=2.2.0" }
Expand Down
3 changes: 3 additions & 0 deletions programs/bpf_loader/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1336,6 +1336,9 @@ fn process_loader_upgradeable_instruction(
additional_bytes
);
}
UpgradeableLoaderInstruction::Migrate => {
return Err(InstructionError::InvalidInstructionData);
}
}

Ok(())
Expand Down
Loading

0 comments on commit a1ed2b1

Please sign in to comment.