Merge branch 'yuji/fix-dry-run-writelog' (#3359)

* origin/yuji/fix-dry-run-writelog: changelog fix write log when dry-run
anoma · Jun 5, 2024 · db4412e · db4412e
2 parents 4dd9bbd + 45b72a2
commit db4412e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.changelog/unreleased/bug-fixes/3358-fix-dry-run-writelog.md b/.changelog/unreleased/bug-fixes/3358-fix-dry-run-writelog.md
@@ -0,0 +1,2 @@
+- Fix to clear the write log when dry-run batched transaction
+  ([\#3358](https://github.com/anoma/namada/issues/3358))
diff --git a/.github/workflows/scripts/hermes.txt b/.github/workflows/scripts/hermes.txt
@@ -1 +1 @@
-1.8.2-namada-beta11-rc
+1.8.2-namada-beta11-rc2
diff --git a/crates/namada/src/ledger/mod.rs b/crates/namada/src/ledger/mod.rs
@@ -98,6 +98,12 @@ mod dry_run_tx {
                     &mut ctx.tx_wasm_cache,
                 ),
             );
+            let is_accepted = matches!(&batched_tx_result, Ok(result) if result.is_accepted());
+            if is_accepted {
+                temp_state.write_log_mut().commit_tx_to_batch();
+            } else {
+                temp_state.write_log_mut().drop_tx();
+            }
             tx_result
                 .batch_results
                 .0

diff --git a/scripts/get_hermes.sh b/scripts/get_hermes.sh
@@ -2,9 +2,9 @@
 
 set -Eo pipefail
 
-HERMES_MAJORMINOR="1.7"
-HERMES_PATCH="4"
-HERMES_SUFFIX="-namada-beta7"
+HERMES_MAJORMINOR="1.8"
+HERMES_PATCH="2"
+HERMES_SUFFIX="-namada-beta11-rc2"
 
 HERMES_REPO="https://github.com/heliaxdev/hermes"