Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving partial advance blockchain state to an independent memory area #113

Merged
merged 1 commit into from
Jan 9, 2023
Merged

Moving partial advance blockchain state to an independent memory area #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ledger/src/signer/src/bc_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ void bc_init_state() {
uint8_t t = 1;
NVM_WRITE(&N_bc_state.initialized, &t, sizeof(t));
}
explicit_bzero(&bc_st_updating, sizeof(bc_st_updating));
}

// -----------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions ledger/src/signer/src/mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@
// -----------------------------------------------------------------------

mem_t mem;

sess_per_mem_t sess_per_mem;
8 changes: 6 additions & 2 deletions ledger/src/signer/src/mem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ typedef union {
struct {
block_t block;
aux_bc_state_t aux_bc_st;
bc_state_updating_t bc_st_updating;
};

auth_ctx_t auth;
Expand All @@ -63,14 +62,19 @@ typedef union {
heartbeat_t heartbeat;
} mem_t;

typedef struct {
bc_state_updating_t bc_st_updating;
} sess_per_mem_t;

extern mem_t mem;
extern sess_per_mem_t sess_per_mem;

#define rlp_ctx (mem.rlp_ctx)
#define tx_ctx (mem.tx_ctx)
#define mp_ctx (mem.mp_ctx)
#define block (mem.block)
#define aux_bc_st (mem.aux_bc_st)
#define bc_st_updating (mem.bc_st_updating)
#define bc_st_updating (sess_per_mem.bc_st_updating)
#define auth (mem.auth)
#define attestation (mem.att)
#define heartbeat (mem.heartbeat)
Expand Down
0 ...t/resources/00-blockchain-parameters.json → .../resources/000-blockchain-parameters.json
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ledger/test/resources/001-get-at-startup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get blockchain state at startup",
"operation": "getState",
"expected": {
"best_block": "bdcb3c17c7aee714cec8ad900341bfd987b452280220dcbd6e7191f67ea4209b",
"newest_valid_block": "bdcb3c17c7aee714cec8ad900341bfd987b452280220dcbd6e7191f67ea4209b",
"ancestor_block": "0000000000000000000000000000000000000000000000000000000000000000",
"ancestor_receipts_root": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.in_progress": false,
"updating.newest_valid_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.total_difficulty": 0,
"updating.already_validated": false
}
}
0 ledger/test/resources/01-sign-noauth.json → ledger/test/resources/002-sign-noauth.json
View file
Open in desktop
File renamed without changes.
0 .../test/resources/11-heartbeat-initial.json → ...test/resources/003-heartbeat-initial.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/10-reset.json → ledger/test/resources/100-reset.json
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ledger/test/resources/101-get-initial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get initial blockchain state",
"operation": "getState",
"expected": {
"best_block": "bdcb3c17c7aee714cec8ad900341bfd987b452280220dcbd6e7191f67ea4209b",
"newest_valid_block": "bdcb3c17c7aee714cec8ad900341bfd987b452280220dcbd6e7191f67ea4209b",
"ancestor_block": "0000000000000000000000000000000000000000000000000000000000000000",
"ancestor_receipts_root": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.in_progress": false,
"updating.newest_valid_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.total_difficulty": 0,
"updating.already_validated": false
}
}
0 ledger/test/resources/12-advance.json → ledger/test/resources/102-advance.json
View file
Open in desktop
File renamed without changes.
0 .../test/resources/13-get-after-advance.json → ...test/resources/103-get-after-advance.json
View file
Open in desktop
File renamed without changes.
0 ...resources/13-heartbeat-after-advance.json → ...esources/104-heartbeat-after-advance.json
View file
Open in desktop
File renamed without changes.
0 ...r/test/resources/14-advance-brothers.json → .../test/resources/105-advance-brothers.json
View file
Open in desktop
File renamed without changes.
0 ...esources/15-get-after-advance-uncles.json → ...urces/106-get-after-advance-brothers.json
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions ledger/test/resources/11-get-initial.json
View file
Open in desktop

This file was deleted.

0 ...t/resources/16-0-get-initial-partial.json → ...st/resources/110-get-initial-partial.json
View file
Open in desktop
File renamed without changes.
0 .../test/resources/16-1-advance-partial.json → ...r/test/resources/111-advance-partial.json
View file
Open in desktop
File renamed without changes.
0 ...est/resources/16-2-get-final-partial.json → ...test/resources/112-get-final-partial.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/16-3-reset.json → ledger/test/resources/113-reset.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../test/resources/16-4-advance-partial.json → ...r/test/resources/114-advance-partial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"f9033ea06672b5d783ea9fb5aff418afce441df5320c52c7724c082c8576a161fa5ade1da09e1c644b63e92b773f0dec489f43f3d92607b52d4079fbad252e35946f66bdd6945b2427729a74667f6cc9ece0b850004c1b75c636a025a798601329c5547a9625b421196d6bcf2f4a2b02e1f504feb0daeb4daaaf48a098124835d3fdb6388f0ec7850ffbe2c2518d6e1a3c1b59ce1c4aa8274309f9fba0fecd2dbfdfef790e31c92fe06f06875805edea30ca1ef51b179e24fd7fe04263b90100000000000000000000000000000000080000000020000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000040000000010000000000000040001000000800000200000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000100000000000000802000000800000001000000000000000000000000000000000020010000000000200000000010000000000000180000000000000200000000000002000401000000000000000000000000000000000001000000000000000000000000000000000000a8204b38367c28080845f35c01f92d1018f504150595255532d6566613161306480000280b850711101000000000000000000000000000000000000000000000000000000000000000000b90880c72924b94f4270975e65634c2ac85fae9f7863c0fdbc2b2582ce8646bb22c0355fffff7f2100000000b8806e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459adbc1b4c900ffe48d575b5da5c638040125f65db0fe3e24494b76ea986457d986084fed08b978af4d7d196a7446a86b58009e636b611db16211b65a9aadff29c5b8860000000000000400f1f2c62bc5bfded2c12c1696ff5ecd3d8ee4867bf5b0b5d42b8ed2433fe4dec552534b424c4f434b3af0daa91c6bf1e5ac2e23b22a3f0ca63fd51de9550000000000000000000004b3ffffffff0100f2052a01000000232103afcefd7798b549c7d178bac0ecb93c270f39d688a439a642a6b2458962e5cd65ac00000000",
"f902dda0c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fca001a89c3ae16bbdea6c86efa3ac43724ffb7de8c53a8964789ff55ffa85f7a8a6945b2427729a74667f6cc9ece0b850004c1b75c636a025a798601329c5547a9625b421196d6bcf2f4a2b02e1f504feb0daeb4daaaf48a098124835d3fdb6388f0ec7850ffbe2c2518d6e1a3c1b59ce1c4aa8274309f9fba0fecd2dbfdfef790e31c92fe06f06875805edea30ca1ef51b179e24fd7fe04263b9010000000000000000000000000000000008000000002000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000004000000001000000000000004000100000080000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000010000000000000080200000080000000100000000000000000000000000000000002001000000000020000000001000000000000018000000000000020000000000000200040100000000000000000000000000000000000100000000000000000000000000000000000078204b38367c28080845f35c01f92d1018f504150595255532d6566613161306480000380b8507111010000000000000000000000000000000000000000000000000000000000000000000a4c574b329ca3e21efc64bd9f5b5310e683c873f1c3409a102d73599de95cd222c0355fffff7f2100000014a06e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01db8860000000000000400f1f2c62bc5bfded2c12c1696ff5ecd3d8ee4867bf5b0b5d42b8ed2433fe4dec552534b424c4f434b3a8467793e71e228a73fc4c0981c2413294969f0b80000000000000000000004b3ffffffff0100f2052a01000000232103afcefd7798b549c7d178bac0ecb93c270f39d688a439a642a6b2458962e5cd65ac00000000"
],
"brothers": [[], [], [], [], [], []]
"brothers": [[], []]
}
0 ...est/resources/16-5-get-final-partial.json → ...test/resources/115-get-final-partial.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/16-6-reset.json → ledger/test/resources/116-reset.json
View file
Open in desktop
File renamed without changes.
0 .../test/resources/16-7-advance-partial.json → ...r/test/resources/117-advance-partial.json
View file
Open in desktop
File renamed without changes.
0 ...est/resources/16-8-get-final-partial.json → ...test/resources/118-get-final-partial.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/17-0-reset.json → ledger/test/resources/120-reset.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/17-1-advance-cap.json → ledger/test/resources/121-advance-cap.json
View file
Open in desktop
File renamed without changes.
0 ...er/test/resources/17-2-get-final-cap.json → ledger/test/resources/122-get-final-cap.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/17-3-reset.json → ledger/test/resources/123-reset.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/17-4-advance-cap.json → ledger/test/resources/124-advance-cap.json
View file
Open in desktop
File renamed without changes.
0 ...er/test/resources/17-5-get-final-cap.json → ledger/test/resources/125-get-final-cap.json
View file
Open in desktop
File renamed without changes.
0 ledger/test/resources/20-update-iris.json → ledger/test/resources/200-update-iris.json
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ledger/test/resources/201-get-after-update-iris.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get blockchain state after update for Iris",
"operation": "getState",
"expected": {
"best_block": "c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fc",
"newest_valid_block": "df875149b0cf41c6d97bfdac376c044db6477ad071df61cc847d89a6bcdcc4f9",
"ancestor_block": "f899db73b9fa342be52307f44bb390e0c4bfe85317a94d791d6fc402dee640c3",
"ancestor_receipts_root": "fecd2dbfdfef790e31c92fe06f06875805edea30ca1ef51b179e24fd7fe04263",
"updating.in_progress": true,
"updating.newest_valid_block": "9f7bab65727e2e699e99517e1171463d5254bc769299d951b4b3249dd70d33f4",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "8da96f2120c2c4653969776aa2388242c4d247620d6866fecf2a2b277e6bfd6c",
"updating.total_difficulty": 45,
"updating.already_validated": false
}
}
0 ledger/test/resources/22-sign-iris.json → ledger/test/resources/202-sign-iris.json
View file
Open in desktop
File renamed without changes.
0 ...sources/23-heartbeat-after-sign-iris.json → ...ources/203-heartbeat-after-sign-iris.json
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions ledger/test/resources/21-get-after-update-iris.json
View file
Open in desktop

This file was deleted.

0 ledger/test/resources/30-update.json → ledger/test/resources/300-update.json
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ledger/test/resources/301-get-after-update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get blockchain state after update",
"operation": "getState",
"expected": {
"best_block": "c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fc",
"newest_valid_block": "df875149b0cf41c6d97bfdac376c044db6477ad071df61cc847d89a6bcdcc4f9",
"ancestor_block": "a91f702314c77a8965b53d1dc8a44301a0bf915023de4258e80a47415a787349",
"ancestor_receipts_root": "21f82fa21d141a345338733fa871efb61cecd716f9f6c46341d9990ea678f7cd",
"updating.in_progress": true,
"updating.newest_valid_block": "9f7bab65727e2e699e99517e1171463d5254bc769299d951b4b3249dd70d33f4",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "8da96f2120c2c4653969776aa2388242c4d247620d6866fecf2a2b277e6bfd6c",
"updating.total_difficulty": 45,
"updating.already_validated": false
}
}
0 ledger/test/resources/32-sign.json → ledger/test/resources/302-sign.json
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions ledger/test/resources/303-get-after-sign.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get blockchain state after signing",
"operation": "getState",
"expected": {
"best_block": "c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fc",
"newest_valid_block": "df875149b0cf41c6d97bfdac376c044db6477ad071df61cc847d89a6bcdcc4f9",
"ancestor_block": "a91f702314c77a8965b53d1dc8a44301a0bf915023de4258e80a47415a787349",
"ancestor_receipts_root": "21f82fa21d141a345338733fa871efb61cecd716f9f6c46341d9990ea678f7cd",
"updating.in_progress": true,
"updating.newest_valid_block": "9f7bab65727e2e699e99517e1171463d5254bc769299d951b4b3249dd70d33f4",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "8da96f2120c2c4653969776aa2388242c4d247620d6866fecf2a2b277e6bfd6c",
"updating.total_difficulty": 45,
"updating.already_validated": false
}
}
6 changes: 6 additions & 0 deletions ledger/test/resources/304-sign-noauth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "Sign non authorized",
"operation": "signUnauthorized",
"expected": true,
"hash": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
}
16 changes: 16 additions & 0 deletions ledger/test/resources/305-get-after-sign-noauth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Get blockchain state after signing",
"operation": "getState",
"expected": {
"best_block": "c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fc",
"newest_valid_block": "df875149b0cf41c6d97bfdac376c044db6477ad071df61cc847d89a6bcdcc4f9",
"ancestor_block": "a91f702314c77a8965b53d1dc8a44301a0bf915023de4258e80a47415a787349",
"ancestor_receipts_root": "21f82fa21d141a345338733fa871efb61cecd716f9f6c46341d9990ea678f7cd",
"updating.in_progress": true,
"updating.newest_valid_block": "9f7bab65727e2e699e99517e1171463d5254bc769299d951b4b3249dd70d33f4",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "8da96f2120c2c4653969776aa2388242c4d247620d6866fecf2a2b277e6bfd6c",
"updating.total_difficulty": 45,
"updating.already_validated": false
}
}
0 ...st/resources/33-heartbeat-after-sign.json → ...t/resources/306-heartbeat-after-sign.json
View file
Open in desktop
File renamed without changes.
0 ...r/test/resources/34-reconnect-dongle.json → .../test/resources/307-reconnect-dongle.json
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion .../resources/35-get-after-reconnection.json → ...resources/308-get-after-reconnection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"best_block": "c38ac27d1f9021e358b0e633536bd381bf586f244d83417116c1d2040fa879fc",
"newest_valid_block": "df875149b0cf41c6d97bfdac376c044db6477ad071df61cc847d89a6bcdcc4f9",
"ancestor_block": "a91f702314c77a8965b53d1dc8a44301a0bf915023de4258e80a47415a787349",
"ancestor_receipts_root": "21f82fa21d141a345338733fa871efb61cecd716f9f6c46341d9990ea678f7cd"
"ancestor_receipts_root": "21f82fa21d141a345338733fa871efb61cecd716f9f6c46341d9990ea678f7cd",
"updating.in_progress": false,
"updating.newest_valid_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.best_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.next_expected_block": "0000000000000000000000000000000000000000000000000000000000000000",
"updating.total_difficulty": 0,
"updating.already_validated": false
}
}
0 ...rces/36-heartbeat-after-reconnection.json → ...ces/309-heartbeat-after-reconnection.json
View file
Open in desktop
File renamed without changes.
10 changes: 0 additions & 10 deletions ledger/test/resources/31-get-after-update.json
View file
Open in desktop

This file was deleted.

Loading