WIP layered accounts

[WIP] Updating frameworks [WIP] Layering prologues/epilogues [WIP] prologue layering with chain-specific account info Closes: #10017
666lcz · Jan 5, 2022 · ebca3d5 · ebca3d5
1 parent 0fa566c
commit ebca3d5
Show file tree

Hide file tree

Showing 681 changed files with 10,005 additions and 57,702 deletions.
diff --git a/api/src/accounts.rs b/api/src/accounts.rs
@@ -144,11 +144,12 @@ impl Account {
     }
 
     pub fn account(self) -> Result<impl Reply, Error> {
-        let account: AccountData = self
-            .account_state()?
+        let account_state = self.account_state()?;
+        let account: AccountData = account_state
             .get_account_resource()?
             .ok_or_else(|| self.resource_not_found(&AccountResource::struct_tag()))?
             .into();
+
         Response::new(self.latest_ledger_info, &account)
     }
 

diff --git a/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv b/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ACL.mv
diff --git a/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv b/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/ASCII.mv
diff --git a/...e_modules/AccountAdministrationScripts.mv → ...1/modules/AccountAdministrationScripts.mv b/...e_modules/AccountAdministrationScripts.mv → ...1/modules/AccountAdministrationScripts.mv
diff --git a/...ytecode_modules/AccountCreationScripts.mv → ...0000001/modules/AccountCreationScripts.mv b/...ytecode_modules/AccountCreationScripts.mv → ...0000001/modules/AccountCreationScripts.mv
diff --git a/...ework/bytecode_modules/AccountFreezing.mv → ...00000000000001/modules/AccountFreezing.mv b/...ework/bytecode_modules/AccountFreezing.mv → ...00000000000001/modules/AccountFreezing.mv
diff --git a/...amework/bytecode_modules/AccountLimits.mv → ...0000000000000001/modules/AccountLimits.mv b/...amework/bytecode_modules/AccountLimits.mv → ...0000000000000001/modules/AccountLimits.mv
diff --git a/...amework/bytecode_modules/Authenticator.mv → ...0000000000000001/modules/Authenticator.mv b/...amework/bytecode_modules/Authenticator.mv → ...0000000000000001/modules/Authenticator.mv
diff --git a/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv b/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BCS.mv
diff --git a/...s/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv b/...s/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/BitVector.mv
diff --git a/...iemCoreFramework/bytecode_modules/CRSN.mv → ...0000000000000000000000001/modules/CRSN.mv b/...iemCoreFramework/bytecode_modules/CRSN.mv → ...0000000000000000000000001/modules/CRSN.mv
diff --git a/.../testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv b/.../testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Capability.mv
diff --git a/...CoreFramework/bytecode_modules/ChainId.mv → ...0000000000000000000001/modules/ChainId.mv b/...CoreFramework/bytecode_modules/ChainId.mv → ...0000000000000000000001/modules/ChainId.mv
diff --git a/...sts/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv b/...sts/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Compare.mv
diff --git a/...amework/bytecode_modules/CoreAddresses.mv → ...0000000000000001/modules/CoreAddresses.mv b/...amework/bytecode_modules/CoreAddresses.mv → ...0000000000000001/modules/CoreAddresses.mv
diff --git a/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv b/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Debug.mv
diff --git a/...work/bytecode_modules/DesignatedDealer.mv → ...0000000000001/modules/DesignatedDealer.mv b/...work/bytecode_modules/DesignatedDealer.mv → ...0000000000001/modules/DesignatedDealer.mv
diff --git a/...iemCoreFramework/bytecode_modules/Diem.mv → ...0000000000000000000000001/modules/Diem.mv b/...iemCoreFramework/bytecode_modules/Diem.mv → ...0000000000000000000000001/modules/Diem.mv
diff --git a/...Framework/bytecode_modules/DiemAccount.mv → ...000000000000000001/modules/DiemAccount.mv b/...Framework/bytecode_modules/DiemAccount.mv → ...000000000000000001/modules/DiemAccount.mv
diff --git a/...reFramework/bytecode_modules/DiemBlock.mv → ...00000000000000000001/modules/DiemBlock.mv b/...reFramework/bytecode_modules/DiemBlock.mv → ...00000000000000000001/modules/DiemBlock.mv
diff --git a/...eFramework/bytecode_modules/DiemConfig.mv → ...0000000000000000001/modules/DiemConfig.mv b/...eFramework/bytecode_modules/DiemConfig.mv → ...0000000000000000001/modules/DiemConfig.mv
diff --git a/...k/bytecode_modules/DiemConsensusConfig.mv → ...0000000001/modules/DiemConsensusConfig.mv b/...k/bytecode_modules/DiemConsensusConfig.mv → ...0000000001/modules/DiemConsensusConfig.mv
diff --git a/...mCoreFramework/bytecode_modules/DiemId.mv → ...00000000000000000000001/modules/DiemId.mv b/...mCoreFramework/bytecode_modules/DiemId.mv → ...00000000000000000000001/modules/DiemId.mv
diff --git a/...eFramework/bytecode_modules/DiemSystem.mv → ...0000000000000000001/modules/DiemSystem.mv b/...eFramework/bytecode_modules/DiemSystem.mv → ...0000000000000000001/modules/DiemSystem.mv
diff --git a/...amework/bytecode_modules/DiemTimestamp.mv → ...0000000000000001/modules/DiemTimestamp.mv b/...amework/bytecode_modules/DiemTimestamp.mv → ...0000000000000001/modules/DiemTimestamp.mv
diff --git a/...odules/DiemTransactionPublishingOption.mv → ...odules/DiemTransactionPublishingOption.mv b/...odules/DiemTransactionPublishingOption.mv → ...odules/DiemTransactionPublishingOption.mv
diff --git a/...ramework/bytecode_modules/DiemVMConfig.mv → ...00000000000000001/modules/DiemVMConfig.mv b/...ramework/bytecode_modules/DiemVMConfig.mv → ...00000000000000001/modules/DiemVMConfig.mv
diff --git a/...Framework/bytecode_modules/DiemVersion.mv → ...000000000000000001/modules/DiemVersion.mv b/...Framework/bytecode_modules/DiemVersion.mv → ...000000000000000001/modules/DiemVersion.mv
diff --git a/...ework/bytecode_modules/DualAttestation.mv → ...00000000000001/modules/DualAttestation.mv b/...ework/bytecode_modules/DualAttestation.mv → ...00000000000001/modules/DualAttestation.mv
diff --git a/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv b/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Errors.mv
diff --git a/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv b/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Event.mv
diff --git a/...estsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv b/...estsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/FixedPoint32.mv
diff --git a/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv b/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/GUID.mv
diff --git a/...CoreFramework/bytecode_modules/Genesis.mv → ...0000000000000000000001/modules/Genesis.mv b/...CoreFramework/bytecode_modules/Genesis.mv → ...0000000000000000000001/modules/Genesis.mv
diff --git a/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv b/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Hash.mv
diff --git a/...ework/bytecode_modules/NetworkIdentity.mv → ...00000000000001/modules/NetworkIdentity.mv b/...ework/bytecode_modules/NetworkIdentity.mv → ...00000000000001/modules/NetworkIdentity.mv
diff --git a/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv b/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Offer.mv
diff --git a/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv b/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Option.mv
diff --git a/...tecode_modules/ParallelExecutionConfig.mv → ...000001/modules/ParallelExecutionConfig.mv b/...tecode_modules/ParallelExecutionConfig.mv → ...000001/modules/ParallelExecutionConfig.mv
diff --git a/...mework/bytecode_modules/PaymentScripts.mv → ...000000000000001/modules/PaymentScripts.mv b/...mework/bytecode_modules/PaymentScripts.mv → ...000000000000001/modules/PaymentScripts.mv
diff --git a/...ework/bytecode_modules/RecoveryAddress.mv → ...00000000000001/modules/RecoveryAddress.mv b/...ework/bytecode_modules/RecoveryAddress.mv → ...00000000000001/modules/RecoveryAddress.mv
diff --git a/.../bytecode_modules/RegisteredCurrencies.mv → ...000000001/modules/RegisteredCurrencies.mv b/.../bytecode_modules/RegisteredCurrencies.mv → ...000000001/modules/RegisteredCurrencies.mv
diff --git a/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv b/.../tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Role.mv
diff --git a/...emCoreFramework/bytecode_modules/Roles.mv → ...000000000000000000000001/modules/Roles.mv b/...emCoreFramework/bytecode_modules/Roles.mv → ...000000000000000000000001/modules/Roles.mv
diff --git a/...ytecode_modules/SharedEd25519PublicKey.mv → ...0000001/modules/SharedEd25519PublicKey.mv b/...ytecode_modules/SharedEd25519PublicKey.mv → ...0000001/modules/SharedEd25519PublicKey.mv
diff --git a/...reFramework/bytecode_modules/Signature.mv → ...00000000000000000001/modules/Signature.mv b/...reFramework/bytecode_modules/Signature.mv → ...00000000000000000001/modules/Signature.mv
diff --git a/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv b/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Signer.mv
diff --git a/...ramework/bytecode_modules/SlidingNonce.mv → ...00000000000000001/modules/SlidingNonce.mv b/...ramework/bytecode_modules/SlidingNonce.mv → ...00000000000000001/modules/SlidingNonce.mv
diff --git a/...de_modules/SystemAdministrationScripts.mv → ...01/modules/SystemAdministrationScripts.mv b/...de_modules/SystemAdministrationScripts.mv → ...01/modules/SystemAdministrationScripts.mv
diff --git a/...mework/bytecode_modules/TransactionFee.mv → ...000000000000001/modules/TransactionFee.mv b/...mework/bytecode_modules/TransactionFee.mv → ...000000000000001/modules/TransactionFee.mv
diff --git a/...code_modules/TreasuryComplianceScripts.mv → ...0001/modules/TreasuryComplianceScripts.mv b/...code_modules/TreasuryComplianceScripts.mv → ...0001/modules/TreasuryComplianceScripts.mv
diff --git a/...iemCoreFramework/bytecode_modules/VASP.mv → ...0000000000000000000000001/modules/VASP.mv b/...iemCoreFramework/bytecode_modules/VASP.mv → ...0000000000000000000000001/modules/VASP.mv
diff --git a/...eFramework/bytecode_modules/VASPDomain.mv → ...0000000000000000001/modules/VASPDomain.mv b/...eFramework/bytecode_modules/VASPDomain.mv → ...0000000000000000001/modules/VASPDomain.mv
diff --git a/...modules/ValidatorAdministrationScripts.mv → ...modules/ValidatorAdministrationScripts.mv b/...modules/ValidatorAdministrationScripts.mv → ...modules/ValidatorAdministrationScripts.mv
diff --git a/...ework/bytecode_modules/ValidatorConfig.mv → ...00000000000001/modules/ValidatorConfig.mv b/...ework/bytecode_modules/ValidatorConfig.mv → ...00000000000001/modules/ValidatorConfig.mv
diff --git a/...tecode_modules/ValidatorOperatorConfig.mv → ...000001/modules/ValidatorOperatorConfig.mv b/...tecode_modules/ValidatorOperatorConfig.mv → ...000001/modules/ValidatorOperatorConfig.mv
diff --git a/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv b/...tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vault.mv
diff --git a/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv b/...ests/testsuite/compare_smoke/storage/0x00000000000000000000000000000001/modules/Vector.mv
diff --git a/...DiemCoreFramework/bytecode_modules/XDX.mv → ...00000000000000000000000001/modules/XDX.mv b/...DiemCoreFramework/bytecode_modules/XDX.mv → ...00000000000000000000000001/modules/XDX.mv
diff --git a/...DiemCoreFramework/bytecode_modules/XUS.mv → ...00000000000000000000000001/modules/XUS.mv b/...DiemCoreFramework/bytecode_modules/XUS.mv → ...00000000000000000000000001/modules/XUS.mv
diff --git a/...testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv b/...testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NameService.mv
diff --git a/...uite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv b/...uite/compare_smoke/storage/0x00000000000000000000000000000002/modules/NonFungibleToken.mv
diff --git a/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv b/...i/tests/testsuite/compare_smoke/storage/0x00000000000000000000000000000002/modules/Set.mv
diff --git a/...ompare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv b/...ompare_smoke/storage/0x00000000000000000000000000000002/modules/SimpleSortedLinkedList.mv
diff --git a/...uite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv b/...uite/compare_smoke/storage/0x00000000000000000000000000000002/modules/SortedLinkedList.mv
diff --git a/diem-move/diem-events-fetcher/src/lib.rs b/diem-move/diem-events-fetcher/src/lib.rs
@@ -40,7 +40,7 @@ impl DiemEventsFetcher {
         account: AccountAddress,
     ) -> Result<Option<(EventHandle, EventHandle)>> {
         match self.get_account_state(account).await? {
-            Some(account_state) => Ok(account_state.get_account_resource()?.map(|resource| {
+            Some(account_state) => Ok(account_state.get_diem_account_resource()?.map(|resource| {
                 (
                     resource.sent_events().clone(),
                     resource.received_events().clone(),

diff --git a/diem-move/diem-framework/DPN/Move.toml b/diem-move/diem-framework/DPN/Move.toml
@@ -2,5 +2,13 @@
 name = "DPNFramework"
 version = "1.5.0"
 
+[addresses]
+Std = "0x1"
+DiemFramework = "0x1"
+DiemRoot = "0xA550C18"
+TreasuryCompliance = "0xB1E55ED"
+CurrencyInfo = "0xA550C18"
+VMReserved = "0x0"
+
 [dependencies]
-DiemCoreFramework = { local = "../core" }
+MoveStdlib = { local = "../../../language/move-stdlib" }
diff --git a/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml b/diem-move/diem-framework/DPN/releases/artifacts/current/build/DPNFramework/BuildInfo.yaml
@@ -2,7 +2,6 @@
 compiled_package_info:
   package_name: DPNFramework
   address_alias_instantiation:
-    CoreFramework: "00000000000000000000000000000001"
     CurrencyInfo: 0000000000000000000000000a550c18
     DiemFramework: "00000000000000000000000000000001"
     DiemRoot: 0000000000000000000000000a550c18
@@ -166,7 +165,7 @@ compiled_package_info:
     ? address: "00000000000000000000000000000001"
       name: XUS
     : DiemFramework
-  source_digest: 7DA6FB50576D6D1C277228DD430480010DCE130D7E1F2CFDC35AF0135D8E4F06
+  source_digest: E694069728C7C632DF6E917D1CB6CD108C696B90EC9BB22798FAEAB81CE4922F
   build_flags:
     dev_mode: false
     test_mode: false
@@ -177,4 +176,3 @@ compiled_package_info:
     additional_named_addresses: {}
 dependencies:
   - MoveStdlib
-  - DiemCoreFramework
diff --git a/...rationScripts/add_currency_to_account.abi → ...rationScripts/add_currency_to_account.abi b/...rationScripts/add_currency_to_account.abi → ...rationScripts/add_currency_to_account.abi
diff --git a/...ipts/add_recovery_rotation_capability.abi → ...ipts/add_recovery_rotation_capability.abi b/...ipts/add_recovery_rotation_capability.abi → ...ipts/add_recovery_rotation_capability.abi
diff --git a/...rationScripts/create_recovery_address.abi → ...rationScripts/create_recovery_address.abi b/...rationScripts/create_recovery_address.abi → ...rationScripts/create_recovery_address.abi
diff --git a/...nistrationScripts/create_vasp_domains.abi → ...nistrationScripts/create_vasp_domains.abi b/...nistrationScripts/create_vasp_domains.abi → ...nistrationScripts/create_vasp_domains.abi
diff --git a/...untAdministrationScripts/force_expire.abi → ...untAdministrationScripts/force_expire.abi b/...untAdministrationScripts/force_expire.abi → ...untAdministrationScripts/force_expire.abi
diff --git a/...tAdministrationScripts/opt_in_to_crsn.abi → ...tAdministrationScripts/opt_in_to_crsn.abi b/...tAdministrationScripts/opt_in_to_crsn.abi → ...tAdministrationScripts/opt_in_to_crsn.abi
diff --git a/...pts/publish_shared_ed25519_public_key.abi → ...pts/publish_shared_ed25519_public_key.abi b/...pts/publish_shared_ed25519_public_key.abi → ...pts/publish_shared_ed25519_public_key.abi
diff --git a/...tionScripts/rotate_authentication_key.abi → ...tionScripts/rotate_authentication_key.abi b/...tionScripts/rotate_authentication_key.abi → ...tionScripts/rotate_authentication_key.abi
diff --git a/.../rotate_authentication_key_with_nonce.abi → .../rotate_authentication_key_with_nonce.abi b/.../rotate_authentication_key_with_nonce.abi → .../rotate_authentication_key_with_nonce.abi
diff --git a/...e_authentication_key_with_nonce_admin.abi → ...e_authentication_key_with_nonce_admin.abi b/...e_authentication_key_with_nonce_admin.abi → ...e_authentication_key_with_nonce_admin.abi
diff --git a/...hentication_key_with_recovery_address.abi → ...hentication_key_with_recovery_address.abi b/...hentication_key_with_recovery_address.abi → ...hentication_key_with_recovery_address.abi
diff --git a/...nScripts/rotate_dual_attestation_info.abi → ...nScripts/rotate_dual_attestation_info.abi b/...nScripts/rotate_dual_attestation_info.abi → ...nScripts/rotate_dual_attestation_info.abi
diff --git a/...ipts/rotate_shared_ed25519_public_key.abi → ...ipts/rotate_shared_ed25519_public_key.abi b/...ipts/rotate_shared_ed25519_public_key.abi → ...ipts/rotate_shared_ed25519_public_key.abi
diff --git a/...tionScripts/create_child_vasp_account.abi → ...tionScripts/create_child_vasp_account.abi b/...tionScripts/create_child_vasp_account.abi → ...tionScripts/create_child_vasp_account.abi
diff --git a/...ationScripts/create_designated_dealer.abi → ...ationScripts/create_designated_dealer.abi b/...ationScripts/create_designated_dealer.abi → ...ationScripts/create_designated_dealer.abi
diff --git a/...ionScripts/create_parent_vasp_account.abi → ...ionScripts/create_parent_vasp_account.abi b/...ionScripts/create_parent_vasp_account.abi → ...ionScripts/create_parent_vasp_account.abi
diff --git a/...ationScripts/create_validator_account.abi → ...ationScripts/create_validator_account.abi b/...ationScripts/create_validator_account.abi → ...ationScripts/create_validator_account.abi
diff --git a/...pts/create_validator_operator_account.abi → ...pts/create_validator_operator_account.abi b/...pts/create_validator_operator_account.abi → ...pts/create_validator_operator_account.abi
diff --git a/...aymentScripts/peer_to_peer_by_signers.abi → ...aymentScripts/peer_to_peer_by_signers.abi b/...aymentScripts/peer_to_peer_by_signers.abi → ...aymentScripts/peer_to_peer_by_signers.abi
diff --git a/...entScripts/peer_to_peer_with_metadata.abi → ...entScripts/peer_to_peer_with_metadata.abi b/...entScripts/peer_to_peer_with_metadata.abi → ...entScripts/peer_to_peer_with_metadata.abi
diff --git a/...ipts/initialize_diem_consensus_config.abi → ...ipts/initialize_diem_consensus_config.abi b/...ipts/initialize_diem_consensus_config.abi → ...ipts/initialize_diem_consensus_config.abi
diff --git a/...ministrationScripts/set_gas_constants.abi → ...ministrationScripts/set_gas_constants.abi b/...ministrationScripts/set_gas_constants.abi → ...ministrationScripts/set_gas_constants.abi
diff --git a/...nScripts/update_diem_consensus_config.abi → ...nScripts/update_diem_consensus_config.abi b/...nScripts/update_diem_consensus_config.abi → ...nScripts/update_diem_consensus_config.abi
diff --git a/...nistrationScripts/update_diem_version.abi → ...nistrationScripts/update_diem_version.abi b/...nistrationScripts/update_diem_version.abi → ...nistrationScripts/update_diem_version.abi
diff --git a/...suryComplianceScripts/add_vasp_domain.abi → ...suryComplianceScripts/add_vasp_domain.abi b/...suryComplianceScripts/add_vasp_domain.abi → ...suryComplianceScripts/add_vasp_domain.abi
diff --git a/...easuryComplianceScripts/burn_txn_fees.abi → ...easuryComplianceScripts/burn_txn_fees.abi b/...easuryComplianceScripts/burn_txn_fees.abi → ...easuryComplianceScripts/burn_txn_fees.abi
diff --git a/...uryComplianceScripts/burn_with_amount.abi → ...uryComplianceScripts/burn_with_amount.abi b/...uryComplianceScripts/burn_with_amount.abi → ...uryComplianceScripts/burn_with_amount.abi
diff --git a/...lianceScripts/cancel_burn_with_amount.abi → ...lianceScripts/cancel_burn_with_amount.abi b/...lianceScripts/cancel_burn_with_amount.abi → ...lianceScripts/cancel_burn_with_amount.abi
diff --git a/...asuryComplianceScripts/freeze_account.abi → ...asuryComplianceScripts/freeze_account.abi b/...asuryComplianceScripts/freeze_account.abi → ...asuryComplianceScripts/freeze_account.abi
diff --git a/...bis/TreasuryComplianceScripts/preburn.abi → ...bis/TreasuryComplianceScripts/preburn.abi b/...bis/TreasuryComplianceScripts/preburn.abi → ...bis/TreasuryComplianceScripts/preburn.abi
diff --git a/...yComplianceScripts/remove_vasp_domain.abi → ...yComplianceScripts/remove_vasp_domain.abi b/...yComplianceScripts/remove_vasp_domain.abi → ...yComplianceScripts/remove_vasp_domain.abi
diff --git a/...TreasuryComplianceScripts/tiered_mint.abi → ...TreasuryComplianceScripts/tiered_mint.abi b/...TreasuryComplianceScripts/tiered_mint.abi → ...TreasuryComplianceScripts/tiered_mint.abi
diff --git a/...uryComplianceScripts/unfreeze_account.abi → ...uryComplianceScripts/unfreeze_account.abi b/...uryComplianceScripts/unfreeze_account.abi → ...uryComplianceScripts/unfreeze_account.abi
diff --git a/...Scripts/update_dual_attestation_limit.abi → ...Scripts/update_dual_attestation_limit.abi b/...Scripts/update_dual_attestation_limit.abi → ...Scripts/update_dual_attestation_limit.abi
diff --git a/...omplianceScripts/update_exchange_rate.abi → ...omplianceScripts/update_exchange_rate.abi b/...omplianceScripts/update_exchange_rate.abi → ...omplianceScripts/update_exchange_rate.abi
diff --git a/...plianceScripts/update_minting_ability.abi → ...plianceScripts/update_minting_ability.abi b/...plianceScripts/update_minting_ability.abi → ...plianceScripts/update_minting_ability.abi
diff --git a/...Scripts/add_validator_and_reconfigure.abi → ...Scripts/add_validator_and_reconfigure.abi b/...Scripts/add_validator_and_reconfigure.abi → ...Scripts/add_validator_and_reconfigure.abi
diff --git a/...tionScripts/register_validator_config.abi → ...tionScripts/register_validator_config.abi b/...tionScripts/register_validator_config.abi → ...tionScripts/register_validator_config.abi
diff --git a/...ipts/remove_validator_and_reconfigure.abi → ...ipts/remove_validator_and_reconfigure.abi b/...ipts/remove_validator_and_reconfigure.abi → ...ipts/remove_validator_and_reconfigure.abi
diff --git a/.../set_validator_config_and_reconfigure.abi → .../set_validator_config_and_reconfigure.abi b/.../set_validator_config_and_reconfigure.abi → .../set_validator_config_and_reconfigure.abi
diff --git a/...trationScripts/set_validator_operator.abi → ...trationScripts/set_validator_operator.abi b/...trationScripts/set_validator_operator.abi → ...trationScripts/set_validator_operator.abi
diff --git a/...t_validator_operator_with_nonce_admin.abi → ...t_validator_operator_with_nonce_admin.abi b/...t_validator_operator_with_nonce_admin.abi → ...t_validator_operator_with_nonce_admin.abi
diff --git a/...e_modules/AccountAdministrationScripts.mv → ...e_modules/AccountAdministrationScripts.mv b/...e_modules/AccountAdministrationScripts.mv → ...e_modules/AccountAdministrationScripts.mv
diff --git a/.../releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv b/.../releases/artifacts/current/build/DPNFramework/bytecode_modules/AccountCreationScripts.mv
diff --git a/...ental/bytecode_modules/AccountFreezing.mv → ...ework/bytecode_modules/AccountFreezing.mv b/...ental/bytecode_modules/AccountFreezing.mv → ...ework/bytecode_modules/AccountFreezing.mv
diff --git a/...imental/bytecode_modules/AccountLimits.mv → ...amework/bytecode_modules/AccountLimits.mv b/...imental/bytecode_modules/AccountLimits.mv → ...amework/bytecode_modules/AccountLimits.mv
diff --git a/...imental/bytecode_modules/Authenticator.mv → ...amework/bytecode_modules/Authenticator.mv b/...imental/bytecode_modules/Authenticator.mv → ...amework/bytecode_modules/Authenticator.mv
diff --git a/...DiemExperimental/bytecode_modules/CRSN.mv → ...ild/DPNFramework/bytecode_modules/CRSN.mv b/...DiemExperimental/bytecode_modules/CRSN.mv → ...ild/DPNFramework/bytecode_modules/CRSN.mv
diff --git a/...mExperimental/bytecode_modules/ChainId.mv → .../DPNFramework/bytecode_modules/ChainId.mv b/...mExperimental/bytecode_modules/ChainId.mv → .../DPNFramework/bytecode_modules/ChainId.mv
diff --git a/...imental/bytecode_modules/CoreAddresses.mv → ...amework/bytecode_modules/CoreAddresses.mv b/...imental/bytecode_modules/CoreAddresses.mv → ...amework/bytecode_modules/CoreAddresses.mv
diff --git a/...ntal/bytecode_modules/DesignatedDealer.mv → ...work/bytecode_modules/DesignatedDealer.mv b/...ntal/bytecode_modules/DesignatedDealer.mv → ...work/bytecode_modules/DesignatedDealer.mv
diff --git a/...DiemExperimental/bytecode_modules/Diem.mv → ...ild/DPNFramework/bytecode_modules/Diem.mv b/...DiemExperimental/bytecode_modules/Diem.mv → ...ild/DPNFramework/bytecode_modules/Diem.mv
diff --git a/...erimental/bytecode_modules/DiemAccount.mv → ...Framework/bytecode_modules/DiemAccount.mv b/...erimental/bytecode_modules/DiemAccount.mv → ...Framework/bytecode_modules/DiemAccount.mv
diff --git a/...framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv b/...framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemBlock.mv
diff --git a/...ramework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv b/...ramework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConfig.mv
diff --git a/...DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv b/...DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemConsensusConfig.mv
diff --git a/...emExperimental/bytecode_modules/DiemId.mv → ...d/DPNFramework/bytecode_modules/DiemId.mv b/...emExperimental/bytecode_modules/DiemId.mv → ...d/DPNFramework/bytecode_modules/DiemId.mv
diff --git a/...ramework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv b/...ramework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemSystem.mv
diff --git a/...imental/bytecode_modules/DiemTimestamp.mv → ...amework/bytecode_modules/DiemTimestamp.mv b/...imental/bytecode_modules/DiemTimestamp.mv → ...amework/bytecode_modules/DiemTimestamp.mv
diff --git a/...odules/DiemTransactionPublishingOption.mv → ...odules/DiemTransactionPublishingOption.mv b/...odules/DiemTransactionPublishingOption.mv → ...odules/DiemTransactionPublishingOption.mv
diff --git a/...mework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv b/...mework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVMConfig.mv
diff --git a/...amework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv b/...amework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/DiemVersion.mv
diff --git a/...ental/bytecode_modules/DualAttestation.mv → ...ework/bytecode_modules/DualAttestation.mv b/...ental/bytecode_modules/DualAttestation.mv → ...ework/bytecode_modules/DualAttestation.mv
diff --git a/...m-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv b/...m-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Genesis.mv
diff --git a/...ental/bytecode_modules/NetworkIdentity.mv → ...ework/bytecode_modules/NetworkIdentity.mv b/...ental/bytecode_modules/NetworkIdentity.mv → ...ework/bytecode_modules/NetworkIdentity.mv
diff --git a/...releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv b/...releases/artifacts/current/build/DPNFramework/bytecode_modules/ParallelExecutionConfig.mv
diff --git a/...mental/bytecode_modules/PaymentScripts.mv → ...mework/bytecode_modules/PaymentScripts.mv b/...mental/bytecode_modules/PaymentScripts.mv → ...mework/bytecode_modules/PaymentScripts.mv
diff --git a/...ental/bytecode_modules/RecoveryAddress.mv → ...ework/bytecode_modules/RecoveryAddress.mv b/...ental/bytecode_modules/RecoveryAddress.mv → ...ework/bytecode_modules/RecoveryAddress.mv
diff --git a/.../bytecode_modules/RegisteredCurrencies.mv → .../bytecode_modules/RegisteredCurrencies.mv b/.../bytecode_modules/RegisteredCurrencies.mv → .../bytecode_modules/RegisteredCurrencies.mv
diff --git a/...iem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv b/...iem-framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Roles.mv
diff --git a/...ytecode_modules/SharedEd25519PublicKey.mv → ...ytecode_modules/SharedEd25519PublicKey.mv b/...ytecode_modules/SharedEd25519PublicKey.mv → ...ytecode_modules/SharedEd25519PublicKey.mv
diff --git a/...framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv b/...framework/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/Signature.mv
diff --git a/...rimental/bytecode_modules/SlidingNonce.mv → ...ramework/bytecode_modules/SlidingNonce.mv b/...rimental/bytecode_modules/SlidingNonce.mv → ...ramework/bytecode_modules/SlidingNonce.mv
diff --git a/...ases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv b/...ases/artifacts/current/build/DPNFramework/bytecode_modules/SystemAdministrationScripts.mv
diff --git a/...mental/bytecode_modules/TransactionFee.mv → ...mework/bytecode_modules/TransactionFee.mv b/...mental/bytecode_modules/TransactionFee.mv → ...mework/bytecode_modules/TransactionFee.mv
diff --git a/...code_modules/TreasuryComplianceScripts.mv → ...code_modules/TreasuryComplianceScripts.mv b/...code_modules/TreasuryComplianceScripts.mv → ...code_modules/TreasuryComplianceScripts.mv
diff --git a/...DiemExperimental/bytecode_modules/VASP.mv → ...ild/DPNFramework/bytecode_modules/VASP.mv b/...DiemExperimental/bytecode_modules/VASP.mv → ...ild/DPNFramework/bytecode_modules/VASP.mv
diff --git a/...perimental/bytecode_modules/VASPDomain.mv → ...NFramework/bytecode_modules/VASPDomain.mv b/...perimental/bytecode_modules/VASPDomain.mv → ...NFramework/bytecode_modules/VASPDomain.mv
diff --git a/...modules/ValidatorAdministrationScripts.mv → ...modules/ValidatorAdministrationScripts.mv b/...modules/ValidatorAdministrationScripts.mv → ...modules/ValidatorAdministrationScripts.mv
diff --git a/...ork/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv b/...ork/DPN/releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorConfig.mv
diff --git a/...releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv b/...releases/artifacts/current/build/DPNFramework/bytecode_modules/ValidatorOperatorConfig.mv
diff --git a/.../DiemExperimental/bytecode_modules/XDX.mv → ...uild/DPNFramework/bytecode_modules/XDX.mv b/.../DiemExperimental/bytecode_modules/XDX.mv → ...uild/DPNFramework/bytecode_modules/XDX.mv
diff --git a/.../DiemExperimental/bytecode_modules/XUS.mv → ...uild/DPNFramework/bytecode_modules/XUS.mv b/.../DiemExperimental/bytecode_modules/XUS.mv → ...uild/DPNFramework/bytecode_modules/XUS.mv
diff --git a/...ntal/docs/AccountAdministrationScripts.md → ...work/docs/AccountAdministrationScripts.md b/...ntal/docs/AccountAdministrationScripts.md → ...work/docs/AccountAdministrationScripts.md
@@ -175,7 +175,7 @@ already have a <code><a href="DiemAccount.md#0x1_DiemAccount_Balance">DiemAccoun
 
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_AddCurrencyAbortsIf">DiemAccount::AddCurrencyAbortsIf</a>&lt;Currency&gt;;
-<b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_AddCurrencyEnsures">DiemAccount::AddCurrencyEnsures</a>&lt;Currency&gt;{addr: <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account)};
+<b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_AddCurrencyEnsures">DiemAccount::AddCurrencyEnsures</a>&lt;Currency&gt;{addr: <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account)};
 <b>aborts_with</b> [check]
     Errors::NOT_PUBLISHED,
     Errors::INVALID_ARGUMENT,
@@ -289,7 +289,7 @@ resource stored under the account at <code>recovery_address</code>.
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: to_recover_account};
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityAbortsIf">DiemAccount::ExtractKeyRotationCapabilityAbortsIf</a>{account: to_recover_account};
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityEnsures">DiemAccount::ExtractKeyRotationCapabilityEnsures</a>{account: to_recover_account};
-<b>let</b> addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(to_recover_account);
+<b>let</b> addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(to_recover_account);
 <b>let</b> rotation_cap = <a href="DiemAccount.md#0x1_DiemAccount_spec_get_key_rotation_cap">DiemAccount::spec_get_key_rotation_cap</a>(addr);
 <b>include</b> <a href="RecoveryAddress.md#0x1_RecoveryAddress_AddRotationCapabilityAbortsIf">RecoveryAddress::AddRotationCapabilityAbortsIf</a>{
     to_recover: rotation_cap
@@ -473,7 +473,7 @@ and <code>account</code> must not have previously delegated its <code><a href="D
 
 
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
-<b>let</b> account_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<b>let</b> account_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityAbortsIf">DiemAccount::ExtractKeyRotationCapabilityAbortsIf</a>;
 <b>let</b> key_rotation_capability = <a href="DiemAccount.md#0x1_DiemAccount_spec_get_key_rotation_cap">DiemAccount::spec_get_key_rotation_cap</a>(account_addr);
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_RotateAuthenticationKeyAbortsIf">DiemAccount::RotateAuthenticationKeyAbortsIf</a>{cap: key_rotation_capability, new_authentication_key: new_key};
@@ -587,7 +587,7 @@ and <code>account</code> must not have previously delegated its <code><a href="D
 
 
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
-<b>let</b> account_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<b>let</b> account_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>include</b> <a href="SlidingNonce.md#0x1_SlidingNonce_RecordNonceAbortsIf">SlidingNonce::RecordNonceAbortsIf</a>{ seq_nonce: sliding_nonce };
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityAbortsIf">DiemAccount::ExtractKeyRotationCapabilityAbortsIf</a>;
 <b>let</b> key_rotation_capability = <a href="DiemAccount.md#0x1_DiemAccount_spec_get_key_rotation_cap">DiemAccount::spec_get_key_rotation_cap</a>(account_addr);
@@ -703,7 +703,7 @@ and <code>account</code> must not have previously delegated its <code><a href="D
 
 
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
-<b>let</b> account_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<b>let</b> account_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>include</b> <a href="SlidingNonce.md#0x1_SlidingNonce_RecordNonceAbortsIf">SlidingNonce::RecordNonceAbortsIf</a>{ account: dr_account, seq_nonce: sliding_nonce };
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityAbortsIf">DiemAccount::ExtractKeyRotationCapabilityAbortsIf</a>;
 <b>let</b> key_rotation_capability = <a href="DiemAccount.md#0x1_DiemAccount_spec_get_key_rotation_cap">DiemAccount::spec_get_key_rotation_cap</a>(account_addr);
@@ -844,7 +844,7 @@ the address to recover. The address of the transaction signer has to be either
 the delegatee's address or the address to recover [[H18]][PERMISSION][[J18]][PERMISSION].
 
 
-<pre><code><b>let</b> account_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<pre><code><b>let</b> account_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>aborts_if</b> !<a href="RecoveryAddress.md#0x1_RecoveryAddress_spec_holds_key_rotation_cap_for">RecoveryAddress::spec_holds_key_rotation_cap_for</a>(recovery_address, to_recover) <b>with</b> Errors::INVALID_ARGUMENT;
 <b>aborts_if</b> !(account_addr == recovery_address || account_addr == to_recover) <b>with</b> Errors::INVALID_ARGUMENT;
 </code></pre>
@@ -961,7 +961,7 @@ Only the account having Credential can rotate the info.
 Credential is granted to either a Parent VASP or a designated dealer [[H17]][PERMISSION].
 
 
-<pre><code><b>include</b> <a href="DualAttestation.md#0x1_DualAttestation_AbortsIfNoCredential">DualAttestation::AbortsIfNoCredential</a>{addr: <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account)};
+<pre><code><b>include</b> <a href="DualAttestation.md#0x1_DualAttestation_AbortsIfNoCredential">DualAttestation::AbortsIfNoCredential</a>{addr: <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account)};
 </code></pre>
 
 
@@ -1137,7 +1137,7 @@ may be used as a recovery account for those accounts.
 <pre><code><b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityAbortsIf">DiemAccount::ExtractKeyRotationCapabilityAbortsIf</a>;
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_ExtractKeyRotationCapabilityEnsures">DiemAccount::ExtractKeyRotationCapabilityEnsures</a>;
-<b>let</b> account_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<b>let</b> account_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>let</b> rotation_cap = <a href="DiemAccount.md#0x1_DiemAccount_spec_get_key_rotation_cap">DiemAccount::spec_get_key_rotation_cap</a>(account_addr);
 <b>include</b> <a href="RecoveryAddress.md#0x1_RecoveryAddress_PublishAbortsIf">RecoveryAddress::PublishAbortsIf</a>{
     recovery_account: account,
@@ -1220,7 +1220,7 @@ of VASPDomain, and will be empty on at the end of processing this transaction.
 
 
 
-<pre><code><b>let</b> vasp_addr = <a href="../../../../../../../experimental/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
+<pre><code><b>let</b> vasp_addr = <a href="../../../../../../../DPN/releases/artifacts/current/build/MoveStdlib/docs/Signer.md#0x1_Signer_address_of">Signer::address_of</a>(account);
 <b>include</b> <a href="DiemAccount.md#0x1_DiemAccount_TransactionChecks">DiemAccount::TransactionChecks</a>{sender: account};
 <b>include</b> <a href="Roles.md#0x1_Roles_AbortsIfNotParentVasp">Roles::AbortsIfNotParentVasp</a>;
 <b>include</b> <a href="VASPDomain.md#0x1_VASPDomain_PublishVASPDomainsAbortsIf">VASPDomain::PublishVASPDomainsAbortsIf</a> { vasp_addr };