diff --git a/crates/sui-core/tests/staged/sui.yaml b/crates/sui-core/tests/staged/sui.yaml
index 5899c80ea3805c..e69de29bb2d1d6 100644
--- a/crates/sui-core/tests/staged/sui.yaml
+++ b/crates/sui-core/tests/staged/sui.yaml
@@ -1,1218 +0,0 @@
----
-AccountAddress:
-  NEWTYPESTRUCT:
-    TUPLEARRAY:
-      CONTENT: U8
-      SIZE: 32
-ActiveJwk:
-  STRUCT:
-    - jwk_id:
-        TYPENAME: JwkId
-    - jwk:
-        TYPENAME: JWK
-    - epoch: U64
-Argument:
-  ENUM:
-    0:
-      GasCoin: UNIT
-    1:
-      Input:
-        NEWTYPE: U16
-    2:
-      Result:
-        NEWTYPE: U16
-    3:
-      NestedResult:
-        TUPLE:
-          - U16
-          - U16
-AuthenticatorStateExpire:
-  STRUCT:
-    - min_epoch: U64
-    - authenticator_obj_initial_shared_version:
-        TYPENAME: SequenceNumber
-AuthenticatorStateUpdate:
-  STRUCT:
-    - epoch: U64
-    - round: U64
-    - new_active_jwks:
-        SEQ:
-          TYPENAME: ActiveJwk
-    - authenticator_obj_initial_shared_version:
-        TYPENAME: SequenceNumber
-AuthorityPublicKeyBytes:
-  NEWTYPESTRUCT: BYTES
-AuthorityQuorumSignInfo:
-  STRUCT:
-    - epoch: U64
-    - signature:
-        TUPLEARRAY:
-          CONTENT: U8
-          SIZE: 48
-    - signers_map: BYTES
-CallArg:
-  ENUM:
-    0:
-      Pure:
-        NEWTYPE:
-          SEQ: U8
-    1:
-      Object:
-        NEWTYPE:
-          TYPENAME: ObjectArg
-ChainIdentifier:
-  NEWTYPESTRUCT:
-    TYPENAME: CheckpointDigest
-ChangeEpoch:
-  STRUCT:
-    - epoch: U64
-    - protocol_version:
-        TYPENAME: ProtocolVersion
-    - storage_charge: U64
-    - computation_charge: U64
-    - storage_rebate: U64
-    - non_refundable_storage_fee: U64
-    - epoch_start_timestamp_ms: U64
-    - system_packages:
-        SEQ:
-          TUPLE:
-            - TYPENAME: SequenceNumber
-            - SEQ:
-                SEQ: U8
-            - SEQ:
-                TYPENAME: ObjectID
-CheckpointCommitment:
-  ENUM:
-    0:
-      ECMHLiveObjectSetDigest:
-        NEWTYPE:
-          TYPENAME: ECMHLiveObjectSetDigest
-CheckpointContents:
-  ENUM:
-    0:
-      V1:
-        NEWTYPE:
-          TYPENAME: CheckpointContentsV1
-CheckpointContentsDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-CheckpointContentsV1:
-  STRUCT:
-    - transactions:
-        SEQ:
-          TYPENAME: ExecutionDigests
-    - user_signatures:
-        SEQ:
-          SEQ:
-            TYPENAME: GenericSignature
-CheckpointData:
-  STRUCT:
-    - checkpoint_summary:
-        TYPENAME: "sui_types::message_envelope::Envelope<sui_types::messages_checkpoint::CheckpointSummary, sui_types::crypto::AuthorityQuorumSignInfo<true>>"
-    - checkpoint_contents:
-        TYPENAME: CheckpointContents
-    - transactions:
-        SEQ:
-          TYPENAME: CheckpointTransaction
-CheckpointDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-CheckpointSummary:
-  STRUCT:
-    - epoch: U64
-    - sequence_number: U64
-    - network_total_transactions: U64
-    - content_digest:
-        TYPENAME: CheckpointContentsDigest
-    - previous_digest:
-        OPTION:
-          TYPENAME: CheckpointDigest
-    - epoch_rolling_gas_cost_summary:
-        TYPENAME: GasCostSummary
-    - timestamp_ms: U64
-    - checkpoint_commitments:
-        SEQ:
-          TYPENAME: CheckpointCommitment
-    - end_of_epoch_data:
-        OPTION:
-          TYPENAME: EndOfEpochData
-    - version_specific_data:
-        SEQ: U8
-CheckpointTransaction:
-  STRUCT:
-    - transaction:
-        TYPENAME: "sui_types::message_envelope::Envelope<sui_types::transaction::SenderSignedData, sui_types::crypto::EmptySignInfo>"
-    - effects:
-        TYPENAME: TransactionEffects
-    - events:
-        OPTION:
-          TYPENAME: TransactionEvents
-    - input_objects:
-        SEQ:
-          TYPENAME: Object
-    - output_objects:
-        SEQ:
-          TYPENAME: Object
-Command:
-  ENUM:
-    0:
-      MoveCall:
-        NEWTYPE:
-          TYPENAME: ProgrammableMoveCall
-    1:
-      TransferObjects:
-        TUPLE:
-          - SEQ:
-              TYPENAME: Argument
-          - TYPENAME: Argument
-    2:
-      SplitCoins:
-        TUPLE:
-          - TYPENAME: Argument
-          - SEQ:
-              TYPENAME: Argument
-    3:
-      MergeCoins:
-        TUPLE:
-          - TYPENAME: Argument
-          - SEQ:
-              TYPENAME: Argument
-    4:
-      Publish:
-        TUPLE:
-          - SEQ:
-              SEQ: U8
-          - SEQ:
-              TYPENAME: ObjectID
-    5:
-      MakeMoveVec:
-        TUPLE:
-          - OPTION:
-              TYPENAME: TypeInput
-          - SEQ:
-              TYPENAME: Argument
-    6:
-      Upgrade:
-        TUPLE:
-          - SEQ:
-              SEQ: U8
-          - SEQ:
-              TYPENAME: ObjectID
-          - TYPENAME: ObjectID
-          - TYPENAME: Argument
-CommandArgumentError:
-  ENUM:
-    0:
-      TypeMismatch: UNIT
-    1:
-      InvalidBCSBytes: UNIT
-    2:
-      InvalidUsageOfPureArg: UNIT
-    3:
-      InvalidArgumentToPrivateEntryFunction: UNIT
-    4:
-      IndexOutOfBounds:
-        STRUCT:
-          - idx: U16
-    5:
-      SecondaryIndexOutOfBounds:
-        STRUCT:
-          - result_idx: U16
-          - secondary_idx: U16
-    6:
-      InvalidResultArity:
-        STRUCT:
-          - result_idx: U16
-    7:
-      InvalidGasCoinUsage: UNIT
-    8:
-      InvalidValueUsage: UNIT
-    9:
-      InvalidObjectByValue: UNIT
-    10:
-      InvalidObjectByMutRef: UNIT
-    11:
-      SharedObjectOperationNotAllowed: UNIT
-CompressedSignature:
-  ENUM:
-    0:
-      Ed25519:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 64
-    1:
-      Secp256k1:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 64
-    2:
-      Secp256r1:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 64
-    3:
-      ZkLogin:
-        NEWTYPE:
-          TYPENAME: ZkLoginAuthenticatorAsBytes
-CongestedObjects:
-  NEWTYPESTRUCT:
-    SEQ:
-      TYPENAME: ObjectID
-ConsensusCommitDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-ConsensusCommitPrologue:
-  STRUCT:
-    - epoch: U64
-    - round: U64
-    - commit_timestamp_ms: U64
-ConsensusCommitPrologueV2:
-  STRUCT:
-    - epoch: U64
-    - round: U64
-    - commit_timestamp_ms: U64
-    - consensus_commit_digest:
-        TYPENAME: ConsensusCommitDigest
-ConsensusCommitPrologueV3:
-  STRUCT:
-    - epoch: U64
-    - round: U64
-    - sub_dag_index:
-        OPTION: U64
-    - commit_timestamp_ms: U64
-    - consensus_commit_digest:
-        TYPENAME: ConsensusCommitDigest
-    - consensus_determined_version_assignments:
-        TYPENAME: ConsensusDeterminedVersionAssignments
-ConsensusDeterminedVersionAssignments:
-  ENUM:
-    0:
-      CancelledTransactions:
-        NEWTYPE:
-          SEQ:
-            TUPLE:
-              - TYPENAME: TransactionDigest
-              - SEQ:
-                  TUPLE:
-                    - TYPENAME: ObjectID
-                    - TYPENAME: SequenceNumber
-Data:
-  ENUM:
-    0:
-      Move:
-        NEWTYPE:
-          TYPENAME: MoveObject
-    1:
-      Package:
-        NEWTYPE:
-          TYPENAME: MovePackage
-DeleteKind:
-  ENUM:
-    0:
-      Normal: UNIT
-    1:
-      UnwrapThenDelete: UNIT
-    2:
-      Wrap: UNIT
-Digest:
-  NEWTYPESTRUCT: BYTES
-ECMHLiveObjectSetDigest:
-  STRUCT:
-    - digest:
-        TYPENAME: Digest
-EffectsAuxDataDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-EffectsObjectChange:
-  STRUCT:
-    - input_state:
-        TYPENAME: ObjectIn
-    - output_state:
-        TYPENAME: ObjectOut
-    - id_operation:
-        TYPENAME: IDOperation
-EmptySignInfo:
-  STRUCT: []
-EndOfEpochData:
-  STRUCT:
-    - nextEpochCommittee:
-        SEQ:
-          TUPLE:
-            - TYPENAME: AuthorityPublicKeyBytes
-            - U64
-    - nextEpochProtocolVersion:
-        TYPENAME: ProtocolVersion
-    - epochCommitments:
-        SEQ:
-          TYPENAME: CheckpointCommitment
-EndOfEpochTransactionKind:
-  ENUM:
-    0:
-      ChangeEpoch:
-        NEWTYPE:
-          TYPENAME: ChangeEpoch
-    1:
-      AuthenticatorStateCreate: UNIT
-    2:
-      AuthenticatorStateExpire:
-        NEWTYPE:
-          TYPENAME: AuthenticatorStateExpire
-    3:
-      RandomnessStateCreate: UNIT
-    4:
-      DenyListStateCreate: UNIT
-    5:
-      BridgeStateCreate:
-        NEWTYPE:
-          TYPENAME: ChainIdentifier
-    6:
-      BridgeCommitteeInit:
-        NEWTYPE:
-          TYPENAME: SequenceNumber
-Event:
-  STRUCT:
-    - package_id:
-        TYPENAME: ObjectID
-    - transaction_module: STR
-    - sender:
-        TYPENAME: SuiAddress
-    - type_:
-        TYPENAME: StructTag
-    - contents: BYTES
-ExecutionData:
-  STRUCT:
-    - transaction:
-        TYPENAME: "sui_types::message_envelope::Envelope<sui_types::transaction::SenderSignedData, sui_types::crypto::EmptySignInfo>"
-    - effects:
-        TYPENAME: TransactionEffects
-ExecutionDigests:
-  STRUCT:
-    - transaction:
-        TYPENAME: TransactionDigest
-    - effects:
-        TYPENAME: TransactionEffectsDigest
-ExecutionFailureStatus:
-  ENUM:
-    0:
-      InsufficientGas: UNIT
-    1:
-      InvalidGasObject: UNIT
-    2:
-      InvariantViolation: UNIT
-    3:
-      FeatureNotYetSupported: UNIT
-    4:
-      MoveObjectTooBig:
-        STRUCT:
-          - object_size: U64
-          - max_object_size: U64
-    5:
-      MovePackageTooBig:
-        STRUCT:
-          - object_size: U64
-          - max_object_size: U64
-    6:
-      CircularObjectOwnership:
-        STRUCT:
-          - object:
-              TYPENAME: ObjectID
-    7:
-      InsufficientCoinBalance: UNIT
-    8:
-      CoinBalanceOverflow: UNIT
-    9:
-      PublishErrorNonZeroAddress: UNIT
-    10:
-      SuiMoveVerificationError: UNIT
-    11:
-      MovePrimitiveRuntimeError:
-        NEWTYPE:
-          TYPENAME: MoveLocationOpt
-    12:
-      MoveAbort:
-        TUPLE:
-          - TYPENAME: MoveLocation
-          - U64
-    13:
-      VMVerificationOrDeserializationError: UNIT
-    14:
-      VMInvariantViolation: UNIT
-    15:
-      FunctionNotFound: UNIT
-    16:
-      ArityMismatch: UNIT
-    17:
-      TypeArityMismatch: UNIT
-    18:
-      NonEntryFunctionInvoked: UNIT
-    19:
-      CommandArgumentError:
-        STRUCT:
-          - arg_idx: U16
-          - kind:
-              TYPENAME: CommandArgumentError
-    20:
-      TypeArgumentError:
-        STRUCT:
-          - argument_idx: U16
-          - kind:
-              TYPENAME: TypeArgumentError
-    21:
-      UnusedValueWithoutDrop:
-        STRUCT:
-          - result_idx: U16
-          - secondary_idx: U16
-    22:
-      InvalidPublicFunctionReturnType:
-        STRUCT:
-          - idx: U16
-    23:
-      InvalidTransferObject: UNIT
-    24:
-      EffectsTooLarge:
-        STRUCT:
-          - current_size: U64
-          - max_size: U64
-    25:
-      PublishUpgradeMissingDependency: UNIT
-    26:
-      PublishUpgradeDependencyDowngrade: UNIT
-    27:
-      PackageUpgradeError:
-        STRUCT:
-          - upgrade_error:
-              TYPENAME: PackageUpgradeError
-    28:
-      WrittenObjectsTooLarge:
-        STRUCT:
-          - current_size: U64
-          - max_size: U64
-    29:
-      CertificateDenied: UNIT
-    30:
-      SuiMoveVerificationTimedout: UNIT
-    31:
-      SharedObjectOperationNotAllowed: UNIT
-    32:
-      InputObjectDeleted: UNIT
-    33:
-      ExecutionCancelledDueToSharedObjectCongestion:
-        STRUCT:
-          - congested_objects:
-              TYPENAME: CongestedObjects
-    34:
-      AddressDeniedForCoin:
-        STRUCT:
-          - address:
-              TYPENAME: SuiAddress
-          - coin_type: STR
-    35:
-      CoinTypeGlobalPause:
-        STRUCT:
-          - coin_type: STR
-    36:
-      ExecutionCancelledDueToRandomnessUnavailable: UNIT
-ExecutionStatus:
-  ENUM:
-    0:
-      Success: UNIT
-    1:
-      Failure:
-        STRUCT:
-          - error:
-              TYPENAME: ExecutionFailureStatus
-          - command:
-              OPTION: U64
-FullCheckpointContents:
-  STRUCT:
-    - transactions:
-        SEQ:
-          TYPENAME: ExecutionData
-    - user_signatures:
-        SEQ:
-          SEQ:
-            TYPENAME: GenericSignature
-GasCostSummary:
-  STRUCT:
-    - computationCost: U64
-    - storageCost: U64
-    - storageRebate: U64
-    - nonRefundableStorageFee: U64
-GasData:
-  STRUCT:
-    - payment:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - owner:
-        TYPENAME: SuiAddress
-    - price: U64
-    - budget: U64
-GenericSignature:
-  NEWTYPESTRUCT:
-    SEQ: U8
-GenesisObject:
-  ENUM:
-    0:
-      RawObject:
-        STRUCT:
-          - data:
-              TYPENAME: Data
-          - owner:
-              TYPENAME: Owner
-GenesisTransaction:
-  STRUCT:
-    - objects:
-        SEQ:
-          TYPENAME: GenesisObject
-IDOperation:
-  ENUM:
-    0:
-      None: UNIT
-    1:
-      Created: UNIT
-    2:
-      Deleted: UNIT
-Intent:
-  STRUCT:
-    - scope: U8
-    - version: U8
-    - app_id: U8
-IntentMessage:
-  STRUCT:
-    - intent:
-        TYPENAME: Intent
-    - value:
-        TYPENAME: TransactionData
-JWK:
-  STRUCT:
-    - kty: STR
-    - e: STR
-    - n: STR
-    - alg: STR
-JwkId:
-  STRUCT:
-    - iss: STR
-    - kid: STR
-ModuleId:
-  STRUCT:
-    - address:
-        TYPENAME: AccountAddress
-    - name: STR
-MoveLocation:
-  STRUCT:
-    - module:
-        TYPENAME: ModuleId
-    - function: U16
-    - instruction: U16
-    - function_name:
-        OPTION: STR
-MoveLocationOpt:
-  NEWTYPESTRUCT:
-    OPTION:
-      TYPENAME: MoveLocation
-MoveObject:
-  STRUCT:
-    - type_:
-        TYPENAME: MoveObjectType
-    - has_public_transfer: BOOL
-    - version:
-        TYPENAME: SequenceNumber
-    - contents: BYTES
-MoveObjectType:
-  NEWTYPESTRUCT:
-    TYPENAME: MoveObjectType_
-MoveObjectType_:
-  ENUM:
-    0:
-      Other:
-        NEWTYPE:
-          TYPENAME: StructTag
-    1:
-      GasCoin: UNIT
-    2:
-      StakedSui: UNIT
-    3:
-      Coin:
-        NEWTYPE:
-          TYPENAME: TypeTag
-MovePackage:
-  STRUCT:
-    - id:
-        TYPENAME: ObjectID
-    - version:
-        TYPENAME: SequenceNumber
-    - module_map:
-        MAP:
-          KEY: STR
-          VALUE: BYTES
-    - type_origin_table:
-        SEQ:
-          TYPENAME: TypeOrigin
-    - linkage_table:
-        MAP:
-          KEY:
-            TYPENAME: ObjectID
-          VALUE:
-            TYPENAME: UpgradeInfo
-MultiSig:
-  STRUCT:
-    - sigs:
-        SEQ:
-          TYPENAME: CompressedSignature
-    - bitmap: U16
-    - multisig_pk:
-        TYPENAME: MultiSigPublicKey
-MultiSigPublicKey:
-  STRUCT:
-    - pk_map:
-        SEQ:
-          TUPLE:
-            - TYPENAME: PublicKey
-            - U8
-    - threshold: U16
-Object:
-  STRUCT:
-    - data:
-        TYPENAME: Data
-    - owner:
-        TYPENAME: Owner
-    - previous_transaction:
-        TYPENAME: TransactionDigest
-    - storage_rebate: U64
-ObjectArg:
-  ENUM:
-    0:
-      ImmOrOwnedObject:
-        NEWTYPE:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    1:
-      SharedObject:
-        STRUCT:
-          - id:
-              TYPENAME: ObjectID
-          - initial_shared_version:
-              TYPENAME: SequenceNumber
-          - mutable: BOOL
-    2:
-      Receiving:
-        NEWTYPE:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-ObjectDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-ObjectID:
-  NEWTYPESTRUCT:
-    TYPENAME: AccountAddress
-ObjectIn:
-  ENUM:
-    0:
-      NotExist: UNIT
-    1:
-      Exist:
-        NEWTYPE:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-ObjectInfoRequestKind:
-  ENUM:
-    0:
-      LatestObjectInfo: UNIT
-    1:
-      PastObjectInfoDebug:
-        NEWTYPE:
-          TYPENAME: SequenceNumber
-ObjectOut:
-  ENUM:
-    0:
-      NotExist: UNIT
-    1:
-      ObjectWrite:
-        NEWTYPE:
-          TUPLE:
-            - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    2:
-      PackageWrite:
-        NEWTYPE:
-          TUPLE:
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-Owner:
-  ENUM:
-    0:
-      AddressOwner:
-        NEWTYPE:
-          TYPENAME: SuiAddress
-    1:
-      ObjectOwner:
-        NEWTYPE:
-          TYPENAME: SuiAddress
-    2:
-      Shared:
-        STRUCT:
-          - initial_shared_version:
-              TYPENAME: SequenceNumber
-    3:
-      Immutable: UNIT
-PackageUpgradeError:
-  ENUM:
-    0:
-      UnableToFetchPackage:
-        STRUCT:
-          - package_id:
-              TYPENAME: ObjectID
-    1:
-      NotAPackage:
-        STRUCT:
-          - object_id:
-              TYPENAME: ObjectID
-    2:
-      IncompatibleUpgrade: UNIT
-    3:
-      DigestDoesNotMatch:
-        STRUCT:
-          - digest:
-              SEQ: U8
-    4:
-      UnknownUpgradePolicy:
-        STRUCT:
-          - policy: U8
-    5:
-      PackageIDDoesNotMatch:
-        STRUCT:
-          - package_id:
-              TYPENAME: ObjectID
-          - ticket_id:
-              TYPENAME: ObjectID
-ProgrammableMoveCall:
-  STRUCT:
-    - package:
-        TYPENAME: ObjectID
-    - module: STR
-    - function: STR
-    - type_arguments:
-        SEQ:
-          TYPENAME: TypeInput
-    - arguments:
-        SEQ:
-          TYPENAME: Argument
-ProgrammableTransaction:
-  STRUCT:
-    - inputs:
-        SEQ:
-          TYPENAME: CallArg
-    - commands:
-        SEQ:
-          TYPENAME: Command
-ProtocolVersion:
-  NEWTYPESTRUCT: U64
-PublicKey:
-  ENUM:
-    0:
-      Ed25519:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 32
-    1:
-      Secp256k1:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 33
-    2:
-      Secp256r1:
-        NEWTYPE:
-          TUPLEARRAY:
-            CONTENT: U8
-            SIZE: 33
-    3:
-      ZkLogin:
-        NEWTYPE:
-          TYPENAME: ZkLoginPublicIdentifier
-RandomnessRound:
-  NEWTYPESTRUCT: U64
-RandomnessStateUpdate:
-  STRUCT:
-    - epoch: U64
-    - randomness_round:
-        TYPENAME: RandomnessRound
-    - random_bytes:
-        SEQ: U8
-    - randomness_obj_initial_shared_version:
-        TYPENAME: SequenceNumber
-SenderSignedData:
-  NEWTYPESTRUCT:
-    SEQ:
-      TYPENAME: SenderSignedTransaction
-SenderSignedTransaction:
-  STRUCT:
-    - intent_message:
-        TYPENAME: IntentMessage
-    - tx_signatures:
-        SEQ:
-          TYPENAME: GenericSignature
-SequenceNumber:
-  NEWTYPESTRUCT: U64
-StructInput:
-  STRUCT:
-    - address:
-        TYPENAME: AccountAddress
-    - module: STR
-    - name: STR
-    - type_args:
-        SEQ:
-          TYPENAME: TypeInput
-StructTag:
-  STRUCT:
-    - address:
-        TYPENAME: AccountAddress
-    - module: STR
-    - name: STR
-    - type_args:
-        SEQ:
-          TYPENAME: TypeTag
-SuiAddress:
-  NEWTYPESTRUCT:
-    TUPLEARRAY:
-      CONTENT: U8
-      SIZE: 32
-TransactionData:
-  ENUM:
-    0:
-      V1:
-        NEWTYPE:
-          TYPENAME: TransactionDataV1
-TransactionDataV1:
-  STRUCT:
-    - kind:
-        TYPENAME: TransactionKind
-    - sender:
-        TYPENAME: SuiAddress
-    - gas_data:
-        TYPENAME: GasData
-    - expiration:
-        TYPENAME: TransactionExpiration
-TransactionDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-TransactionEffects:
-  ENUM:
-    0:
-      V1:
-        NEWTYPE:
-          TYPENAME: TransactionEffectsV1
-    1:
-      V2:
-        NEWTYPE:
-          TYPENAME: TransactionEffectsV2
-TransactionEffectsDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-TransactionEffectsV1:
-  STRUCT:
-    - status:
-        TYPENAME: ExecutionStatus
-    - executed_epoch: U64
-    - gas_used:
-        TYPENAME: GasCostSummary
-    - modified_at_versions:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-    - shared_objects:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - transaction_digest:
-        TYPENAME: TransactionDigest
-    - created:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - mutated:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - unwrapped:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - deleted:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - unwrapped_then_deleted:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - wrapped:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - gas_object:
-        TUPLE:
-          - TUPLE:
-              - TYPENAME: ObjectID
-              - TYPENAME: SequenceNumber
-              - TYPENAME: ObjectDigest
-          - TYPENAME: Owner
-    - events_digest:
-        OPTION:
-          TYPENAME: TransactionEventsDigest
-    - dependencies:
-        SEQ:
-          TYPENAME: TransactionDigest
-TransactionEffectsV2:
-  STRUCT:
-    - status:
-        TYPENAME: ExecutionStatus
-    - executed_epoch: U64
-    - gas_used:
-        TYPENAME: GasCostSummary
-    - transaction_digest:
-        TYPENAME: TransactionDigest
-    - gas_object_index:
-        OPTION: U32
-    - events_digest:
-        OPTION:
-          TYPENAME: TransactionEventsDigest
-    - dependencies:
-        SEQ:
-          TYPENAME: TransactionDigest
-    - lamport_version:
-        TYPENAME: SequenceNumber
-    - changed_objects:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: EffectsObjectChange
-    - unchanged_shared_objects:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: UnchangedSharedKind
-    - aux_data_digest:
-        OPTION:
-          TYPENAME: EffectsAuxDataDigest
-TransactionEvents:
-  STRUCT:
-    - data:
-        SEQ:
-          TYPENAME: Event
-TransactionEventsDigest:
-  NEWTYPESTRUCT:
-    TYPENAME: Digest
-TransactionExpiration:
-  ENUM:
-    0:
-      None: UNIT
-    1:
-      Epoch:
-        NEWTYPE: U64
-TransactionKind:
-  ENUM:
-    0:
-      ProgrammableTransaction:
-        NEWTYPE:
-          TYPENAME: ProgrammableTransaction
-    1:
-      ChangeEpoch:
-        NEWTYPE:
-          TYPENAME: ChangeEpoch
-    2:
-      Genesis:
-        NEWTYPE:
-          TYPENAME: GenesisTransaction
-    3:
-      ConsensusCommitPrologue:
-        NEWTYPE:
-          TYPENAME: ConsensusCommitPrologue
-    4:
-      AuthenticatorStateUpdate:
-        NEWTYPE:
-          TYPENAME: AuthenticatorStateUpdate
-    5:
-      EndOfEpochTransaction:
-        NEWTYPE:
-          SEQ:
-            TYPENAME: EndOfEpochTransactionKind
-    6:
-      RandomnessStateUpdate:
-        NEWTYPE:
-          TYPENAME: RandomnessStateUpdate
-    7:
-      ConsensusCommitPrologueV2:
-        NEWTYPE:
-          TYPENAME: ConsensusCommitPrologueV2
-    8:
-      ConsensusCommitPrologueV3:
-        NEWTYPE:
-          TYPENAME: ConsensusCommitPrologueV3
-TypeArgumentError:
-  ENUM:
-    0:
-      TypeNotFound: UNIT
-    1:
-      ConstraintNotSatisfied: UNIT
-TypeInput:
-  ENUM:
-    0:
-      bool: UNIT
-    1:
-      u8: UNIT
-    2:
-      u64: UNIT
-    3:
-      u128: UNIT
-    4:
-      address: UNIT
-    5:
-      signer: UNIT
-    6:
-      vector:
-        NEWTYPE:
-          TYPENAME: TypeInput
-    7:
-      struct:
-        NEWTYPE:
-          TYPENAME: StructInput
-    8:
-      u16: UNIT
-    9:
-      u32: UNIT
-    10:
-      u256: UNIT
-TypeOrigin:
-  STRUCT:
-    - module_name: STR
-    - datatype_name: STR
-    - package:
-        TYPENAME: ObjectID
-TypeTag:
-  ENUM:
-    0:
-      bool: UNIT
-    1:
-      u8: UNIT
-    2:
-      u64: UNIT
-    3:
-      u128: UNIT
-    4:
-      address: UNIT
-    5:
-      signer: UNIT
-    6:
-      vector:
-        NEWTYPE:
-          TYPENAME: TypeTag
-    7:
-      struct:
-        NEWTYPE:
-          TYPENAME: StructTag
-    8:
-      u16: UNIT
-    9:
-      u32: UNIT
-    10:
-      u256: UNIT
-TypedStoreError:
-  ENUM:
-    0:
-      RocksDBError:
-        NEWTYPE: STR
-    1:
-      SerializationError:
-        NEWTYPE: STR
-    2:
-      UnregisteredColumn:
-        NEWTYPE: STR
-    3:
-      CrossDBBatch: UNIT
-    4:
-      MetricsReporting: UNIT
-    5:
-      RetryableTransactionError: UNIT
-UnchangedSharedKind:
-  ENUM:
-    0:
-      ReadOnlyRoot:
-        NEWTYPE:
-          TUPLE:
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    1:
-      MutateDeleted:
-        NEWTYPE:
-          TYPENAME: SequenceNumber
-    2:
-      ReadDeleted:
-        NEWTYPE:
-          TYPENAME: SequenceNumber
-    3:
-      Cancelled:
-        NEWTYPE:
-          TYPENAME: SequenceNumber
-    4:
-      PerEpochConfig: UNIT
-UpgradeInfo:
-  STRUCT:
-    - upgraded_id:
-        TYPENAME: ObjectID
-    - upgraded_version:
-        TYPENAME: SequenceNumber
-ZkLoginAuthenticatorAsBytes:
-  NEWTYPESTRUCT:
-    SEQ: U8
-ZkLoginPublicIdentifier:
-  NEWTYPESTRUCT:
-    SEQ: U8
-"sui_types::message_envelope::Envelope<sui_types::messages_checkpoint::CheckpointSummary, sui_types::crypto::AuthorityQuorumSignInfo<true>>":
-  STRUCT:
-    - data:
-        TYPENAME: CheckpointSummary
-    - auth_signature:
-        TYPENAME: AuthorityQuorumSignInfo
-"sui_types::message_envelope::Envelope<sui_types::transaction::SenderSignedData, sui_types::crypto::EmptySignInfo>":
-  STRUCT:
-    - data:
-        TYPENAME: SenderSignedData
-    - auth_signature:
-        TYPENAME: EmptySignInfo
-
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
index be3cef7bea4d73..bf133a7ed8d83d 100644
--- a/crates/sui-protocol-config/src/lib.rs
+++ b/crates/sui-protocol-config/src/lib.rs
@@ -184,11 +184,7 @@ const MAX_PROTOCOL_VERSION: u64 = 63;
 //             Further reduce minimum number of random beacon shares.
 //             Add feature flag for Mysticeti fastpath.
 // Version 62: Makes the event's sending module package upgrade-aware.
-<<<<<<< HEAD
-=======
 // Version 63: Enable gas based congestion control in consensus commit.
-// Version 64: Switch to distributed vote scoring in consensus in mainnet
->>>>>>> 72e54057fc (Implement gas budget based congestion control with PTB/Obj cap (#19853))
 
 #[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProtocolVersion(u64);
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
index 5ce1bfac812325..ab2b42abe9b0f5 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
@@ -240,13 +240,13 @@ validators:
         next_epoch_worker_address: ~
         extra_fields:
           id:
-            id: "0x4f629d26c57551fd5ccf03e0bd64bb9005687e7d0680508f26dcace639b165ef"
+            id: "0xc889ec278315d265553aa2ca7c07e02e459ccfeda28b45fd3931a089a9ceea89"
           size: 0
       voting_power: 10000
-      operation_cap_id: "0x2fba4507d8d6ab5b21d44342d3406b5112a82ede7602c1070e7c53ff20521467"
+      operation_cap_id: "0xe3cc74e2d6cea3a24d73c8e206a7c39eb20b105d4985282e3243b617fd6d5bfa"
       gas_price: 1000
       staking_pool:
-        id: "0xb1ac0597cf93273a32eebf6eb921676365db6d63788321cabdb472a2d5c0b170"
+        id: "0x3da22a584bb3992b6ec89aa22283ef533b181bab7c075660c1ad3bf1a4d8a992"
         activation_epoch: 0
         deactivation_epoch: ~
         sui_balance: 20000000000000000
@@ -254,14 +254,14 @@ validators:
           value: 0
         pool_token_balance: 20000000000000000
         exchange_rates:
-          id: "0x019ff669614a8fb22bef655912832f39ba675b637930a42ddb65abf19aa6b24c"
+          id: "0x91de3f7b1c5e0090bf12efa8ca4eac12bf24fa8d1c3aabe0069043839e1eec0d"
           size: 1
         pending_stake: 0
         pending_total_sui_withdraw: 0
         pending_pool_token_withdraw: 0
         extra_fields:
           id:
-            id: "0xa8f2c5692de4e9f72f8d7d9c70e00c54704f8f232ca28028df668463d5297cb7"
+            id: "0x6f7b549b3bc97b14cae2665d4b4e3e2713342882d7f1e3891ea3c2d7384c72a8"
           size: 0
       commission_rate: 200
       next_epoch_stake: 20000000000000000
@@ -269,27 +269,27 @@ validators:
       next_epoch_commission_rate: 200
       extra_fields:
         id:
-          id: "0x1ee8eb11345dadf1d88acf5cb26bfdbff625433fe833359510b71b67a773ae02"
+          id: "0x65e5ffb824294594a4dcaa5ff8a7c4fb769591d7f2f4eedf779f4d952b9e4734"
         size: 0
   pending_active_validators:
     contents:
-      id: "0xddb2e575ff0b5aa6819847fa500e70eef24500cf40524789811a93d771ca0ff2"
+      id: "0xfa40dfc2e8efef31f2a5149fc4ec08f13c278f52c2068b486a40d6b70ed8d198"
       size: 0
   pending_removals: []
   staking_pool_mappings:
-    id: "0x96908877d2a68c389469b4bc1739382761dfeb083a121979e64f55ea4f790695"
+    id: "0x8f9cc06a104e4dfcfb9f7d5dc5d949d53a0cbc95edd124eaa860e2ff50c8d0dd"
     size: 1
   inactive_validators:
-    id: "0xcf9ee70ea65e35e6fcc751fbaad2b60ab36b0104afcc3c2adea1663f6dd0f74f"
+    id: "0x0f9558ae5734953dcc551f7efd455146d5fcee697e2bc0702534d74905f0f030"
     size: 0
   validator_candidates:
-    id: "0xa5b70ebd266ccf00af5311ba400eb01871e7f3fa423cc7ca5a2c253f5241f40c"
+    id: "0xb3f4410ffd5d507e203bf856a1205196adf59e481a069367ea07677dea91c48b"
     size: 0
   at_risk_validators:
     contents: []
   extra_fields:
     id:
-      id: "0x2d0e822d9c1acada00c0822a9b09058f92b9d7211c85c45998561af90f5bc0ef"
+      id: "0xa088a9c1d64dfa8e36c78913d93493fce5e6bc08be9b4b3ceef5212e4a0967b7"
     size: 0
 storage_fund:
   total_object_storage_rebates:
@@ -306,7 +306,7 @@ parameters:
   validator_low_stake_grace_period: 7
   extra_fields:
     id:
-      id: "0xa026eaa35feb14bd1eb1e71f988d42e87d66c85388feaa3f53c3a22b7b3831d8"
+      id: "0xee609e1350a82d79d28d9f222a1ac7eae91044af26bf1cceacf41f2b9e1e47fd"
     size: 0
 reference_gas_price: 1000
 validator_report_records:
@@ -320,7 +320,7 @@ stake_subsidy:
   stake_subsidy_decrease_rate: 1000
   extra_fields:
     id:
-      id: "0x7eb42ca897dc4f88c6b72f51872657f5b946d925154743d0330ce96ff023787a"
+      id: "0x5a326beb65d1ea418134be378fa8c7d61f21084e24dee6e21156e75e2555f330"
     size: 0
 safe_mode: false
 safe_mode_storage_rewards:
@@ -332,5 +332,5 @@ safe_mode_non_refundable_storage_fee: 0
 epoch_start_timestamp_ms: 10
 extra_fields:
   id:
-    id: "0x061bfc58ee1164bf043c5ce8662126eb8a67936ec682ffd855fd2877212af86f"
+    id: "0xf4b7d5e06a3461a4f8b27517b4dfdfaf24ed20faeaa960c568714bc44e2ec345"
   size: 0