Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add table, string, frombcs, acl, secp2561k, gasschedule module #231

Merged
merged 64 commits into from
Apr 17, 2023
Merged

Conversation

welbon
Copy link
Contributor

@welbon welbon commented Mar 17, 2023

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe):

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Other information

# Conflicts:
#	build/StarcoinFramework/BuildInfo.yaml
#	build/StarcoinFramework/bytecode_modules/Account.mv
#	build/StarcoinFramework/bytecode_modules/AccountScripts.mv
#	build/StarcoinFramework/bytecode_modules/Genesis.mv
#	build/StarcoinFramework/bytecode_modules/GenesisNFT.mv
#	build/StarcoinFramework/bytecode_modules/GenesisNFTScripts.mv
#	build/StarcoinFramework/bytecode_modules/IdentifierNFT.mv
#	build/StarcoinFramework/bytecode_modules/IdentifierNFTScripts.mv
#	build/StarcoinFramework/bytecode_modules/NFTGallery.mv
#	build/StarcoinFramework/bytecode_modules/NFTGalleryScripts.mv
#	build/StarcoinFramework/bytecode_modules/PriceOracle.mv
#	build/StarcoinFramework/bytecode_modules/PriceOracleScripts.mv
#	build/StarcoinFramework/bytecode_modules/SimpleMap.mv
#	build/StarcoinFramework/bytecode_modules/TypeInfo.mv
#	build/StarcoinFramework/bytecode_modules/VMConfig.mv
#	build/StarcoinFramework/bytecode_modules/Vector.mv
#	build/StarcoinFramework/docs/AccountScripts.md
#	build/StarcoinFramework/docs/GenesisNFT.md
#	build/StarcoinFramework/docs/NFT.md
#	build/StarcoinFramework/docs/Oracle.md
#	build/StarcoinFramework/docs/SimpleMap.md
#	build/StarcoinFramework/docs/StdlibUpgradeScripts.md
#	build/StarcoinFramework/source_maps/Account.mvsm
#	build/StarcoinFramework/source_maps/AccountScripts.mvsm
#	build/StarcoinFramework/source_maps/BCS.mvsm
#	build/StarcoinFramework/source_maps/Block.mvsm
#	build/StarcoinFramework/source_maps/Genesis.mvsm
#	build/StarcoinFramework/source_maps/GenesisNFT.mvsm
#	build/StarcoinFramework/source_maps/GenesisNFTScripts.mvsm
#	build/StarcoinFramework/source_maps/IdentifierNFT.mvsm
#	build/StarcoinFramework/source_maps/IdentifierNFTScripts.mvsm
#	build/StarcoinFramework/source_maps/NFT.mvsm
#	build/StarcoinFramework/source_maps/NFTGallery.mvsm
#	build/StarcoinFramework/source_maps/NFTGalleryScripts.mvsm
#	build/StarcoinFramework/source_maps/Oracle.mvsm
#	build/StarcoinFramework/source_maps/PriceOracle.mvsm
#	build/StarcoinFramework/source_maps/PriceOracleAggregator.mvsm
#	build/StarcoinFramework/source_maps/PriceOracleScripts.mvsm
#	build/StarcoinFramework/source_maps/STCUSDOracle.mvsm
#	build/StarcoinFramework/source_maps/SimpleMap.mvsm
#	build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
#	build/StarcoinFramework/source_maps/TypeInfo.mvsm
#	build/StarcoinFramework/source_maps/VMConfig.mvsm
#	build/StarcoinFramework/source_maps/Vector.mvsm
#	integration-tests/account/basic.exp
#	integration-tests/account/delegate_account.exp
#	integration-tests/account/txn_prologue_and_epilogue.exp
#	integration-tests/account/withdraw_capability.exp
#	integration-tests/authenticator/authenticator.exp
#	integration-tests/block/block_checkpoints.exp
#	integration-tests/block/block_checkpoints.move
#	integration-tests/block_reward/basic.exp
#	integration-tests/nft/nft_boxminer.exp
#	integration-tests/nft/nft_card.exp
#	integration-tests/nft/nft_metadata.exp
#	integration-tests/nft/test_gallery.exp
#	integration-tests/nft/test_nft.exp
#	integration-tests/signer_capability/create_signer.exp
#	integration-tests/signer_capability/destroy_signer.exp
#	integration-tests/token/create_account_with_token.exp
#	integration-tests/transaction_scripts/create_account.exp
#	sources/Account.move
#	sources/AccountScripts.move
#	sources/BCS.move
#	sources/GenesisNFT.move
#	sources/NFT.move
#	sources/Oracle.move
#	sources/SimpleMap.move
#	sources/StdlibUpgradeScripts.move
{

};
StdlibUpgradeScripts::do_upgrade_from_v11_to_v12(&genesis_account);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里应该要保留吧?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里我从main同步过来的

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

貌似同步丢了?帮忙多看下

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为防止类似合丢的事情,最好加一些集成测试保证一下

length: u64,
}

spec Table {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个spec先删除,我们的move版本暂时不支持

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已删除

@nkysg nkysg changed the title V11 v12 bob Add table, string, frombcs, secp2561k, gasschedule module Apr 17, 2023
@nkysg nkysg changed the title Add table, string, frombcs, secp2561k, gasschedule module Add table, string, frombcs, acl, secp2561k, gasschedule module Apr 17, 2023
@nkysg nkysg requested a review from sanlee42 April 17, 2023 09:13
@nkysg nkysg merged commit 7ce805c into main Apr 17, 2023
@nkysg nkysg deleted the v11_v12_BOB branch April 17, 2023 09:30
@nkysg nkysg mentioned this pull request Apr 17, 2023
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants