From a4956844bdd081e7b90508066c579f29be306ce7 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 22 Oct 2020 10:32:35 -0700 Subject: [PATCH] Update frozen_abi hashes The movement of files in sdk/ caused ABI hashes to change --- core/src/cluster_info.rs | 2 +- core/src/consensus.rs | 2 +- programs/vote/src/vote_state/mod.rs | 4 ++-- runtime/src/bank.rs | 2 +- runtime/src/blockhash_queue.rs | 2 +- runtime/src/serde_snapshot/tests.rs | 2 +- sdk/program/src/account.rs | 2 +- sdk/program/src/message.rs | 2 +- sdk/program/src/system_instruction.rs | 2 +- sdk/src/genesis_config.rs | 2 +- sdk/src/transaction.rs | 2 +- test-abi.sh | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index 7d542e982fb3b9..0c83fb7a2f4596 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -356,7 +356,7 @@ pub fn make_accounts_hashes_message( } // TODO These messages should go through the gpu pipeline for spam filtering -#[frozen_abi(digest = "3ZHQscZ9SgxKh45idzHv3hiagyyPRtDgeySmJn171PTi")] +#[frozen_abi(digest = "21UweZ4WXK9RHypF97D1rEJQ4C8Bh4pw52SBSNAKxJvW")] #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)] #[allow(clippy::large_enum_variant)] enum Protocol { diff --git a/core/src/consensus.rs b/core/src/consensus.rs index ebd91cd81684c3..cff89b11b5e4c0 100644 --- a/core/src/consensus.rs +++ b/core/src/consensus.rs @@ -89,7 +89,7 @@ pub(crate) struct ComputedBankState { pub pubkey_votes: Arc, } -#[frozen_abi(digest = "2ZUeCLMVQxmHYbeqMH7M97ifVSKoVErGvRHzyxcQRjgU")] +#[frozen_abi(digest = "Eay84NBbJqiMBfE7HHH2o6e51wcvoU79g8zCi5sw6uj3")] #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, AbiExample)] pub struct Tower { node_pubkey: Pubkey, diff --git a/programs/vote/src/vote_state/mod.rs b/programs/vote/src/vote_state/mod.rs index 112942e5b2f39e..628eabea300d6a 100644 --- a/programs/vote/src/vote_state/mod.rs +++ b/programs/vote/src/vote_state/mod.rs @@ -32,7 +32,7 @@ pub const INITIAL_LOCKOUT: usize = 2; // smaller numbers makes pub const MAX_EPOCH_CREDITS_HISTORY: usize = 64; -#[frozen_abi(digest = "69hYtmmcuqPbhpc64ZaNJDidaUcg66CW6wzPFiuYZ3To")] +#[frozen_abi(digest = "Ch2vVEwos2EjAVqSHCyJjnN2MNX1yrpapZTGhMSCjWUH")] #[derive(Serialize, Default, Deserialize, Debug, PartialEq, Eq, Clone, AbiExample)] pub struct Vote { /// A stack of votes starting with the oldest vote @@ -150,7 +150,7 @@ impl CircBuf { } } -#[frozen_abi(digest = "H7z93iz4PiRJqahQ9G1aJXao1huusBz47SA5WfP8g4yd")] +#[frozen_abi(digest = "331ZmXrmsUcwbKhzR3C1UEU6uNwZr48ExE54JDKGWA4w")] #[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq, Clone, AbiExample)] pub struct VoteState { /// the node that votes in this account diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 03a013952ce83a..5825b6ecb6de0c 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -114,7 +114,7 @@ pub const MAX_LEADER_SCHEDULE_STAKES: Epoch = 5; pub const TRANSACTION_LOG_MESSAGES_BYTES_LIMIT: usize = 100 * 1000; type BankStatusCache = StatusCache>; -#[frozen_abi(digest = "EEFPLdPhngiBojqEnDMkoEGjyYYHNWPHnenRf8b9diqd")] +#[frozen_abi(digest = "4nZ6EdivqQPcnrnXisbjuTjpcUBoHLDEQWvbZQDCoQQR")] pub type BankSlotDelta = SlotDelta>; type TransactionAccountRefCells = Vec>>; type TransactionLoaderRefCells = Vec)>>; diff --git a/runtime/src/blockhash_queue.rs b/runtime/src/blockhash_queue.rs index fd077cdaf329c6..ee109c7a023346 100644 --- a/runtime/src/blockhash_queue.rs +++ b/runtime/src/blockhash_queue.rs @@ -12,7 +12,7 @@ struct HashAge { } /// Low memory overhead, so can be cloned for every checkpoint -#[frozen_abi(digest = "EwaoLA34VN18E95GvjmkeStUpWqTeBd7FGpd7mppLmEw")] +#[frozen_abi(digest = "J1fGiMHyiKEBcWE6mfm7grAEGJgYEaVLzcrNZvd37iA2")] #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, AbiExample)] pub struct BlockhashQueue { /// updated whenever an hash is registered diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index e1d7c059f17495..7abe26f7789af9 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -262,7 +262,7 @@ mod test_bank_serialize { // These some what long test harness is required to freeze the ABI of // Bank's serialization due to versioned nature - #[frozen_abi(digest = "ULV2jDndxR3JB677ayyjaamtAcZ24q75tCkHS2bKVoy")] + #[frozen_abi(digest = "7f8quGr9ia7Dg5o339uKrPd4bLesNVdPuKMLpGQ9c3SR")] #[derive(Serialize, AbiExample)] pub struct BankAbiTestWrapperFuture { #[serde(serialize_with = "wrapper_future")] diff --git a/sdk/program/src/account.rs b/sdk/program/src/account.rs index a5ec2c9deb64c5..fd16d08020627b 100644 --- a/sdk/program/src/account.rs +++ b/sdk/program/src/account.rs @@ -8,7 +8,7 @@ use std::{ /// An Account with data that is stored on chain #[repr(C)] -#[frozen_abi(digest = "AVG6bXqVUippoYRAE8e1ewHeZi1UvFx5r5gKspFSEbxM")] +#[frozen_abi(digest = "Upy4zg4EXZTnY371b4JPrGTh2kLcYpRno2K2pvjbN4e")] #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Default, AbiExample)] #[serde(rename_all = "camelCase")] pub struct Account { diff --git a/sdk/program/src/message.rs b/sdk/program/src/message.rs index 300b5b4e30cc2a..ad4ba63f12158d 100644 --- a/sdk/program/src/message.rs +++ b/sdk/program/src/message.rs @@ -160,7 +160,7 @@ pub struct MessageHeader { pub num_readonly_unsigned_accounts: u8, } -#[frozen_abi(digest = "A18PN3BWKw4hU69STY79SyRS3tS6w54nCgYRRx77vQiL")] +#[frozen_abi(digest = "6zcKiPfKoqYChcZfYcxqcmpJetXk8P51ihc4kiujPgdr")] #[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, AbiExample)] #[serde(rename_all = "camelCase")] pub struct Message { diff --git a/sdk/program/src/system_instruction.rs b/sdk/program/src/system_instruction.rs index 4fdad5082dc5ab..adc38e697a4dcb 100644 --- a/sdk/program/src/system_instruction.rs +++ b/sdk/program/src/system_instruction.rs @@ -52,7 +52,7 @@ impl DecodeError for NonceError { /// maximum permitted size of data: 10 MB pub const MAX_PERMITTED_DATA_LENGTH: u64 = 10 * 1024 * 1024; -#[frozen_abi(digest = "EpsptsKTYzMoQGSdoWRfPbwT3odGNfK3imEUTrxpLF1i")] +#[frozen_abi(digest = "2xnDcizcPKKR7b624FeuuPd1zj5bmnkmVsBWgoKPTh4w")] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, AbiExample, AbiEnumVisitor)] pub enum SystemInstruction { /// Create a new account diff --git a/sdk/src/genesis_config.rs b/sdk/src/genesis_config.rs index 42ebdf1ab7654a..9642383ea59998 100644 --- a/sdk/src/genesis_config.rs +++ b/sdk/src/genesis_config.rs @@ -61,7 +61,7 @@ impl FromStr for ClusterType { } } -#[frozen_abi(digest = "DEg4N5ps9EdEBL2H2ahU54SCcw3QphtPjh48H413fvNq")] +#[frozen_abi(digest = "BAfWTFBwzed5FYCGAyMDq4HLsoZNTp8dZx2bqtYTCmGZ")] #[derive(Serialize, Deserialize, Debug, Clone, AbiExample)] pub struct GenesisConfig { /// when the network (bootstrap validator) was started relative to the UNIX Epoch diff --git a/sdk/src/transaction.rs b/sdk/src/transaction.rs index 0b49eef82921fe..7b18d580a29bfe 100644 --- a/sdk/src/transaction.rs +++ b/sdk/src/transaction.rs @@ -103,7 +103,7 @@ impl From for TransactionError { } /// An atomic transaction -#[frozen_abi(digest = "GoxM5ZMMjM2FSuY1VtuMhs1j8u9kMuYsH3dpYcSVVnTe")] +#[frozen_abi(digest = "EGPL8qfT6of8UDKUTPQfcCADiRrpVxKXmULWtNdfjbQ8")] #[derive(Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize, AbiExample)] pub struct Transaction { /// A set of digital signatures of `account_keys`, `program_ids`, `recent_blockhash`, and `instructions`, signed by the first diff --git a/test-abi.sh b/test-abi.sh index 72a5ce2f897ad5..5cda8446f89066 100755 --- a/test-abi.sh +++ b/test-abi.sh @@ -5,4 +5,4 @@ here=$(dirname "$0") set -x -exec "${here}/cargo" nightly test --lib -- test_abi_ +exec "${here}/cargo" nightly test --lib -- test_abi_ --nocapture