[CIS-3 NFT] Fix nonce event serialization

examples/cis2-multi/src/lib.rs

@@ -171,10 +171,10 @@ pub enum Event {
 /// tracks the nonce used by the signer of the `PermitMessage`.
 #[derive(Debug, Serialize, SchemaType, PartialEq, Eq)]
 pub struct NonceEvent {
-    /// Account that signed the `PermitMessage`.
-    pub account: AccountAddress,
     /// The nonce that was used in the `PermitMessage`.
     pub nonce:   u64,
+    /// Account that signed the `PermitMessage`.
+    pub account: AccountAddress,
 }
 
 /// The UpdateBlacklistEvent is logged when an address is added to or removed
@@ -218,8 +218,8 @@ impl schema::SchemaType for Event {
             (
                 "Nonce".to_string(),
                 schema::Fields::Named(vec![
-                    (String::from("account"), AccountAddress::get_type()),
                     (String::from("nonce"), u64::get_type()),
+                    (String::from("account"), AccountAddress::get_type()),
                 ]),
             ),
         );
@@ -1424,8 +1424,8 @@ fn contract_permit(
 
     // Log the nonce event.
     logger.log(&Event::Nonce(NonceEvent {
-        account: param.signer,
         nonce,
+        account: param.signer,
     }))?;
 
     Ok(())

examples/cis2-multi/tests/tests.rs

@@ -345,8 +345,8 @@ fn test_permit_mint() {
             },
         })),
         Event::Nonce(NonceEvent {
-            account: ALICE,
             nonce:   0,
+            account: ALICE,
         })
     ]);
 
@@ -391,8 +391,8 @@ fn test_permit_burn() {
             owner:    ALICE_ADDR,
         })),
         Event::Nonce(NonceEvent {
-            account: ALICE,
             nonce:   0,
+            account: ALICE,
         })
     ]);
 
@@ -442,8 +442,8 @@ fn test_permit_update_operator() {
             operator: BOB_ADDR,
         })),
         Event::Nonce(NonceEvent {
-            account: ALICE,
             nonce:   0,
+            account: ALICE,
         })
     ]);
 
@@ -492,8 +492,8 @@ fn test_permit_transfer() {
             to:       BOB_ADDR,
         })),
         Event::Nonce(NonceEvent {
-            account: ALICE,
             nonce:   0,
+            account: ALICE,
         })
     ]);
 

examples/cis3-nft-sponsored-txs/src/lib.rs

@@ -94,10 +94,10 @@ pub enum Event {
 /// tracks the nonce used by the signer of the `PermitMessage`.
 #[derive(Debug, Serialize, SchemaType, PartialEq, Eq)]
 pub struct NonceEvent {
-    /// Account that signed the `PermitMessage`.
-    pub account: AccountAddress,
     /// The nonce that was used in the `PermitMessage`.
     pub nonce:   u64,
+    /// Account that signed the `PermitMessage`.
+    pub account: AccountAddress,
 }
 
 // Implementing a custom schemaType to the `Event` combining all CIS2/CIS3
@@ -110,8 +110,8 @@ impl schema::SchemaType for Event {
             (
                 "Nonce".to_string(),
                 schema::Fields::Named(vec![
-                    (String::from("account"), AccountAddress::get_type()),
                     (String::from("nonce"), u64::get_type()),
+                    (String::from("account"), AccountAddress::get_type()),
                 ]),
             ),
         );
@@ -871,8 +871,8 @@ fn contract_permit(
 
     // Log the nonce event.
     logger.log(&Event::Nonce(NonceEvent {
-        account: param.signer,
         nonce,
+        account: param.signer,
     }))?;
 
     Ok(())

examples/cis5-smart-contract-wallet/src/lib.rs

@@ -104,10 +104,10 @@ pub enum Event {
 /// tracks the nonce used by the signer of the message.
 #[derive(Debug, Serialize, SchemaType, PartialEq, Eq)]
 pub struct NonceEvent {
-    /// Account that signed the message.
-    pub public_key: PublicKeyEd25519,
     /// The nonce that was used in the message.
     pub nonce:      u64,
+    /// Account that signed the message.
+    pub public_key: PublicKeyEd25519,
 }
 
 /// The `DepositCcdEvent` is logged whenever a CCD amount received by
@@ -811,8 +811,8 @@ fn withdraw_ccd(
         }
 
         logger.log(&Event::Nonce(NonceEvent {
-            public_key: signer,
             nonce,
+            public_key: signer,
         }))?;
     }
 
@@ -947,8 +947,8 @@ fn withdraw_cis2_tokens(
         }
 
         logger.log(&Event::Nonce(NonceEvent {
-            public_key: signer,
             nonce,
+            public_key: signer,
         }))?;
     }
 
@@ -1133,8 +1133,8 @@ fn transfer_ccd(
         }
 
         logger.log(&Event::Nonce(NonceEvent {
-            public_key: signer,
             nonce,
+            public_key: signer,
         }))?;
     }
 
@@ -1230,8 +1230,8 @@ fn transfer_cis2_tokens(
         }
 
         logger.log(&Event::Nonce(NonceEvent {
-            public_key: signer,
             nonce,
+            public_key: signer,
         }))?;
     }
 

examples/cis5-smart-contract-wallet/tests/tests.rs

@@ -172,8 +172,8 @@ fn test_withdraw_ccd() {
             to:         BOB_ADDR,
         }),
         Event::Nonce(NonceEvent {
-            public_key: alice_public_key,
             nonce:      0,
+            public_key: alice_public_key,
         })
     ]);
 }
@@ -312,8 +312,8 @@ fn test_withdraw_cis2_tokens() {
             to: BOB_ADDR
         }),
         Event::Nonce(NonceEvent {
-            public_key: alice_public_key,
             nonce:      0,
+            public_key: alice_public_key,
         })
     ]);
 }
@@ -423,8 +423,8 @@ fn test_transfer_ccd() {
             to:         BOB_PUBLIC_KEY,
         }),
         Event::Nonce(NonceEvent {
-            public_key: alice_public_key,
             nonce:      0,
+            public_key: alice_public_key,
         })
     ]);
 }
@@ -554,8 +554,8 @@ fn test_transfer_cis2_tokens() {
             to: BOB_PUBLIC_KEY
         }),
         Event::Nonce(NonceEvent {
-            public_key: alice_public_key,
             nonce:      0,
+            public_key: alice_public_key,
         })
     ]);
 }