fix(contract): migrate old Config layout and bump reshare gas

Adding the verifier-vote cleanup broke two things:

- The sixth detached cleanup promise in vote_reshared pushed total cleanup
  gas to 39 TGas, over the fixed GAS_FOR_VOTE_RESHARED test budget. Raise it
  to 50 TGas (production attaches max gas, so it is unaffected).

- The new remove_non_participant_tee_verifier_votes_tera_gas field changed
  Config's borsh layout, so migrate() could no longer deserialize production
  state written with the old layout. Shadow the old 13-field Config as
  OldConfig in the v3.12.0 migration state and convert it into the current
  Config, defaulting the new field.

Author: pbeza

crates/contract/src/v3_12_0_state.rs

@@ -12,7 +12,7 @@ use near_mpc_contract_interface::types::{Metrics, VerifyForeignTransactionReques
 use near_sdk::store::{Lazy, LookupMap};
 
 use crate::{
-    Config, SupportedForeignChainsByNode,
+    SupportedForeignChainsByNode,
     foreign_chain_rpc::ForeignChainRpcWhitelist,
     foreign_chains_metadata::ForeignChainsMetadata,
     node_migrations::NodeMigrations,
@@ -26,6 +26,54 @@ use crate::{
     update::ProposedUpdates,
 };
 
+/// The `Config` layout written by the `3.12.0` contract, before
+/// `remove_non_participant_tee_verifier_votes_tera_gas` was appended.
+#[derive(Debug, BorshSerialize, BorshDeserialize)]
+pub struct OldConfig {
+    key_event_timeout_blocks: u64,
+    tee_upgrade_deadline_duration_seconds: u64,
+    contract_upgrade_deposit_tera_gas: u64,
+    sign_call_gas_attachment_requirement_tera_gas: u64,
+    ckd_call_gas_attachment_requirement_tera_gas: u64,
+    return_signature_and_clean_state_on_success_call_tera_gas: u64,
+    return_ck_and_clean_state_on_success_call_tera_gas: u64,
+    fail_on_timeout_tera_gas: u64,
+    clean_tee_status_tera_gas: u64,
+    clean_invalid_attestations_tera_gas: u64,
+    cleanup_orphaned_node_migrations_tera_gas: u64,
+    remove_non_participant_update_votes_tera_gas: u64,
+    clean_foreign_chain_data_tera_gas: u64,
+}
+
+impl From<OldConfig> for crate::Config {
+    fn from(old: OldConfig) -> Self {
+        crate::Config {
+            key_event_timeout_blocks: old.key_event_timeout_blocks,
+            tee_upgrade_deadline_duration_seconds: old.tee_upgrade_deadline_duration_seconds,
+            contract_upgrade_deposit_tera_gas: old.contract_upgrade_deposit_tera_gas,
+            sign_call_gas_attachment_requirement_tera_gas: old
+                .sign_call_gas_attachment_requirement_tera_gas,
+            ckd_call_gas_attachment_requirement_tera_gas: old
+                .ckd_call_gas_attachment_requirement_tera_gas,
+            return_signature_and_clean_state_on_success_call_tera_gas: old
+                .return_signature_and_clean_state_on_success_call_tera_gas,
+            return_ck_and_clean_state_on_success_call_tera_gas: old
+                .return_ck_and_clean_state_on_success_call_tera_gas,
+            fail_on_timeout_tera_gas: old.fail_on_timeout_tera_gas,
+            clean_tee_status_tera_gas: old.clean_tee_status_tera_gas,
+            clean_invalid_attestations_tera_gas: old.clean_invalid_attestations_tera_gas,
+            cleanup_orphaned_node_migrations_tera_gas: old
+                .cleanup_orphaned_node_migrations_tera_gas,
+            remove_non_participant_update_votes_tera_gas: old
+                .remove_non_participant_update_votes_tera_gas,
+            clean_foreign_chain_data_tera_gas: old.clean_foreign_chain_data_tera_gas,
+            // New in this version: default the gas for the verifier-vote cleanup
+            // promise added after `3.12.0`.
+            ..crate::Config::default()
+        }
+    }
+}
+
 /// Keep this module in sync with [`crate::MpcContract`]: the moment a field's borsh
 /// layout diverges, shadow the old type here (see this module's history for examples) so
 /// state written by the `3.12.0` contract still deserializes during migration.
@@ -37,7 +85,7 @@ pub struct MpcContract {
     pending_verify_foreign_tx_requests: LookupMap<VerifyForeignTransactionRequest, Vec<YieldIndex>>,
     proposed_updates: ProposedUpdates,
     node_foreign_chain_support: SupportedForeignChainsByNode,
-    config: Config,
+    config: OldConfig,
     tee_state: TeeState,
     accept_requests: bool,
     node_migrations: NodeMigrations,
@@ -54,7 +102,7 @@ impl From<MpcContract> for crate::MpcContract {
             pending_verify_foreign_tx_requests: old.pending_verify_foreign_tx_requests,
             proposed_updates: old.proposed_updates,
             node_foreign_chain_support: old.node_foreign_chain_support,
-            config: old.config,
+            config: old.config.into(),
             tee_state: old.tee_state,
             accept_requests: old.accept_requests,
             node_migrations: old.node_migrations,

crates/contract/tests/sandbox/utils/consts.rs

@@ -17,7 +17,7 @@ pub const ALL_PROTOCOLS: &[Protocol; 4] = &[
 /// gas attachment; in practice, nodes usually attach the maximum available gas. For testing,
 /// we use this constant to attach a fixed amount to each call and detect if gas usage
 /// increases unexpectedly in the future.
-pub const GAS_FOR_VOTE_RESHARED: Gas = Gas::from_tgas(44);
+pub const GAS_FOR_VOTE_RESHARED: Gas = Gas::from_tgas(50);
 pub const GAS_FOR_VOTE_PK: Gas = Gas::from_tgas(22);
 pub const GAS_FOR_VOTE_CANCEL_KEYGEN: Gas = Gas::from_tgas(5);
 pub const GAS_FOR_VOTE_CANCEL_RESHARING: Gas = Gas::from_tgas(5);