contract/money: shuffled functions enum

src/contract/money/src/lib.rs

@@ -27,12 +27,12 @@ use darkfi_sdk::error::ContractError;
 pub enum MoneyFunction {
     FeeV1 = 0x00,
     GenesisMintV1 = 0x01,
-    TransferV1 = 0x02,
-    OtcSwapV1 = 0x03,
-    TokenMintV1 = 0x04,
-    TokenFreezeV1 = 0x05,
-    PoWRewardV1 = 0x06,
-    AuthTokenMintV1 = 0x07,
+    PoWRewardV1 = 0x02,
+    TransferV1 = 0x03,
+    OtcSwapV1 = 0x04,
+    AuthTokenMintV1 = 0x05,
+    TokenFreezeV1 = 0x06,
+    TokenMintV1 = 0x07,
 }
 // ANCHOR_END: money-function
 
@@ -43,12 +43,12 @@ impl TryFrom<u8> for MoneyFunction {
         match b {
             0x00 => Ok(Self::FeeV1),
             0x01 => Ok(Self::GenesisMintV1),
-            0x02 => Ok(Self::TransferV1),
-            0x03 => Ok(Self::OtcSwapV1),
-            0x04 => Ok(Self::TokenMintV1),
-            0x05 => Ok(Self::TokenFreezeV1),
-            0x06 => Ok(Self::PoWRewardV1),
-            0x07 => Ok(Self::AuthTokenMintV1),
+            0x02 => Ok(Self::PoWRewardV1),
+            0x03 => Ok(Self::TransferV1),
+            0x04 => Ok(Self::OtcSwapV1),
+            0x05 => Ok(Self::AuthTokenMintV1),
+            0x06 => Ok(Self::TokenFreezeV1),
+            0x07 => Ok(Self::TokenMintV1),
             _ => Err(ContractError::InvalidFunction),
         }
     }
@@ -96,9 +96,9 @@ pub const MONEY_CONTRACT_ZKAS_FEE_NS_V1: &str = "Fee_V1";
 pub const MONEY_CONTRACT_ZKAS_MINT_NS_V1: &str = "Mint_V1";
 /// zkas burn circuit namespace
 pub const MONEY_CONTRACT_ZKAS_BURN_NS_V1: &str = "Burn_V1";
-/// zkas token mint circuit namespace
-pub const MONEY_CONTRACT_ZKAS_TOKEN_MINT_NS_V1: &str = "TokenMint_V1";
-/// zkas token freeze circuit namespace
-pub const MONEY_CONTRACT_ZKAS_TOKEN_FRZ_NS_V1: &str = "TokenFreeze_V1";
 /// zkas token auth mint circuit namespace
 pub const MONEY_CONTRACT_ZKAS_AUTH_TOKEN_MINT_NS_V1: &str = "AuthTokenMint_V1";
+/// zkas token freeze circuit namespace
+pub const MONEY_CONTRACT_ZKAS_TOKEN_FRZ_NS_V1: &str = "TokenFreeze_V1";
+/// zkas token mint circuit namespace
+pub const MONEY_CONTRACT_ZKAS_TOKEN_MINT_NS_V1: &str = "TokenMint_V1";

src/validator/verification.rs

@@ -319,8 +319,8 @@ pub async fn verify_producer_transaction(
 
     // Verify call based on version
     let call = &tx.calls[0];
-    // Block must contain a Money::PoWReward(0x06) call
-    if call.data.contract_id != *MONEY_CONTRACT_ID || call.data.data[0] != 0x06 {
+    // Block must contain a Money::PoWReward(0x02) call
+    if call.data.contract_id != *MONEY_CONTRACT_ID || call.data.data[0] != 0x02 {
         return Err(TxVerifyFailed::ErroneousTxs(vec![tx.clone()]).into())
     }
 
@@ -571,8 +571,8 @@ pub async fn verify_transaction(
 
     // Iterate over all calls to get the metadata
     for (idx, call) in tx.calls.iter().enumerate() {
-        // Transaction must not contain a Money::PoWReward(0x06) call
-        if call.data.contract_id == *MONEY_CONTRACT_ID && call.data.data[0] == 0x06 {
+        // Transaction must not contain a Money::PoWReward(0x02) call
+        if call.data.contract_id == *MONEY_CONTRACT_ID && call.data.data[0] == 0x02 {
             error!(target: "validator::verification::verify_transaction", "Reward transaction detected");
             return Err(TxVerifyFailed::ErroneousTxs(vec![tx.clone()]).into())
         }