develop: small fixes #1924
Merged
develop: small fixes #1924
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
…y, make timestamp optional instead of `| null`
Codecov Report
Flags with carried forward coverage won't be shown. Click here to find out more. |
…turn the eth protocol versions in admin_nodeInfo, so this is safely removable)
ryanio
commented
Jun 1, 2022
Comment on lines
-218
to
-222
| // Throw on chain or hardfork options removed in latest major release to | ||
| // prevent implicit chain setup on a wrong chain | ||
| if ('chain' in opts || 'hardfork' in opts) { | ||
| throw new Error('Chain/hardfork options are not allowed any more on initialization') | ||
| } |
There was a problem hiding this comment.
I removed this since it would be two major releases ago for develop, which I think is far enough to remove the legacy check, and TypeScript should guard downstream users against these options being used.
holgerd77
approved these changes
Jun 3, 2022
| @@ -22,7 +22,7 @@ import EEI from './eei' | |||
| import { ERROR, VmError } from '../exceptions' | |||
| import { default as Interpreter, InterpreterOpts, RunState } from './interpreter' | |||
| import Message, { MessageWithTo } from './message' | |||
| import * as eof from './opcodes/eof' | |||
| import EOF from './eof' | |||
There was a problem hiding this comment.
Ah, yes, that's better. I was actually me who introduced the structure if I remember correctly.
| @@ -73,7 +70,7 @@ export class ENR { | |||
| obj.secp256k1 | |||
| ) | |||
|
|
|||
| assert(isVerified, 'Unable to verify ENR signature') | |||
| if (!isVerified) throw new Error('Unable to verify ENR signature') | |||
| @@ -371,7 +371,7 @@ async function startClient(config: Config, customGenesisState?: GenesisState) { | |||
| validateBlocks: true, | |||
| validateConsensus, | |||
| }) | |||
| setCommonForkHashes(config.chainCommon, blockchain.genesisBlock().hash()) | |||
| setCommonForkHashes(config.chainCommon, blockchain.genesisBlock.hash()) | |||
Comment on lines
-218
to
-222
| // Throw on chain or hardfork options removed in latest major release to | ||
| // prevent implicit chain setup on a wrong chain | ||
| if ('chain' in opts || 'hardfork' in opts) { | ||
| throw new Error('Chain/hardfork options are not allowed any more on initialization') | ||
| } |
g11tech
pushed a commit
that referenced
this pull request
Jun 3, 2022
* simplify setting blockchan genesis parameters for future extensibility, make timestamp optional instead of `| null` * move EOF one folder up, export default rather than wildcard import * remove `assert` usage from vm/precompiles, devp2p * eof: reinstate individual imports * make genesisBlock a property and add a separate createGenesisBlock method * fix mock, remove commented out code (double checked, geth does not return the eth protocol versions in admin_nodeInfo, so this is safely removable) * remove old chain/hardfork check * simplify errors, use increment operator, use for..of rather than forEach
holgerd77
pushed a commit
that referenced
this pull request
Jun 8, 2022
* simplify setting blockchan genesis parameters for future extensibility, make timestamp optional instead of `| null` * move EOF one folder up, export default rather than wildcard import * remove `assert` usage from vm/precompiles, devp2p * eof: reinstate individual imports * make genesisBlock a property and add a separate createGenesisBlock method * fix mock, remove commented out code (double checked, geth does not return the eth protocol versions in admin_nodeInfo, so this is safely removable) * remove old chain/hardfork check * simplify errors, use increment operator, use for..of rather than forEach
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.
This PR:
timestampoptional instead of| nullto satisfy BlockHeader type constraints.EOFfile one folder up (couldn't find a reason it needed to be invm/opcodes), export default rather than wildcard importassertusages from evm/precompiles, devp2passertusage left across the monorepo, woo!)