feat: add opt-in config to execute all redeem and replace requests

runtime/src/rpc.rs

@@ -942,6 +942,8 @@ pub trait ReplacePallet {
         account_id: AccountId,
     ) -> Result<Vec<(H256, InterBtcReplaceRequest)>, Error>;
 
+    async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, Error>;
+
     /// Get the time difference in number of blocks between when a replace
     /// request is created and required completion time by a vault
     async fn get_replace_period(&self) -> Result<u32, Error>;
@@ -1053,6 +1055,20 @@ impl ReplacePallet for InterBtcParachain {
         .collect()
     }
 
+    async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, Error> {
+        let head = self.get_finalized_block_hash().await?;
+        let key_addr = metadata::storage().replace().replace_requests_root();
+        let mut iter = self.api.storage().iter(key_addr, DEFAULT_PAGE_SIZE, head).await?;
+        let mut replace_requests = Vec::new();
+        while let Some((replace_id, request)) = iter.next().await? {
+            let key_hash = replace_id.0.as_slice();
+            // last bytes are the raw key
+            let key = &key_hash[key_hash.len() - 32..];
+            replace_requests.push((H256::from_slice(key), request));
+        }
+        Ok(replace_requests)
+    }
+
     async fn get_replace_period(&self) -> Result<u32, Error> {
         self.query_finalized_or_error(metadata::storage().replace().replace_period())
             .await
@@ -1340,12 +1356,15 @@ pub trait RedeemPallet {
 
     async fn get_redeem_request(&self, redeem_id: H256) -> Result<InterBtcRedeemRequest, Error>;
 
-    /// Get all redeem requests requested of the given vault
+    /// Get all redeem requests for a vault
     async fn get_vault_redeem_requests(
         &self,
         account_id: AccountId,
     ) -> Result<Vec<(H256, InterBtcRedeemRequest)>, Error>;
 
+    /// Get all redeem requests
+    async fn get_all_redeem_requests(&self) -> Result<Vec<(H256, InterBtcRedeemRequest)>, Error>;
+
     async fn get_redeem_period(&self) -> Result<BlockNumber, Error>;
 }
 
@@ -1406,6 +1425,20 @@ impl RedeemPallet for InterBtcParachain {
         .collect()
     }
 
+    async fn get_all_redeem_requests(&self) -> Result<Vec<(H256, InterBtcRedeemRequest)>, Error> {
+        let head = self.get_finalized_block_hash().await?;
+        let key_addr = metadata::storage().redeem().redeem_requests_root();
+        let mut iter = self.api.storage().iter(key_addr, DEFAULT_PAGE_SIZE, head).await?;
+        let mut redeem_requests = Vec::new();
+        while let Some((redeem_id, request)) = iter.next().await? {
+            let key_hash = redeem_id.0.as_slice();
+            // last bytes are the raw key
+            let key = &key_hash[key_hash.len() - 32..];
+            redeem_requests.push((H256::from_slice(key), request));
+        }
+        Ok(redeem_requests)
+    }
+
     async fn get_redeem_period(&self) -> Result<BlockNumber, Error> {
         self.query_finalized_or_error(metadata::storage().redeem().redeem_period())
             .await

vault/src/cancellation.rs

@@ -359,6 +359,7 @@ mod tests {
             async fn cancel_replace(&self, replace_id: H256) -> Result<(), RuntimeError>;
             async fn get_new_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_old_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
+            async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_replace_period(&self) -> Result<u32, RuntimeError>;
             async fn get_replace_request(&self, replace_id: H256) -> Result<InterBtcReplaceRequest, RuntimeError>;
             async fn get_replace_dust_amount(&self) -> Result<u128, RuntimeError>;

vault/src/execution.rs

@@ -471,15 +471,23 @@ pub async fn execute_open_requests(
     num_confirmations: u32,
     payment_margin: Duration,
     auto_rbf: bool,
+    execute_all: bool,
 ) -> Result<(), ServiceError<Error>> {
     let parachain_rpc = &parachain_rpc;
     let vault_id = parachain_rpc.get_account_id().clone();
 
     // get all redeem and replace requests
-    let (redeem_requests, replace_requests) = try_join!(
-        parachain_rpc.get_vault_redeem_requests(vault_id.clone()),
-        parachain_rpc.get_old_vault_replace_requests(vault_id.clone()),
-    )?;
+    let (redeem_requests, replace_requests) = if execute_all {
+        try_join!(
+            parachain_rpc.get_all_redeem_requests(),
+            parachain_rpc.get_all_replace_requests(),
+        )?
+    } else {
+        try_join!(
+            parachain_rpc.get_vault_redeem_requests(vault_id.clone()),
+            parachain_rpc.get_old_vault_replace_requests(vault_id.clone()),
+        )?
+    };
 
     let open_redeems = redeem_requests
         .into_iter()
@@ -723,6 +731,7 @@ mod tests {
             async fn cancel_redeem(&self, redeem_id: H256, reimburse: bool) -> Result<(), RuntimeError>;
             async fn get_redeem_request(&self, redeem_id: H256) -> Result<InterBtcRedeemRequest, RuntimeError>;
             async fn get_vault_redeem_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcRedeemRequest)>, RuntimeError>;
+            async fn get_all_redeem_requests(&self) -> Result<Vec<(H256, InterBtcRedeemRequest)>, RuntimeError>;
             async fn get_redeem_period(&self) -> Result<BlockNumber, RuntimeError>;
         }
 
@@ -735,6 +744,7 @@ mod tests {
             async fn cancel_replace(&self, replace_id: H256) -> Result<(), RuntimeError>;
             async fn get_new_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_old_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
+            async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_replace_period(&self) -> Result<u32, RuntimeError>;
             async fn get_replace_request(&self, replace_id: H256) -> Result<InterBtcReplaceRequest, RuntimeError>;
             async fn get_replace_dust_amount(&self) -> Result<u128, RuntimeError>;

vault/src/metrics.rs

@@ -721,6 +721,7 @@ mod tests {
             async fn cancel_redeem(&self, redeem_id: H256, reimburse: bool) -> Result<(), RuntimeError>;
             async fn get_redeem_request(&self, redeem_id: H256) -> Result<InterBtcRedeemRequest, RuntimeError>;
             async fn get_vault_redeem_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcRedeemRequest)>, RuntimeError>;
+            async fn get_all_redeem_requests(&self) -> Result<Vec<(H256, InterBtcRedeemRequest)>, RuntimeError>;
             async fn get_redeem_period(&self) -> Result<BlockNumber, RuntimeError>;
         }
 
@@ -760,6 +761,7 @@ mod tests {
             async fn cancel_replace(&self, replace_id: H256) -> Result<(), RuntimeError>;
             async fn get_new_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_old_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
+            async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
             async fn get_replace_period(&self) -> Result<u32, RuntimeError>;
             async fn get_replace_request(&self, replace_id: H256) -> Result<InterBtcReplaceRequest, RuntimeError>;
             async fn get_replace_dust_amount(&self) -> Result<u128, RuntimeError>;

vault/src/replace.rs

@@ -332,6 +332,7 @@ mod tests {
         async fn cancel_replace(&self, replace_id: H256) -> Result<(), RuntimeError>;
         async fn get_new_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
         async fn get_old_vault_replace_requests(&self, account_id: AccountId) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
+        async fn get_all_replace_requests(&self) -> Result<Vec<(H256, InterBtcReplaceRequest)>, RuntimeError>;
         async fn get_replace_period(&self) -> Result<u32, RuntimeError>;
         async fn get_replace_request(&self, replace_id: H256) -> Result<InterBtcReplaceRequest, RuntimeError>;
         async fn get_replace_dust_amount(&self) -> Result<u128, RuntimeError>;

vault/src/system.rs

@@ -69,6 +69,11 @@ pub struct VaultServiceConfig {
     #[clap(long)]
     pub no_issue_execution: bool,
 
+    /// Try to execute **all** redeem and replace requests,
+    /// the Vault will still submit proofs for their own
+    #[clap(long)]
+    pub execute_all: bool,
+
     /// Don't run the RPC API.
     #[clap(long)]
     pub no_api: bool,
@@ -632,6 +637,7 @@ impl VaultService {
             num_confirmations,
             self.config.payment_margin_minutes,
             self.config.auto_rbf,
+            self.config.execute_all,
         );
 
         let shutdown_clone = self.shutdown.clone();

vault/tests/vault_integration_tests.rs

@@ -840,6 +840,7 @@ async fn test_execute_open_requests_succeeds() {
                 0,
                 Duration::from_secs(0),
                 true,
+                false,
             )
             .map(Result::unwrap),
             assert_redeem_event(TIMEOUT, user_provider.clone(), redeem_ids[0]),