Bug fixes for endianness between boundaries

lib/ain-cpp-imports/src/bridge.rs

@@ -30,7 +30,7 @@ pub mod ffi {
         fn getPoolTransactions() -> Vec<String>;
         fn getNativeTxSize(data: Vec<u8>) -> u64;
         fn getMinRelayTxFee() -> u64;
-        fn getEthPrivKey(key_id: [u8; 20]) -> [u8; 32];
+        fn getEthPrivKey(key: String) -> [u8; 32];
         fn getStateInputJSON() -> String;
         fn getHighestBlock() -> i32;
         fn getCurrentHeight() -> i32;

lib/ain-cpp-imports/src/lib.rs

@@ -55,7 +55,7 @@ mod ffi {
     pub fn getMinRelayTxFee() -> u64 {
         unimplemented!("{}", UNIMPL_MSG)
     }
-    pub fn getEthPrivKey(_key_id: [u8; 20]) -> [u8; 32] {
+    pub fn getEthPrivKey(_key: String) -> [u8; 32] {
         unimplemented!("{}", UNIMPL_MSG)
     }
     pub fn getStateInputJSON() -> String {
@@ -136,8 +136,8 @@ pub fn get_min_relay_tx_fee() -> Result<u64, Box<dyn Error>> {
     Ok(tx_fee)
 }
 
-pub fn get_eth_priv_key(key_id: [u8; 20]) -> Result<[u8; 32], Box<dyn Error>> {
-    let eth_key = ffi::getEthPrivKey(key_id);
+pub fn get_eth_priv_key(key: String) -> Result<[u8; 32], Box<dyn Error>> {
+    let eth_key = ffi::getEthPrivKey(key);
     Ok(eth_key)
 }
 

lib/ain-evm/src/core.rs

@@ -27,8 +27,6 @@ use crate::{
     Result,
 };
 
-pub type NativeTxHash = [u8; 32];
-
 pub struct EVMCoreService {
     pub tx_queues: Arc<TransactionQueueMap>,
     pub trie_store: Arc<TrieDBStore>,
@@ -349,7 +347,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: NativeTxHash,
+        hash: String,
     ) -> Result<()> {
         let queue_tx = QueueTx::SystemTx(SystemTx::EvmIn(BalanceUpdate { address, amount }));
         self.tx_queues
@@ -368,7 +366,7 @@ impl EVMCoreService {
         queue_id: u64,
         address: H160,
         amount: U256,
-        hash: NativeTxHash,
+        hash: String,
     ) -> Result<()> {
         let block_number = self
             .storage

lib/ain-evm/src/evm.rs

@@ -14,7 +14,7 @@ use primitive_types::H256;
 use crate::backend::{EVMBackend, Vicinity};
 use crate::block::BlockService;
 use crate::bytes::Bytes;
-use crate::core::{EVMCoreService, NativeTxHash};
+use crate::core::EVMCoreService;
 use crate::executor::{AinExecutor, TxResponse};
 use crate::fee::{calculate_gas_fee, calculate_prepay_gas_fee};
 use crate::filters::FilterService;
@@ -40,7 +40,7 @@ pub struct EVMServices {
 }
 
 pub struct FinalizedBlockInfo {
-    pub block_hash: [u8; 32],
+    pub block_hash: String,
     pub failed_transactions: Vec<String>,
     pub total_burnt_fees: U256,
     pub total_priority_fees: U256,
@@ -227,7 +227,7 @@ impl EVMServices {
                         signed_tx.transaction.hash()
                     );
                     if !exit_reason.is_succeed() {
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
 
                     let gas_fee = calculate_gas_fee(&signed_tx, U256::from(used_gas), base_fee)?;
@@ -245,7 +245,7 @@ impl EVMServices {
                     );
                     if let Err(e) = executor.add_balance(address, amount) {
                         debug!("[construct_block] EvmIn failed with {e}");
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
                 }
                 QueueTx::SystemTx(SystemTx::EvmOut(BalanceUpdate { address, amount })) => {
@@ -256,7 +256,7 @@ impl EVMServices {
 
                     if let Err(e) = executor.sub_balance(address, amount) {
                         debug!("[construct_block] EvmOut failed with {e}");
-                        failed_transactions.push(hex::encode(queue_item.tx_hash));
+                        failed_transactions.push(queue_item.tx_hash);
                     }
                 }
                 QueueTx::SystemTx(SystemTx::DeployContract(DeployContractData {
@@ -304,12 +304,12 @@ impl EVMServices {
                         Ok(DST20BridgeInfo { address, storage }) => {
                             if let Err(e) = executor.update_storage(address, storage) {
                                 debug!("[construct_block] EvmOut failed with {e}");
-                                failed_transactions.push(hex::encode(queue_item.tx_hash));
+                                failed_transactions.push(queue_item.tx_hash);
                             }
                         }
                         Err(e) => {
                             debug!("[construct_block] EvmOut failed with {e}");
-                            failed_transactions.push(hex::encode(queue_item.tx_hash));
+                            failed_transactions.push(queue_item.tx_hash);
                         }
                     }
                 }
@@ -358,8 +358,7 @@ impl EVMServices {
                 .collect(),
             Vec::new(),
         );
-
-        let block_hash = *block.header.hash().as_fixed_bytes();
+        let block_hash = format!("{:?}", block.header.hash());
         let receipts = self.receipt.generate_receipts(
             &all_transactions,
             receipts_v3,
@@ -436,7 +435,7 @@ impl EVMServices {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: NativeTxHash,
+        hash: String,
         gas_used: U256,
     ) -> Result<()> {
         let parent_data = self.block.get_latest_block_hash_and_number()?;

lib/ain-evm/src/transaction/mod.rs

@@ -49,18 +49,18 @@ impl LegacyUnsignedTransaction {
         H256::from(output)
     }
 
-    pub fn sign(&self, key: &H256, chain_id: u64) -> Result<LegacyTransaction, TransactionError> {
+    pub fn sign(&self, key: &[u8], chain_id: u64) -> Result<LegacyTransaction, TransactionError> {
         self.sign_with_chain_id(key, chain_id)
     }
 
     pub fn sign_with_chain_id(
         &self,
-        key: &H256,
+        key: &[u8],
         chain_id: u64,
     ) -> Result<LegacyTransaction, TransactionError> {
         let hash = self.signing_hash(chain_id);
         let msg = libsecp256k1::Message::parse(hash.as_fixed_bytes());
-        let s = libsecp256k1::sign(&msg, &libsecp256k1::SecretKey::parse_slice(&key[..])?);
+        let s = libsecp256k1::sign(&msg, &libsecp256k1::SecretKey::parse_slice(key)?);
         let sig = s.0.serialize();
 
         let sig = TransactionSignature::new(

lib/ain-evm/src/txqueue.rs

@@ -7,7 +7,6 @@ use ethereum::{Block, TransactionV2};
 use ethereum_types::{H160, U256};
 use rand::Rng;
 
-use crate::core::NativeTxHash;
 use crate::fee::calculate_gas_fee;
 use crate::receipt::Receipt;
 use crate::transaction::{system::SystemTx, SignedTx};
@@ -119,7 +118,7 @@ impl TransactionQueueMap {
         &self,
         queue_id: u64,
         tx: QueueTx,
-        hash: NativeTxHash,
+        hash: String,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {
@@ -219,7 +218,7 @@ pub enum QueueTx {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct QueueTxItem {
     pub tx: QueueTx,
-    pub tx_hash: NativeTxHash,
+    pub tx_hash: String,
     pub tx_fee: U256,
     pub gas_used: U256,
 }
@@ -277,7 +276,7 @@ impl TransactionQueue {
     pub fn queue_tx(
         &self,
         tx: QueueTx,
-        tx_hash: NativeTxHash,
+        tx_hash: String,
         gas_used: U256,
         base_fee: U256,
     ) -> Result<()> {

lib/ain-grpc/src/rpc/eth.rs

@@ -1059,8 +1059,8 @@ fn sign(
     message: TransactionMessage,
 ) -> Result<TransactionV2, Box<dyn std::error::Error>> {
     debug!("sign address {:#x}", address);
-    let key_id = address.as_fixed_bytes().to_owned();
-    let priv_key = get_eth_priv_key(key_id).unwrap();
+    let key = format!("{:?}", address);
+    let priv_key = get_eth_priv_key(key).unwrap();
     let secret_key = SecretKey::parse(&priv_key).unwrap();
 
     match message {