Merge pull request #28 from OffchainLabs/gzeoneth-patch-2

Fix retryable buffer not triming
OffchainLabs · Apr 20, 2022 · 93326c5 · 93326c5
2 parents aaed2b6 + 2506de4
commit 93326c5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/arb_os/arbos-upgrade.mexe b/arb_os/arbos-upgrade.mexe
diff --git a/arb_os/arbos.mexe b/arb_os/arbos.mexe
diff --git a/arb_os/retrybuffer.mini b/arb_os/retrybuffer.mini
@@ -148,13 +148,13 @@ view write throw func retryBuffer_trimOne(rbuf: RetryBuffer) -> option<RetryBuff
         let qitem = unsafecast<RetryQueueItem>(rawQitem);
         let currentTimestamp = inbox_currentTimestamp();
         if qitem.checkTime < currentTimestamp {
+            set rbuf.fifo = uq;
             if let Some(rtx) = rbuf.byTxId[qitem.txId] {
                 if rtx.expiryTime < currentTimestamp {
                     rbuf = retryBuffer_delete(rbuf, qitem.txId, true)?;
                 }
-                set rbuf.fifo = uq;
-                ret = Some(rbuf);
             }
+            ret = Some(rbuf);
         }
     }
     ret

diff --git a/arb_os/upgrade.json b/arb_os/upgrade.json