diff --git a/params/version.go b/params/version.go index 500e4dc033..be2da23ea0 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 5 // Minor version component of the current release - VersionPatch = 15 // Patch version component of the current release + VersionPatch = 16 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) diff --git a/rollup/circuitcapacitychecker/libzkp/src/lib.rs b/rollup/circuitcapacitychecker/libzkp/src/lib.rs index d8eee0013a..b3f7fddc88 100644 --- a/rollup/circuitcapacitychecker/libzkp/src/lib.rs +++ b/rollup/circuitcapacitychecker/libzkp/src/lib.rs @@ -50,7 +50,14 @@ pub mod checker { let trace_json_cstr = unsafe { CStr::from_ptr(trace_json_ptr) }; let trace = serde_json::from_slice::(trace_json_cstr.to_bytes()); match trace { - Err(_) => return null_mut(), + Err(e) => { + log::warn!( + "failed to parse trace in parse_json_to_rust_trace, error: {:?}, trace_json_cstr: {:?}", + e, + trace_json_cstr, + ); + return null_mut(); + } Ok(t) => return Box::into_raw(Box::new(t)) } } diff --git a/rollup/pipeline/pipeline.go b/rollup/pipeline/pipeline.go index e4467862de..b2d5beb43d 100644 --- a/rollup/pipeline/pipeline.go +++ b/rollup/pipeline/pipeline.go @@ -143,6 +143,11 @@ func (p *Pipeline) TryPushTxns(txs types.OrderedTransactionSet, onFailingTxn fun break } + if p.txs.Len() == 0 && tx.Hash() == common.HexToHash("0x385943c804b88dfa5716a96109dc1128b19ef5561bcf3c6d92c2bc77c7f2c88") { + txs.Shift() + continue + } + result, err := p.TryPushTxn(tx) if result != nil { return result