Merge branch '1.x' into wyatt/4058-unsubscribe-fix

Author: spacesailor24

CHANGELOG.md

@@ -448,3 +448,4 @@ Released with 1.0.0-beta.37 code base.
 - Dropped build tests in CI for Node v8 and v10, and added support for Node v14
 - Change default value for `maxPriorityFeePerGas` from `1 Gwei` to `2.5 Gwei` (#4284)
 - Emit subscription id with connect event when creating a subscription (#4300)
+- Fixed bug in signTransaction (#4295) 

RELEASE.md

@@ -79,25 +79,27 @@ The following describes the steps required to release a new version of `web3.js`
 1.  Update and commit `CHANGELOG.md`.
     1.  Move section header `[Unreleased]` to bottom.
     1.  Add next anticipated release version number to bottom (as a placeholder for new changelog entries).
-1.  Create release commit and tags e.g. `lerna version 1.2.7-rc.0 --no-push`
+1.  In the project root, run `npm run build` and commit changes after using a commit message like: `Build for 1.0.0-rc.0`
+    1. The next step will also build each package, but Lerna makes the tagged commit before building the packages (so they're not included)
+3.  Create release commit and tags e.g. `lerna version 1.2.7-rc.0 --no-push`
     1.  (updates package version numbers, builds minified file (for `1.x`), creates release commit and tags.)
-1.  Push release branch to origin with tags `git push origin release/1.2.7 --follow-tags`.
-1.  Create release PR as draft ([example](https://github.com/ethereum/web3.js/pull/3351)).
-1.  Ensure CI is green / passing.
+4.  Push release branch to origin with tags `git push origin release/1.2.7 --follow-tags`.
+5.  Create release PR as draft ([example](https://github.com/ethereum/web3.js/pull/3351)).
+6.  Ensure CI is green / passing.
     1.  (spend time here inspecting the CI logs to ensure everything looks valid and results were reported correctly)
-1.  Run `npm run publish from-package -- --dist-tag rc`.
+7.  Run `npm run publish from-package -- --dist-tag rc`.
     1. Lerna can sometimes have difficulty with the number of packages we have. If the above command is unsuccessful, for every unpublished package run: `lerna publish --scope="package-name"` `npm dist-tag add <package-name>@<version> rc`)
-1.  Publish the GitHub release.
-1.  A GitHub Webhook should trigger the ReadTheDocs build after the release is published.
+8.  Publish the GitHub release.
+9.  A GitHub Webhook should trigger the ReadTheDocs build after the release is published.
     1.  (The build may sometimes need to be manually triggered in ReadTheDocs admin panel. If the version does not appear, create a build of a previous version to refresh the list.)
     1.  Activate the new version.
-1.  Request PR review from key contributors:
+10.  Request PR review from key contributors:
     1.  Chris from EthereumJS ([@cgewecke](https://github.com/cgewecke))
     1.  Patricio from Nomic Labs ([@alcuadrado](https://github.com/alcuadrado))
     1.  Michael from Embark ([@michaelsbradleyjr](https://github.com/michaelsbradleyjr))
     1.  Nicholas from Truffle ([@gnidan](https://github.com/gnidan))
     1.  If touches or affects ENS: Nick Johnson ([@Arachnid](https://github.com/Arachnid))
-1.  Wait 1 week for community discourse and 2 reviewer approvals.
+11.  Wait 1 week for community discourse and 2 reviewer approvals.
     1.  (if release is an emergency patch, time limit may be reduced relative to severity.)
 
 ## Formal Release Procedure

packages/web3-eth-accounts/src/index.js

@@ -228,9 +228,9 @@ Accounts.prototype.signTransaction = function signTransaction(tx, privateKey, ca
 
             var result = {
                 messageHash: '0x' + Buffer.from(signedTx.getMessageToSign(true)).toString('hex'),
-                v: '0x' + Buffer.from(signedTx.v).toString('hex'),
-                r: '0x' + Buffer.from(signedTx.r).toString('hex'),
-                s: '0x' + Buffer.from(signedTx.s).toString('hex'),
+                v: '0x' + signedTx.v.toString('hex'),
+                r: '0x' + signedTx.r.toString('hex'),
+                s: '0x' + signedTx.s.toString('hex'),
                 rawTransaction: rawTransaction,
                 transactionHash: transactionHash
             };

test/e2e.method.signing.js

@@ -2,6 +2,7 @@ var assert = require('assert');
 var Basic = require('./sources/Basic');
 var utils = require('./helpers/test.utils');
 var Web3 = utils.getWeb3();
+var {TransactionFactory} = require('@ethereumjs/tx');
 
 describe('transaction and message signing [ @E2E ]', function() {
     let web3;
@@ -563,5 +564,43 @@ describe('transaction and message signing [ @E2E ]', function() {
             done(error)
         }
     });
-});
 
+    it('accounts.signTransaction returning valid v r s values', async function(){
+
+        const source = wallet[0].address;
+        const destination = wallet[1].address;
+
+        const txCount = await web3.eth.getTransactionCount(source);
+        const networkId = await web3.eth.net.getId();
+        const chainId = await web3.eth.getChainId();
+
+
+        const customCommon = {
+            baseChain: 'mainnet',
+            customChain: {
+                name: 'custom-network',
+                networkId: networkId,
+                chainId: chainId,
+            },
+            hardfork: 'petersburg',
+        };
+
+        const txObject = {
+            nonce:    web3.utils.toHex(txCount),
+            to:       destination,
+            value:    web3.utils.toHex(web3.utils.toWei('0.1', 'ether')),
+            gasLimit: web3.utils.toHex(21000),
+            gasPrice: web3.utils.toHex(web3.utils.toWei('10', 'gwei')),
+            common: customCommon
+        };
+
+        const signed = await web3.eth.accounts.signTransaction(txObject, wallet[0].privateKey);
+        
+        const data = Buffer.from(signed.rawTransaction.slice(2), "hex")
+        const tx = TransactionFactory.fromSerializedData(data);
+
+        assert(signed.v === ('0x' + tx.v.toString('hex')));
+        assert(signed.r === ('0x' + tx.r.toString('hex')));
+        assert(signed.s === ('0x' + tx.s.toString('hex')));
+    });
+});