smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2024-12-24 23:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a wrong assertion when we insert the last tx again. (#23)

Browse Source
This commit is contained in:
peilun-conflux 2024-02-28 16:59:30 +08:00 committed by GitHub
parent 310bf1c8dd
commit 3e2068d363
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/storage/src/log_store/tx_store.rs
View File

@ -41,8 +41,14 @@ impl TransactionStore {
#[instrument(skip(self))]
/// Return `Ok(Some(tx_seq))` if a previous transaction has the same tx root.
pub fn put_tx(&self, mut tx: Transaction) -> Result<Vec<u64>> {
let mut db_tx = self.kvdb.transaction();
let old_tx_seq_list = self.get_tx_seq_list_by_data_root(&tx.data_merkle_root)?;
if old_tx_seq_list.last().is_some_and(|seq| *seq == tx.seq) {
// The last tx is inserted again, so no need to process it.
self.next_tx_seq.store(tx.seq + 1, Ordering::SeqCst);
return Ok(old_tx_seq_list);
}
let mut db_tx = self.kvdb.transaction();
if !tx.data.is_empty() {
tx.size = tx.data.len() as u64;
let mut padded_data = tx.data.clone();
@ -56,7 +62,6 @@ impl TransactionStore {
db_tx.put(COL_TX, &tx.seq.to_be_bytes(), &tx.as_ssz_bytes());
db_tx.put(COL_TX, NEXT_TX_KEY.as_bytes(), &(tx.seq + 1).to_be_bytes());
let old_tx_seq_list = self.get_tx_seq_list_by_data_root(&tx.data_merkle_root)?;
// The list is sorted, and we always call `put_tx` in order.
assert!(old_tx_seq_list
.last()