Skip to content

Conversation

@jackzhhuang
Copy link
Contributor

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

@jackzhhuang jackzhhuang requested a review from nkysg as a code owner October 13, 2023 10:05
);
let gas_schedule = GasSchedule::fetch_config(&remote_storage)?;
(gas_schedule, "gas schedule from GasSchedule")
let gas_schedule = {
Copy link
Contributor

Choose a reason for hiding this comment

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

版本合的有问题,左边都是1.13.7的内容,右边是以前的代码

// Executor external API
impl VMExecutor for StarcoinVM {
/// Execute a block of `transactions`. The output vector will have the exact same length as the
/// input vector. The discarded transactions will be marked as `TransactionStatus::Discard` and
Copy link
Contributor

@nkysg nkysg Oct 13, 2023

Choose a reason for hiding this comment

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

同以前, 版本合并的有问题,把TurboSTM代码都删了

self,
ap_cache: &mut C,
) -> Result<
(
Copy link
Contributor

Choose a reason for hiding this comment

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

这些地方也是

license = { workspace = true }
name = "starcoin-vm-types"
publish = { workspace = true }
version = "1.13.7"
Copy link
Contributor

Choose a reason for hiding this comment

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

这里应该用1.13.7版本,现在变成1.13.5,版本合的有问题

name = "transaction-builder-generator"
repository = { workspace = true }
version = "1.13.7"
version = "1.13.5"
Copy link
Contributor

Choose a reason for hiding this comment

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

版本合的有问题,应该先rebase下master代码

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