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/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) {

state/src/ibc.rs

@@ -0,0 +1,28 @@
+// 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<()>;
+}

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(())
             }
         };

state/src/lib.rs

@@ -33,6 +33,7 @@ mod cache;
 mod checkpoint;
 mod db;
 mod error;
+mod ibc;
 mod impls;
 mod item;
 mod traits;
@@ -43,6 +44,7 @@ pub use crate::action_handler::{ActionDataKeyBuilder, ActionHandler, FindActionH
 pub use crate::checkpoint::{CheckpointId, StateWithCheckpoint};
 pub use crate::db::StateDB;
 pub use crate::error::Error as StateError;
+pub use crate::ibc::IBCTransactionExecutor;
 pub use crate::impls::{ShardLevelState, TopLevelState};
 pub use crate::item::account::Account;
 pub use crate::item::action_data::ActionData;