Skip to content

Commit 8ec5ff5

Browse files
author
Timothy Zakian
committed
Revert "[3/n][object runtime type tags] Add type tags to object runtime update adapter to handle them (#22092)" and "[sui-adapter] Add basic package cache (#22099)"
This reverts commit b4ea7a4.
1 parent 7c3ad5f commit 8ec5ff5

File tree

20 files changed

+157
-380
lines changed

20 files changed

+157
-380
lines changed

crates/sui-adapter-transactional-tests/tests/init/create_object.move

Lines changed: 0 additions & 17 deletions
This file was deleted.

crates/sui-adapter-transactional-tests/tests/init/create_object.snap

Lines changed: 0 additions & 22 deletions
This file was deleted.

crates/sui-adapter-transactional-tests/tests/init/emit_event.move

Lines changed: 0 additions & 17 deletions
This file was deleted.

crates/sui-adapter-transactional-tests/tests/init/emit_event.snap

Lines changed: 0 additions & 15 deletions
This file was deleted.

crates/sui-open-rpc/spec/openrpc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,6 @@
13751375
"soft_bundle": false,
13761376
"throughput_aware_consensus_submission": false,
13771377
"txn_base_cost_as_multiplier": false,
1378-
"type_tags_in_object_runtime": false,
13791378
"uncompressed_g1_group_elements": false,
13801379
"upgraded_multisig_supported": false,
13811380
"validate_identifier_inputs": false,

crates/sui-protocol-config/src/lib.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,6 @@ struct FeatureFlags {
694694
// Enable native function for party transfer
695695
#[serde(skip_serializing_if = "is_false")]
696696
enable_party_transfer: bool,
697-
698-
// Signifies the cut-over of using type tags instead of `Type`s in the object runtime.
699-
#[serde(skip_serializing_if = "is_false")]
700-
type_tags_in_object_runtime: bool,
701697
}
702698

703699
fn is_false(b: &bool) -> bool {
@@ -1982,10 +1978,6 @@ impl ProtocolConfig {
19821978
pub fn enable_party_transfer(&self) -> bool {
19831979
self.feature_flags.enable_party_transfer
19841980
}
1985-
1986-
pub fn type_tags_in_object_runtime(&self) -> bool {
1987-
self.feature_flags.type_tags_in_object_runtime
1988-
}
19891981
}
19901982

19911983
#[cfg(not(msim))]
@@ -3547,7 +3539,6 @@ impl ProtocolConfig {
35473539
// native function on mainnet.
35483540
cfg.feature_flags.enable_nitro_attestation_upgraded_parsing = true;
35493541
cfg.feature_flags.enable_nitro_attestation = true;
3550-
cfg.feature_flags.type_tags_in_object_runtime = true;
35513542
}
35523543
// Use this template when making changes:
35533544
//

crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_83.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ feature_flags:
9090
enforce_checkpoint_timestamp_monotonicity: true
9191
max_ptb_value_size_v2: true
9292
resolve_type_input_ids_to_defining_id: true
93-
type_tags_in_object_runtime: true
9493
max_tx_size_bytes: 131072
9594
max_input_objects: 2048
9695
max_size_written_objects: 5000000

crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_83.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ feature_flags:
9292
enforce_checkpoint_timestamp_monotonicity: true
9393
max_ptb_value_size_v2: true
9494
resolve_type_input_ids_to_defining_id: true
95-
type_tags_in_object_runtime: true
9695
max_tx_size_bytes: 131072
9796
max_input_objects: 2048
9897
max_size_written_objects: 5000000

crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_83.snap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ feature_flags:
9797
enforce_checkpoint_timestamp_monotonicity: true
9898
max_ptb_value_size_v2: true
9999
resolve_type_input_ids_to_defining_id: true
100-
type_tags_in_object_runtime: true
101100
max_tx_size_bytes: 131072
102101
max_input_objects: 2048
103102
max_size_written_objects: 5000000

external-crates/move/crates/move-vm-runtime/src/native_functions.rs

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ use move_core_types::{
2020
};
2121
use move_vm_config::runtime::VMRuntimeLimitsConfig;
2222
use move_vm_types::{
23-
data_store::DataStore, loaded_data::runtime_types::Type, natives::function::NativeResult,
24-
values::Value,
23+
loaded_data::runtime_types::Type, natives::function::NativeResult, values::Value,
2524
};
2625
use std::{
2726
cell::RefCell,
@@ -159,36 +158,6 @@ impl<'b> NativeContext<'_, 'b> {
159158
}
160159
}
161160

162-
// TODO: This is a bit hacky right now since we need to pass the store, however this is only
163-
// used in test scenarios so we have some special knowledge that makes this work. In the new VM
164-
// however this is _MUCH_ nicer as we don't need to pass the datastore as the VM's linkage
165-
// tables must have the type present.
166-
pub fn type_tag_to_fully_annotated_layout_for_test_scenario_only(
167-
&self,
168-
tag: &TypeTag,
169-
store: &impl DataStore,
170-
) -> PartialVMResult<A::MoveTypeLayout> {
171-
self.resolver
172-
.loader()
173-
.get_fully_annotated_type_layout(tag, store)
174-
.map_err(|e| e.to_partial())
175-
}
176-
177-
// TODO: This is a bit hacky right now since we need to pass the store, however this is only
178-
// used in test scenarios so we have some special knowledge that makes this work. In the new VM
179-
// however this is _MUCH_ nicer as we don't need to pass the datastore as the VM's linkage
180-
// tables must have the type present.
181-
pub fn type_tag_to_layout_for_test_scenario_only(
182-
&self,
183-
tag: &TypeTag,
184-
store: &impl DataStore,
185-
) -> PartialVMResult<R::MoveTypeLayout> {
186-
self.resolver
187-
.loader()
188-
.get_type_layout(tag, store)
189-
.map_err(|e| e.to_partial())
190-
}
191-
192161
pub fn type_to_abilities(&self, ty: &Type) -> PartialVMResult<AbilitySet> {
193162
self.resolver.loader().abilities(ty)
194163
}

0 commit comments

Comments
 (0)