fix: always take gas price from previous block #9638
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pugachAG
approved these changes
Oct 6, 2023
nikurt
pushed a commit
that referenced
this pull request
Oct 9, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
nikurt
pushed a commit
that referenced
this pull request
Oct 11, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
nikurt
pushed a commit
that referenced
this pull request
Oct 16, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
nikurt
pushed a commit
that referenced
this pull request
Oct 19, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
nikurt
pushed a commit
that referenced
this pull request
Oct 23, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
nikurt
pushed a commit
that referenced
this pull request
Oct 24, 2023
Part of #9618. In post-state-root, chunk production is moved before block production, thus we don't have a `Block` during applying chunk anymore. We need to make sure that all necessary data is still propagated to `Runtime::apply`. It should've not have been an error for gas price, as it is taken from previous block in the general case: https://github.com/near/nearcore/blob/9c8d0bbec6a71876bb3317db2ade425f0077a184/chain/chain/src/chain.rs#L4120 However, when there is no chunk, there seem to be a very old error - it is taken from the same block. Luckily, after `ProtocolFeature::FixApplyChunks` it is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed. Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144 ## Testing As the change must be no-op, existing tests are enough.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #9618.
In post-state-root, chunk production is moved before block production, thus we don't have a
Blockduring applying chunk anymore. We need to make sure that all necessary data is still propagated toRuntime::apply.It should've not have been an error for gas price, as it is taken from previous block in the general case:
nearcore/chain/chain/src/chain.rs
Line 4120 in 9c8d0bb
Luckily, after
ProtocolFeature::FixApplyChunksit is not an issue: when there is no chunk, gas price is not used at all. So I just start taking it from previous block for consistency, to ensure that in post-state-root current block can be safely removed.Full context: https://near.zulipchat.com/#narrow/stream/295302-general/topic/.E2.9C.94.20gas.20price.20inconsistency/near/394894144
Testing
As the change must be no-op, existing tests are enough.