blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Governance: Use correct max size for multiple instruction transaction (#2891) 

* fix: use correct max size for multiple instruction transaction

* chore: add instruction to serialisation tests
This commit is contained in:
Sebastian Bor 2022-02-09 12:32:06 +00:00 committed by GitHub
parent f36e973697
commit 11d9952937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Anchor.toml
View File

@ -9,4 +9,4 @@ cluster = "mainnet"
wallet = "~/.config/solana/id.json" wallet = "~/.config/solana/id.json"
[programs.mainnet] [programs.mainnet]
spl_governance = "GoVEr6xcF9QGrRFJC4kt9wiCdNqZzrG7KWdrm7viDnpa" spl_governance = "GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw"

2
Cargo.lock generated
View File

@ -3621,7 +3621,7 @@ dependencies = [
[[package]] [[package]]
name = "spl-governance" name = "spl-governance"
version = "2.2.2" version = "2.2.3"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"assert_matches", "assert_matches",

2
governance/chat/program/Cargo.toml
View File

@ -21,7 +21,7 @@ serde = "1.0.127"
serde_derive = "1.0.103" serde_derive = "1.0.103"
solana-program = "1.9.5" solana-program = "1.9.5"
spl-token = { version = "3.3", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-token = { version = "3.3", path = "../../../token/program", features = [ "no-entrypoint" ] }
spl-governance= { version = "2.2.2", path ="../../program", features = [ "no-entrypoint" ]} spl-governance= { version = "2.2.3", path ="../../program", features = [ "no-entrypoint" ]}
spl-governance-tools= { version = "0.1.2", path ="../../tools"} spl-governance-tools= { version = "0.1.2", path ="../../tools"}
spl-governance-addin-api= { version = "0.1.1", path ="../../addin-api"} spl-governance-addin-api= { version = "0.1.1", path ="../../addin-api"}
thiserror = "1.0" thiserror = "1.0"

2
governance/program/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "spl-governance" name = "spl-governance"
version = "2.2.2" version = "2.2.3"
description = "Solana Program Library Governance Program" description = "Solana Program Library Governance Program"
authors = ["Solana Maintainers <maintainers@solana.foundation>"] authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana-program-library" repository = "https://github.com/solana-labs/solana-program-library"

8
governance/program/src/state/proposal_transaction.rs
View File

@ -125,11 +125,10 @@ impl AccountMaxSize for ProposalTransactionV2 {
let instructions_size = self let instructions_size = self
.instructions .instructions
.iter() .iter()
.map(|i| i.accounts.len() * 34 + i.data.len()) .map(|i| i.accounts.len() * 34 + i.data.len() + 40)
.sum::<usize>() .sum::<usize>();
+ 4;
Some(instructions_size + 98) Some(instructions_size + 62)
} }
} }
@ -273,6 +272,7 @@ mod test {
accounts: vec![ accounts: vec![
create_test_account_meta_data(), create_test_account_meta_data(),
create_test_account_meta_data(), create_test_account_meta_data(),
create_test_account_meta_data(),
], ],
data: vec![1, 2, 3], data: vec![1, 2, 3],
}] }]