Ledger test vector generator fixes for 0.21.1

apps/src/lib/client/tx.rs

@@ -870,6 +870,7 @@ where
             signing_data,
         )
     };
+    signing::generate_test_vector(client, &mut ctx.wallet, &tx_builder).await;
 
     if args.tx.dump_tx {
         tx::dump_tx(&args.tx, tx_builder);
@@ -956,6 +957,7 @@ where
         )
         .await?
     };
+    signing::generate_test_vector(client, &mut ctx.wallet, &tx_builder).await;
 
     if args.tx.dump_tx {
         tx::dump_tx(&args.tx, tx_builder);

core/src/types/transaction/account.rs

@@ -21,10 +21,10 @@ pub struct InitAccount {
     /// for signature verification of transactions for the newly created
     /// account.
     pub public_keys: Vec<common::PublicKey>,
-    /// The VP code hash
-    pub vp_code_hash: Hash,
     /// The account signature threshold
     pub threshold: u8,
+    /// The VP code hash
+    pub vp_code_hash: Hash,
 }
 
 /// A tx data type to update an account's validity predicate
@@ -41,12 +41,12 @@ pub struct InitAccount {
 pub struct UpdateAccount {
     /// An address of the account
     pub addr: Address,
-    /// The new VP code hash
-    pub vp_code_hash: Option<Hash>,
     /// Public keys to be written into the account's storage. This can be used
     /// for signature verification of transactions for the newly created
     /// account.
     pub public_keys: Vec<common::PublicKey>,
     /// The account signature threshold
     pub threshold: Option<u8>,
+    /// The new VP code hash
+    pub vp_code_hash: Option<Hash>,
 }