Tomas/dbg below cap

.changelog/unreleased/improvements/3835-refactor-tx-crate.md

@@ -0,0 +1,2 @@
+- Refactored tx crate modules and slightly improved its API.
+  ([\#3835](https://github.com/anoma/namada/pull/3835))

.changelog/unreleased/testing/3857-batch-events-tests.md

@@ -0,0 +1,2 @@
+- Added testing for batched tx events.
+  ([\#3857](https://github.com/anoma/namada/pull/3857))

.changelog/unreleased/testing/3866-test-ibc-gas-payment.md

@@ -0,0 +1,2 @@
+- Added test for gas payment with an IBC token.
+  ([\#3866](https://github.com/anoma/namada/pull/3866))

.github/workflows/ci.yml

@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - main
+      - 'v?[0-9]+.[0-9]+.[0-9]+'
   # Run in PRs with conflicts (https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request)
   pull_request_target:
     branches:
       - main
+      - 'v?[0-9]+.[0-9]+.[0-9]+'
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
@@ -463,7 +465,7 @@ jobs:
     runs-on: [self-hosted, 16vcpu-32ram-ubuntu22-namada-x86]
     container: 
       image: ghcr.io/heliaxdev/namada-ci:namada-main
-    timeout-minutes: 20
+    timeout-minutes: 25
 
     steps:
       - name: Checkout repo

.github/workflows/docker.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - 'v?[0-9]+.[0-9]+.[0-9]+'
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
 

.github/workflows/scripts/e2e.json

@@ -2,6 +2,7 @@
     "e2e::eth_bridge_tests::everything": 4,
     "e2e::ibc_tests::ibc_transfers": 414,
     "e2e::ibc_tests::pgf_over_ibc": 415,
+    "e2e::ibc_tests::fee_payment_with_ibc_token": 357,
     "e2e::ibc_tests::ibc_token_inflation": 840,
     "e2e::ibc_tests::ibc_rate_limit": 485,
     "e2e::ibc_tests::ibc_upgrade_client": 280,

.github/workflows/scripts/hermes.txt

@@ -1 +1 @@
-1.10.0-namada-beta15-rc2
+1.10.4-namada-beta17-rc2

.mergify.yml

@@ -6,15 +6,24 @@ queue_rules:
       - "#approved-reviews-by >= 1"
       - base = main
     merge_method: merge
-
+
+  - name: backport-0.44-queue
+    speculative_checks: 3
+    batch_size: 3
+    queue_conditions:
+      - "#approved-reviews-by >= 1"
+      - base = 0.44.0
+    merge_method: merge
 
 pull_request_rules:
-  - name: main-automatic-merge
+  - name: automatic merge to main or backport branch
     conditions:
         - label = "merge"
         - label != "do-not-merge"
         - "#approved-reviews-by >= 1"
-        - base = main
+        - or:
+          - base = main
+          - base = "0.44.0"
     actions:
       queue:
         autosquash: true   
@@ -30,4 +39,12 @@ pull_request_rules:
           reason: {{queue_dequeue_reason}}.
 
           Sorry about that, but you can requeue the PR by using `@mergifyio requeue`
-          if you think this was a mistake.
+          if you think this was a mistake.
+
+  - name: backport PR to 0.44.0 lane
+    conditions:
+      - label = backport-44
+    actions:
+      backport:
+        branches:
+          - "0.44.0"

README.md

@@ -84,3 +84,13 @@ Please see the [contributing page](./CONTRIBUTING.md).
 ### Dependencies
 
 The ledger currently requires [CometBFT v0.37.11](https://github.com/cometbft/cometbft/releases/tag/v0.37.11) is installed and available on path. This can be achieved through following [these instructions](https://github.com/cometbft/cometbft/blob/main/docs/guides/install.md)
+
+#### Hermes
+
+We maintain a fork of [hermes](https://github.com/heliaxdev/hermes) that adds support for Namada.
+
+Compatibility table with Namada:
+
+| Namada | Hermes |
+| ----------- | ----------- |
+| v0.44.0 | 1.10.4-namada-beta17-rc2 |

crates/apps_lib/src/cli.rs

@@ -1789,7 +1789,7 @@ pub mod cmds {
         fn def() -> App {
             App::new(Self::CMD)
                 .about(wrap!(
-                    "Query the substorage space of a specific enstablished \
+                    "Query the substorage space of a specific established \
                      address."
                 ))
                 .add_args::<args::QueryAccount<args::CliTypes>>()

crates/apps_lib/src/client/tx.rs

@@ -1069,7 +1069,8 @@ pub async fn sign_tx<N: Namada>(
 where
     <N::Client as namada_sdk::io::Client>::Error: std::fmt::Display,
 {
-    let tx = if let Ok(transaction) = Tx::deserialize(tx_data.as_ref()) {
+    let tx = if let Ok(transaction) = Tx::try_from_json_bytes(tx_data.as_ref())
+    {
         transaction
     } else {
         edisplay_line!(namada.io(), "Couldn't decode the transaction.");
@@ -1117,8 +1118,9 @@ where
             };
             let signature_path = File::create(&output_path)
                 .expect("Should be able to create signature file.");
-            serde_json::to_writer_pretty(signature_path, &signature)
-                .expect("Signature should be serializable.");
+            signature.to_writer_json(signature_path).expect(
+                "Signature should be serializable and the file writeable.",
+            );
 
             display_line!(
                 namada.io(),

crates/apps_lib/src/client/utils.rs

@@ -1050,7 +1050,8 @@ pub async fn sign_offline(
         safe_exit(1)
     };
 
-    let tx = if let Ok(transaction) = Tx::deserialize(tx_data.as_ref()) {
+    let tx = if let Ok(transaction) = Tx::try_from_json_bytes(tx_data.as_ref())
+    {
         transaction
     } else {
         eprintln!("Couldn't decode the transaction.");

crates/events/src/extend.rs

@@ -542,20 +542,6 @@ impl EventAttributeEntry<'static> for MaspDataRefs {
     }
 }
 
-/// Extend an [`Event`] with success data.
-pub struct Success(pub bool);
-
-impl EventAttributeEntry<'static> for Success {
-    type Value = bool;
-    type ValueOwned = Self::Value;
-
-    const KEY: &'static str = "success";
-
-    fn into_value(self) -> Self::Value {
-        self.0
-    }
-}
-
 /// Extend an [`Event`] with a new domain.
 pub struct Domain<E>(PhantomData<E>);
 

crates/node/src/dry_run_tx.rs

@@ -29,7 +29,7 @@ where
     H: 'static + StorageHasher + Sync,
     CA: 'static + WasmCacheAccess + Sync,
 {
-    let tx = Tx::try_from(&request.data[..]).into_storage_result()?;
+    let tx = Tx::try_from_bytes(&request.data[..]).into_storage_result()?;
     tx.validate_tx().into_storage_result()?;
 
     let gas_scale = parameters::get_gas_scale(&state)?;