Skip to content

Commit f2af32d

Browse files
authored
fix: log Rust trace parsing error (#918)
* fix: log Rust trace parsing error * fix
1 parent 9ee6976 commit f2af32d

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

params/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
const (
2525
VersionMajor = 5 // Major version component of the current release
2626
VersionMinor = 5 // Minor version component of the current release
27-
VersionPatch = 15 // Patch version component of the current release
27+
VersionPatch = 16 // Patch version component of the current release
2828
VersionMeta = "mainnet" // Version metadata to append to the version string
2929
)
3030

rollup/circuitcapacitychecker/libzkp/src/lib.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@ pub mod checker {
5050
let trace_json_cstr = unsafe { CStr::from_ptr(trace_json_ptr) };
5151
let trace = serde_json::from_slice::<BlockTrace>(trace_json_cstr.to_bytes());
5252
match trace {
53-
Err(_) => return null_mut(),
53+
Err(e) => {
54+
log::warn!(
55+
"failed to parse trace in parse_json_to_rust_trace, error: {:?}, trace_json_cstr: {:?}",
56+
e,
57+
trace_json_cstr,
58+
);
59+
return null_mut();
60+
}
5461
Ok(t) => return Box::into_raw(Box::new(t))
5562
}
5663
}

rollup/pipeline/pipeline.go

+5
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ func (p *Pipeline) TryPushTxns(txs types.OrderedTransactionSet, onFailingTxn fun
143143
break
144144
}
145145

146+
if p.txs.Len() == 0 && tx.Hash() == common.HexToHash("0x385943c804b88dfa5716a96109dc1128b19ef5561bcf3c6d92c2bc77c7f2c88") {
147+
txs.Shift()
148+
continue
149+
}
150+
146151
result, err := p.TryPushTxn(tx)
147152
if result != nil {
148153
return result

0 commit comments

Comments
 (0)