Call the IBC transactions in the state module

Author: majecty

core/src/block.rs

@@ -22,7 +22,7 @@ use crate::transaction::{SignedTransaction, UnverifiedTransaction};
 use crate::BlockId;
 use ccrypto::BLAKE_NULL_RLP;
 use ckey::Address;
-use cstate::{FindActionHandler, StateDB, StateError, StateWithCache, TopLevelState};
+use cstate::{FindActionHandler, IBCTransactionExecutor, StateDB, StateError, StateWithCache, TopLevelState};
 use ctypes::errors::HistoryError;
 use ctypes::header::{Header, Seal};
 use ctypes::util::unexpected::Mismatch;
@@ -149,7 +149,7 @@ impl<'x> OpenBlock<'x> {
     }
 
     /// Push a transaction into the block.
-    pub fn push_transaction<C: ChainTimeInfo + FindActionHandler>(
+    pub fn push_transaction<C: ChainTimeInfo + FindActionHandler + IBCTransactionExecutor>(
         &mut self,
         tx: SignedTransaction,
         h: Option<TxHash>,
@@ -192,7 +192,7 @@ impl<'x> OpenBlock<'x> {
     }
 
     /// Push transactions onto the block.
-    pub fn push_transactions<C: ChainTimeInfo + FindActionHandler>(
+    pub fn push_transactions<C: ChainTimeInfo + FindActionHandler + IBCTransactionExecutor>(
         &mut self,
         transactions: &[SignedTransaction],
         client: &C,
@@ -455,7 +455,7 @@ impl IsBlock for SealedBlock {
 }
 
 /// Enact the block given by block header, transactions and uncles
-pub fn enact<C: ChainTimeInfo + EngineInfo + FindActionHandler + TermInfo>(
+pub fn enact<C: ChainTimeInfo + EngineInfo + FindActionHandler + TermInfo + IBCTransactionExecutor>(
     header: &Header,
     transactions: &[SignedTransaction],
     engine: &dyn CodeChainEngine,

core/src/client/client.rs

@@ -36,7 +36,9 @@ use cdb::{new_journaldb, Algorithm, AsHashDB, DatabaseError};
 use cio::IoChannel;
 use ckey::{Address, NetworkId, PlatformAddress, Public};
 use cnetwork::NodeId;
-use cstate::{ActionHandler, FindActionHandler, StateDB, StateResult, TopLevelState, TopStateView};
+use cstate::{
+    ActionHandler, FindActionHandler, IBCTransactionExecutor, StateDB, StateResult, TopLevelState, TopStateView,
+};
 use ctimer::{TimeoutHandler, TimerApi, TimerScheduleError, TimerToken};
 use ctypes::header::Header;
 use ctypes::transaction::{AssetTransferInput, PartialHashing, ShardTransaction};
@@ -856,3 +858,15 @@ impl SnapshotClient for Client {
         }
     }
 }
+
+impl IBCTransactionExecutor for Client {
+    fn execute(
+        &self,
+        _bytes: &[u8],
+        _state: &mut TopLevelState,
+        _fee_payer: &Address,
+        _sender_pubkey: &Public,
+    ) -> StateResult<()> {
+        unimplemented!()
+    }
+}

core/src/client/mod.rs

@@ -324,3 +324,5 @@ pub trait StateInfo {
 pub trait SnapshotClient {
     fn notify_snapshot(&self, id: BlockId);
 }
+
+pub trait IBCClient {}

core/src/client/test_client.rs

@@ -50,7 +50,7 @@ use cdb;
 use ckey::{public_to_address, Address, Generator, KeyPair, NetworkId, PlatformAddress, Private, Public, Random};
 use cnetwork::NodeId;
 use cstate::tests::helpers::empty_top_state;
-use cstate::{FindActionHandler, StateDB, TopLevelState};
+use cstate::{FindActionHandler, IBCTransactionExecutor, StateDB, TopLevelState};
 use ctimer::{TimeoutHandler, TimerToken};
 use ctypes::header::Header;
 use ctypes::transaction::{Action, Transaction};
@@ -691,3 +691,5 @@ impl StateInfo for TestBlockChainClient {
         Some(top_state)
     }
 }
+
+impl IBCTransactionExecutor for TestBlockChainClient {}

core/src/miner/miner.rs

@@ -30,7 +30,7 @@ use crate::scheme::Scheme;
 use crate::transaction::{PendingSignedTransactions, SignedTransaction, UnverifiedTransaction};
 use crate::types::{BlockId, TransactionId};
 use ckey::{public_to_address, Address, Password, PlatformAddress, Public};
-use cstate::{FindActionHandler, TopLevelState};
+use cstate::{FindActionHandler, IBCTransactionExecutor, TopLevelState};
 use ctypes::errors::HistoryError;
 use ctypes::transaction::{Action, IncompleteTransaction};
 use ctypes::{BlockHash, TxHash};
@@ -287,7 +287,14 @@ impl Miner {
 
     /// Prepares new block for sealing including top transactions from queue and seal it.
     fn prepare_and_seal_block<
-        C: AccountData + BlockChainTrait + BlockProducer + ChainTimeInfo + EngineInfo + FindActionHandler + TermInfo,
+        C: AccountData
+            + BlockChainTrait
+            + BlockProducer
+            + ChainTimeInfo
+            + EngineInfo
+            + FindActionHandler
+            + TermInfo
+            + IBCTransactionExecutor,
     >(
         &self,
         parent_block_id: BlockId,
@@ -519,7 +526,8 @@ impl MinerService for Miner {
             + ImportBlock
             + ChainTimeInfo
             + FindActionHandler
-            + TermInfo, {
+            + TermInfo
+            + IBCTransactionExecutor, {
         ctrace!(MINER, "update_sealing: preparing a block");
 
         let block = match self.prepare_and_seal_block(parent_block, chain) {
@@ -557,7 +565,7 @@ impl MinerService for Miner {
         }
     }
 
-    fn import_external_transactions<C: MiningBlockChainClient + EngineInfo + TermInfo>(
+    fn import_external_transactions<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(
         &self,
         client: &C,
         transactions: Vec<UnverifiedTransaction>,
@@ -582,7 +590,7 @@ impl MinerService for Miner {
         results
     }
 
-    fn import_own_transaction<C: MiningBlockChainClient + EngineInfo + TermInfo>(
+    fn import_own_transaction<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(
         &self,
         chain: &C,
         tx: SignedTransaction,
@@ -627,7 +635,9 @@ impl MinerService for Miner {
         imported
     }
 
-    fn import_incomplete_transaction<C: MiningBlockChainClient + AccountData + EngineInfo + TermInfo>(
+    fn import_incomplete_transaction<
+        C: MiningBlockChainClient + AccountData + EngineInfo + TermInfo + IBCTransactionExecutor,
+    >(
         &self,
         client: &C,
         account_provider: &AccountProvider,
@@ -687,7 +697,7 @@ impl MinerService for Miner {
         self.mem_pool.read().future_transactions()
     }
 
-    fn start_sealing<C: MiningBlockChainClient + EngineInfo + TermInfo>(&self, client: &C) {
+    fn start_sealing<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(&self, client: &C) {
         cdebug!(MINER, "Start sealing");
         self.sealing_enabled.store(true, Ordering::Relaxed);
         // ------------------------------------------------------------------

core/src/miner/mod.rs

@@ -21,7 +21,7 @@ mod mem_pool_types;
 mod miner;
 
 use ckey::{public_to_address, Address, Password, PlatformAddress, Public};
-use cstate::{FindActionHandler, TopStateView};
+use cstate::{FindActionHandler, IBCTransactionExecutor, TopStateView};
 use ctypes::transaction::IncompleteTransaction;
 use ctypes::{BlockHash, TxHash};
 use cvm::ChainTimeInfo;
@@ -84,24 +84,27 @@ pub trait MinerService: Send + Sync {
             + ChainTimeInfo
             + EngineInfo
             + FindActionHandler
+            + IBCTransactionExecutor
             + TermInfo;
 
     /// Imports transactions to mem pool.
-    fn import_external_transactions<C: MiningBlockChainClient + EngineInfo + TermInfo>(
+    fn import_external_transactions<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(
         &self,
         client: &C,
         transactions: Vec<UnverifiedTransaction>,
     ) -> Vec<Result<TransactionImportResult, Error>>;
 
     /// Imports own (node owner) transaction to mem pool.
-    fn import_own_transaction<C: MiningBlockChainClient + EngineInfo + TermInfo>(
+    fn import_own_transaction<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(
         &self,
         chain: &C,
         tx: SignedTransaction,
     ) -> Result<TransactionImportResult, Error>;
 
     /// Imports incomplete (node owner) transaction to mem pool.
-    fn import_incomplete_transaction<C: MiningBlockChainClient + AccountData + EngineInfo + TermInfo>(
+    fn import_incomplete_transaction<
+        C: MiningBlockChainClient + AccountData + EngineInfo + TermInfo + IBCTransactionExecutor,
+    >(
         &self,
         chain: &C,
         account_provider: &AccountProvider,
@@ -121,7 +124,7 @@ pub trait MinerService: Send + Sync {
     fn future_transactions(&self) -> Vec<SignedTransaction>;
 
     /// Start sealing.
-    fn start_sealing<C: MiningBlockChainClient + EngineInfo + TermInfo>(&self, client: &C);
+    fn start_sealing<C: MiningBlockChainClient + EngineInfo + TermInfo + IBCTransactionExecutor>(&self, client: &C);
 
     /// Stop sealing.
     fn stop_sealing(&self);

rpc/src/v1/impls/account.rs

@@ -19,6 +19,7 @@ use super::super::traits::Account;
 use super::super::types::{SendTransactionResult, UnsignedTransaction};
 use ccore::{AccountData, AccountProvider, EngineInfo, MinerService, MiningBlockChainClient, TermInfo};
 use ckey::{Password, PlatformAddress, Signature};
+use cstate::IBCTransactionExecutor;
 use ctypes::transaction::IncompleteTransaction;
 use jsonrpc_core::Result;
 use parking_lot::Mutex;
@@ -48,7 +49,7 @@ where
 
 impl<C, M> Account for AccountClient<C, M>
 where
-    C: EngineInfo + MiningBlockChainClient + AccountData + TermInfo + 'static,
+    C: EngineInfo + MiningBlockChainClient + AccountData + TermInfo + IBCTransactionExecutor + 'static,
     M: MinerService + 'static,
 {
     fn get_account_list(&self) -> Result<Vec<PlatformAddress>> {

rpc/src/v1/impls/devel.rs

@@ -24,6 +24,7 @@ use ccore::{
 use cjson::bytes::Bytes;
 use ckey::{Address, KeyPair, Private};
 use cnetwork::{unbounded_event_callback, EventSender, IntoSocketAddr};
+use cstate::IBCTransactionExecutor;
 use csync::BlockSyncEvent;
 use ctypes::transaction::{Action, Transaction};
 use ctypes::BlockHash;
@@ -63,7 +64,14 @@ where
 
 impl<C, M> Devel for DevelClient<C, M>
 where
-    C: DatabaseClient + EngineInfo + EngineClient + MiningBlockChainClient + TermInfo + SnapshotClient + 'static,
+    C: DatabaseClient
+        + EngineInfo
+        + EngineClient
+        + MiningBlockChainClient
+        + TermInfo
+        + SnapshotClient
+        + IBCTransactionExecutor
+        + 'static,
     M: MinerService + 'static,
 {
     fn get_state_trie_keys(&self, offset: usize, limit: usize) -> Result<Vec<H256>> {

state/src/ibc.rs

@@ -0,0 +1,30 @@
+// Copyright 2020 Kodebox, Inc.
+// This file is part of CodeChain.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use crate::{StateResult, TopLevelState};
+use ckey::{Address, Public};
+
+pub trait IBCTransactionExecutor {
+    fn execute(
+        &self,
+        _bytes: &[u8],
+        _state: &mut TopLevelState,
+        _fee_payer: &Address,
+        _sender_pubkey: &Public,
+    ) -> StateResult<()> {
+        Ok(())
+    }
+}

state/src/impls/top_level.rs

@@ -40,8 +40,8 @@ use crate::checkpoint::{CheckpointId, StateWithCheckpoint};
 use crate::error::Error;
 use crate::traits::{ShardState, ShardStateView, StateWithCache, TopState, TopStateView};
 use crate::{
-    Account, ActionData, FindActionHandler, IBCData, Metadata, MetadataAddress, RegularAccount, RegularAccountAddress,
-    Shard, ShardAddress, ShardLevelState, StateDB, StateResult,
+    Account, ActionData, FindActionHandler, IBCData, IBCTransactionExecutor, Metadata, MetadataAddress, RegularAccount,
+    RegularAccountAddress, Shard, ShardAddress, ShardLevelState, StateDB, StateResult,
 };
 use ccrypto::BLAKE_NULL_RLP;
 use cdb::{AsHashDB, DatabaseError};
@@ -245,7 +245,7 @@ impl TopLevelState {
 
     /// Execute a given tranasction, charging tranasction fee.
     /// This will change the state accordingly.
-    pub fn apply<C: ChainTimeInfo + FindActionHandler>(
+    pub fn apply<C: ChainTimeInfo + FindActionHandler + IBCTransactionExecutor>(
         &mut self,
         tx: &Transaction,
         signed_hash: &TxHash,
@@ -276,7 +276,7 @@ impl TopLevelState {
         result
     }
 
-    fn apply_internal<C: ChainTimeInfo + FindActionHandler>(
+    fn apply_internal<C: ChainTimeInfo + FindActionHandler + IBCTransactionExecutor>(
         &mut self,
         tx: &Transaction,
         signed_hash: &TxHash,
@@ -341,7 +341,7 @@ impl TopLevelState {
     }
 
     #[allow(clippy::too_many_arguments)]
-    fn apply_action<C: ChainTimeInfo + FindActionHandler>(
+    fn apply_action<C: ChainTimeInfo + FindActionHandler + IBCTransactionExecutor>(
         &mut self,
         action: &Action,
         network_id: NetworkId,
@@ -406,9 +406,9 @@ impl TopLevelState {
                 return Ok(())
             }
             Action::IBC {
-                ..
+                bytes,
             } => {
-                // FIXME: call ibc transactions
+                IBCTransactionExecutor::execute(client, bytes, self, fee_payer, signer_public)?;
                 return Ok(())
             }
         };