@@ -201,21 +201,21 @@ init_vote_account_state( fd_exec_instr_ctx_t * ctx,
201201 fd_vote_program_v3_create_new (
202202 vote_init ,
203203 clock ,
204- ctx -> txn_ctx -> exec_stack -> vote_program .init_account .authorized_voters_mem ,
204+ ctx -> runtime -> vote_program .init_account .authorized_voters_mem ,
205205 versioned
206206 );
207207 return fd_vote_state_v3_set_vote_account_state (
208208 ctx ,
209209 vote_account ,
210210 versioned ,
211- ctx -> txn_ctx -> exec_stack -> vote_program .init_account .vote_lockout_mem
211+ ctx -> runtime -> vote_program .init_account .vote_lockout_mem
212212 );
213213 case VOTE_STATE_TARGET_VERSION_V4 :
214214 fd_vote_state_v4_create_new (
215215 & vote_init -> node_pubkey ,
216216 vote_init ,
217217 clock ,
218- ctx -> txn_ctx -> exec_stack -> vote_program .init_account .authorized_voters_mem ,
218+ ctx -> runtime -> vote_program .init_account .authorized_voters_mem ,
219219 versioned
220220 );
221221 return fd_vote_state_v4_set_vote_account_state ( ctx , vote_account , versioned );
@@ -582,7 +582,7 @@ process_new_vote_state( fd_exec_instr_ctx_t * ctx,
582582 if ( FD_UNLIKELY ( has_new_root && has_root_slot ) ) {
583583 // https://github.com/anza-xyz/agave/blob/v2.0.1/programs/vote/src/vote_state/mod.rs#L581
584584 if ( FD_UNLIKELY ( new_root < * root_slot ) ) {
585- ctx -> txn_ctx -> err .custom_err = FD_VOTE_ERR_ROOT_ROLL_BACK ;
585+ ctx -> txn_out -> err .custom_err = FD_VOTE_ERR_ROOT_ROLL_BACK ;
586586 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
587587 }
588588 } else if ( FD_UNLIKELY ( !has_new_root && has_root_slot ) ) {
@@ -622,7 +622,7 @@ process_new_vote_state( fd_exec_instr_ctx_t * ctx,
622622 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
623623 } else if ( FD_UNLIKELY ( vote -> lockout .slot >
624624 fd_vote_lockout_last_locked_out_slot ( & previous_vote -> lockout ) ) ) {
625- ctx -> txn_ctx -> err .custom_err = FD_VOTE_ERR_NEW_VOTE_STATE_LOCKOUT_MISMATCH ;
625+ ctx -> txn_out -> err .custom_err = FD_VOTE_ERR_NEW_VOTE_STATE_LOCKOUT_MISMATCH ;
626626 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
627627 }
628628 }
@@ -813,14 +813,14 @@ authorize( fd_exec_instr_ctx_t * ctx,
813813 vote_account ,
814814 target_version ,
815815 0 ,
816- ctx -> txn_ctx -> exec_stack -> vote_program .authorize .vote_state_mem ,
817- ctx -> txn_ctx -> exec_stack -> vote_program .authorize .authorized_voters_mem ,
818- ctx -> txn_ctx -> exec_stack -> vote_program .authorize .landed_votes_mem
816+ ctx -> runtime -> vote_program .authorize .vote_state_mem ,
817+ ctx -> runtime -> vote_program .authorize .authorized_voters_mem ,
818+ ctx -> runtime -> vote_program .authorize .landed_votes_mem
819819 );
820820 if ( FD_UNLIKELY ( rc ) ) return rc ;
821821
822822 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L729-L756 */
823- fd_vote_state_versioned_t * vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .authorize .vote_state_mem ;
823+ fd_vote_state_versioned_t * vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .authorize .vote_state_mem ;
824824 switch ( vote_authorize .discriminant ) {
825825
826826 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L730-L750 */
@@ -872,7 +872,7 @@ authorize( fd_exec_instr_ctx_t * ctx,
872872 ctx ,
873873 vote_account ,
874874 vote_state_versioned ,
875- ctx -> txn_ctx -> exec_stack -> vote_program .authorize .vote_lockout_mem
875+ ctx -> runtime -> vote_program .authorize .vote_lockout_mem
876876 );
877877}
878878
@@ -888,13 +888,13 @@ update_validator_identity( fd_exec_instr_ctx_t * ctx,
888888 vote_account ,
889889 target_version ,
890890 0 ,
891- ctx -> txn_ctx -> exec_stack -> vote_program .update_validator_identity .vote_state_mem ,
892- ctx -> txn_ctx -> exec_stack -> vote_program .update_validator_identity .authorized_voters_mem ,
893- ctx -> txn_ctx -> exec_stack -> vote_program .update_validator_identity .landed_votes_mem
891+ ctx -> runtime -> vote_program .update_validator_identity .vote_state_mem ,
892+ ctx -> runtime -> vote_program .update_validator_identity .authorized_voters_mem ,
893+ ctx -> runtime -> vote_program .update_validator_identity .landed_votes_mem
894894 );
895895 if ( FD_UNLIKELY ( rc ) ) return rc ;
896896
897- fd_vote_state_versioned_t * vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .update_validator_identity .vote_state_mem ;
897+ fd_vote_state_versioned_t * vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .update_validator_identity .vote_state_mem ;
898898
899899 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L774 */
900900 rc = fd_vote_verify_authorized_signer (
@@ -918,7 +918,7 @@ update_validator_identity( fd_exec_instr_ctx_t * ctx,
918918 ctx ,
919919 vote_account ,
920920 vote_state_versioned ,
921- ctx -> txn_ctx -> exec_stack -> vote_program .update_validator_identity .vote_lockout_mem
921+ ctx -> runtime -> vote_program .update_validator_identity .vote_lockout_mem
922922 );
923923}
924924
@@ -950,22 +950,22 @@ update_commission( fd_exec_instr_ctx_t * ctx,
950950 vote_account ,
951951 target_version ,
952952 false,
953- ctx -> txn_ctx -> exec_stack -> vote_program .update_commission .vote_state_mem ,
954- ctx -> txn_ctx -> exec_stack -> vote_program .update_commission .authorized_voters_mem ,
955- ctx -> txn_ctx -> exec_stack -> vote_program .update_commission .landed_votes_mem
953+ ctx -> runtime -> vote_program .update_commission .vote_state_mem ,
954+ ctx -> runtime -> vote_program .update_commission .authorized_voters_mem ,
955+ ctx -> runtime -> vote_program .update_commission .landed_votes_mem
956956 );
957957
958958 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L800-L804 */
959959 fd_vote_state_versioned_t * vote_state_versioned = NULL ;
960960 int enforce_commission_update_rule = 1 ;
961961 if ( FD_LIKELY ( rc == FD_EXECUTOR_INSTR_SUCCESS ) ) {
962- vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .update_commission .vote_state_mem ;
962+ vote_state_versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .update_commission .vote_state_mem ;
963963 enforce_commission_update_rule = (commission > fd_vsv_get_commission ( vote_state_versioned ));
964964 }
965965
966966 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L806-L808 */
967967 if ( FD_UNLIKELY ( enforce_commission_update_rule && !is_commission_update_allowed ( clock -> slot , epoch_schedule ) ) ) {
968- ctx -> txn_ctx -> err .custom_err = FD_VOTE_ERR_COMMISSION_UPDATE_TOO_LATE ;
968+ ctx -> txn_out -> err .custom_err = FD_VOTE_ERR_COMMISSION_UPDATE_TOO_LATE ;
969969 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
970970 }
971971
@@ -987,7 +987,7 @@ update_commission( fd_exec_instr_ctx_t * ctx,
987987 ctx ,
988988 vote_account ,
989989 vote_state_versioned ,
990- ctx -> txn_ctx -> exec_stack -> vote_program .update_commission .vote_lockout_mem
990+ ctx -> runtime -> vote_program .update_commission .vote_lockout_mem
991991 );
992992}
993993
@@ -1006,13 +1006,13 @@ withdraw( fd_exec_instr_ctx_t * ctx,
10061006 vote_account ,
10071007 target_version ,
10081008 0 ,
1009- ctx -> txn_ctx -> exec_stack -> vote_program .withdraw .vote_state_mem ,
1010- ctx -> txn_ctx -> exec_stack -> vote_program .withdraw .authorized_voters_mem ,
1011- ctx -> txn_ctx -> exec_stack -> vote_program .withdraw .landed_votes_mem
1009+ ctx -> runtime -> vote_program .withdraw .vote_state_mem ,
1010+ ctx -> runtime -> vote_program .withdraw .authorized_voters_mem ,
1011+ ctx -> runtime -> vote_program .withdraw .landed_votes_mem
10121012 );
10131013 if ( FD_UNLIKELY ( rc ) ) return rc ;
10141014
1015- fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .withdraw .vote_state_mem ;
1015+ fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .withdraw .vote_state_mem ;
10161016
10171017 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L865 */
10181018 rc = fd_vote_verify_authorized_signer (
@@ -1042,14 +1042,14 @@ withdraw( fd_exec_instr_ctx_t * ctx,
10421042
10431043 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L885-L890 */
10441044 if ( FD_UNLIKELY ( reject_active_vote_account_close ) ) {
1045- ctx -> txn_ctx -> err .custom_err = FD_VOTE_ERR_ACTIVE_VOTE_ACCOUNT_CLOSE ;
1045+ ctx -> txn_out -> err .custom_err = FD_VOTE_ERR_ACTIVE_VOTE_ACCOUNT_CLOSE ;
10461046 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
10471047 } else {
10481048 rc = fd_vsv_deinitialize_vote_account_state (
10491049 ctx ,
10501050 vote_account ,
10511051 target_version ,
1052- ctx -> txn_ctx -> exec_stack -> vote_program .withdraw .vote_lockout_mem
1052+ ctx -> runtime -> vote_program .withdraw .vote_lockout_mem
10531053 );
10541054 if ( FD_UNLIKELY ( rc ) ) return rc ;
10551055 }
@@ -1184,7 +1184,7 @@ initialize_account( fd_exec_instr_ctx_t * ctx,
11841184 if ( FD_UNLIKELY ( rc ) ) return rc ;
11851185
11861186 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L916 */
1187- rc = fd_vsv_get_state ( vote_account -> acct , ctx -> txn_ctx -> exec_stack -> vote_program .init_account .vote_state_mem );
1187+ rc = fd_vsv_get_state ( vote_account -> acct , ctx -> runtime -> vote_program .init_account .vote_state_mem );
11881188 if ( FD_UNLIKELY ( rc ) ) return rc ;
11891189 fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .init_account .vote_state_mem ;
11901190
@@ -1217,13 +1217,13 @@ process_vote_with_account( fd_exec_instr_ctx_t * ctx,
12171217 vote_account ,
12181218 target_version ,
12191219 1 ,
1220- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_state_mem ,
1221- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .authorized_voters_mem ,
1222- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .landed_votes_mem
1220+ ctx -> runtime -> vote_program .process_vote .vote_state_mem ,
1221+ ctx -> runtime -> vote_program .process_vote .authorized_voters_mem ,
1222+ ctx -> runtime -> vote_program .process_vote .landed_votes_mem
12231223 );
12241224 if ( FD_UNLIKELY ( rc ) ) return rc ;
12251225
1226- fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_state_mem ;
1226+ fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .process_vote .vote_state_mem ;
12271227
12281228 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L941 */
12291229 fd_pubkey_t * authorized_voter = NULL ;
@@ -1242,7 +1242,7 @@ process_vote_with_account( fd_exec_instr_ctx_t * ctx,
12421242 if ( FD_LIKELY ( vote -> has_timestamp ) ) {
12431243 /* Calling max() on an empty iterator returns None */
12441244 if ( FD_UNLIKELY ( deq_ulong_cnt ( vote -> slots )== 0 ) ) {
1245- ctx -> txn_ctx -> err .custom_err = FD_VOTE_ERR_EMPTY_SLOTS ;
1245+ ctx -> txn_out -> err .custom_err = FD_VOTE_ERR_EMPTY_SLOTS ;
12461246 return FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR ;
12471247 }
12481248
@@ -1265,7 +1265,7 @@ process_vote_with_account( fd_exec_instr_ctx_t * ctx,
12651265 ctx ,
12661266 vote_account ,
12671267 versioned ,
1268- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_lockout_mem
1268+ ctx -> runtime -> vote_program .process_vote .vote_lockout_mem
12691269 );
12701270}
12711271
@@ -1332,13 +1332,13 @@ process_vote_state_update( fd_exec_instr_ctx_t * ctx,
13321332 vote_account ,
13331333 target_version ,
13341334 1 ,
1335- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_state_mem ,
1336- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .authorized_voters_mem ,
1337- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .landed_votes_mem
1335+ ctx -> runtime -> vote_program .process_vote .vote_state_mem ,
1336+ ctx -> runtime -> vote_program .process_vote .authorized_voters_mem ,
1337+ ctx -> runtime -> vote_program .process_vote .landed_votes_mem
13381338 );
13391339 if ( FD_UNLIKELY ( rc ) ) return rc ;
13401340
1341- fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_state_mem ;
1341+ fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .process_vote .vote_state_mem ;
13421342
13431343 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L968 */
13441344 fd_pubkey_t * authorized_voter = NULL ;
@@ -1367,7 +1367,7 @@ process_vote_state_update( fd_exec_instr_ctx_t * ctx,
13671367 ctx ,
13681368 vote_account ,
13691369 versioned ,
1370- ctx -> txn_ctx -> exec_stack -> vote_program .process_vote .vote_lockout_mem
1370+ ctx -> runtime -> vote_program .process_vote .vote_lockout_mem
13711371 );
13721372}
13731373
@@ -1396,7 +1396,7 @@ do_process_tower_sync( fd_exec_instr_ctx_t * ctx,
13961396 return process_new_vote_state (
13971397 ctx ,
13981398 versioned ,
1399- fd_vote_landed_votes_from_lockouts ( tower_sync -> lockouts , ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .tower_sync_landed_votes_mem ),
1399+ fd_vote_landed_votes_from_lockouts ( tower_sync -> lockouts , ctx -> runtime -> vote_program .tower_sync .tower_sync_landed_votes_mem ),
14001400 tower_sync -> has_root ,
14011401 tower_sync -> root ,
14021402 tower_sync -> has_timestamp ,
@@ -1420,13 +1420,13 @@ process_tower_sync( fd_exec_instr_ctx_t * ctx,
14201420 vote_account ,
14211421 target_version ,
14221422 1 ,
1423- ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .vote_state_mem ,
1424- ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .authorized_voters_mem ,
1425- ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .vote_state_landed_votes_mem
1423+ ctx -> runtime -> vote_program .tower_sync .vote_state_mem ,
1424+ ctx -> runtime -> vote_program .tower_sync .authorized_voters_mem ,
1425+ ctx -> runtime -> vote_program .tower_sync .vote_state_landed_votes_mem
14261426 );
14271427 if ( FD_UNLIKELY ( rc ) ) return rc ;
14281428
1429- fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .vote_state_mem ;
1429+ fd_vote_state_versioned_t * versioned = (fd_vote_state_versioned_t * )ctx -> runtime -> vote_program .tower_sync .vote_state_mem ;
14301430
14311431 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_state/mod.rs#L1022 */
14321432 fd_pubkey_t * authorized_voter = NULL ;
@@ -1452,7 +1452,7 @@ process_tower_sync( fd_exec_instr_ctx_t * ctx,
14521452 ctx ,
14531453 vote_account ,
14541454 versioned ,
1455- ctx -> txn_ctx -> exec_stack -> vote_program .tower_sync .vote_lockout_mem
1455+ ctx -> runtime -> vote_program .tower_sync .vote_lockout_mem
14561456 );
14571457}
14581458
@@ -1583,7 +1583,7 @@ fd_vote_program_execute( fd_exec_instr_ctx_t * ctx ) {
15831583 }
15841584
15851585 /* https://github.com/anza-xyz/agave/blob/v3.1.1/programs/vote/src/vote_processor.rs#L69-L74 */
1586- int target_version = FD_FEATURE_ACTIVE_BANK ( ctx -> txn_ctx -> bank , vote_state_v4 ) ? VOTE_STATE_TARGET_VERSION_V4 : VOTE_STATE_TARGET_VERSION_V3 ;
1586+ int target_version = FD_FEATURE_ACTIVE_BANK ( ctx -> bank , vote_state_v4 ) ? VOTE_STATE_TARGET_VERSION_V4 : VOTE_STATE_TARGET_VERSION_V3 ;
15871587
15881588 // https://github.com/anza-xyz/agave/blob/v2.0.1/programs/vote/src/vote_processor.rs#L69
15891589 fd_pubkey_t const * signers [FD_TXN_SIG_MAX ] = { 0 };
0 commit comments