From c29b932451c5941996ea1a03608aad7b47fabd74 Mon Sep 17 00:00:00 2001 From: exx8 Date: Sun, 9 May 2021 12:19:30 +0300 Subject: [PATCH 01/17] add nonce to send options. --- docs/web3-eth-contract.rst | 2 ++ packages/web3-eth-contract/types/index.d.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/docs/web3-eth-contract.rst b/docs/web3-eth-contract.rst index a15a9b1025b..ebf176ac9bc 100644 --- a/docs/web3-eth-contract.rst +++ b/docs/web3-eth-contract.rst @@ -837,6 +837,8 @@ Parameters * ``gasPrice`` - ``String`` (optional): The gas price in wei to use for this transaction. * ``gas`` - ``Number`` (optional): The maximum gas provided for this transaction (gas limit). * ``value`` - ``Number|String|BN|BigNumber``(optional): The value transferred for the transaction in wei. + * ``nonce`` - ``Number`` (optional): the nonce number of transaction + 2. ``callback`` - ``Function`` (optional): This callback will be fired first with the "transactionHash", or with an error object as the first argument. ------- diff --git a/packages/web3-eth-contract/types/index.d.ts b/packages/web3-eth-contract/types/index.d.ts index 3b8485e7ce9..e988c0ee0a7 100644 --- a/packages/web3-eth-contract/types/index.d.ts +++ b/packages/web3-eth-contract/types/index.d.ts @@ -125,6 +125,7 @@ export interface SendOptions { gasPrice?: string; gas?: number; value?: number | string | BN; + nonce?:number; } export interface EstimateGasOptions { From fb726abc12e55abf757b9f2f248f199a7359388a Mon Sep 17 00:00:00 2001 From: exx8 Date: Sun, 9 May 2021 12:23:55 +0300 Subject: [PATCH 02/17] add nonce to send options. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef5011747df..c9331fdb0d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -374,3 +374,4 @@ Released with 1.0.0-beta.37 code base. ## [Unreleased] ## [1.3.6] +- I've fixed XY (#4052) From 70e4fdadc9543d2dc757f1342cce7220de2bc3c4 Mon Sep 17 00:00:00 2001 From: Eran Date: Sun, 9 May 2021 12:28:17 +0300 Subject: [PATCH 03/17] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9331fdb0d5..865e00475e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -374,4 +374,4 @@ Released with 1.0.0-beta.37 code base. ## [Unreleased] ## [1.3.6] -- I've fixed XY (#4052) +- Nonce added to send options in documentation and types (#4052) From 9139352d2c2486b6b85e69c820172bcd1ecf3d03 Mon Sep 17 00:00:00 2001 From: exx8 Date: Wed, 12 May 2021 23:41:17 +0300 Subject: [PATCH 04/17] linting --- packages/web3-eth-contract/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-eth-contract/types/index.d.ts b/packages/web3-eth-contract/types/index.d.ts index e988c0ee0a7..d7c09fc522f 100644 --- a/packages/web3-eth-contract/types/index.d.ts +++ b/packages/web3-eth-contract/types/index.d.ts @@ -125,7 +125,7 @@ export interface SendOptions { gasPrice?: string; gas?: number; value?: number | string | BN; - nonce?:number; + nonce?: number; } export interface EstimateGasOptions { From 8899f3507aaa701e4ba31d5d6ce91fa8fcdc74d1 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 13:55:39 -0400 Subject: [PATCH 05/17] updating docs --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af5e311c338..1c6898e637c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -400,4 +400,7 @@ Released with 1.0.0-beta.37 code base. - Removing the underscore package +### Changed + - Docs are being updated + ## [Unreleased] \ No newline at end of file From ab58050f38e179f3b01e4c6d516391c9f1f35e01 Mon Sep 17 00:00:00 2001 From: starwalker00 <68958932+starwalker00@users.noreply.github.com> Date: Wed, 21 Jul 2021 19:58:27 +0200 Subject: [PATCH 06/17] update web3-shh.rst : whisper-overview broken link (#4170) whisper overview has been moved from https://github.com/ethereum/go-ethereum/wiki/Whisper to https://eth.wiki/concepts/whisper/whisper-overview --- docs/web3-shh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web3-shh.rst b/docs/web3-shh.rst index bb74e34e511..859bf1d070d 100644 --- a/docs/web3-shh.rst +++ b/docs/web3-shh.rst @@ -5,7 +5,7 @@ web3.shh ======== -The ``web3-shh`` package allows you to interact with the whisper protocol for broadcasting. For more see `Whisper Overview `_. +The ``web3-shh`` package allows you to interact with the whisper protocol for broadcasting. For more see `Whisper Overview `_. .. code-block:: javascript From c61a3357d5c02949a0833823fe1f1dcbf0978daa Mon Sep 17 00:00:00 2001 From: mongolsteppe <75075420+mongolsteppe@users.noreply.github.com> Date: Wed, 21 Jul 2021 21:00:58 +0300 Subject: [PATCH 07/17] [Docs] Fixed a broken link (#4151) Original link gives out a 404, replaced by the closest thing I could find. --- docs/web3-bzz.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web3-bzz.rst b/docs/web3-bzz.rst index fdefefeb07f..9d3300168b0 100644 --- a/docs/web3-bzz.rst +++ b/docs/web3-bzz.rst @@ -8,7 +8,7 @@ web3.bzz The ``web3-bzz`` package allows you to interact with swarm, the decentralized file store. -For more see the `Swarm Docs `_. +For more see the `Swarm Docs `_. .. code-block:: javascript From 9c31732b2663f4e57c93bc39a78fdace495f4b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Monteiro?= Date: Wed, 21 Jul 2021 20:06:20 +0200 Subject: [PATCH 08/17] Possible typo in docs (#4088) I think the author missed a "this" in the phrase --- docs/callbacks-promises-events.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/callbacks-promises-events.rst b/docs/callbacks-promises-events.rst index 0f5f0f73b45..7d74f0e7698 100644 --- a/docs/callbacks-promises-events.rst +++ b/docs/callbacks-promises-events.rst @@ -9,7 +9,7 @@ To help web3 integrate into all kinds of projects with different standards we pr Most web3.js objects allow a callback as the last parameter, as well as returning promises to chain functions. Ethereum as a blockchain has different levels of finality and therefore needs to return multiple "stages" of an action. -To cope with requirement we return a "promiEvent" for functions like ``web3.eth.sendTransaction`` or contract methods. +To cope with this requirement we return a "promiEvent" for functions like ``web3.eth.sendTransaction`` or contract methods. This "promiEvent" is a promise combined with an event emitter to allow acting on different stages of action on the blockchain, like a transaction. PromiEvents work like a normal promises with added ``on``, ``once`` and ``off`` functions. From 46f9f6b0b5bef35ff74428d99c6187bcd966e162 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Wed, 21 Jul 2021 14:42:14 -0400 Subject: [PATCH 09/17] Typically you will have only one Web3 connection, use const (#3967) Co-authored-by: Gregory Markou <16929357+GregTheGreek@users.noreply.github.com> --- docs/getting-started.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started.rst b/docs/getting-started.rst index 303b22857cd..72b0fd91ae2 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -37,6 +37,6 @@ If this property is ``null`` you should connect to a remote/local node. // In Node.js use: const Web3 = require('web3'); - let web3 = new Web3(Web3.givenProvider || "ws://localhost:8545"); + const web3 = new Web3(Web3.givenProvider || "ws://localhost:8545"); That's it! now you can use the ``web3`` object. From 33167fcb58959e66f5c0b321d548df87d7c52c0e Mon Sep 17 00:00:00 2001 From: Ev Date: Wed, 21 Jul 2021 14:48:23 -0400 Subject: [PATCH 10/17] Removing deprecation notice for HttpProvider (#4008) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Removing deprecation notice for HttpProvider From my view, it is just a provider with less capabilities than websockets, but still widely useful — and widely used as well. @frozeman @nivida @GregTheGreek any thoughts? * Update include_package-core.rst * Update CHANGELOG.md Co-authored-by: Gregory Markou <16929357+GregTheGreek@users.noreply.github.com> Co-authored-by: Alex --- CHANGELOG.md | 3 ++- docs/include_package-core.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c6898e637c..121fe9bf43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -402,5 +402,6 @@ Released with 1.0.0-beta.37 code base. ### Changed - Docs are being updated + - Remove deprecation notice for HttpProvider (#4008) -## [Unreleased] \ No newline at end of file +## [Unreleased] diff --git a/docs/include_package-core.rst b/docs/include_package-core.rst index 6d7225ca653..72a0659ded2 100644 --- a/docs/include_package-core.rst +++ b/docs/include_package-core.rst @@ -84,7 +84,7 @@ Value ``Object`` with the following providers: - - ``Object`` - ``HttpProvider``: The HTTP provider is **deprecated**, as it won't work for subscriptions. + - ``Object`` - ``HttpProvider``: HTTP provider, does not support subscriptions. - ``Object`` - ``WebsocketProvider``: The Websocket provider is the standard for usage in legacy browsers. - ``Object`` - ``IpcProvider``: The IPC provider is used node.js dapps when running a local node. Gives the most secure connection. From 51bf795a281cd1470ee93f49970fb8a9f6eb4ec0 Mon Sep 17 00:00:00 2001 From: mongolsteppe <75075420+mongolsteppe@users.noreply.github.com> Date: Wed, 21 Jul 2021 21:50:36 +0300 Subject: [PATCH 11/17] [Docs] Updated solidity example to modern syntax (#4147) * [Docs] Updated solidity example to modern syntax Replaced the old constructor function syntax with the modern one, added 'emit' to event calls, added pragma, added a valid bytes32 value and updated the JSON ABI. * [Docs] Fixed a broken link (#1) Original link gives out a 404, replaced by the proper guide. Co-authored-by: Juan Alonso * Revert "[Docs] Fixed a broken link (#1)" This reverts commit 0de1272d062ea20daf47d3a7e0b39789a74e1130. Co-authored-by: Juan Alonso --- docs/glossary.rst | 60 +++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/docs/glossary.rst b/docs/glossary.rst index d3b1967b934..7aad6f63d5a 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -51,47 +51,51 @@ Example .. code-block:: javascript + pragma solidity ^0.8.4; contract Test { uint a; - address d = 0x12345678901234567890123456789012; + address d = 0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF; - function Test(uint testInt) { a = testInt;} + constructor(uint testInt) { a = testInt;} event Event(uint indexed b, bytes32 c); event Event2(uint indexed b, bytes32 c); - function foo(uint b, bytes32 c) returns(address) { - Event(b, c); + function foo(uint b, bytes32 c) public returns(address) { + emit Event(b, c); return d; } } + // would result in the JSON: - [{ - "type":"constructor", - "payable":false, - "stateMutability":"nonpayable" - "inputs":[{"name":"testInt","type":"uint256"}], - },{ - "type":"function", - "name":"foo", - "constant":false, - "payable":false, - "stateMutability":"nonpayable", - "inputs":[{"name":"b","type":"uint256"}, {"name":"c","type":"bytes32"}], - "outputs":[{"name":"","type":"address"}] - },{ - "type":"event", - "name":"Event", - "inputs":[{"indexed":true,"name":"b","type":"uint256"}, {"indexed":false,"name":"c","type":"bytes32"}], - "anonymous":false - },{ - "type":"event", - "name":"Event2", - "inputs":[{"indexed":true,"name":"b","type":"uint256"},{"indexed":false,"name":"c","type":"bytes32"}], - "anonymous":false - }] + [ + { + "type": "constructor" + "stateMutability": "nonpayable", + "inputs": [{"internalType":"uint256","name":"testInt","type":"uint256"}], + }, + { + "type": "event" + "name": "Event", + "inputs": [{"indexed":true,"internalType":"uint256","name":"b","type":"uint256"},{"indexed":false,"internalType":"bytes32","name":"c","type":"bytes32"}], + "anonymous": false, + }, + { + "type": "event" + "name": "Event2", + "inputs": [{"indexed":true,"internalType":"uint256","name":"b","type":"uint256"},{"indexed":false,"internalType":"bytes32","name":"c","type":"bytes32"}], + "anonymous": false, + }, + { + "type": "function" + "name": "foo", + "stateMutability": "nonpayable", + "inputs": [{"internalType":"uint256","name":"b","type":"uint256"},{"internalType":"bytes32","name":"c","type":"bytes32"}], + "outputs": [{"internalType":"address","name":"","type":"address"}], + } + ] ------------------------------------------------------------------------------ From 4779430364a7e22e3cd3abcd2846d0219f75d34b Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 16:42:43 -0400 Subject: [PATCH 12/17] added EIP-2718 and EIP-1559 documentation --- CHANGELOG.md | 5 +++-- docs/web3-eth.rst | 16 +++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c3a0fa83a2..b8bb328a37e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -401,10 +401,11 @@ Released with 1.0.0-beta.37 code base. - Removing the underscore package ### Changed - - Grammar fix and updated Swarm and Whisper doc links - - Remove deprecation notice for HttpProvider (#4008) + - Grammar fix (4088) and updated Swarm (#4151)and Whisper doc links (#4170) + - Removed deprecation notice for HttpProvider (#4008) - Nonce added to send options in documentation and types (#4052) - Updated Solidity example to modern syntax (#4147) - Changing web3 connection example from lets to const (#3967) + - Updated the documentation for the transaction object to include EIP-2718 and EIP-1559 options ## [Unreleased] diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index ef2a15a15a8..5535e567b4a 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -236,8 +236,10 @@ The default hardfork property can be one of the following: - ``"constantinople"`` - ``String`` - ``"petersburg"`` - ``String`` - ``"istanbul"`` - ``String`` +- ``"berlin"`` - ``String`` +- ``"london"`` - ``String`` -Default is ``"petersburg"`` +Default is ``"london"`` ------- @@ -247,7 +249,7 @@ Example .. code-block:: javascript web3.eth.defaultHardfork; - > "petersburg" + > "london" // set the default block web3.eth.defaultHardfork = 'istanbul'; @@ -318,7 +320,7 @@ The default common property does contain the following ``Common`` object: - ``networkId`` - ``number``: Network ID of the custom chain - ``chainId`` - ``number``: Chain ID of the custom chain - ``baseChain`` - ``string``: (optional) ``mainnet``, ``goerli``, ``kovan``, ``rinkeby``, or ``ropsten`` -- ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, or ``istanbul`` +- ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, ``istanbul``, ``berlin``, or ``london`` Default is ``undefined``. @@ -1419,17 +1421,21 @@ Parameters - ``value`` - ``Number|String|BN|BigNumber``: (optional) The value transferred for the transaction in :ref:`wei `, also the endowment if it's a contract-creation transaction. - ``gas`` - ``Number``: (optional, default: To-Be-Determined) The amount of gas to use for the transaction (unused gas is refunded). - ``gasPrice`` - ``Number|String|BN|BigNumber``: (optional) The price of gas for this transaction in :ref:`wei `, defaults to :ref:`web3.eth.gasPrice `. + - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transcation. + - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional) The maximum fee per gas that the transaction is willing to pay in total + - ``maxPriorityFeePerGas`` - ``Number|String|BN|BigNumber`` (optional) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) + - ``accessList`` - ``List of hexstrings`` (optional) a list of addresses and storage keys that the transaction plans to access - ``data`` - ``String``: (optional) Either a `ABI byte string `_ containing the data of the function call on a contract, or in the case of a contract-creation transaction the initialisation code. - ``nonce`` - ``Number``: (optional) Integer of the nonce. This allows to overwrite your own pending transactions that use the same nonce. - ``chain`` - ``String``: (optional) Defaults to ``mainnet``. - - ``hardfork`` - ``String``: (optional) Defaults to ``petersburg``. + - ``hardfork`` - ``String``: (optional) Defaults to ``london``. - ``common`` - ``Object``: (optional) The common object - ``customChain`` - ``Object``: The custom chain properties - ``name`` - ``string``: (optional) The name of the chain - ``networkId`` - ``number``: Network ID of the custom chain - ``chainId`` - ``number``: Chain ID of the custom chain - ``baseChain`` - ``string``: (optional) ``mainnet``, ``goerli``, ``kovan``, ``rinkeby``, or ``ropsten`` - - ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, or ``istanbul`` + - ``hardfork`` - ``string``: (optional) ``chainstart``, ``homestead``, ``dao``, ``tangerineWhistle``, ``spuriousDragon``, ``byzantium``, ``constantinople``, ``petersburg``, ``istanbul``, ``berlin``, or ``london`` 2. ``callback`` - ``Function``: (optional) Optional callback, returns an error object as first parameter and the result as second. From b0ea0369e871d41562991dc9bb6565a2d1823f7a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 16:44:23 -0400 Subject: [PATCH 13/17] fixing typo --- docs/web3-eth.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index 5535e567b4a..e717bbea0c0 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -1421,7 +1421,7 @@ Parameters - ``value`` - ``Number|String|BN|BigNumber``: (optional) The value transferred for the transaction in :ref:`wei `, also the endowment if it's a contract-creation transaction. - ``gas`` - ``Number``: (optional, default: To-Be-Determined) The amount of gas to use for the transaction (unused gas is refunded). - ``gasPrice`` - ``Number|String|BN|BigNumber``: (optional) The price of gas for this transaction in :ref:`wei `, defaults to :ref:`web3.eth.gasPrice `. - - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transcation. + - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transaction. - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional) The maximum fee per gas that the transaction is willing to pay in total - ``maxPriorityFeePerGas`` - ``Number|String|BN|BigNumber`` (optional) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) - ``accessList`` - ``List of hexstrings`` (optional) a list of addresses and storage keys that the transaction plans to access From b650d1aea36f32dc5c2492965d565053cbb2bc9d Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 16:54:16 -0400 Subject: [PATCH 14/17] addressing feedback --- docs/web3-eth.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index e717bbea0c0..25aa7ad7ed2 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -1422,8 +1422,8 @@ Parameters - ``gas`` - ``Number``: (optional, default: To-Be-Determined) The amount of gas to use for the transaction (unused gas is refunded). - ``gasPrice`` - ``Number|String|BN|BigNumber``: (optional) The price of gas for this transaction in :ref:`wei `, defaults to :ref:`web3.eth.gasPrice `. - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transaction. - - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional) The maximum fee per gas that the transaction is willing to pay in total - - ``maxPriorityFeePerGas`` - ``Number|String|BN|BigNumber`` (optional) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) + - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional, defaulted to ``(2 * block.baseFeePerGas) + maxPriorityFeePerGas``) The maximum fee per gas that the transaction is willing to pay in total + - ``maxPriorityFeePerGas`` - ``Number|String|BN|BigNumber`` (optional, defaulted to ``1 Gwei``) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) - ``accessList`` - ``List of hexstrings`` (optional) a list of addresses and storage keys that the transaction plans to access - ``data`` - ``String``: (optional) Either a `ABI byte string `_ containing the data of the function call on a contract, or in the case of a contract-creation transaction the initialisation code. - ``nonce`` - ``Number``: (optional) Integer of the nonce. This allows to overwrite your own pending transactions that use the same nonce. From 1ad5608784c1229c5bd6ea73fd68e6551f5a5f0f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 17:05:02 -0400 Subject: [PATCH 15/17] changing possible types for maxPriorityFeePerGas --- docs/web3-eth.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index 25aa7ad7ed2..13d0dbc0da5 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -1423,7 +1423,7 @@ Parameters - ``gasPrice`` - ``Number|String|BN|BigNumber``: (optional) The price of gas for this transaction in :ref:`wei `, defaults to :ref:`web3.eth.gasPrice `. - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transaction. - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional, defaulted to ``(2 * block.baseFeePerGas) + maxPriorityFeePerGas``) The maximum fee per gas that the transaction is willing to pay in total - - ``maxPriorityFeePerGas`` - ``Number|String|BN|BigNumber`` (optional, defaulted to ``1 Gwei``) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) + - ``maxPriorityFeePerGas`` - ``Number|String|BN`` (optional, defaulted to ``1 Gwei``) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) - ``accessList`` - ``List of hexstrings`` (optional) a list of addresses and storage keys that the transaction plans to access - ``data`` - ``String``: (optional) Either a `ABI byte string `_ containing the data of the function call on a contract, or in the case of a contract-creation transaction the initialisation code. - ``nonce`` - ``Number``: (optional) Integer of the nonce. This allows to overwrite your own pending transactions that use the same nonce. From 086ccd553d86adce12e61dd7990a295893f76d20 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 21 Jul 2021 17:09:28 -0400 Subject: [PATCH 16/17] updating maxFeePerGas type --- docs/web3-eth.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst index 13d0dbc0da5..107b172e721 100644 --- a/docs/web3-eth.rst +++ b/docs/web3-eth.rst @@ -1422,7 +1422,7 @@ Parameters - ``gas`` - ``Number``: (optional, default: To-Be-Determined) The amount of gas to use for the transaction (unused gas is refunded). - ``gasPrice`` - ``Number|String|BN|BigNumber``: (optional) The price of gas for this transaction in :ref:`wei `, defaults to :ref:`web3.eth.gasPrice `. - ``type`` - ``Number|String|BN|BigNumber``: (optional) A positive unsigned 8-bit number between 0 and 0x7f that represents the type of the transaction. - - ``maxFeePerGas`` - ``Number|String|BN|BigNumber``: (optional, defaulted to ``(2 * block.baseFeePerGas) + maxPriorityFeePerGas``) The maximum fee per gas that the transaction is willing to pay in total + - ``maxFeePerGas`` - ``Number|String|BN``: (optional, defaulted to ``(2 * block.baseFeePerGas) + maxPriorityFeePerGas``) The maximum fee per gas that the transaction is willing to pay in total - ``maxPriorityFeePerGas`` - ``Number|String|BN`` (optional, defaulted to ``1 Gwei``) The maximum fee per gas to give miners to incentivize them to include the transaction (Priority fee) - ``accessList`` - ``List of hexstrings`` (optional) a list of addresses and storage keys that the transaction plans to access - ``data`` - ``String``: (optional) Either a `ABI byte string `_ containing the data of the function call on a contract, or in the case of a contract-creation transaction the initialisation code. From 5883de1f0209b68974b44e4c3f07e3dcde3803fc Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 22 Jul 2021 10:15:37 -0400 Subject: [PATCH 17/17] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3a86d37867..49b3c436df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -409,7 +409,7 @@ Released with 1.0.0-beta.37 code base. - London transaction support (#4155) ### Changed - - Grammar fix (4088) and updated Swarm (#4151)and Whisper doc links (#4170) + - Grammar fix (#4088) and updated Swarm (#4151)and Whisper doc links (#4170) - Removed deprecation notice for HttpProvider (#4008) - Nonce added to send options in documentation and types (#4052) - Updated Solidity example to modern syntax (#4147)