fix(zkgm): fungible asset order field order

Signed-off-by: aeryz <[email protected]>

Author: aeryz

aptos/ucs03-zkgm/sources/fungible_asset_order.move

@@ -71,10 +71,10 @@ module zkgm::fungible_asset_order {
         base_amount: u256,
         base_token_symbol: String,
         base_token_name: String,
+        base_token_decimals: u8,
         base_token_path: u256,
         quote_token: vector<u8>,
-        quote_amount: u256,
-        decimals: u8
+        quote_amount: u256
     }
 
     public fun new(
@@ -84,10 +84,10 @@ module zkgm::fungible_asset_order {
         base_amount: u256,
         base_token_symbol: String,
         base_token_name: String,
+        base_token_decimals: u8,
         base_token_path: u256,
         quote_token: vector<u8>,
-        quote_amount: u256,
-        decimals: u8
+        quote_amount: u256
     ): FungibleAssetOrder {
         FungibleAssetOrder {
             sender,
@@ -96,10 +96,10 @@ module zkgm::fungible_asset_order {
             base_amount,
             base_token_symbol,
             base_token_name,
+            base_token_decimals,
             base_token_path,
             quote_token,
-            quote_amount,
-            decimals
+            quote_amount
         }
     }
 
@@ -127,6 +127,10 @@ module zkgm::fungible_asset_order {
         &order.base_token_name
     }
 
+    public fun base_token_decimals(order: &FungibleAssetOrder): u8 {
+        order.base_token_decimals
+    }
+
     public fun base_token_path(order: &FungibleAssetOrder): u256 {
         order.base_token_path
     }
@@ -139,10 +143,6 @@ module zkgm::fungible_asset_order {
         order.quote_amount
     }
 
-    public fun decimals(order: &FungibleAssetOrder): u8 {
-        order.decimals
-    }
-
     public fun encode(order: &FungibleAssetOrder): vector<u8> {
         let buf = vector::empty();
 
@@ -176,11 +176,11 @@ module zkgm::fungible_asset_order {
         // base_token_name offset
         zkgm_ethabi::encode_uint<u64>(&mut buf, dyn_offset);
         dyn_offset = dyn_offset + vector::length(&base_token_name);
+        zkgm_ethabi::encode_uint<u8>(&mut buf, order.base_token_decimals);
         zkgm_ethabi::encode_uint<u256>(&mut buf, order.base_token_path);
         // quote_token offset
         zkgm_ethabi::encode_uint<u64>(&mut buf, dyn_offset);
         zkgm_ethabi::encode_uint<u256>(&mut buf, order.quote_amount);
-        zkgm_ethabi::encode_uint<u8>(&mut buf, order.decimals);
 
         vector::append(&mut buf, sender);
         vector::append(&mut buf, receiver);
@@ -201,10 +201,10 @@ module zkgm::fungible_asset_order {
             base_amount: zkgm_ethabi::decode_uint(buf, &mut index),
             base_token_symbol: zkgm_ethabi::decode_string_from_offset(buf, &mut index),
             base_token_name: zkgm_ethabi::decode_string_from_offset(buf, &mut index),
+            base_token_decimals: (zkgm_ethabi::decode_uint(buf, &mut index) as u8),
             base_token_path: zkgm_ethabi::decode_uint(buf, &mut index),
             quote_token: zkgm_ethabi::decode_bytes_from_offset(buf, &mut index),
-            quote_amount: zkgm_ethabi::decode_uint(buf, &mut index),
-            decimals: (zkgm_ethabi::decode_uint(buf, &mut index) as u8)
+            quote_amount: zkgm_ethabi::decode_uint(buf, &mut index)
         }
     }
 

aptos/ucs03-zkgm/sources/zkgm.move

@@ -451,10 +451,10 @@ module zkgm::ibc_app {
                 base_amount,
                 symbol,
                 name,
+                zkgm::fa_coin::decimals_with_metadata(asset),
                 origin,
                 quote_token,
-                quote_amount,
-                zkgm::fa_coin::decimals_with_metadata(asset)
+                quote_amount
             );
         let operand = fungible_asset_order::encode(&fungible_asset_order);
         let zkgm_pack =
@@ -911,7 +911,7 @@ module zkgm::ibc_app {
             if (!is_deployed(wrapped_address)) {
                 let token_name = *fungible_asset_order::base_token_name(&order);
                 let token_symbol = *fungible_asset_order::base_token_symbol(&order);
-                deploy_token(salt, token_name, token_symbol, fungible_asset_order::decimals(&order));
+                deploy_token(salt, token_name, token_symbol, fungible_asset_order::base_token_decimals(&order));
                 let value =
                     update_channel_path(
                         path, ibc::packet::destination_channel_id(&ibc_packet)

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

@@ -70,12 +70,13 @@ alloy::sol! {
       uint256 base_amount;
       string base_token_symbol;
       string base_token_name;
+      uint8 base_token_decimals;
       uint256 base_token_path;
       bytes quote_token;
       uint256 quote_amount;
-      uint8 decimals;
   }
 
+  #[derive(Debug)]
   struct Ack {
       uint256 tag;
       bytes inner_ack;
@@ -85,6 +86,7 @@ alloy::sol! {
       bytes[] acknowledgements;
   }
 
+  #[derive(Debug)]
   struct FungibleAssetOrderAck {
       uint256 fill_type;
       bytes market_maker;
@@ -100,10 +102,10 @@ impl From<FungibleAssetOrderV0> for FungibleAssetOrder {
             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,
-            decimals: 0,
         }
     }
 }

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

@@ -791,7 +791,7 @@ fn execute_fungible_asset_order(
                         metadata: Metadata {
                             name: order.base_token_name,
                             symbol: order.base_token_symbol,
-                            decimals: order.decimals,
+                            decimals: order.base_token_decimals,
                         },
                         path: path.to_be_bytes_vec().into(),
                         channel: packet.destination_channel_id,
@@ -1084,7 +1084,7 @@ fn transfer(
     let MetadataResponse {
         name: base_token_name,
         symbol: base_token_symbol,
-        decimals,
+        decimals: base_token_decimals,
     } = deps.querier.query::<MetadataResponse>(&QueryRequest::Wasm(
         cosmwasm_std::WasmQuery::Smart {
             contract_addr: minter.to_string(),
@@ -1113,14 +1113,14 @@ fn transfer(
                         base_amount: base_amount.u128().try_into().expect("u256>u128"),
                         base_token_symbol,
                         base_token_name,
+                        base_token_decimals,
                         base_token_path: origin
                             .map(|x| alloy::primitives::U256::from_be_bytes(x.to_be_bytes()))
                             .unwrap_or(alloy::primitives::U256::ZERO),
                         quote_token: Vec::from(quote_token).into(),
                         quote_amount: alloy::primitives::U256::from_be_bytes(
                             quote_amount.to_be_bytes(),
                         ),
-                        decimals,
                     }
                     .abi_encode_params()
                     .into(),