Merge pull request #2282 from dusk-network/fix-rusk-wallet

rusk-wallet: fix compilation with memo updates
dusk-network · Sep 5, 2024 · 73be96e · 73be96e
2 parents 134bf87 + c4dbb01
commit 73be96e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ruskwallet_ci.yml b/.github/workflows/ruskwallet_ci.yml
@@ -25,6 +25,8 @@ jobs:
         with:
           filters: |
             run-ci:
+              - 'wallet-core/**'
+              - 'execution-core/**'
               - 'rusk-wallet/**'
               - '.github/workflows/ruskwallet_ci.yml'
   fmt:

diff --git a/rusk-wallet/src/error.rs b/rusk-wallet/src/error.rs
@@ -116,6 +116,9 @@ pub enum Error {
     /// Prover errors from execution-core
     #[error("Prover Error")]
     ProverError(String),
+    /// Memo provided is too large
+    #[error("Memo too large {0}")]
+    MemoTooLarge(usize),
 }
 
 impl From<dusk_bytes::Error> for Error {
@@ -147,6 +150,7 @@ impl From<execution_core::Error> for Error {
                 Self::Bytes(dusk_bytes::Error::InvalidChar { ch, index })
             }
             Rkyv(_) => Self::Rkyv,
+            MemoTooLarge(m) => Self::MemoTooLarge(m),
         }
     }
 }

diff --git a/rusk-wallet/src/wallet.rs b/rusk-wallet/src/wallet.rs
@@ -35,7 +35,7 @@ use wallet_core::{
 use execution_core::{
     signatures::bls::{PublicKey as BlsPublicKey, SecretKey as BlsSecretKey},
     transfer::{
-        contract_exec::{ContractCall, ContractExec},
+        data::{ContractCall, TransactionData},
         Transaction,
     },
 };
@@ -401,7 +401,7 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
         sender: &Address,
         reciever: &Address,
         deposit: Dusk,
-        exec: Option<impl Into<ContractExec>>,
+        data: Option<impl Into<TransactionData>>,
         gas: Gas,
     ) -> Result<Transaction, Error> {
         // make sure we own the sender address
@@ -445,7 +445,7 @@ impl<F: SecureWalletFile + Debug> Wallet<F> {
             gas.limit,
             gas.price,
             chain_id,
-            exec,
+            data,
         )?;
 
         let tx = state.prove_and_propagate(tx);