From 19dfc0384801ff843179a2e26b7a47c6caba28ae Mon Sep 17 00:00:00 2001 From: so-kkroy22 Date: Thu, 9 May 2024 18:54:55 +0530 Subject: [PATCH] integrate supra-framework --- aptos-move/framework/aptos-stdlib/Move.toml | 2 +- .../framework/aptos-token-objects/Move.toml | 4 ++-- .../sources/aptos_token.move | 8 +++---- .../sources/collection.move | 20 ++++++++--------- .../sources/property_map.move | 4 ++-- .../aptos-token-objects/sources/royalty.move | 4 ++-- .../aptos-token-objects/sources/token.move | 22 +++++++++---------- aptos-move/framework/aptos-token/Move.toml | 4 ++-- .../sources/property_map.spec.move | 16 +++++++------- .../framework/aptos-token/sources/token.move | 6 ++--- .../aptos-token/sources/token.spec.move | 8 +++---- .../aptos-token/sources/token_coin_swap.move | 2 +- .../sources/token_event_store.move | 4 ++-- .../sources/token_event_store.spec.move | 4 ++-- .../aptos-token/sources/token_transfers.move | 12 +++++----- .../sources/token_transfers.spec.move | 2 +- aptos-move/framework/cached-packages/build.rs | 4 ++-- aptos-move/framework/src/built_package.rs | 2 +- 18 files changed, 64 insertions(+), 64 deletions(-) diff --git a/aptos-move/framework/aptos-stdlib/Move.toml b/aptos-move/framework/aptos-stdlib/Move.toml index 10e346cf41bdbc..1a58e9243fb5a0 100644 --- a/aptos-move/framework/aptos-stdlib/Move.toml +++ b/aptos-move/framework/aptos-stdlib/Move.toml @@ -5,7 +5,7 @@ version = "1.0.0" [addresses] std = "0x1" aptos_std = "0x1" -aptos_framework = "0x1" +supra_framework = "0x1" Extensions = "0x1" # For Prover to instantiate `{{Ext}}` in prelude. [dependencies] diff --git a/aptos-move/framework/aptos-token-objects/Move.toml b/aptos-move/framework/aptos-token-objects/Move.toml index c60f18f8d8f406..b19f4e4cad98dc 100644 --- a/aptos-move/framework/aptos-token-objects/Move.toml +++ b/aptos-move/framework/aptos-token-objects/Move.toml @@ -5,9 +5,9 @@ version = "1.0.0" [addresses] std = "0x1" aptos_std = "0x1" -aptos_framework = "0x1" +supra_framework = "0x1" aptos_token_objects = "0x4" [dependencies] MoveStdlib = { local = "../move-stdlib" } -AptosFramework = { local = "../aptos-framework"} +SupraFramework = { local = "../supra-framework"} diff --git a/aptos-move/framework/aptos-token-objects/sources/aptos_token.move b/aptos-move/framework/aptos-token-objects/sources/aptos_token.move index 560e22ca340688..5a7290e144eab4 100644 --- a/aptos-move/framework/aptos-token-objects/sources/aptos_token.move +++ b/aptos-move/framework/aptos-token-objects/sources/aptos_token.move @@ -11,7 +11,7 @@ module aptos_token_objects::aptos_token { use std::option::{Self, Option}; use std::string::String; use std::signer; - use aptos_framework::object::{Self, ConstructorRef, Object}; + use supra_framework::object::{Self, ConstructorRef, Object}; use aptos_token_objects::collection; use aptos_token_objects::property_map; use aptos_token_objects::royalty; @@ -30,7 +30,7 @@ module aptos_token_objects::aptos_token { /// The property map being mutated is not mutable const EPROPERTIES_NOT_MUTABLE: u64 = 6; - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Storage state for managing the no-code Collection. struct AptosCollection has key { /// Used to mutate collection fields @@ -55,7 +55,7 @@ module aptos_token_objects::aptos_token { tokens_freezable_by_creator: bool, } - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Storage state for managing the no-code Token. struct AptosToken has key { /// Used to burn. @@ -672,7 +672,7 @@ module aptos_token_objects::aptos_token { #[test_only] use std::string; #[test_only] - use aptos_framework::account; + use supra_framework::account; #[test(creator = @0x123)] fun test_create_and_transfer(creator: &signer) acquires AptosCollection, AptosToken { diff --git a/aptos-move/framework/aptos-token-objects/sources/collection.move b/aptos-move/framework/aptos-token-objects/sources/collection.move index 2cceda617feefd..9b0260dcca883f 100644 --- a/aptos-move/framework/aptos-token-objects/sources/collection.move +++ b/aptos-move/framework/aptos-token-objects/sources/collection.move @@ -22,9 +22,9 @@ module aptos_token_objects::collection { use std::option::{Self, Option}; use std::signer; use std::string::{Self, String}; - use aptos_framework::aggregator_v2::{Self, Aggregator, AggregatorSnapshot}; - use aptos_framework::event; - use aptos_framework::object::{Self, ConstructorRef, ExtendRef, Object}; + use supra_framework::aggregator_v2::{Self, Aggregator, AggregatorSnapshot}; + use supra_framework::event; + use supra_framework::object::{Self, ConstructorRef, ExtendRef, Object}; use aptos_token_objects::royalty::{Self, Royalty}; @@ -53,7 +53,7 @@ module aptos_token_objects::collection { const MAX_U64: u64 = 18446744073709551615; - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Represents the common fields for a collection. struct Collection has key { /// The creator of this collection. @@ -80,7 +80,7 @@ module aptos_token_objects::collection { mutated_field_name: String, } - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Fixed supply tracker, this is useful for ensuring that a limited number of tokens are minted. /// and adding events and supply tracking to a collection. struct FixedSupply has key { @@ -94,7 +94,7 @@ module aptos_token_objects::collection { mint_events: event::EventHandle, } - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Unlimited supply tracker, this is useful for adding events and supply tracking to a collection. struct UnlimitedSupply has key { current_supply: u64, @@ -105,7 +105,7 @@ module aptos_token_objects::collection { mint_events: event::EventHandle, } - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Supply tracker, useful for tracking amount of issued tokens. /// If max_value is not set to U64_MAX, this ensures that a limited number of tokens are minted. struct ConcurrentSupply has key { @@ -649,7 +649,7 @@ module aptos_token_objects::collection { assert!(event::counter(&borrow_global(collection_address).burn_events) == 1, 0); } - #[test(fx = @aptos_framework, creator = @0x123)] + #[test(fx = @supra_framework, creator = @0x123)] fun test_create_mint_burn_for_concurrent(fx: &signer, creator: &signer) acquires FixedSupply, UnlimitedSupply, ConcurrentSupply { let feature = features::get_concurrent_token_v2_feature(); let agg_feature = features::get_aggregator_v2_api_feature(); @@ -682,7 +682,7 @@ module aptos_token_objects::collection { } #[test(creator = @0x123, trader = @0x456)] - #[expected_failure(abort_code = 0x50003, location = aptos_framework::object)] + #[expected_failure(abort_code = 0x50003, location = supra_framework::object)] entry fun test_create_and_transfer(creator: &signer, trader: &signer) { let creator_address = signer::address_of(creator); let collection_name = string::utf8(b"collection name"); @@ -696,7 +696,7 @@ module aptos_token_objects::collection { } #[test(creator = @0x123)] - #[expected_failure(abort_code = 0x80001, location = aptos_framework::object)] + #[expected_failure(abort_code = 0x80001, location = supra_framework::object)] entry fun test_duplicate_collection(creator: &signer) { let collection_name = string::utf8(b"collection name"); create_collection_helper(creator, collection_name); diff --git a/aptos-move/framework/aptos-token-objects/sources/property_map.move b/aptos-move/framework/aptos-token-objects/sources/property_map.move index f8cfa7e0d52444..1b62c11774c898 100644 --- a/aptos-move/framework/aptos-token-objects/sources/property_map.move +++ b/aptos-move/framework/aptos-token-objects/sources/property_map.move @@ -9,7 +9,7 @@ module aptos_token_objects::property_map { use aptos_std::from_bcs; use aptos_std::simple_map::{Self, SimpleMap}; use aptos_std::type_info; - use aptos_framework::object::{Self, ConstructorRef, Object}; + use supra_framework::object::{Self, ConstructorRef, Object}; // Errors /// The property map does not exist @@ -48,7 +48,7 @@ module aptos_token_objects::property_map { const STRING: u8 = 9; // Structs - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// A Map for typed key to value mapping, the contract using it /// should keep track of what keys are what types, and parse them accordingly. struct PropertyMap has drop, key { diff --git a/aptos-move/framework/aptos-token-objects/sources/royalty.move b/aptos-move/framework/aptos-token-objects/sources/royalty.move index e3068b68ad4ff1..67b29104c6a358 100644 --- a/aptos-move/framework/aptos-token-objects/sources/royalty.move +++ b/aptos-move/framework/aptos-token-objects/sources/royalty.move @@ -4,7 +4,7 @@ module aptos_token_objects::royalty { use std::error; use std::option::{Self, Option}; - use aptos_framework::object::{Self, ConstructorRef, ExtendRef, Object}; + use supra_framework::object::{Self, ConstructorRef, ExtendRef, Object}; friend aptos_token_objects::token; @@ -15,7 +15,7 @@ module aptos_token_objects::royalty { /// The royalty denominator cannot be 0 const EROYALTY_DENOMINATOR_IS_ZERO: u64 = 3; - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// The royalty of a token within this collection /// /// Royalties are optional for a collection. Royalty percentage is calculated diff --git a/aptos-move/framework/aptos-token-objects/sources/token.move b/aptos-move/framework/aptos-token-objects/sources/token.move index 270fa7b6a2d921..2d2f615fbf3216 100644 --- a/aptos-move/framework/aptos-token-objects/sources/token.move +++ b/aptos-move/framework/aptos-token-objects/sources/token.move @@ -11,15 +11,15 @@ module aptos_token_objects::token { use std::string::{Self, String}; use std::signer; use std::vector; - use aptos_framework::aggregator_v2::{Self, AggregatorSnapshot, DerivedStringSnapshot}; - use aptos_framework::event; - use aptos_framework::object::{Self, ConstructorRef, Object}; + use supra_framework::aggregator_v2::{Self, AggregatorSnapshot, DerivedStringSnapshot}; + use supra_framework::event; + use supra_framework::object::{Self, ConstructorRef, Object}; use aptos_std::string_utils::{to_string}; use aptos_token_objects::collection::{Self, Collection}; use aptos_token_objects::royalty::{Self, Royalty}; #[test_only] - use aptos_framework::object::ExtendRef; + use supra_framework::object::ExtendRef; /// The token does not exist const ETOKEN_DOES_NOT_EXIST: u64 = 1; @@ -38,7 +38,7 @@ module aptos_token_objects::token { const MAX_URI_LENGTH: u64 = 512; const MAX_DESCRIPTION_LENGTH: u64 = 2048; - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Represents the common fields to all tokens. struct Token has key { /// The collection from which this token resides. @@ -63,7 +63,7 @@ module aptos_token_objects::token { mutation_events: event::EventHandle, } - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] /// Represents first addition to the common fields for all tokens /// Starts being populated once aggregator_v2_api_enabled is enabled. struct TokenIdentifiers has key { @@ -76,7 +76,7 @@ module aptos_token_objects::token { // DEPRECATED, NEVER USED #[deprecated] - #[resource_group_member(group = aptos_framework::object::ObjectGroup)] + #[resource_group_member(group = supra_framework::object::ObjectGroup)] struct ConcurrentTokenIdentifiers has key { index: AggregatorSnapshot, name: AggregatorSnapshot, @@ -612,7 +612,7 @@ module aptos_token_objects::token { } #[test(creator = @0x123)] - #[expected_failure(abort_code = 0x80001, location = aptos_framework::object)] + #[expected_failure(abort_code = 0x80001, location = supra_framework::object)] fun test_duplicate_tokens(creator: &signer) { let collection_name = string::utf8(b"collection name"); let token_name = string::utf8(b"token name"); @@ -722,7 +722,7 @@ module aptos_token_objects::token { #[test(creator = @0x123)] fun test_create_from_account_burn_and_delete(creator: &signer) acquires Token, TokenIdentifiers { - use aptos_framework::account; + use supra_framework::account; let collection_name = string::utf8(b"collection name"); let token_name = string::utf8(b"token name"); @@ -747,7 +747,7 @@ module aptos_token_objects::token { #[test(creator = @0x123,fx = @std)] fun test_create_burn_and_delete(creator: &signer, fx: signer) acquires Token, TokenIdentifiers { - use aptos_framework::account; + use supra_framework::account; use std::features; let feature = features::get_auids(); @@ -774,7 +774,7 @@ module aptos_token_objects::token { assert!(!object::is_object(token_addr), 2); } - #[test(fx = @aptos_framework, creator = @0x123)] + #[test(fx = @supra_framework, creator = @0x123)] fun test_upgrade_to_concurrent_and_numbered_tokens(fx: &signer, creator: &signer) acquires Token, TokenIdentifiers { use std::debug; diff --git a/aptos-move/framework/aptos-token/Move.toml b/aptos-move/framework/aptos-token/Move.toml index c974ca0e90eeb3..deba7e4b55a7a5 100644 --- a/aptos-move/framework/aptos-token/Move.toml +++ b/aptos-move/framework/aptos-token/Move.toml @@ -4,9 +4,9 @@ version = "1.0.0" [addresses] std = "0x1" -aptos_framework = "0x1" +supra_framework = "0x1" aptos_token = "0x3" [dependencies] MoveStdlib = { local = "../move-stdlib" } -AptosFramework = { local = "../aptos-framework"} +SupraFramework = { local = "../supra-framework"} diff --git a/aptos-move/framework/aptos-token/sources/property_map.spec.move b/aptos-move/framework/aptos-token/sources/property_map.spec.move index b97e90b2c1baee..72f868ca73fc1c 100644 --- a/aptos-move/framework/aptos-token/sources/property_map.spec.move +++ b/aptos-move/framework/aptos-token/sources/property_map.spec.move @@ -41,7 +41,7 @@ spec aptos_token::property_map { } spec add(map: &mut PropertyMap, key: String, value: PropertyValue) { - use aptos_framework::simple_map; + use supra_framework::simple_map; aborts_if !(string::length(key) <= MAX_PROPERTY_NAME_LENGTH); aborts_if !(!simple_map::spec_contains_key(map.map, key)); @@ -65,7 +65,7 @@ spec aptos_token::property_map { } spec borrow(map: &PropertyMap, key: &String): &PropertyValue { - use aptos_framework::simple_map; + use supra_framework::simple_map; aborts_if !simple_map::spec_contains_key(map.map, key); } @@ -73,7 +73,7 @@ spec aptos_token::property_map { /// to `prop.type` spec read_string(map: &PropertyMap, key: &String): String { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; pragma aborts_if_is_partial; // TODO: Unable to handle abort from `from_bcs::to_string` because there is a function call at assert. @@ -90,7 +90,7 @@ spec aptos_token::property_map { spec read_u8(map: &PropertyMap, key: &String): u8 { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; let str = b"u8"; aborts_if !simple_map::spec_contains_key(map.map, key); @@ -102,7 +102,7 @@ spec aptos_token::property_map { spec read_u64(map: &PropertyMap, key: &String): u64 { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; let str = b"u64"; aborts_if !simple_map::spec_contains_key(map.map, key); @@ -114,7 +114,7 @@ spec aptos_token::property_map { spec read_address(map: &PropertyMap, key: &String): address { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; let str = b"address"; aborts_if !simple_map::spec_contains_key(map.map, key); @@ -126,7 +126,7 @@ spec aptos_token::property_map { spec read_u128(map: &PropertyMap, key: &String): u128 { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; let str = b"u128"; aborts_if !simple_map::spec_contains_key(map.map, key); @@ -138,7 +138,7 @@ spec aptos_token::property_map { spec read_bool(map: &PropertyMap, key: &String): bool { use std::string; - use aptos_framework::simple_map; + use supra_framework::simple_map; let str = b"bool"; aborts_if !simple_map::spec_contains_key(map.map, key); diff --git a/aptos-move/framework/aptos-token/sources/token.move b/aptos-move/framework/aptos-token/sources/token.move index 8841b3498e20af..683cf05d0f21a1 100644 --- a/aptos-move/framework/aptos-token/sources/token.move +++ b/aptos-move/framework/aptos-token/sources/token.move @@ -7,9 +7,9 @@ module aptos_token::token { use std::string::{Self, String}; use std::vector; - use aptos_framework::account; - use aptos_framework::event::{Self, EventHandle}; - use aptos_framework::timestamp; + use supra_framework::account; + use supra_framework::event::{Self, EventHandle}; + use supra_framework::timestamp; use aptos_std::table::{Self, Table}; use aptos_token::property_map::{Self, PropertyMap, PropertyValue}; use aptos_token::token_event_store; diff --git a/aptos-move/framework/aptos-token/sources/token.spec.move b/aptos-move/framework/aptos-token/sources/token.spec.move index 5226e51f27441e..1ddb2d730bc566 100644 --- a/aptos-move/framework/aptos-token/sources/token.spec.move +++ b/aptos-move/framework/aptos-token/sources/token.spec.move @@ -479,8 +479,8 @@ spec aptos_token::token { spec withdraw_with_capability( withdraw_proof: WithdrawCapability, ): Token { - let now_seconds = global(@aptos_framework).microseconds; - aborts_if !exists(@aptos_framework); + let now_seconds = global(@supra_framework).microseconds; + aborts_if !exists(@supra_framework); aborts_if now_seconds / timestamp::MICRO_CONVERSION_FACTOR > withdraw_proof.expiration_sec; include WithdrawWithEventInternalAbortsIf{ account_addr: withdraw_proof.token_owner, @@ -492,8 +492,8 @@ spec aptos_token::token { withdraw_proof: WithdrawCapability, withdraw_amount: u64, ): (Token, Option) { - let now_seconds = global(@aptos_framework).microseconds; - aborts_if !exists(@aptos_framework); + let now_seconds = global(@supra_framework).microseconds; + aborts_if !exists(@supra_framework); aborts_if now_seconds / timestamp::MICRO_CONVERSION_FACTOR > withdraw_proof.expiration_sec; aborts_if withdraw_amount > withdraw_proof.amount; include WithdrawWithEventInternalAbortsIf{ diff --git a/aptos-move/framework/aptos-token/sources/token_coin_swap.move b/aptos-move/framework/aptos-token/sources/token_coin_swap.move index dafc8a1577af45..82ae93a3d8e9fd 100644 --- a/aptos-move/framework/aptos-token/sources/token_coin_swap.move +++ b/aptos-move/framework/aptos-token/sources/token_coin_swap.move @@ -4,7 +4,7 @@ module aptos_token::token_coin_swap { use std::error; use aptos_std::table::Table; use aptos_std::type_info::TypeInfo; - use aptos_framework::event::EventHandle; + use supra_framework::event::EventHandle; use aptos_token::token::{Token, TokenId}; // diff --git a/aptos-move/framework/aptos-token/sources/token_event_store.move b/aptos-move/framework/aptos-token/sources/token_event_store.move index 52ba6c7c69ce0f..95949de900285c 100644 --- a/aptos-move/framework/aptos-token/sources/token_event_store.move +++ b/aptos-move/framework/aptos-token/sources/token_event_store.move @@ -2,8 +2,8 @@ module aptos_token::token_event_store { use std::string::String; use std::signer; - use aptos_framework::event::{Self, EventHandle}; - use aptos_framework::account; + use supra_framework::event::{Self, EventHandle}; + use supra_framework::account; use std::option::Option; use aptos_std::any::Any; use std::option; diff --git a/aptos-move/framework/aptos-token/sources/token_event_store.spec.move b/aptos-move/framework/aptos-token/sources/token_event_store.spec.move index f05fe20a6a7599..958a575f5f52cd 100644 --- a/aptos-move/framework/aptos-token/sources/token_event_store.spec.move +++ b/aptos-move/framework/aptos-token/sources/token_event_store.spec.move @@ -13,7 +13,7 @@ spec aptos_token::token_event_store { /// Adjust the overflow value according to the /// number of registered events spec schema InitializeTokenEventStoreAbortsIf { - use aptos_framework::account::{Account}; + use supra_framework::account::{Account}; creator: &signer; let addr = signer::address_of(creator); let account = global(addr); @@ -23,7 +23,7 @@ spec aptos_token::token_event_store { } spec schema TokenEventStoreAbortsIf { - use aptos_framework::account::{Account}; + use supra_framework::account::{Account}; creator: &signer; let addr = signer::address_of(creator); let account = global(addr); diff --git a/aptos-move/framework/aptos-token/sources/token_transfers.move b/aptos-move/framework/aptos-token/sources/token_transfers.move index 796a7b79abb212..20aa4786b1ae9b 100644 --- a/aptos-move/framework/aptos-token/sources/token_transfers.move +++ b/aptos-move/framework/aptos-token/sources/token_transfers.move @@ -5,8 +5,8 @@ module aptos_token::token_transfers { use std::error; use aptos_std::table::{Self, Table}; use aptos_token::token::{Self, Token, TokenId}; - use aptos_framework::account; - use aptos_framework::event::{Self, EventHandle}; + use supra_framework::account; + use supra_framework::event::{Self, EventHandle}; // // Errors. @@ -188,7 +188,7 @@ module aptos_token::token_transfers { let creator_addr = signer::address_of(&creator); let owner_addr = signer::address_of(&owner); - aptos_framework::account::create_account_for_test(owner_addr); + supra_framework::account::create_account_for_test(owner_addr); offer(&creator, owner_addr, token_id, 1); claim(&owner, creator_addr, token_id); @@ -207,9 +207,9 @@ module aptos_token::token_transfers { let creator_addr = signer::address_of(&creator); let owner0_addr = signer::address_of(&owner0); - aptos_framework::account::create_account_for_test(owner0_addr); + supra_framework::account::create_account_for_test(owner0_addr); let owner1_addr = signer::address_of(&owner1); - aptos_framework::account::create_account_for_test(owner1_addr); + supra_framework::account::create_account_for_test(owner1_addr); offer(&creator, owner0_addr, token_id, 1); offer(&creator, owner1_addr, token_id, 1); @@ -234,7 +234,7 @@ module aptos_token::token_transfers { let collection_name = string::utf8(b"Hello, World"); let collection_mutation_setting = vector[false, false, false]; - aptos_framework::account::create_account_for_test(signer::address_of(creator)); + supra_framework::account::create_account_for_test(signer::address_of(creator)); token::create_collection( creator, diff --git a/aptos-move/framework/aptos-token/sources/token_transfers.spec.move b/aptos-move/framework/aptos-token/sources/token_transfers.spec.move index b87fda41a7a827..8764b43f5d2711 100644 --- a/aptos-move/framework/aptos-token/sources/token_transfers.spec.move +++ b/aptos-move/framework/aptos-token/sources/token_transfers.spec.move @@ -10,7 +10,7 @@ spec aptos_token::token_transfers { /// Abort according to the code spec schema InitializeTokenTransfersAbortsIf { - use aptos_framework::account::{Account}; + use supra_framework::account::{Account}; account: &signer; let addr = signer::address_of(account); diff --git a/aptos-move/framework/cached-packages/build.rs b/aptos-move/framework/cached-packages/build.rs index 581e8c7b32f46d..afec25e78dbe6c 100644 --- a/aptos-move/framework/cached-packages/build.rs +++ b/aptos-move/framework/cached-packages/build.rs @@ -51,11 +51,11 @@ fn main() -> Result<()> { ); println!( "cargo:rerun-if-changed={}", - prev_dir.join("aptos-framework").join("sources").display() + prev_dir.join("supra-framework").join("sources").display() ); println!( "cargo:rerun-if-changed={}", - prev_dir.join("aptos-framework").join("Move.toml").display() + prev_dir.join("supra-framework").join("Move.toml").display() ); println!( "cargo:rerun-if-changed={}", diff --git a/aptos-move/framework/src/built_package.rs b/aptos-move/framework/src/built_package.rs index 5fbf1c7c00c52b..767dfe2bf1d1d6 100644 --- a/aptos-move/framework/src/built_package.rs +++ b/aptos-move/framework/src/built_package.rs @@ -37,7 +37,7 @@ pub const METADATA_FILE_NAME: &str = "package-metadata.bcs"; pub const UPGRADE_POLICY_CUSTOM_FIELD: &str = "upgrade_policy"; pub const APTOS_PACKAGES: [&str; 5] = [ - "AptosFramework", + "SupraFramework", "MoveStdlib", "AptosStdlib", "AptosToken",