Skip to content

Commit 631036b

Browse files
joncinquemergify[bot]
authored andcommitted
sdk: Bump all SDK crates for relaxed dependencies (#4969)
* 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 (cherry picked from commit a1ed2b1)
1 parent ddc5d20 commit 631036b

File tree

8 files changed

+687
-681
lines changed

8 files changed

+687
-681
lines changed

Cargo.lock

Lines changed: 194 additions & 194 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -355,24 +355,24 @@ smallvec = "1.13.2"
355355
smpl_jwt = "0.7.1"
356356
socket2 = "0.5.8"
357357
soketto = "0.7"
358-
solana-account = "=2.2.0"
358+
solana-account = "=2.2.1"
359359
solana-account-decoder = { path = "account-decoder", version = "=2.2.0" }
360360
solana-account-decoder-client-types = { path = "account-decoder-client-types", version = "=2.2.0" }
361-
solana-account-info = "=2.2.0"
361+
solana-account-info = "=2.2.1"
362362
solana-accounts-db = { path = "accounts-db", version = "=2.2.0" }
363-
solana-address-lookup-table-interface = "=2.2.1"
363+
solana-address-lookup-table-interface = "=2.2.2"
364364
solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.2.0" }
365-
solana-atomic-u64 = "=2.2.0"
365+
solana-atomic-u64 = "=2.2.1"
366366
solana-banks-client = { path = "banks-client", version = "=2.2.0" }
367367
solana-banks-interface = { path = "banks-interface", version = "=2.2.0" }
368368
solana-banks-server = { path = "banks-server", version = "=2.2.0" }
369369
solana-bench-tps = { path = "bench-tps", version = "=2.2.0" }
370-
solana-big-mod-exp = "=2.2.0"
371-
solana-bincode = "=2.2.0"
372-
solana-blake3-hasher = "=2.2.0"
370+
solana-big-mod-exp = "=2.2.1"
371+
solana-bincode = "=2.2.1"
372+
solana-blake3-hasher = "=2.2.1"
373373
solana-bloom = { path = "bloom", version = "=2.2.0" }
374-
solana-bn254 = "=2.2.0"
375-
solana-borsh = "=2.2.0"
374+
solana-bn254 = "=2.2.1"
375+
solana-borsh = "=2.2.1"
376376
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=2.2.0" }
377377
solana-bucket-map = { path = "bucket_map", version = "=2.2.0" }
378378
solana-builtins = { path = "builtins", version = "=2.2.0" }
@@ -385,120 +385,120 @@ solana-cli = { path = "cli", version = "=2.2.0" }
385385
solana-cli-config = { path = "cli-config", version = "=2.2.0" }
386386
solana-cli-output = { path = "cli-output", version = "=2.2.0" }
387387
solana-client = { path = "client", version = "=2.2.0" }
388-
solana-client-traits = "=2.2.0"
389-
solana-clock = "=2.2.0"
390-
solana-cluster-type = "=2.2.0"
391-
solana-commitment-config = "=2.2.0"
388+
solana-client-traits = "=2.2.1"
389+
solana-clock = "=2.2.1"
390+
solana-cluster-type = "=2.2.1"
391+
solana-commitment-config = "=2.2.1"
392392
solana-compute-budget = { path = "compute-budget", version = "=2.2.0" }
393393
solana-compute-budget-instruction = { path = "compute-budget-instruction", version = "=2.2.0" }
394-
solana-compute-budget-interface = "=2.2.0"
394+
solana-compute-budget-interface = "=2.2.1"
395395
solana-compute-budget-program = { path = "programs/compute-budget", version = "=2.2.0" }
396396
solana-config-program = { path = "programs/config", version = "=2.2.0" }
397397
solana-connection-cache = { path = "connection-cache", version = "=2.2.0", default-features = false }
398398
solana-core = { path = "core", version = "=2.2.0" }
399399
solana-cost-model = { path = "cost-model", version = "=2.2.0" }
400-
solana-cpi = "=2.2.0"
400+
solana-cpi = "=2.2.1"
401401
solana-curve25519 = { path = "curves/curve25519", version = "=2.2.0" }
402-
solana-decode-error = "=2.2.0"
403-
solana-define-syscall = "=2.2.0"
404-
solana-derivation-path = "=2.2.0"
402+
solana-decode-error = "=2.2.1"
403+
solana-define-syscall = "=2.2.1"
404+
solana-derivation-path = "=2.2.1"
405405
solana-download-utils = { path = "download-utils", version = "=2.2.0" }
406-
solana-ed25519-program = "=2.2.0"
406+
solana-ed25519-program = "=2.2.1"
407407
solana-entry = { path = "entry", version = "=2.2.0" }
408-
solana-program-entrypoint = "=2.2.0"
409-
solana-epoch-info = "=2.2.0"
410-
solana-epoch-rewards = "=2.2.0"
411-
solana-epoch-rewards-hasher = "=2.2.0"
412-
solana-epoch-schedule = "=2.2.0"
413-
solana-example-mocks = "=2.2.0"
408+
solana-program-entrypoint = "=2.2.1"
409+
solana-epoch-info = "=2.2.1"
410+
solana-epoch-rewards = "=2.2.1"
411+
solana-epoch-rewards-hasher = "=2.2.1"
412+
solana-epoch-schedule = "=2.2.1"
413+
solana-example-mocks = "=2.2.1"
414414
solana-faucet = { path = "faucet", version = "=2.2.0" }
415415
solana-feature-gate-client = "0.0.2"
416-
solana-feature-gate-interface = "=2.2.0"
417-
solana-feature-set = "=2.2.0"
418-
solana-fee-calculator = "=2.2.0"
416+
solana-feature-gate-interface = "=2.2.1"
417+
solana-feature-set = "=2.2.1"
418+
solana-fee-calculator = "=2.2.1"
419419
solana-fee = { path = "fee", version = "=2.2.0" }
420-
solana-fee-structure = "=2.2.0"
421-
solana-frozen-abi = "=2.2.0"
422-
solana-frozen-abi-macro = "=2.2.0"
420+
solana-fee-structure = "=2.2.1"
421+
solana-frozen-abi = "=2.2.1"
422+
solana-frozen-abi-macro = "=2.2.1"
423423
solana-tps-client = { path = "tps-client", version = "=2.2.0" }
424-
solana-file-download = "=2.2.0"
424+
solana-file-download = "=2.2.1"
425425
solana-genesis = { path = "genesis", version = "=2.2.0" }
426-
solana-genesis-config = "=2.2.0"
426+
solana-genesis-config = "=2.2.1"
427427
solana-genesis-utils = { path = "genesis-utils", version = "=2.2.0" }
428428
agave-geyser-plugin-interface = { path = "geyser-plugin-interface", version = "=2.2.0" }
429429
solana-geyser-plugin-manager = { path = "geyser-plugin-manager", version = "=2.2.0" }
430430
solana-gossip = { path = "gossip", version = "=2.2.0" }
431-
solana-hard-forks = "=2.2.0"
432-
solana-hash = "=2.2.0"
433-
solana-inflation = "=2.2.0"
431+
solana-hard-forks = "=2.2.1"
432+
solana-hash = "=2.2.1"
433+
solana-inflation = "=2.2.1"
434434
solana-inline-spl = { path = "inline-spl", version = "=2.2.0" }
435-
solana-instruction = "=2.2.0"
436-
solana-instructions-sysvar = "=2.2.0"
437-
solana-keccak-hasher = "=2.2.0"
438-
solana-keypair = "=2.2.0"
439-
solana-last-restart-slot = "=2.2.0"
435+
solana-instruction = "=2.2.1"
436+
solana-instructions-sysvar = "=2.2.1"
437+
solana-keccak-hasher = "=2.2.1"
438+
solana-keypair = "=2.2.1"
439+
solana-last-restart-slot = "=2.2.1"
440440
solana-lattice-hash = { path = "lattice-hash", version = "=2.2.0" }
441441
solana-ledger = { path = "ledger", version = "=2.2.0" }
442-
solana-loader-v2-interface = "=2.2.0"
443-
solana-loader-v3-interface = "=2.2.0"
444-
solana-loader-v4-interface = "=2.2.0"
442+
solana-loader-v2-interface = "=2.2.1"
443+
solana-loader-v3-interface = "=3.0.0"
444+
solana-loader-v4-interface = "=2.2.1"
445445
solana-loader-v4-program = { path = "programs/loader-v4", version = "=2.2.0" }
446446
solana-local-cluster = { path = "local-cluster", version = "=2.2.0" }
447447
solana-log-collector = { path = "log-collector", version = "=2.2.0" }
448-
solana-logger = "=2.2.0"
448+
solana-logger = "=2.2.1"
449449
solana-measure = { path = "measure", version = "=2.2.0" }
450450
solana-merkle-tree = { path = "merkle-tree", version = "=2.2.0" }
451-
solana-message = "=2.2.0"
451+
solana-message = "=2.2.1"
452452
solana-metrics = { path = "metrics", version = "=2.2.0" }
453-
solana-msg = "=2.2.0"
454-
solana-native-token = "=2.2.0"
453+
solana-msg = "=2.2.1"
454+
solana-native-token = "=2.2.1"
455455
solana-net-utils = { path = "net-utils", version = "=2.2.0" }
456456
solana-nohash-hasher = "0.2.1"
457-
solana-nonce = "=2.2.0"
458-
solana-nonce-account = "=2.2.0"
457+
solana-nonce = "=2.2.1"
458+
solana-nonce-account = "=2.2.1"
459459
solana-notifier = { path = "notifier", version = "=2.2.0" }
460-
solana-offchain-message = "=2.2.0"
461-
solana-package-metadata = "=2.2.0"
462-
solana-package-metadata-macro = "=2.2.0"
463-
solana-packet = "=2.2.0"
460+
solana-offchain-message = "=2.2.1"
461+
solana-package-metadata = "=2.2.1"
462+
solana-package-metadata-macro = "=2.2.1"
463+
solana-packet = "=2.2.1"
464464
solana-perf = { path = "perf", version = "=2.2.0" }
465465
solana-poh = { path = "poh", version = "=2.2.0" }
466-
solana-poh-config = "=2.2.0"
466+
solana-poh-config = "=2.2.1"
467467
solana-poseidon = { path = "poseidon", version = "=2.2.0" }
468-
solana-precompile-error = "=2.2.0"
469-
solana-precompiles = "=2.2.0"
470-
solana-presigner = "=2.2.0"
471-
solana-program = "=2.2.0"
472-
solana-program-error = "=2.2.0"
473-
solana-program-memory = "=2.2.0"
474-
solana-program-option = "=2.2.0"
475-
solana-program-pack = "=2.2.0"
468+
solana-precompile-error = "=2.2.1"
469+
solana-precompiles = "=2.2.1"
470+
solana-presigner = "=2.2.1"
471+
solana-program = "=2.2.1"
472+
solana-program-error = "=2.2.1"
473+
solana-program-memory = "=2.2.1"
474+
solana-program-option = "=2.2.1"
475+
solana-program-pack = "=2.2.1"
476476
solana-program-runtime = { path = "program-runtime", version = "=2.2.0" }
477477
solana-program-test = { path = "program-test", version = "=2.2.0" }
478-
solana-pubkey = "=2.2.0"
478+
solana-pubkey = "=2.2.1"
479479
solana-pubsub-client = { path = "pubsub-client", version = "=2.2.0" }
480480
solana-quic-client = { path = "quic-client", version = "=2.2.0" }
481-
solana-quic-definitions = "=2.2.0"
481+
solana-quic-definitions = "=2.2.1"
482482
solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.2.0" }
483483
solana-remote-wallet = { path = "remote-wallet", version = "=2.2.0", default-features = false }
484-
solana-rent = "=2.2.0"
485-
solana-rent-collector = "=2.2.0"
486-
solana-rent-debits = "=2.2.0"
487-
solana-reserved-account-keys = "=2.2.0"
488-
solana-reward-info = "=2.2.0"
489-
solana-sanitize = "=2.2.0"
490-
solana-secp256r1-program = "=2.2.0"
491-
solana-seed-derivable = "=2.2.0"
492-
solana-seed-phrase = "=2.2.0"
493-
solana-serde = "=2.2.0"
494-
solana-serde-varint = "=2.2.0"
495-
solana-serialize-utils = "=2.2.0"
496-
solana-sha256-hasher = "=2.2.0"
497-
solana-signature = "=2.2.0"
498-
solana-signer = "=2.2.0"
499-
solana-slot-hashes = "=2.2.0"
500-
solana-slot-history = "=2.2.0"
501-
solana-time-utils = "=2.2.0"
484+
solana-rent = "=2.2.1"
485+
solana-rent-collector = "=2.2.1"
486+
solana-rent-debits = "=2.2.1"
487+
solana-reserved-account-keys = "=2.2.1"
488+
solana-reward-info = "=2.2.1"
489+
solana-sanitize = "=2.2.1"
490+
solana-secp256r1-program = "=2.2.1"
491+
solana-seed-derivable = "=2.2.1"
492+
solana-seed-phrase = "=2.2.1"
493+
solana-serde = "=2.2.1"
494+
solana-serde-varint = "=2.2.1"
495+
solana-serialize-utils = "=2.2.1"
496+
solana-sha256-hasher = "=2.2.1"
497+
solana-signature = "=2.2.1"
498+
solana-signer = "=2.2.1"
499+
solana-slot-hashes = "=2.2.1"
500+
solana-slot-history = "=2.2.1"
501+
solana-time-utils = "=2.2.1"
502502
solana-timings = { path = "timings", version = "=2.2.0" }
503503
solana-tls-utils = { path = "tls-utils", version = "=2.2.0" }
504504
solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=2.2.0" }
@@ -510,15 +510,15 @@ solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2
510510
solana-runtime = { path = "runtime", version = "=2.2.0" }
511511
solana-runtime-transaction = { path = "runtime-transaction", version = "=2.2.0" }
512512
solana-sbpf = "=0.10.0"
513-
solana-sdk = "=2.2.0"
514-
solana-sdk-ids = "=2.2.0"
515-
solana-sdk-macro = "=2.2.0"
516-
solana-secp256k1-program = "=2.2.0"
517-
solana-secp256k1-recover = "=2.2.0"
513+
solana-sdk = "=2.2.1"
514+
solana-sdk-ids = "=2.2.1"
515+
solana-sdk-macro = "=2.2.1"
516+
solana-secp256k1-program = "=2.2.1"
517+
solana-secp256k1-recover = "=2.2.1"
518518
solana-send-transaction-service = { path = "send-transaction-service", version = "=2.2.0" }
519-
solana-short-vec = "=2.2.0"
520-
solana-shred-version = "=2.2.0"
521-
solana-stable-layout = "=2.2.0"
519+
solana-short-vec = "=2.2.1"
520+
solana-shred-version = "=2.2.1"
521+
solana-stable-layout = "=2.2.1"
522522
solana-stake-interface = { version = "1.2.1" }
523523
solana-stake-program = { path = "programs/stake", version = "=2.2.0" }
524524
solana-storage-bigtable = { path = "storage-bigtable", version = "=2.2.0" }
@@ -530,26 +530,26 @@ solana-svm-rent-collector = { path = "svm-rent-collector", version = "=2.2.0" }
530530
solana-svm-transaction = { path = "svm-transaction", version = "=2.2.0" }
531531
solana-system-interface = "1.0"
532532
solana-system-program = { path = "programs/system", version = "=2.2.0" }
533-
solana-system-transaction = "=2.2.0"
534-
solana-sysvar = "=2.2.0"
535-
solana-sysvar-id = "=2.2.0"
533+
solana-system-transaction = "=2.2.1"
534+
solana-sysvar = "=2.2.1"
535+
solana-sysvar-id = "=2.2.1"
536536
solana-test-validator = { path = "test-validator", version = "=2.2.0" }
537537
solana-thin-client = { path = "thin-client", version = "=2.2.0" }
538-
solana-transaction = "=2.2.0"
539-
solana-transaction-error = "=2.2.0"
538+
solana-transaction = "=2.2.1"
539+
solana-transaction-error = "=2.2.1"
540540
solana-tpu-client = { path = "tpu-client", version = "=2.2.0", default-features = false }
541541
solana-tpu-client-next = { path = "tpu-client-next", version = "=2.2.0" }
542-
solana-transaction-context = "=2.2.0"
542+
solana-transaction-context = "=2.2.1"
543543
solana-transaction-status = { path = "transaction-status", version = "=2.2.0" }
544544
solana-transaction-status-client-types = { path = "transaction-status-client-types", version = "=2.2.0" }
545545
solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", version = "=2.2.0" }
546546
solana-turbine = { path = "turbine", version = "=2.2.0" }
547547
solana-type-overrides = { path = "type-overrides", version = "=2.2.0" }
548548
solana-udp-client = { path = "udp-client", version = "=2.2.0" }
549-
solana-validator-exit = "=2.2.0"
549+
solana-validator-exit = "=2.2.1"
550550
solana-version = { path = "version", version = "=2.2.0" }
551551
solana-vote = { path = "vote", version = "=2.2.0" }
552-
solana-vote-interface = "=2.2.0"
552+
solana-vote-interface = "=2.2.1"
553553
solana-vote-program = { path = "programs/vote", version = "=2.2.0", default-features = false }
554554
solana-wen-restart = { path = "wen-restart", version = "=2.2.0" }
555555
solana-zk-elgamal-proof-program = { path = "programs/zk-elgamal-proof", version = "=2.2.0" }

programs/bpf_loader/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,6 +1336,9 @@ fn process_loader_upgradeable_instruction(
13361336
additional_bytes
13371337
);
13381338
}
1339+
UpgradeableLoaderInstruction::Migrate => {
1340+
return Err(InstructionError::InvalidInstructionData);
1341+
}
13391342
}
13401343

13411344
Ok(())

0 commit comments

Comments
 (0)