-
Notifications
You must be signed in to change notification settings - Fork 289
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 use selec_head to update startinfo and add some testing case #3972
base: master
Are you sure you want to change the base?
Conversation
stdlib_version | ||
); | ||
let gas_schedule = GasSchedule::fetch_config(&remote_storage)?; | ||
(gas_schedule, "gas schedule from GasSchedule") | ||
let gas_schedule = { |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
同以前, 版本合并的有问题,把TurboSTM代码都删了
@@ -79,14 +77,7 @@ impl SessionOutput { | |||
pub fn into_change_set<C: AccessPathCache>( | |||
self, | |||
ap_cache: &mut C, | |||
) -> Result< | |||
( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这些地方也是
@@ -52,7 +52,7 @@ edition = { workspace = true } | |||
license = { workspace = true } | |||
name = "starcoin-vm-types" | |||
publish = { workspace = true } | |||
version = "1.13.7" |
There was a problem hiding this comment.
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,版本合的有问题
@@ -31,6 +31,6 @@ homepage = { workspace = true } | |||
license = { workspace = true } | |||
name = "transaction-builder-generator" | |||
repository = { workspace = true } | |||
version = "1.13.7" | |||
version = "1.13.5" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
版本合的有问题,应该先rebase下master代码
Pull request type
Please check the type of change your PR introduces:
What is the current behavior?
Issue Number: N/A
What is the new behavior?
Other information