Skip to content

Commit 7fd1dfa

Browse files
Chen-Yifanmichael-yxchen
authored andcommitted
Bump execution module with db api change
1 parent 2defb5f commit 7fd1dfa

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

monad-cxx/monad-execution

Submodule monad-execution updated 55 files

monad-triedb/triedb-driver/src/triedb.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ int triedb_read(
9292
triedb *db, bytes key, uint8_t key_len_nibbles, bytes *value,
9393
uint64_t block_id)
9494
{
95-
auto result =
96-
db->db_.get(monad::mpt::NibblesView{0, key_len_nibbles, key}, block_id);
95+
auto result = db->db_.find(
96+
monad::mpt::NibblesView{0, key_len_nibbles, key}, block_id);
9797
if (!result.has_value()) {
9898
return -1;
9999
}
100100

101-
auto const &value_view = result.value();
101+
auto const &value_view = result.value().node->value();
102102
if ((value_view.size() >> std::numeric_limits<int>::digits) != 0) {
103103
// value length doesn't fit in return type
104104
return -2;
@@ -437,18 +437,21 @@ uint64_t triedb_earliest_finalized_block(triedb *db)
437437
return earliest_finalized_block;
438438
}
439439

440-
validator_set* alloc_valset(uint64_t length)
440+
validator_set *alloc_valset(uint64_t length)
441441
{
442442
auto *validators = new validator_data[length];
443443
return new validator_set{.validators = validators, .length = length};
444444
}
445445

446-
void free_valset(validator_set* valset) {
446+
void free_valset(validator_set *valset)
447+
{
447448
delete[] valset->validators;
448449
delete valset;
449450
}
450451

451-
validator_set* read_valset(triedb *db, size_t block_num, uint64_t requested_epoch) {
452+
validator_set *
453+
read_valset(triedb *db, size_t block_num, uint64_t requested_epoch)
454+
{
452455
auto ret = monad::staking::read_valset(db->db_, block_num, requested_epoch);
453456
if (!ret.has_value()) {
454457
return nullptr;
@@ -457,9 +460,12 @@ validator_set* read_valset(triedb *db, size_t block_num, uint64_t requested_epoc
457460
uint64_t length = ret.value().size();
458461
auto valset = alloc_valset(length);
459462
for (uint64_t i = 0; i < length; i++) {
460-
std::memcpy(valset->validators[i].secp_pubkey, ret.value()[i].secp_pubkey, 33);
461-
std::memcpy(valset->validators[i].bls_pubkey, ret.value()[i].bls_pubkey, 48);
462-
std::memcpy(valset->validators[i].stake, ret.value()[i].stake.bytes, 32);
463+
std::memcpy(
464+
valset->validators[i].secp_pubkey, ret.value()[i].secp_pubkey, 33);
465+
std::memcpy(
466+
valset->validators[i].bls_pubkey, ret.value()[i].bls_pubkey, 48);
467+
std::memcpy(
468+
valset->validators[i].stake, ret.value()[i].stake.bytes, 32);
463469
}
464470

465471
return valset;

0 commit comments

Comments
 (0)