F/rewards distribution consumer

contracts/babylon/schema/babylon-contract.json

@@ -237,7 +237,7 @@
                 "description": "`fp_distribution` is the list of finality providers and their rewards",
                 "type": "array",
                 "items": {
-                  "$ref": "#/definitions/RewardsDistribution"
+                  "$ref": "#/definitions/RewardInfo"
                 }
               }
             },
@@ -369,7 +369,7 @@
         },
         "additionalProperties": false
       },
-      "RewardsDistribution": {
+      "RewardInfo": {
         "type": "object",
         "required": [
           "fp_pubkey_hex",

contracts/babylon/schema/raw/execute.json

@@ -66,7 +66,7 @@
               "description": "`fp_distribution` is the list of finality providers and their rewards",
               "type": "array",
               "items": {
-                "$ref": "#/definitions/RewardsDistribution"
+                "$ref": "#/definitions/RewardInfo"
               }
             }
           },
@@ -198,7 +198,7 @@
       },
       "additionalProperties": false
     },
-    "RewardsDistribution": {
+    "RewardInfo": {
       "type": "object",
       "required": [
         "fp_pubkey_hex",

contracts/babylon/src/contract.rs

@@ -172,20 +172,33 @@ fn reply_init_finality_callback(
         cfg.btc_finality = Some(finality_addr.clone());
         Ok::<_, ContractError>(cfg)
     })?;
-    // Set the BTC staking contract address to the BTC finality contract
+    // Set the BTC finality contract address to the BTC staking contract
     let cfg = CONFIG.load(deps.storage)?;
-    let msg = finality_api::ExecuteMsg::UpdateStaking {
-        staking: cfg
-            .btc_staking
-            .ok_or(ContractError::BtcStakingNotSet {})?
+    let msg = btc_staking_api::ExecuteMsg::UpdateFinality {
+        finality: cfg
+            .btc_finality
+            .ok_or(ContractError::BtcFinalityNotSet {})?
             .to_string(),
     };
-    let wasm_msg = WasmMsg::Execute {
+    let staking_addr = cfg.btc_staking.ok_or(ContractError::BtcStakingNotSet {})?;
+    let wasm_msg_1 = WasmMsg::Execute {
+        contract_addr: staking_addr.to_string(),
+        msg: to_json_binary(&msg)?,
+        funds: vec![],
+    };
+
+    // Set the BTC staking contract address to the BTC finality contract
+    let msg = finality_api::ExecuteMsg::UpdateStaking {
+        staking: staking_addr.to_string(),
+    };
+    let wasm_msg_2 = WasmMsg::Execute {
         contract_addr: finality_addr.to_string(),
         msg: to_json_binary(&msg)?,
         funds: vec![],
     };
-    Ok(Response::new().add_message(wasm_msg))
+    Ok(Response::new()
+        .add_message(wasm_msg_1)
+        .add_message(wasm_msg_2))
 }
 
 pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
@@ -330,10 +343,7 @@ pub fn execute(
                         Ok(Response::new())
                     }
                 }
-                None => {
-                    // TODO: Send payload over the custom IBC channel for distribution
-                    Ok(Response::new())
-                }
+                None => Err(ContractError::IbcTransferInfoNotSet {}),
             }
         }
     }

contracts/babylon/src/error.rs

@@ -43,6 +43,8 @@ pub enum ContractError {
     BtcFinalityNotSet {},
     #[error("Invalid configuration: {msg}")]
     InvalidConfig { msg: String },
+    #[error("IBC transfer info not set")]
+    IbcTransferInfoNotSet {},
 }
 
 #[derive(Error, Debug, PartialEq)]

contracts/babylon/src/msg/contract.rs

@@ -1,10 +1,10 @@
 use cosmwasm_schema::{cw_serde, QueryResponses};
-use cosmwasm_std::Uint128;
 use cosmwasm_std::{Binary, StdError, StdResult};
 
 use babylon_apis::finality_api::Evidence;
 
 use crate::msg::btc_header::BtcHeader;
+use babylon_apis::btc_staking_api::RewardInfo;
 #[cfg(not(target_arch = "wasm32"))]
 use {
     crate::msg::btc_header::{BtcHeaderResponse, BtcHeadersResponse},
@@ -119,16 +119,10 @@ pub enum ExecuteMsg {
     /// `SendRewards` is a message sent by the finality contract, to send rewards to Babylon
     SendRewards {
         /// `fp_distribution` is the list of finality providers and their rewards
-        fp_distribution: Vec<RewardsDistribution>,
+        fp_distribution: Vec<RewardInfo>,
     },
 }
 
-#[cw_serde]
-pub struct RewardsDistribution {
-    pub fp_pubkey_hex: String,
-    pub reward: Uint128,
-}
-
 #[cw_serde]
 #[derive(QueryResponses)]
 pub enum QueryMsg {

contracts/btc-finality/schema/btc-finality.json

@@ -43,6 +43,7 @@
           "covenant_pks",
           "covenant_quorum",
           "min_slashing_tx_fee_sat",
+          "rewards_denom",
           "slashing_pk_script",
           "slashing_rate"
         ],
@@ -74,6 +75,9 @@
             "format": "uint64",
             "minimum": 0.0
           },
+          "rewards_denom": {
+            "type": "string"
+          },
           "slashing_pk_script": {
             "description": "`slashing_pk_script` is the pk script that the slashed BTC goes to. The pk script is in string format on Bitcoin.",
             "type": "string"
@@ -181,6 +185,60 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "description": "`DistributeRewards` is a message sent by the finality contract, to distribute rewards to delegators",
+        "type": "object",
+        "required": [
+          "distribute_rewards"
+        ],
+        "properties": {
+          "distribute_rewards": {
+            "type": "object",
+            "required": [
+              "fp_distribution"
+            ],
+            "properties": {
+              "fp_distribution": {
+                "description": "`fp_distribution` is the list of finality providers and their rewards",
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/RewardInfo"
+                }
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "description": "`WithdrawRewards` is a message sent by the staker, or the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\nThe optional `recipient` is the address on the Consumer side to receive the rewards. If not provided, the rewards will be sent to the sender of this message. Only the Babylon contract can set the recipient to a different address than the sender's.",
+        "type": "object",
+        "required": [
+          "withdraw_rewards"
+        ],
+        "properties": {
+          "withdraw_rewards": {
+            "type": "object",
+            "required": [
+              "fp_pubkey_hex"
+            ],
+            "properties": {
+              "fp_pubkey_hex": {
+                "type": "string"
+              },
+              "recipient": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ],
     "definitions": {
@@ -517,6 +575,22 @@
         },
         "additionalProperties": false
       },
+      "RewardInfo": {
+        "type": "object",
+        "required": [
+          "fp_pubkey_hex",
+          "reward"
+        ],
+        "properties": {
+          "fp_pubkey_hex": {
+            "type": "string"
+          },
+          "reward": {
+            "$ref": "#/definitions/Uint128"
+          }
+        },
+        "additionalProperties": false
+      },
       "SignatureInfo": {
         "description": "SignatureInfo is a BIP-340 signature together with its signer's BIP-340 PK",
         "type": "object",
@@ -553,6 +627,10 @@
         },
         "additionalProperties": false
       },
+      "Uint128": {
+        "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+        "type": "string"
+      },
       "UnbondedBtcDelegation": {
         "description": "UnbondedBTCDelegation is sent from Babylon to the Consumer chain upon an early unbonded BTC delegation",
         "type": "object",
@@ -1813,6 +1891,7 @@
         "covenant_pks",
         "covenant_quorum",
         "min_slashing_tx_fee_sat",
+        "rewards_denom",
         "slashing_pk_script",
         "slashing_rate"
       ],
@@ -1844,6 +1923,9 @@
           "format": "uint64",
           "minimum": 0.0
         },
+        "rewards_denom": {
+          "type": "string"
+        },
         "slashing_pk_script": {
           "description": "`slashing_pk_script` is the pk script that the slashed BTC goes to. The pk script is in string format on Bitcoin.",
           "type": "string"

contracts/btc-finality/schema/raw/execute.json

@@ -92,6 +92,60 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "description": "`DistributeRewards` is a message sent by the finality contract, to distribute rewards to delegators",
+      "type": "object",
+      "required": [
+        "distribute_rewards"
+      ],
+      "properties": {
+        "distribute_rewards": {
+          "type": "object",
+          "required": [
+            "fp_distribution"
+          ],
+          "properties": {
+            "fp_distribution": {
+              "description": "`fp_distribution` is the list of finality providers and their rewards",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/RewardInfo"
+              }
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "description": "`WithdrawRewards` is a message sent by the staker, or the Babylon contract on behalf of the staker, to withdraw rewards from BTC staking via the given FP.\n\nThe optional `recipient` is the address on the Consumer side to receive the rewards. If not provided, the rewards will be sent to the sender of this message. Only the Babylon contract can set the recipient to a different address than the sender's.",
+      "type": "object",
+      "required": [
+        "withdraw_rewards"
+      ],
+      "properties": {
+        "withdraw_rewards": {
+          "type": "object",
+          "required": [
+            "fp_pubkey_hex"
+          ],
+          "properties": {
+            "fp_pubkey_hex": {
+              "type": "string"
+            },
+            "recipient": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     }
   ],
   "definitions": {
@@ -428,6 +482,22 @@
       },
       "additionalProperties": false
     },
+    "RewardInfo": {
+      "type": "object",
+      "required": [
+        "fp_pubkey_hex",
+        "reward"
+      ],
+      "properties": {
+        "fp_pubkey_hex": {
+          "type": "string"
+        },
+        "reward": {
+          "$ref": "#/definitions/Uint128"
+        }
+      },
+      "additionalProperties": false
+    },
     "SignatureInfo": {
       "description": "SignatureInfo is a BIP-340 signature together with its signer's BIP-340 PK",
       "type": "object",
@@ -464,6 +534,10 @@
       },
       "additionalProperties": false
     },
+    "Uint128": {
+      "description": "A thin wrapper around u128 that is using strings for JSON encoding/decoding, such that the full u128 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u128` to get the value out:\n\n``` # use cosmwasm_std::Uint128; let a = Uint128::from(123u128); assert_eq!(a.u128(), 123);\n\nlet b = Uint128::from(42u64); assert_eq!(b.u128(), 42);\n\nlet c = Uint128::from(70u32); assert_eq!(c.u128(), 70); ```",
+      "type": "string"
+    },
     "UnbondedBtcDelegation": {
       "description": "UnbondedBTCDelegation is sent from Babylon to the Consumer chain upon an early unbonded BTC delegation",
       "type": "object",

contracts/btc-finality/schema/raw/instantiate.json

@@ -39,6 +39,7 @@
         "covenant_pks",
         "covenant_quorum",
         "min_slashing_tx_fee_sat",
+        "rewards_denom",
         "slashing_pk_script",
         "slashing_rate"
       ],
@@ -70,6 +71,9 @@
           "format": "uint64",
           "minimum": 0.0
         },
+        "rewards_denom": {
+          "type": "string"
+        },
         "slashing_pk_script": {
           "description": "`slashing_pk_script` is the pk script that the slashed BTC goes to. The pk script is in string format on Bitcoin.",
           "type": "string"

contracts/btc-finality/schema/raw/response_to_params.json

@@ -8,6 +8,7 @@
     "covenant_pks",
     "covenant_quorum",
     "min_slashing_tx_fee_sat",
+    "rewards_denom",
     "slashing_pk_script",
     "slashing_rate"
   ],
@@ -39,6 +40,9 @@
       "format": "uint64",
       "minimum": 0.0
     },
+    "rewards_denom": {
+      "type": "string"
+    },
     "slashing_pk_script": {
       "description": "`slashing_pk_script` is the pk script that the slashed BTC goes to. The pk script is in string format on Bitcoin.",
       "type": "string"