feat(zkgm): cleanup and restart from version 0

Author: hussein-aitlahcen

cosmwasm/ibc-union/app/ucs03-zkgm/src/com.rs

@@ -1,4 +1,4 @@
-use alloy::{primitives::U256, sol_types::SolValue};
+use alloy::primitives::U256;
 
 pub const INSTR_VERSION_0: u8 = 0x00;
 pub const INSTR_VERSION_1: u8 = 0x01;
@@ -54,19 +54,6 @@ alloy::sol! {
       Instruction[] instructions;
   }
 
-  #[derive(Debug)]
-  struct FungibleAssetOrderV0 {
-      bytes sender;
-      bytes receiver;
-      bytes base_token;
-      uint256 base_amount;
-      string base_token_symbol;
-      string base_token_name;
-      uint256 base_token_path;
-      bytes quote_token;
-      uint256 quote_amount;
-  }
-
   #[derive(Debug, PartialEq)]
   struct FungibleAssetOrder {
       bytes sender;
@@ -97,38 +84,3 @@ alloy::sol! {
       bytes market_maker;
   }
 }
-
-impl From<FungibleAssetOrderV0> for FungibleAssetOrder {
-    fn from(value: FungibleAssetOrderV0) -> Self {
-        FungibleAssetOrder {
-            sender: value.sender,
-            receiver: value.receiver,
-            base_token: value.base_token,
-            base_amount: value.base_amount,
-            base_token_symbol: value.base_token_symbol,
-            base_token_name: value.base_token_name,
-            base_token_decimals: 0,
-            base_token_path: value.base_token_path,
-            quote_token: value.quote_token,
-            quote_amount: value.quote_amount,
-        }
-    }
-}
-
-pub fn decode_fungible_asset(
-    instruction: &Instruction,
-) -> Result<FungibleAssetOrder, alloy::sol_types::Error> {
-    match instruction.version {
-        INSTR_VERSION_0 => {
-            FungibleAssetOrderV0::abi_decode_params(&instruction.operand, true).map(Into::into)
-        }
-        INSTR_VERSION_1 => FungibleAssetOrder::abi_decode_params(&instruction.operand, true),
-        _ => panic!("the protocol must handle an incorrect version"),
-    }
-}
-
-pub fn decode_fungible_asset_order_from_v0(
-    data: &[u8],
-) -> Result<FungibleAssetOrder, alloy::sol_types::Error> {
-    FungibleAssetOrderV0::abi_decode_params(data, true).map(Into::into)
-}

cosmwasm/ibc-union/app/ucs03-zkgm/src/contract.rs

@@ -24,11 +24,10 @@ use unionlabs_cosmwasm_upgradable::UpgradeMsg;
 
 use crate::{
     com::{
-        decode_fungible_asset, Ack, Batch, BatchAck, Forward, FungibleAssetOrder,
-        FungibleAssetOrderAck, Instruction, Multiplex, ZkgmPacket, ACK_ERR_ONLY_MAKER,
-        FILL_TYPE_MARKETMAKER, FILL_TYPE_PROTOCOL, FORWARD_SALT_MAGIC, INSTR_VERSION_0,
-        INSTR_VERSION_1, OP_BATCH, OP_FORWARD, OP_FUNGIBLE_ASSET_ORDER, OP_MULTIPLEX,
-        TAG_ACK_FAILURE, TAG_ACK_SUCCESS,
+        Ack, Batch, BatchAck, Forward, FungibleAssetOrder, FungibleAssetOrderAck, Instruction,
+        Multiplex, ZkgmPacket, ACK_ERR_ONLY_MAKER, FILL_TYPE_MARKETMAKER, FILL_TYPE_PROTOCOL,
+        FORWARD_SALT_MAGIC, INSTR_VERSION_0, OP_BATCH, OP_FORWARD, OP_FUNGIBLE_ASSET_ORDER,
+        OP_MULTIPLEX, TAG_ACK_FAILURE, TAG_ACK_SUCCESS,
     },
     msg::{EurekaMsg, ExecuteMsg, InitMsg, PredictWrappedTokenResponse, QueryMsg},
     state::{
@@ -314,12 +313,12 @@ fn timeout_internal(
 ) -> Result<Response, ContractError> {
     match instruction.opcode {
         OP_FUNGIBLE_ASSET_ORDER => {
-            if instruction.version > INSTR_VERSION_1 {
+            if instruction.version > INSTR_VERSION_0 {
                 return Err(ContractError::UnsupportedVersion {
                     version: instruction.version,
                 });
             }
-            let order = decode_fungible_asset(&instruction)?;
+            let order = FungibleAssetOrder::abi_decode_params(&instruction.operand, true)?;
             refund(deps, path, packet.source_channel_id, order)
         }
         OP_BATCH => {
@@ -477,12 +476,12 @@ fn acknowledge_internal(
 ) -> Result<Response, ContractError> {
     match instruction.opcode {
         OP_FUNGIBLE_ASSET_ORDER => {
-            if instruction.version > INSTR_VERSION_1 {
+            if instruction.version > INSTR_VERSION_0 {
                 return Err(ContractError::UnsupportedVersion {
                     version: instruction.version,
                 });
             }
-            let order = decode_fungible_asset(&instruction)?;
+            let order = FungibleAssetOrder::abi_decode_params(&instruction.operand, true)?;
             let order_ack = if successful {
                 Some(FungibleAssetOrderAck::abi_decode_params(&ack, true)?)
             } else {
@@ -764,12 +763,12 @@ fn execute_internal(
 ) -> Result<Response, ContractError> {
     match instruction.opcode {
         OP_FUNGIBLE_ASSET_ORDER => {
-            if instruction.version > INSTR_VERSION_1 {
+            if instruction.version > INSTR_VERSION_0 {
                 return Err(ContractError::UnsupportedVersion {
                     version: instruction.version,
                 });
             }
-            let order = decode_fungible_asset(&instruction)?;
+            let order = FungibleAssetOrder::abi_decode_params(&instruction.operand, true)?;
             execute_fungible_asset_order(
                 deps,
                 env,
@@ -1424,12 +1423,12 @@ pub fn verify_internal(
 ) -> Result<(), ContractError> {
     match instruction.opcode {
         OP_FUNGIBLE_ASSET_ORDER => {
-            if instruction.version != INSTR_VERSION_1 {
+            if instruction.version != INSTR_VERSION_0 {
                 return Err(ContractError::UnsupportedVersion {
                     version: instruction.version,
                 });
             }
-            let order = decode_fungible_asset(instruction)?;
+            let order = FungibleAssetOrder::abi_decode_params(&instruction.operand, true)?;
             verify_fungible_asset_order(deps, info, channel_id, path, &order, response)
         }
         OP_BATCH => {
@@ -1779,7 +1778,7 @@ fn transfer(
                 salt: salt.into(),
                 path: U256::ZERO,
                 instruction: Instruction {
-                    version: INSTR_VERSION_1,
+                    version: INSTR_VERSION_0,
                     opcode: OP_FUNGIBLE_ASSET_ORDER,
                     operand: FungibleAssetOrder {
                         sender: info.sender.as_bytes().to_vec().into(),