Pass the sender address to the custom ActionHandler

Author: foriequal0

state/src/action_handler/hit.rs

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use ccrypto::blake256;
+use ckey::Address;
 use cmerkle::TrieMut;
 use ctypes::invoice::Invoice;
 use primitives::H256;
@@ -58,7 +59,7 @@ impl ActionHandler for HitHandler {
     }
 
     /// `bytes` must be valid encoding of HitAction
-    fn execute(&self, bytes: &[u8], state: &mut TopLevelState) -> ActionHandlerResult {
+    fn execute(&self, bytes: &[u8], state: &mut TopLevelState, _sender: &Address) -> ActionHandlerResult {
         let action = HitAction::decode(&UntrustedRlp::new(bytes))?;
         let action_data = state.action_data(&self.address())?.unwrap_or_default();
         let prev_counter: u32 = rlp::decode(&*action_data);

state/src/action_handler/mod.rs

@@ -19,6 +19,7 @@ mod hit;
 use std::convert::From;
 use std::sync::Arc;
 
+use ckey::Address;
 use cmerkle::{TrieError, TrieMut};
 use ctypes::invoice::Invoice;
 use rlp::DecoderError;
@@ -28,7 +29,7 @@ use crate::{StateError, StateResult, TopLevelState};
 pub trait ActionHandler: Send + Sync {
     fn handler_id(&self) -> u64;
     fn init(&self, state: &mut TrieMut) -> StateResult<()>;
-    fn execute(&self, bytes: &[u8], state: &mut TopLevelState) -> ActionHandlerResult;
+    fn execute(&self, bytes: &[u8], state: &mut TopLevelState, sender: &Address) -> ActionHandlerResult;
 }
 
 pub fn find_handler_for_id<'a>(id: u64, handlers: &'a [Arc<ActionHandler>]) -> Option<&'a Arc<ActionHandler>> {

state/src/impls/top_level.rs

@@ -426,7 +426,7 @@ impl TopLevelState {
                         find_handler_for_id(*handler_id, db.custom_handlers()).expect("Unknown custom parcel applied!"),
                     )
                 };
-                let invoice = handler.execute(bytes, self).expect("Custom action hander execution failed");
+                let invoice = handler.execute(bytes, self, fee_payer).expect("Custom action hander execution failed");
                 Ok(invoice)
             }
         }