Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 8d010df

Browse files
committed
Merge conflitcs
1 parent e099b9d commit 8d010df

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@ Released with 1.0.0-beta.37 code base.
400400

401401
- Removing the underscore package
402402

403-
## [Unreleased]
404-
405403
## [1.5.0]
406404

407405
### Added
@@ -418,6 +416,8 @@ Released with 1.0.0-beta.37 code base.
418416
- Changing web3 connection example from lets to const (#3967)
419417
- Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options (#4188)
420418

419+
## [Unreleased]
420+
421421
## [3.0.0]
422422

423423
### Changed
@@ -427,4 +427,4 @@ Released with 1.0.0-beta.37 code base.
427427

428428
### Removed
429429

430-
- Removed bzz and shh api (#3909)
430+
- Removed bzz and shh api (#3909)

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
"crypto-js": "^3.3.0",
114114
"decache": "^4.6.0",
115115
"dependency-check": "^4.1.0",
116+
"ethereumjs-common": "^1.3.2",
117+
"ethereumjs-tx": "^2.1.2",
116118
"ethers": "^5.1.4",
117119
"ganache-cli": "^6.12.0",
118120
"jshint": "^2.12.0",

0 commit comments

Comments
 (0)