vote_account_api: remove duplicated code

firedancer-io · Jun 26, 2024 · 5746b25 · 5746b25
1 parent d11a36b
commit 5746b25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 42 deletions.
diff --git a/config/extra/with-lz4.mk b/config/extra/with-lz4.mk
@@ -3,5 +3,5 @@ FD_HAS_LZ4:=1
 CFLAGS+=-DFD_HAS_LZ4=1
 LDFLAGS+=opt/lib/liblz4.a
 else
-$(warning "lz4 not installed, skipping")
+$(info "lz4 not installed, skipping")
 endif
diff --git a/src/flamenco/runtime/program/fd_vote_program.c b/src/flamenco/runtime/program/fd_vote_program.c
@@ -141,27 +141,6 @@ from_vote_state_1_14_11( fd_vote_state_t *         vote_state,
 /* impl VoteAccount                                                   */
 /**********************************************************************/
 
-// https://github.com/anza-xyz/agave/blob/v2.0.0/sdk/src/transaction_context.rs#L800
-static inline int
-checked_add_lamports( fd_account_meta_t * self, ulong lamports ) {
-  if( FD_UNLIKELY( self->info.lamports + lamports < self->info.lamports ) ) {
-    return FD_EXECUTOR_INSTR_ERR_ARITHMETIC_OVERFLOW;
-  };
-
-  self->info.lamports += lamports;
-  return 0;
-}
-
-// https://github.com/anza-xyz/agave/blob/v2.0.0/sdk/src/transaction_context.rs#L810
-static inline int
-checked_sub_lamports( fd_account_meta_t * self, ulong lamports ) {
-  if( FD_UNLIKELY( self->info.lamports - lamports > self->info.lamports ) ) {
-    return FD_EXECUTOR_INSTR_ERR_ARITHMETIC_OVERFLOW;
-  };
-  self->info.lamports -= lamports;
-  return 0;
-}
-
 // https://github.com/firedancer-io/solana/blob/da470eef4652b3b22598a1f379cacfe82bd5928d/programs/vote/src/vote_state/mod.rs#L966
 static int
 get_state( fd_borrowed_account_t const * self,
@@ -1599,30 +1578,12 @@ withdraw(
     }
   }
 
-  // https://github.com/firedancer-io/solana/blob/da470eef4652b3b22598a1f379cacfe82bd5928d/programs/vote/src/vote_state/mod.rs#L941
-  rc = fd_instr_borrowed_account_modify_idx(
-      ctx, vote_acct_idx, 0 /* TODO min_data_sz */, &vote_account );
-  if( FD_UNLIKELY( rc ) ) return rc;
-
-  rc = checked_sub_lamports( vote_account->meta, lamports );
+  rc = fd_account_checked_sub_lamports(ctx, vote_acct_idx, lamports);
   if( FD_UNLIKELY( rc ) ) return rc;
 
-  // https://github.com/firedancer-io/solana/blob/da470eef4652b3b22598a1f379cacfe82bd5928d/programs/vote/src/vote_state/mod.rs#L943-L944
-  fd_borrowed_account_t * to_account = NULL;
-
-  rc = fd_instr_borrowed_account_modify_idx(
-      ctx, to_account_index, 0 /* TODO min_data_sz */, &to_account );
-  if( FD_UNLIKELY( rc ) ) return rc;
-
-  // https://github.com/firedancer-io/solana/blob/da470eef4652b3b22598a1f379cacfe82bd5928d/programs/vote/src/vote_state/mod.rs#L945
-  rc = checked_add_lamports( to_account->meta, lamports );
+  rc = fd_account_checked_add_lamports(ctx, to_account_index, lamports);
   if( FD_UNLIKELY( rc ) ) return rc;
 
-  // TODO: is there a better way to add to dirty list?
-  if( FD_UNLIKELY( lamports == 0 ) ) {
-    vote_account->meta->slot = ctx->slot_ctx->slot_bank.slot;
-    to_account->meta->slot   = ctx->slot_ctx->slot_bank.slot;
-  }
   return 0;
 }