implement feeAddr, allowing validators to receive fees at a different address

Author: Ivo Georgiev

adapter/src/ethereum.rs

@@ -547,6 +547,7 @@ mod test {
                 .expect("failed to create id"),
             url: "http://localhost:8005".to_string(),
             fee: 100.into(),
+            fee_addr: None,
         };
 
         let follower_validator_desc = ValidatorDesc {
@@ -555,6 +556,7 @@ mod test {
                 .expect("failed to create id"),
             url: "http://localhost:8006".to_string(),
             fee: 100.into(),
+            fee_addr: None,
         };
 
         let mut valid_channel = Channel {

primitives/src/util/tests/prep_db.rs

@@ -45,12 +45,14 @@ lazy_static! {
         id:  ValidatorId::try_from("ce07CbB7e054514D590a0262C93070D838bFBA2e").expect("Failed to parse DUMMY_VALIDATOR_LEADER id "),
         url: "http://localhost:8005".to_string(),
         fee: 100.into(),
+        fee_addr: None,
     };
 
     pub static ref DUMMY_VALIDATOR_FOLLOWER: ValidatorDesc = ValidatorDesc {
         id:  ValidatorId::try_from("c91763d7f14ac5c5ddfbcd012e0d2a61ab9bded3").expect("Failed to parse DUMMY_VALIDATOR_FOLLOWER id "),
         url: "http://localhost:8006".to_string(),
         fee: 100.into(),
+        fee_addr: None,
     };
 
     pub static ref DUMMY_CHANNEL: Channel = {

primitives/src/validator.rs

@@ -87,6 +87,7 @@ impl fmt::Display for ValidatorId {
 #[serde(rename_all = "camelCase")]
 pub struct ValidatorDesc {
     pub id: ValidatorId,
+    pub fee_addr: Option<ValidatorId>,
     pub url: String,
     pub fee: BigNum,
 }

validator_worker/src/core/fees.rs

@@ -76,8 +76,9 @@ fn distribute_fee<'a>(
         };
 
         if fee_rounded > 0.into() {
+            let addr = validator.fee_addr.as_ref().unwrap_or(&validator.id);
             let entry = balances
-                .entry(validator.id.to_string())
+                .entry(addr.to_string())
                 .or_insert_with(|| 0.into());
 
             *entry += &fee_rounded;