Add (basic) custom chain support (e.g. Görli)

modules/tests/mocks/@colony/purser-core/helpers.js

@@ -28,3 +28,7 @@ export const messageOrDataValidator = jest.fn(
     return messageData;
   },
 );
+
+export const getChainDefinition = jest.fn(() => ({
+  common: { chainId: 'mocked-chain-id' },
+}));

modules/tests/purser-ledger/staticMethods/signTransaction.test.js

@@ -1,6 +1,9 @@
 import { Transaction as EthereumTx } from 'ethereumjs-tx';
 
-import { transactionObjectValidator } from '@colony/purser-core/helpers';
+import {
+  getChainDefinition,
+  transactionObjectValidator,
+} from '@colony/purser-core/helpers';
 import * as utils from '@colony/purser-core/utils';
 
 import { signTransaction } from '@colony/purser-ledger/staticMethods';
@@ -75,6 +78,7 @@ describe('`Ledger` Hardware Wallet Module Static Methods', () => {
     ledgerConnection.mockClear();
     handleLedgerConnectionError.mockClear();
     transactionObjectValidator.mockClear();
+    getChainDefinition.mockClear();
     derivationPathValidator.mockClear();
     utils.warning.mockClear();
   });
@@ -108,6 +112,16 @@ describe('`Ledger` Hardware Wallet Module Static Methods', () => {
       expect(derivationPathValidator).toHaveBeenCalled();
       expect(derivationPathValidator).toHaveBeenCalledWith(derivationPath);
     });
+    test('Gets the correct chain definition', async () => {
+      await signTransaction(mockedArgumentsObject);
+      /*
+       * Calls the chain definition helper with the correct value
+       */
+      expect(getChainDefinition).toHaveBeenCalled();
+      expect(getChainDefinition).toHaveBeenCalledWith(
+        mockedTransactionObject.chainId,
+      );
+    });
     test('Normalizes the transaction input values', async () => {
       await signTransaction(mockedArgumentsObject);
       /*
@@ -127,11 +141,6 @@ describe('`Ledger` Hardware Wallet Module Static Methods', () => {
        */
       expect(hexSequenceNormalizer).toHaveBeenCalledWith(nonce);
       expect(multipleOfTwoHexValueNormalizer).toHaveBeenCalledWith(nonce);
-      /*
-       * Normalizes the destination address
-       */
-      expect(addressNormalizer).toHaveBeenCalled();
-      expect(addressNormalizer).toHaveBeenCalledWith(to);
       /*
        * Normalizes the transaction value
        */
@@ -170,22 +179,17 @@ describe('`Ledger` Hardware Wallet Module Static Methods', () => {
        */
       expect(EthereumTx).toHaveBeenCalled();
       expect(EthereumTx).toHaveBeenCalledWith(
-        expect.objectContaining(
-          {
-            gasPrice,
-            gasLimit,
-            nonce,
-            value,
-            data: inputData,
-            r: String(SIGNATURE.R),
-            s: String(SIGNATURE.S),
-            v: chainId,
-          },
-          {
-            chain: chainId,
-            to,
-          },
-        ),
+        expect.objectContaining({
+          gasPrice,
+          gasLimit,
+          nonce,
+          value,
+          data: inputData,
+          r: String(SIGNATURE.R),
+          s: String(SIGNATURE.S),
+          v: chainId,
+        }),
+        expect.objectContaining({ common: { chainId: 'mocked-chain-id' } }),
       );
     });
     test('Normalizes the signed transaction signature components', async () => {

modules/tests/purser-metamask/staticMethods/signTransaction.test.js

@@ -1,4 +1,8 @@
-import { transactionObjectValidator } from '@colony/purser-core/helpers';
+import { Transaction as EthereumTx } from 'ethereumjs-tx';
+import {
+  getChainDefinition,
+  transactionObjectValidator,
+} from '@colony/purser-core/helpers';
 import { warning } from '@colony/purser-core/utils';
 
 import { signTransaction } from '@colony/purser-metamask/staticMethods';
@@ -15,6 +19,7 @@ import {
 } from '@colony/purser-core/validators';
 
 import { STD_ERRORS } from '@colony/purser-metamask/defaults';
+import { SIGNATURE } from '@colony/purser-core/defaults';
 
 jest.dontMock('@colony/purser-metamask/staticMethods');
 
@@ -38,11 +43,23 @@ jest.mock('@colony/purser-metamask/helpers', () =>
   require('@mocks/purser-metamask/helpers'),
 );
 
+const chainId = 5;
+
 /*
  * Mock the injected web3 proxy object
  */
 const mockedTransactionHash = 'mocked-transaction-hash';
-const mockedRawSignedTransaction = {};
+const mockedRawSignedTransaction = {
+  gas: '1000',
+  gasPrice: '1',
+  input: 'mocked-signed-data',
+  nonce: '10',
+  r: SIGNATURE.R,
+  s: SIGNATURE.S,
+  to: 'mocked-signed-to',
+  v: SIGNATURE.RECOVERY_EVEN,
+  value: '0',
+};
 global.web3 = {
   eth: {
     sendTransaction: jest.fn((transactionObject, callback) =>
@@ -67,6 +84,7 @@ const mockedTransactionObject = {
   gasPrice,
   gasLimit,
   to,
+  chainId,
   value,
   inputData,
 };
@@ -84,6 +102,7 @@ describe('`Metamask` Wallet Module Static Methods', () => {
     addressValidator.mockClear();
     safeIntegerValidator.mockClear();
     hexSequenceValidator.mockClear();
+    getChainDefinition.mockClear();
     warning.mockClear();
     addressNormalizer.mockClear();
     hexSequenceNormalizer.mockClear();
@@ -118,6 +137,16 @@ describe('`Metamask` Wallet Module Static Methods', () => {
         mockedTransactionObject,
       );
     });
+    test('Gets the correct chain definition', async () => {
+      await signTransaction(mockedArgumentsObject);
+      /*
+       * Calls the chain definition helper with the correct value
+       */
+      expect(getChainDefinition).toHaveBeenCalled();
+      expect(getChainDefinition).toHaveBeenCalledWith(
+        mockedTransactionObject.chainId,
+      );
+    });
     test('Throws if no argument provided', async () => {
       expect(signTransaction()).rejects.toThrow();
     });
@@ -182,6 +211,27 @@ describe('`Metamask` Wallet Module Static Methods', () => {
       expect(hexSequenceNormalizer).toHaveBeenCalled();
       expect(hexSequenceNormalizer).toHaveBeenCalledWith(mockedTransactionHash);
     });
+    test('Creates the unsigned transaction object', async () => {
+      await signTransaction(mockedArgumentsObject);
+      /*
+       * Creates the unsigned transaction, seeding the R,S and V components
+       */
+      expect(EthereumTx).toHaveBeenCalled();
+      expect(EthereumTx).toHaveBeenCalledWith(
+        {
+          data: mockedRawSignedTransaction.input,
+          r: mockedRawSignedTransaction.r,
+          s: mockedRawSignedTransaction.s,
+          v: mockedRawSignedTransaction.v,
+          to: mockedRawSignedTransaction.to,
+          gasLimit: expect.anything(),
+          gasPrice: expect.anything(),
+          nonce: expect.anything(),
+          value: expect.anything(),
+        },
+        { common: { chainId: 'mocked-chain-id' } },
+      );
+    });
     test('Returns the valid hash received from signing', async () => {
       const signedTransaction = await signTransaction(mockedArgumentsObject);
       expect(global.web3.eth.getTransaction).toHaveBeenCalled();