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

Commit 1ad6858

Browse files
authored
Merge branch '1.x' into wyatt/4058-unsubscribe-fix
2 parents c354831 + 4b9b7d6 commit 1ad6858

15 files changed

Lines changed: 54532 additions & 41518 deletions

File tree

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Bug Report
2+
description: File a bug report
3+
labels: ["Bug"]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Is there an existing issue for this?
8+
description: Please search to see if an issue already exists for the bug you've encountered
9+
options:
10+
- label: I have searched the existing issues
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: Current Behavior
15+
description: A concise description of what you're experiencing (include error message if you have one)
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Expected Behavior
21+
description: A concise description of what you expected to happen
22+
validations:
23+
required: true
24+
- type: textarea
25+
attributes:
26+
label: Steps to Reproduce
27+
description: "Steps to reproduce what you've encountered"
28+
placeholder: |
29+
Using this code:
30+
```typescript
31+
// Your code using Web3.js
32+
```
33+
validations:
34+
required: true
35+
- type: input
36+
attributes:
37+
label: Web3.js Version
38+
placeholder: "1.5.3"
39+
validations:
40+
required: true
41+
- type: textarea
42+
attributes:
43+
label: Environment
44+
description: |
45+
Versions of software you're using
46+
examples:
47+
- **Operating System**: Ubuntu 20.04
48+
- **Browser**: Brave Version 1.29.81 Chromium: 93.0.4577.82 (Official Build) (64-bit)
49+
- **Node.js Version**: v14.16.0
50+
- **NPM Version**: 7.19.1
51+
value: |
52+
- Operating System:
53+
- Browser:
54+
- Node.js Version:
55+
- NPM Version:
56+
- type: textarea
57+
attributes:
58+
label: Anything Else?
59+
description: Links? References? Anything that would give us more context about what you've encountered

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,12 +447,19 @@ Released with 1.0.0-beta.37 code base.
447447
- Dropped build tests in CI for Node v8 and v10, and added support for Node v14 (#4231)
448448
- Change default value for `maxPriorityFeePerGas` from `1 Gwei` to `2.5 Gwei` (#4284)
449449
- Emit subscription id with connect event when creating a subscription (#4300)
450-
- Fixed bug in signTransaction (#4295)
450+
- Fixed bug in signTransaction (#4295)
451+
- Format `block.baseFeePerGas` to number (#4330)
451452
- Introduced new configuration "blockHeaderTimeout" for waiting of block headers for transaction receipt (#3891)
452453

453454
## [Unreleased]
454455

455-
## [1.5.4]
456+
## [1.6.0]
457+
458+
### Changed
459+
460+
- Partially replace usage of [eth-lib](https://github.com/MaiaVictor/eth-lib) with [ethereumjs-util](https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/util) (#4390)
461+
462+
## [1.6.1]
456463

457464
### Changed
458465

docs/web3-eth.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,7 @@ Returns
996996
- ``number`` - ``Number``: The block number. ``null`` if a pending block.
997997
- ``hash`` 32 Bytes - ``String``: Hash of the block. ``null`` if a pending block.
998998
- ``parentHash`` 32 Bytes - ``String``: Hash of the parent block.
999+
- ``baseFeePerGas`` - ``Number``: Minimum to be charged to send a transaction on the network
9991000
- ``nonce`` 8 Bytes - ``String``: Hash of the generated proof-of-work. ``null`` if a pending block.
10001001
- ``sha3Uncles`` 32 Bytes - ``String``: SHA3 of the uncles data in the block.
10011002
- ``logsBloom`` 256 Bytes - ``String``: The bloom filter for the logs of the block. ``null`` if a pending block.
@@ -1026,6 +1027,7 @@ Example
10261027
"number": 3,
10271028
"hash": "0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46",
10281029
"parentHash": "0x2302e1c0b972d00932deb5dab9eb2982f570597d9d42504c05d9c2147eaf9c88",
1030+
"baseFeePerGas": 58713056622,
10291031
"nonce": "0xfb6e1a62d119228b",
10301032
"sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
10311033
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",

0 commit comments

Comments
 (0)