Add force_commit_state

Author: snawaz

magicblock-committor-service/src/tasks/args_task.rs

@@ -88,9 +88,15 @@ impl BaseTask for ArgsTask {
         self: Box<Self>,
     ) -> Result<Box<dyn BaseTask>, Box<dyn BaseTask>> {
         match self.task_type {
-            ArgsTaskType::Commit(ref value) if value.is_commit_diff() => {
-                // We do not currently support executing CommitDiff as BufferTask
-                Err(self)
+            ArgsTaskType::Commit(mut value) if value.is_commit_diff() => {
+                //TODO (snawaz): We do not currently support executing CommitDiff as BufferTask, which is why we're forcing CommitTask to use CommitState before converting this task into BufferTask
+                // Once CommitDiff is supported by BufferTask, we do not have to
+                // force_commit_state.
+
+                value.force_commit_state();
+                Ok(Box::new(BufferTask::new_preparation_required(
+                    BufferTaskType::Commit(value),
+                )))
             }
             ArgsTaskType::Commit(value) => {
                 Ok(Box::new(BufferTask::new_preparation_required(

magicblock-committor-service/src/tasks/mod.rs

@@ -110,6 +110,7 @@ pub struct CommitTask {
     pub allow_undelegation: bool,
     pub committed_account: CommittedAccount,
     base_account: Option<Account>,
+    force_commit_state: bool,
 }
 
 impl CommitTask {
@@ -152,15 +153,21 @@ impl CommitTask {
             allow_undelegation,
             committed_account,
             base_account: fetched_account,
+            force_commit_state: false,
         }
     }
 
     pub fn is_commit_diff(&self) -> bool {
-        self.committed_account.account.data.len()
-            > CommitTask::COMMIT_STATE_SIZE_THRESHOLD
+        !self.force_commit_state
+            && self.committed_account.account.data.len()
+                > CommitTask::COMMIT_STATE_SIZE_THRESHOLD
             && self.base_account.is_some()
     }
 
+    pub fn force_commit_state(&mut self) {
+        self.force_commit_state = true;
+    }
+
     pub fn create_commit_ix(&self, validator: &Pubkey) -> Instruction {
         if let Some(fetched_account) = self.base_account.as_ref() {
             self.create_commit_diff_ix(validator, fetched_account)
@@ -190,6 +197,13 @@ impl CommitTask {
         validator: &Pubkey,
         fetched_account: &Account,
     ) -> Instruction {
+        if self.force_commit_state {
+            println!(
+                "force_commit_state is true, so call create_commit_state_ix"
+            );
+            return self.create_commit_state_ix(validator);
+        }
+
         let args = CommitDiffArgs {
             nonce: self.commit_id,
             lamports: self.committed_account.account.lamports,

test-integration/test-committor-service/tests/test_ix_commit_local.rs

@@ -80,28 +80,28 @@ async fn test_ix_commit_single_account_100_bytes_and_undelegate() {
 // # see the PR #575 for more context.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_ix_commit_single_account_800_bytes() {
-    commit_single_account(800, CommitStrategy::Args, false).await;
+    commit_single_account(800, CommitStrategy::FromBuffer, false).await;
 }
 
 // TODO (snawaz): use #[tokio::test] once CommitTask::new() stops using blocking RpcClient
 // # see the PR #575 for more context.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_ix_commit_single_account_800_bytes_and_undelegate() {
-    commit_single_account(800, CommitStrategy::Args, true).await;
+    commit_single_account(800, CommitStrategy::FromBuffer, true).await;
 }
 
 // TODO (snawaz): use #[tokio::test] once CommitTask::new() stops using blocking RpcClient
 // # see the PR #575 for more context.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_ix_commit_single_account_one_kb() {
-    commit_single_account(1024, CommitStrategy::Args, false).await;
+    commit_single_account(1024, CommitStrategy::FromBuffer, false).await;
 }
 
 // TODO (snawaz): use #[tokio::test] once CommitTask::new() stops using blocking RpcClient
 // # see the PR #575 for more context.
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_ix_commit_single_account_ten_kb() {
-    commit_single_account(10 * 1024, CommitStrategy::Args, false).await;
+    commit_single_account(10 * 1024, CommitStrategy::FromBuffer, false).await;
 }
 
 async fn commit_single_account(
@@ -265,7 +265,7 @@ async fn test_commit_5_accounts_1kb_bundle_size_3_undelegate_all() {
         3,
         expect_strategies(&[
             // Intent fits in 1 TX only with ALT, see IntentExecutorImpl::try_unite_tasks
-            (CommitStrategy::ArgsWithLookupTable, 3),
+            (CommitStrategy::FromBufferWithLookupTable, 3),
             (CommitStrategy::Args, 2),
         ]),
         true,
@@ -309,7 +309,7 @@ async fn test_commit_5_accounts_1kb_bundle_size_4_undelegate_all() {
 async fn test_commit_5_accounts_1kb_bundle_size_5_undelegate_all() {
     commit_5_accounts_1kb(
         5,
-        expect_strategies(&[(CommitStrategy::ArgsWithLookupTable, 5)]),
+        expect_strategies(&[(CommitStrategy::FromBufferWithLookupTable, 5)]),
         true,
     )
     .await;