Use ObjectID over AccountAddress (#468)

* Use ObjectID over AccountAddress
MystenLabs · Feb 18, 2022 · ec02fe5 · ec02fe5 · github-actions · Feb 18, 2022
1 parent 3af4b1a
commit ec02fe5
Show file tree

Hide file tree

Showing 15 changed files with 349 additions and 32 deletions.
diff --git a/sui/src/bench.rs b/sui/src/bench.rs
@@ -213,7 +213,7 @@ impl ClientServerBenchmark {
             let order = if self.use_move {
                 // TODO: authority should not require seq# or digets for package in Move calls. Use dummy values
                 let framework_obj_ref = (
-                    SUI_FRAMEWORK_ADDRESS,
+                    ObjectID::from(SUI_FRAMEWORK_ADDRESS),
                     SequenceNumber::new(),
                     ObjectDigest::new([0; 32]),
                 );

diff --git a/sui_core/src/authority.rs b/sui_core/src/authority.rs
@@ -3,7 +3,6 @@
 
 use move_bytecode_utils::module_cache::ModuleCache;
 use move_core_types::{
-    account_address::AccountAddress,
     language_storage::{ModuleId, StructTag},
     resolver::{ModuleResolver, ResourceResolver},
 };

diff --git a/sui_core/src/authority/authority_store.rs b/sui_core/src/authority/authority_store.rs
@@ -455,7 +455,7 @@ impl ModuleResolver for AuthorityStore {
     type Error = SuiError;
 
     fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
-        match self.get_object(module_id.address())? {
+        match self.get_object(&ObjectID::from(*module_id.address()))? {
             Some(o) => match &o.data {
                 Data::Package(c) => Ok(c
                     .get(module_id.name().as_str())

diff --git a/sui_core/src/authority/temporary_store.rs b/sui_core/src/authority/temporary_store.rs
@@ -1,3 +1,4 @@
+use move_core_types::account_address::AccountAddress;
 use sui_types::event::Event;
 
 use super::*;
@@ -262,7 +263,7 @@ impl Storage for AuthorityTemporaryStore {
 impl ModuleResolver for AuthorityTemporaryStore {
     type Error = SuiError;
     fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
-        match self.read_object(module_id.address()) {
+        match self.read_object(&ObjectID::from(*module_id.address())) {
             Some(o) => match &o.data {
                 Data::Package(c) => Ok(c
                     .get(module_id.name().as_str())
@@ -285,9 +286,9 @@ impl ResourceResolver for AuthorityTemporaryStore {
         address: &AccountAddress,
         struct_tag: &StructTag,
     ) -> Result<Option<Vec<u8>>, Self::Error> {
-        let object = match self.read_object(address) {
+        let object = match self.read_object(&ObjectID::from(*address)) {
             Some(x) => x,
-            None => match self.read_object(address) {
+            None => match self.read_object(&ObjectID::from(*address)) {
                 None => return Ok(None),
                 Some(x) => {
                     if !x.is_read_only() {

diff --git a/sui_core/src/client.rs b/sui_core/src/client.rs
@@ -300,7 +300,9 @@ where
 
     #[cfg(test)]
     pub async fn get_framework_object_ref(&mut self) -> Result<ObjectRef, anyhow::Error> {
-        let info = self.get_object_info(SUI_FRAMEWORK_ADDRESS).await?;
+        let info = self
+            .get_object_info(ObjectID::from(SUI_FRAMEWORK_ADDRESS))
+            .await?;
         Ok(info.reference()?)
     }
 

diff --git a/sui_core/src/unit_tests/authority_tests.rs b/sui_core/src/unit_tests/authority_tests.rs
@@ -8,7 +8,9 @@ use move_binary_format::{
     file_format::{self, AddressIdentifierIndex, IdentifierIndex, ModuleHandle},
     CompiledModule,
 };
-use move_core_types::{ident_str, identifier::Identifier, language_storage::TypeTag};
+use move_core_types::{
+    account_address::AccountAddress, ident_str, identifier::Identifier, language_storage::TypeTag,
+};
 use move_package::BuildConfig;
 use sui_adapter::genesis;
 use sui_types::{
@@ -454,7 +456,7 @@ async fn test_publish_non_existing_dependent_module() {
     // Add another dependent module that points to a random address, hence does not exist on-chain.
     dependent_module
         .address_identifiers
-        .push(AccountAddress::random());
+        .push(AccountAddress::from(ObjectID::random()));
     dependent_module.module_handles.push(ModuleHandle {
         address: AddressIdentifierIndex((dependent_module.address_identifiers.len() - 1) as u16),
         name: IdentifierIndex(0),

diff --git a/sui_core/src/unit_tests/client_tests.rs b/sui_core/src/unit_tests/client_tests.rs
@@ -20,7 +20,6 @@ use sui_types::object::{Data, Object, GAS_VALUE_FOR_TESTING, OBJECT_START_VERSIO
 use tokio::runtime::Runtime;
 use typed_store::Map;
 
-use move_core_types::account_address::AccountAddress;
 use std::env;
 use std::fs;
 use sui_types::error::SuiError::ObjectNotFound;
@@ -381,7 +380,7 @@ async fn fund_account_with_same_objects(
     authorities: Vec<&LocalAuthorityClient>,
     client: &mut ClientState<LocalAuthorityClient>,
     object_ids: Vec<ObjectID>,
-) -> HashMap<AccountAddress, Object> {
+) -> HashMap<ObjectID, Object> {
     let objs: Vec<_> = (0..authorities.len()).map(|_| object_ids.clone()).collect();
     fund_account(authorities, client, objs).await
 }
@@ -391,7 +390,7 @@ async fn fund_account(
     authorities: Vec<&LocalAuthorityClient>,
     client: &mut ClientState<LocalAuthorityClient>,
     object_ids: Vec<Vec<ObjectID>>,
-) -> HashMap<AccountAddress, Object> {
+) -> HashMap<ObjectID, Object> {
     let mut created_objects = HashMap::new();
     for (authority, object_ids) in authorities.into_iter().zip(object_ids.into_iter()) {
         for object_id in object_ids {

diff --git a/sui_programmability/adapter/src/adapter.rs b/sui_programmability/adapter/src/adapter.rs
@@ -148,7 +148,7 @@ fn execute_internal<
     type_args: Vec<TypeTag>,
     args: Vec<Vec<u8>>,
     mutable_ref_objects: Vec<Object>,
-    by_value_objects: BTreeMap<AccountAddress, Object>,
+    by_value_objects: BTreeMap<ObjectID, Object>,
     object_owner_map: HashMap<SuiAddress, SuiAddress>,
     gas_budget: u64, // gas budget for the current call operation
     ctx: &mut TxContext,
@@ -400,7 +400,11 @@ pub fn verify_and_link<
         })
         .collect();
     session
-        .publish_module_bundle(new_module_bytes, package_id, &mut gas_status)
+        .publish_module_bundle(
+            new_module_bytes,
+            AccountAddress::from(package_id),
+            &mut gas_status,
+        )
         .map_err(|e| SuiError::ModulePublishFailure {
             error: e.to_string(),
         })?;
@@ -433,7 +437,10 @@ pub fn generate_package_id(
                 error: "Publishing modules with non-zero address is not allowed".to_string(),
             });
         }
-        let new_module_id = ModuleId::new(package_id, old_module_id.name().to_owned());
+        let new_module_id = ModuleId::new(
+            AccountAddress::from(package_id),
+            old_module_id.name().to_owned(),
+        );
         if sub_map.insert(old_module_id, new_module_id).is_some() {
             return Err(SuiError::ModulePublishFailure {
                 error: "Publishing two modules with the same ID".to_string(),

diff --git a/sui_programmability/adapter/src/unit_tests/adapter_tests.rs b/sui_programmability/adapter/src/unit_tests/adapter_tests.rs
@@ -150,7 +150,7 @@ impl ModuleResolver for InMemoryStorage {
     type Error = ();
     fn get_module(&self, module_id: &ModuleId) -> Result<Option<Vec<u8>>, Self::Error> {
         Ok(self
-            .read_object(module_id.address())
+            .read_object(&ObjectID::from(*module_id.address()))
             .map(|o| match &o.data {
                 Data::Package(m) => m[module_id.name().as_str()].clone().into_vec(),
                 Data::Move(_) => panic!("Type error"),

diff --git a/sui_programmability/framework/src/natives/tx_context.rs b/sui_programmability/framework/src/natives/tx_context.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use move_binary_format::errors::PartialVMResult;
+use move_core_types::account_address::AccountAddress;
 use move_vm_runtime::native_functions::NativeContext;
 use move_vm_types::{
     gas_schedule::NativeCostIndex,
@@ -28,7 +29,7 @@ pub fn fresh_id(
     // TODO(https://github.com/MystenLabs/fastnft/issues/58): finalize digest format
     // unwrap safe because all digests in Move are serialized from the Rust `TransactionDigest`
     let digest = TransactionDigest::try_from(inputs_hash.as_slice()).unwrap();
-    let id = Value::address(digest.derive_id(ids_created));
+    let id = Value::address(AccountAddress::from(digest.derive_id(ids_created)));
 
     // TODO: choose cost
     let cost = native_gas(context.cost_table(), NativeCostIndex::CREATE_SIGNER, 0);