Skip to content

Commit 0f74624

Browse files
authored
context: remove seed_addr from account states (#377)
1 parent 8e74669 commit 0f74624

File tree

6 files changed

+5
-28
lines changed

6 files changed

+5
-28
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ winapi = "0.3.8"
518518
x509-parser = "0.14.0"
519519
zeroize = { version = "1.7", default-features = false }
520520
zstd = "0.13.3"
521-
protosol = {git = "https://github.com/firedancer-io/protosol", tag = "v1.0.4"}
521+
protosol = {git = "https://github.com/firedancer-io/protosol", tag = "v1.0.5"}
522522
solfuzz-agave-macro = { path = "macro" }
523523
once_cell = "1.21.3"
524524
lazy_static = "1.5.0"

scripts/generate_cargo.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import subprocess
1313

1414
# NOTE: this needs bumped with schema version upgrades of the protocol
15-
PROTOSOL_VERSION_TAG = "v1.0.4"
15+
PROTOSOL_VERSION_TAG = "v1.0.5"
1616

1717
def replace_path_with_git_rev(toml_data, git_url, rev):
1818
"""
@@ -131,11 +131,11 @@ def main():
131131
# Add protosol dependency (deduped if already present)
132132
if "dependencies" not in toml_data:
133133
toml_data["dependencies"] = table()
134-
134+
135135
# Remove existing protosol if present to ensure we use the correct version
136136
if "protosol" in toml_data["dependencies"]:
137137
del toml_data["dependencies"]["protosol"]
138-
138+
139139
# Add the required protosol dependency
140140
protosol_dep = inline_table()
141141
protosol_dep["git"] = "https://github.com/firedancer-io/protosol"

src/lib.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ impl From<InstrEffects> for proto::InstrEffects {
497497
lamports: account.lamports,
498498
data: account.data.to_vec(),
499499
executable: account.executable,
500-
seed_addr: None,
501500
})
502501
.collect(),
503502
cu_avail: val.cu_avail,
@@ -1127,7 +1126,6 @@ mod tests {
11271126
lamports: 1,
11281127
data: bincode::serialize(&sysvar).unwrap(),
11291128
executable: false,
1130-
seed_addr: None,
11311129
}
11321130
}
11331131

@@ -1166,23 +1164,20 @@ mod tests {
11661164
lamports: 1000,
11671165
data: vec![],
11681166
executable: false,
1169-
seed_addr: None,
11701167
},
11711168
proto::AcctState {
11721169
address: vec![2u8; 32],
11731170
owner: vec![0u8; 32],
11741171
lamports: 0,
11751172
data: vec![],
11761173
executable: false,
1177-
seed_addr: None,
11781174
},
11791175
proto::AcctState {
11801176
address: vec![0u8; 32],
11811177
owner: native_loader_id.clone(),
11821178
lamports: 10000000,
11831179
data: b"Solana Program".to_vec(),
11841180
executable: true,
1185-
seed_addr: None,
11861181
},
11871182
]),
11881183
instr_accounts: vec![
@@ -1219,23 +1214,20 @@ mod tests {
12191214
lamports: 999,
12201215
data: vec![],
12211216
executable: false,
1222-
seed_addr: None,
12231217
},
12241218
proto::AcctState {
12251219
address: vec![2u8; 32],
12261220
owner: vec![0u8; 32],
12271221
lamports: 1,
12281222
data: vec![],
12291223
executable: false,
1230-
seed_addr: None,
12311224
},
12321225
proto::AcctState {
12331226
address: vec![0u8; 32],
12341227
owner: native_loader_id.clone(),
12351228
lamports: 10000000,
12361229
data: b"Solana Program".to_vec(),
12371230
executable: true,
1238-
seed_addr: None,
12391231
},
12401232
]),
12411233
cu_avail: 9850u64,

src/txn_fuzzer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ impl From<TransactionAccount> for proto::AcctState {
152152
data: value.1.data().to_vec(),
153153
executable: value.1.executable(),
154154
owner: value.1.owner().to_bytes().to_vec(),
155-
seed_addr: None,
156155
}
157156
}
158157
}

tests/txn_fuzzer_sanity.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ fn get_clock_sysvar_account() -> AcctState {
5454
data: bincode::serialize(&clock).unwrap(),
5555
executable: false,
5656
owner: native_loader::id().to_bytes().to_vec(),
57-
seed_addr: None,
5857
}
5958
}
6059

@@ -72,7 +71,6 @@ fn get_epoch_schedule_sysvar_account() -> AcctState {
7271
data: bincode::serialize(&epoch_schedule).unwrap(),
7372
executable: false,
7473
owner: native_loader::id().to_bytes().to_vec(),
75-
seed_addr: None,
7674
}
7775
}
7876

@@ -88,7 +86,6 @@ fn get_rent_sysvar_account() -> AcctState {
8886
data: bincode::serialize(&rent).unwrap(),
8987
executable: false,
9088
owner: native_loader::id().to_bytes().to_vec(),
91-
seed_addr: None,
9289
}
9390
}
9491

@@ -119,7 +116,6 @@ fn deploy_program(name: String) -> [(Pubkey, AcctState); 2] {
119116
data: bincode::serialize(&state).unwrap(),
120117
executable: true,
121118
owner: bpf_loader_upgradeable::id().to_bytes().to_vec(),
122-
seed_addr: None,
123119
};
124120

125121
let state = UpgradeableLoaderState::ProgramData {
@@ -144,7 +140,6 @@ fn deploy_program(name: String) -> [(Pubkey, AcctState); 2] {
144140
data: header,
145141
executable: false,
146142
owner: vec![0; 32],
147-
seed_addr: None,
148143
};
149144

150145
[
@@ -196,7 +191,6 @@ fn test_txn_execute_clock() {
196191
data: vec![],
197192
executable: false,
198193
owner: vec![0; 32],
199-
seed_addr: None,
200194
};
201195

202196
let mut program_info = deploy_program("clock-sysvar".to_string());
@@ -315,7 +309,6 @@ fn test_simple_transfer() {
315309
data: vec![],
316310
executable: false,
317311
owner: vec![0; 32],
318-
seed_addr: None,
319312
};
320313

321314
let sender = Pubkey::new_unique();
@@ -325,7 +318,6 @@ fn test_simple_transfer() {
325318
data: vec![],
326319
executable: false,
327320
owner: vec![0; 32],
328-
seed_addr: None,
329321
};
330322

331323
let recipient = Pubkey::new_unique();
@@ -335,7 +327,6 @@ fn test_simple_transfer() {
335327
data: vec![],
336328
executable: false,
337329
owner: vec![0; 32],
338-
seed_addr: None,
339330
};
340331

341332
let mut program_info = deploy_program("simple-transfer".to_string());
@@ -470,7 +461,6 @@ fn test_lookup_table() {
470461
data: vec![],
471462
executable: false,
472463
owner: vec![0; 32],
473-
seed_addr: None,
474464
};
475465

476466
let sender = Pubkey::new_unique();
@@ -480,7 +470,6 @@ fn test_lookup_table() {
480470
data: vec![],
481471
executable: false,
482472
owner: vec![0; 32],
483-
seed_addr: None,
484473
};
485474

486475
let recipient = Pubkey::new_unique();
@@ -490,7 +479,6 @@ fn test_lookup_table() {
490479
data: vec![],
491480
executable: false,
492481
owner: vec![0; 32],
493-
seed_addr: None,
494482
};
495483

496484
let extra_account = Pubkey::new_unique();
@@ -500,7 +488,6 @@ fn test_lookup_table() {
500488
data: vec![5, 0, 0, 0, 0, 0, 0, 0],
501489
executable: false,
502490
owner: vec![0; 32],
503-
seed_addr: None,
504491
};
505492

506493
let mut program_info = deploy_program("complex-transfer".to_string());
@@ -534,7 +521,6 @@ fn test_lookup_table() {
534521
data: alut_data,
535522
executable: false,
536523
owner: address_lookup_table::id().to_bytes().to_vec(),
537-
seed_addr: None,
538524
};
539525

540526
let blockhash_queue = vec![

0 commit comments

Comments
 (0)