Skip to content

Commit e7be490

Browse files
authored
Merge pull request #65 from firedancer-io/mjain/remove-seed-address
context: remove old seed_address field
2 parents 2f78d5e + 68638b5 commit e7be490

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

proto/context.options

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ context.proto include:"../../../../ballet/nanopb/pb_firedancer.h"
33

44
fd_exec_test.FeatureSet.features type:FT_POINTER
55

6-
# No options needed for SeedAddress since its solfuzz-specific
7-
86
fd_exec_test.AcctState.address max_size:32 fixed_length:true
97
fd_exec_test.AcctState.data type:FT_POINTER
108
fd_exec_test.AcctState.owner max_size:32 fixed_length:true

proto/context.proto

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,8 @@ message FeatureSet {
99
repeated fixed64 features = 1;
1010
}
1111

12-
// A seed address. This is not a PDA.
13-
message SeedAddress {
14-
// The seed address base. (32 bytes)
15-
bytes base = 1;
16-
17-
// The seed path (<= 32 bytes)
18-
bytes seed = 2;
19-
20-
// The seed address owner. (32 bytes)
21-
bytes owner = 3;
22-
}
23-
2412
// The complete state of an account excluding its public key.
2513
message AcctState {
26-
reserved 5;
27-
2814
// The account address. (32 bytes)
2915
bytes address = 1;
3016

@@ -35,14 +21,12 @@ message AcctState {
3521

3622
bool executable = 4;
3723

24+
reserved 5;
25+
3826
// Address of the program that owns this account. (32 bytes)
3927
bytes owner = 6;
4028

41-
// The account address, but derived as a seed address. Overrides
42-
// `address` if present.
43-
// TODO: This is a solfuzz specific extension and is not compliant
44-
// with the org.solana.sealevel.v1 API.
45-
SeedAddress seed_addr = 7;
29+
reserved 7;
4630
}
4731

4832
message VoteAccount {

0 commit comments

Comments
 (0)