gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump version to v1.11 (#23807)

Browse Source 
* Revert crossbeam_epoch to stable. 0.9.8 only works with nightly
* Remove unneeded unit expression
This commit is contained in:
Will Hickey
2022-03-21 17:40:50 -05:00
committed by GitHub
parent 24f6855f86
commit c4ecfa5716
140 changed files with 2115 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/program/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "solana-program"
version = "1.10.4"
version = "1.11.0"
description = "Solana Program"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
@ -29,9 +29,9 @@ serde_bytes = "0.11"
serde_derive = "1.0.103"
sha2 = "0.10.0"
sha3 = "0.10.0"
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.4" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.4" }
solana-sdk-macro = { path = "../macro", version = "=1.10.4" }
solana-frozen-abi = { path = "../../frozen-abi", version = "=1.11.0" }
solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.11.0" }
solana-sdk-macro = { path = "../macro", version = "=1.11.0" }
thiserror = "1.0"
[target.'cfg(not(target_arch = "bpf"))'.dependencies]
@ -44,7 +44,7 @@ itertools = "0.10.1"
wasm-bindgen = "0.2"
[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
solana-logger = { path = "../../logger", version = "=1.10.4" }
solana-logger = { path = "../../logger", version = "=1.11.0" }
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.7"

6
sdk/program/src/message/legacy.rs
View File

@ -19,7 +19,7 @@ use {
message::{CompiledKeys, MessageHeader},
pubkey::Pubkey,
sanitize::{Sanitize, SanitizeError},
short_vec, system_instruction, system_program, sysvar, wasm_bindgen,
short_vec, system_instruction, system_program, sysvar,
},
lazy_static::lazy_static,
std::{convert::TryFrom, str::FromStr},
@ -82,18 +82,15 @@ fn compile_instructions(ixs: &[Instruction], keys: &[Pubkey]) -> Vec<CompiledIns
/// redundantly specifying the fee-payer is not strictly required.
// NOTE: Serialization-related changes must be paired with the custom serialization
// for versioned messages in the `RemainingLegacyMessage` struct.
#[wasm_bindgen]
#[frozen_abi(digest = "2KnLEqfLcTBQqitE22Pp8JYkaqVVbAkGbCfdeHoyxcAU")]
#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, AbiExample)]
#[serde(rename_all = "camelCase")]
pub struct Message {
/// The message header, identifying signed and read-only `account_keys`.
// NOTE: Serialization-related changes must be paired with the direct read at sigverify.
#[wasm_bindgen(skip)]
pub header: MessageHeader,
/// All the account keys used by this transaction.
#[wasm_bindgen(skip)]
#[serde(with = "short_vec")]
pub account_keys: Vec<Pubkey>,
@ -102,7 +99,6 @@ pub struct Message {
/// Programs that will be executed in sequence and committed in one atomic transaction if all
/// succeed.
#[wasm_bindgen(skip)]
#[serde(with = "short_vec")]
pub instructions: Vec<CompiledInstruction>,
}