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

Develop-v7 merged with master commits #2698

Merged
merged 15 commits into from
May 12, 2023
Merged

Conversation

acolytec3
Copy link
Contributor

I cherrypicked all of the commits from master that weren't included in develop-v7 into this branch. This PR is to give us a view on the diff and see if there's anything I missed or any tests failing due to bad merge commit fixes.

acolytec3 and others added 11 commits May 12, 2023 10:26
* Make `block.fromEthersProvider` provider agnostic

* Finish block

* Move provider utils to util

* Remove ethers from tx

* skip fetch test in browser context

* Fix tests

* Fix td typing

* more td typing

* Switch fetch dep to micro-ftch

* Add error handling
* Draft various release notes

* CHANGELOG updates

* Version bump, updated upstream dependency versions, @ethereumjs/util v8.0.6

* Version bump, updated upstream dependency versions, @ethereumjs/common v3.1.2

* Version bump, updated upstream dependency versions, @ethereumjs/tx v4.1.2

* Version bump, updated upstream dependency versions, @ethereumjs/trie v5.0.5

* Add additional @chainsafe/ssz notes to CHANGELOG files of other libraries

* Version bump, updated upstream dependency versions, updated (all) client @ethereumjs dependencies, @ethereumjs/devp2p v5.1.2

* Version bump, updated upstream dependency versions, @ethereumjs/statemanager v1.0.5

* Version bump, updated upstream dependency versions, @ethereumjs/block v4.2.2

* Version bump, updated upstream dependency versions, @ethereumjs/ethash v2.0.5

* Version bump, updated upstream dependency versions, @ethereumjs/blockchain v6.2.2

* Version bump, updated upstream dependency versions, @ethereumjs/evm v1.3.2

* Version bump, updated upstream dependency versions, @ethereumjs/vm v6.4.2

* Version bump, @ethereumjs/client v0.7.1

* Rebuild package-lock.json

* Rebuild relevant documentation

* Updated @chainsafe/ssz related CHANGELOG entries
When preparing Ethereum data for RLP encoding, you must convert all values to either byte arrays or lists.  Scalar values (positive integers) are converted to byte arrays by using the fewest bytes possible to represent the value in big endian format.  The canonical form of any scalar value prepped for RLP encoding is that any leading `0` bytes stripped.  In the case of `0`, this means that the only byte (`0x00`) is stripped and you are left with an empty array.

Most of the values in this code are properly 0-stripped using `bigIntToUnpaddedBuffer`.  Unfortunately, it appears that the `chainId` was added without stripping leading zeros.  In most cases this doesn't matter, but if someone is running a chainId 0 blockchain and they want to EIP-155 encode their transaction, the previous code would result in an invalid transaction because only the canonical form is allowed.

This change fixes this bug and correctly prepares the chainId in EIP-155 transactions for RLP encoding.
* Monorepo: remove dynamic external node version check, statically set to 16,18,20

* Remove get-node-versions entirely

* Remove pull request trigger

---------

Co-authored-by: acolytec3 <17355484+acolytec3@users.noreply.github.com>
@acolytec3 acolytec3 marked this pull request as draft May 12, 2023 15:05
@acolytec3 acolytec3 changed the base branch from master to develop-v7 May 12, 2023 15:06
@codecov
Copy link

codecov bot commented May 12, 2023

Codecov Report

❗ No coverage uploaded for pull request base (develop-v7@355b03b). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

Flag Coverage Δ
block 90.30% <0.00%> (?)
blockchain 90.55% <0.00%> (?)
client 86.90% <0.00%> (?)
common 96.06% <0.00%> (?)
ethash ∅ <0.00%> (?)
statemanager 80.92% <0.00%> (?)
trie 89.94% <0.00%> (?)
tx 95.50% <0.00%> (?)
util 81.33% <0.00%> (?)
vm 81.36% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@holgerd77 holgerd77 left a comment

Choose a reason for hiding this comment

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

Cool, have done a few consistency checks, looks good!

Will merge. 🙂

@holgerd77 holgerd77 marked this pull request as ready for review May 12, 2023 18:05
@holgerd77 holgerd77 merged commit 364fd44 into develop-v7 May 12, 2023
@holgerd77 holgerd77 deleted the develop-master-cherrypick branch June 6, 2023 08:37
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.

8 participants