Replace scrypt-shim with scrypt.js; add test (#128)

* Replace scrypt-shim with scrypt.js; add test * Add keystore tests * Travis CI: set nodejs version 16 * Update rollup version * [account] test: mock fetch value * [account] upgrade to 0.1.58 * e2e tests: mock results for Travis * src tests: adjust for new fetch-mock * package: fix tslib version * readme: update instructions for actual e2e tests mock is used in travis, but the actual e2e tests can be run by following the specified instructions Co-authored-by: MaxMustermann2 <[email protected]>
harmony-one · Jul 6, 2022 · 71304c2 · 71304c2
1 parent 3c70618
commit 71304c2
Show file tree

Hide file tree

Showing 30 changed files with 25,663 additions and 3,734 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 sudo: true
 dist: trusty
 node_js:
-  - 10
+  - 16
 branches:
   except:
     - /^v[0-9]/

diff --git a/README.md b/README.md
@@ -93,12 +93,9 @@ yarn test:src
 ```
 ## e2e tests
 
-1. `.env` file defines configuration, edit if you have custom settings
-
-2. Run harmony node locally, follow the instructions: https://github.com/harmony-one/harmony
-
-3. Wait for 1-2 mins, and run this:
-
+1. Remove the `'cross-fetch': 'jest-fetch-mock'` line from `scripts/jest/jest.e2e.config.js`
+1. Run harmony node locally, follow the instructions: https://github.com/harmony-one/harmony  
+1. Wait for 1-2 mins, and run this:
 ```bash
 yarn build && yarn test:e2e
 ```

diff --git a/e2e/fixtures/transactions.json b/e2e/fixtures/transactions.json
@@ -110,5 +110,29 @@
       "gasPrice": "0x174876e800",
       "rawTransaction": "0xf8690985174876e8008252088080949d72989b68777a1f3ffd6f1db079f1928373ee52830f42408028a022efd1decb6e80e88fd33f5e189f48105acc72f7e302931221183f86ca8a7015a02001dee44471a5397a4579f733b3a13a86ba1d6c78ad3312187513d6a424f72b"
     }
+  ],
+  "hashes": [
+    "0x5aE91eCA3BF7CB97FCd1305bD6e030e24bda9bbfED3b8c741Efe808e8D4F95Ff",
+    "0xf4CA9DdED0bC36B5AFBCf4fC6De082DFd0F7FCFad1c2aFC1aF52d16d9Dbd733f",
+    "0x56C2408c5F58ac9aDFE824B7755f3b54CB0848c7A837Ea1CC5a0FdB521D4A1a2",
+    "0xACFD09AD729E0C9f23EC9eEf27CC68bA37D7EE9D53aABace2dDD42616Eb8351A",
+    "0xB8baee4EfB120254Afab3092c8Ccc458fF49eBda12ead9950CD39ac8Bb26D4C1",
+    "0x412D8DBF0BC3dCAf91A0339EEadd1EEB44b44cD0cEBFaea0d35656d31F96Dde9",
+    "0xbbeDcd6e4dCDef0c666C0C0c7914ba1E5617F8d57ddc40C32cCb31D4BC5CAfBF",
+    "0x6E008bEbC8F2CE750d208dbF987edEf7476DcFDF8Eb8607f3B3c2E1ce8675ba9",
+    "0x0Ff0AcBD45cdDf3A8A148eb2F4Fe6dBf74B422eabdD0766ba9284f0Fe8F6dc8a",
+    "0x7FDCEE6B5EEf5C3F82B2Ffe8a088E0d3d485bEbBcdBCac16ECCb9d1cbfe50c91"
+  ],
+  "blockHashes": [
+    "0x9dD4e063d8cc7A6Fe74a0E3AC4feD5F84eB8Bdc4647Ba8DAd651FD1b4a3979cE",
+    "0xEF5F7D7ca60bE76c1Cc5aADD8DC9e1bC0F7a3BCD0EEDA6e9Cca0EACAd99BE3Bb",
+    "0x4261B409CCcDA3ab97aABCFe8dECCfd65D1aB9Bb536dD57Fdafd191FC6BbFbbc",
+    "0x1fb05a17794cAd1ac025469eA1Bf5af4F33f9bdbD3c0e14bCeca323BC5DF0EC3",
+    "0xEA405dB5dc0E7e2DB2CfdBf272DCeAf69E9CDa2DFD47229b38A3C5b7b9cc41fB",
+    "0xCC1ADfef1bb2E496A3BbDb181ec5c8EA047AE340FaD6fF4FeF3CCE452c1975B6",
+    "0x80dffAe15B6619Cc7aD74Bc132C1b29EFc38B8d8CAD1AfbDb9E37f7357E2EBe4",
+    "0x6BcB9858d8cCE9de2a6ECd6392A5eC712be9b4A79F6Cf84De8aa5ae9C04f60A8",
+    "0xB6De43A866dFcE1f7AA7DA0E8e9eb7Fe545cB6becF7cf5fdC564B22C4cBb72b9",
+    "0xc4b4CeAEAEadADfa8CbCcDeFdcBaBeF999dBF42D14C9AFEDd1de2956B571CebD"
   ]
 }
diff --git a/e2e/src/blockchain.e2e.ts b/e2e/src/blockchain.e2e.ts
@@ -1,35 +1,82 @@
-import { harmony } from './harmony';
+import fetch from 'jest-fetch-mock';
+import { harmony, checkCalledMethod } from './harmony';
 
 import demoAccounts from '../fixtures/testAccount.json';
+import { RPCMethod } from '@harmony-js/network';
 
 const bc = harmony.blockchain;
 
 const testAccount = demoAccounts.Accounts[1];
 
 describe('e2e test blockchain', () => {
+  beforeEach(() => {
+    fetch.resetMocks();
+  });
   // net_*
   it('should test net_peerCount', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x0"}),
+    );
     const peerCount = await bc.net_peerCount();
+    expect(checkCalledMethod(0, RPCMethod.PeerCount)).toEqual(true);
     expect(harmony.utils.isHex(peerCount.result)).toEqual(true);
   });
 
   it('should test net_version', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "5"}),
+    );
     const netVersion = await bc.net_version();
     const versionNumber = parseInt(netVersion.result as string, 10);
     expect(netVersion.result).toEqual(`${versionNumber}`);
+    expect(checkCalledMethod(0, RPCMethod.NetVersion)).toEqual(true);
   });
   it('should test hmy_protocolVersion', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x10"}),
+    );
     const protocolVersion = await bc.getProtocolVersion();
     expect(harmony.utils.isHex(protocolVersion.result)).toEqual(true);
+    expect(checkCalledMethod(0, RPCMethod.ProtocolVersion)).toEqual(true);
   });
 
   // block chain info
   it('should test hmy_blockNumber', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x10"}),
+    );
     const res = await bc.getBlockNumber();
     expect(res.responseType).toEqual('raw');
     expect(harmony.utils.isHex(res.result)).toEqual(true);
+    expect(checkCalledMethod(0, RPCMethod.BlockNumber)).toEqual(true);
   });
+
   it('should test hmy_getBlockByNumber', async () => {
+    fetch.mockResponse(
+      JSON.stringify({
+        "jsonrpc": "2.0",
+        "id": 1,
+        "result": {
+          "size": "0x1",
+          "difficulty": 5,
+          "extraData": "0x",
+          "gasLimit": "0x80",
+          "gasUsed": "0x40",
+          "hash": "0x8a3390ab500Fbca6514eB326d2fcD9B3BFCFbA7DA392593cB4885b8e3399a2D8",
+          "logsBloom": "0x0",
+          "miner": "one155jp2y76nazx8uw5sa94fr0m4s5aj8e5xm6fu3",
+          "mixHash": "0x3A7c1Ae14AfecFf55Da298F66b75F4FfB771c3EaBDeAa267FF33A77d4d0be220",
+          "nonce": 1,
+          "number": "0x1",
+          "parentHash": "0x7CebC07e456F0bCD09dbc9A6f271074d93E27B40A4C67Dcc402e6513e12B9aF9",
+          "receiptsRoot": "0x02B82e11eDC07775Dc6fCF706be2cdAF9165750Ea7bC1B3Eb48ea16Bb3072F4D",
+          "stateRoot": "0xAaDc89C8bA4e3fCfC140cFcc8D3efD3BE7a49ab31534A5a3F0E1DEA09aae0f4a",
+          "timestamp": "0x62c44c0a",
+          "transactionsRoot": "0xc4bfa888fDCC8ca70E2b0CcdCEcc2fF545acCC2D655Ba33DaF4aBc31cFDBd9Ac",
+          "uncles": []
+        }
+      }),
+    );
     const res = await bc.getBlockByNumber({ blockNumber: 'latest' });
     const size = res.result.size;
     expect(res.responseType).toEqual('raw');
@@ -42,21 +89,55 @@ describe('e2e test blockchain', () => {
     const res3 = await bc.getBlockByNumber({ returnObject: true });
     expect(res3.responseType).toEqual('raw');
     expect(checkBlockData(res3.result)).toEqual(true);
+    for(let i = 0; i < 3; i++) {
+      expect(checkCalledMethod(i, RPCMethod.GetBlockByNumber)).toEqual(true);
+    }
   });
 
   it('should test hmy_getBlockByHash', async () => {
+    fetch.mockResponse(
+      JSON.stringify({
+        "jsonrpc": "2.0",
+        "id": 1,
+        "result": {
+          "size": "0x1",
+          "difficulty": 5,
+          "extraData": "0x",
+          "gasLimit": "0x80",
+          "gasUsed": "0x40",
+          "hash": "0x8a3390ab500Fbca6514eB326d2fcD9B3BFCFbA7DA392593cB4885b8e3399a2D8",
+          "logsBloom": "0x0",
+          "miner": "one155jp2y76nazx8uw5sa94fr0m4s5aj8e5xm6fu3",
+          "mixHash": "0x3A7c1Ae14AfecFf55Da298F66b75F4FfB771c3EaBDeAa267FF33A77d4d0be220",
+          "nonce": 1,
+          "number": "0x1",
+          "parentHash": "0x7CebC07e456F0bCD09dbc9A6f271074d93E27B40A4C67Dcc402e6513e12B9aF9",
+          "receiptsRoot": "0x02B82e11eDC07775Dc6fCF706be2cdAF9165750Ea7bC1B3Eb48ea16Bb3072F4D",
+          "stateRoot": "0xAaDc89C8bA4e3fCfC140cFcc8D3efD3BE7a49ab31534A5a3F0E1DEA09aae0f4a",
+          "timestamp": "0x62c44c0a",
+          "transactionsRoot": "0xc4bfa888fDCC8ca70E2b0CcdCEcc2fF545acCC2D655Ba33DaF4aBc31cFDBd9Ac",
+          "uncles": []
+        }
+      }),
+    );
     const latestBlock = await bc.getBlockByNumber({ blockNumber: 'latest' });
     const res = await bc.getBlockByHash({ blockHash: latestBlock.result.hash });
     expect(res.responseType).toEqual('raw');
     expect(latestBlock.result.hash).toEqual(res.result.hash);
     expect(harmony.utils.isHex(res.result.size)).toEqual(true);
     expect(checkBlockData(res.result)).toEqual(true);
+    expect(checkCalledMethod(0, RPCMethod.GetBlockByNumber)).toEqual(true);
+    expect(checkCalledMethod(1, RPCMethod.GetBlockByHash)).toEqual(true);
   });
 
   // account related
   it('should test hmy_getBalance', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x10"}),
+    );
     const balance = await bc.getBalance({ address: testAccount.Address });
     expect(harmony.utils.isHex(balance.result)).toEqual(true);
+    expect(checkCalledMethod(0, RPCMethod.GetBalance)).toEqual(true);
   });
 });
 
@@ -85,4 +166,4 @@ function checkBlockData(data: any) {
     },
     { transactions: [harmony.utils.isArray] },
   );
-}
+}
diff --git a/e2e/src/harmony.ts b/e2e/src/harmony.ts
@@ -1,14 +1,15 @@
+import fetch from 'jest-fetch-mock';
 // tslint:disable-next-line: no-implicit-dependencies
 import { Harmony } from '@harmony-js/core';
 // tslint:disable-next-line: no-implicit-dependencies
 import { ChainType } from '@harmony-js/utils';
 // tslint:disable-next-line: no-implicit-dependencies
 import { Account } from '@harmony-js/account';
 
-const CHAIN_ID: number = parseInt(process.env.CHAIN_ID as string, 10);
-const CHAIN_TYPE: string = process.env.CHAIN_TYPE as string;
-const HTTP_PROVIDER: string = process.env.HTTP_PROVIDER as string;
-const GENESIS_PRIV_KEY: string = process.env.GENESIS_PRIV_KEY as string;
+const CHAIN_ID: number = 2;
+const CHAIN_TYPE: string = 'hmy';
+const HTTP_PROVIDER: string = 'http://localhost:9500';
+const GENESIS_PRIV_KEY: string = '45e497bd45a9049bcb649016594489ac67b9f052a6cdf5cb74ee2427a60bf25e';
 
 let chainType: ChainType = ChainType.Harmony;
 
@@ -27,3 +28,12 @@ export const harmony: Harmony = new Harmony(HTTP_PROVIDER, {
 export const myAccount: Account = harmony.wallet.addByPrivateKey(
   GENESIS_PRIV_KEY,
 );
+
+export function checkCalledMethod(i: number, s: string) {
+  let params: (string | undefined) = fetch.mock.calls[i][1]?.body?.toString();
+  if (params) {
+    let method: string = JSON.parse(params).method;
+    return method === s;
+  }
+  return false;
+}
diff --git a/e2e/src/transaction.e2e.ts b/e2e/src/transaction.e2e.ts
@@ -1,15 +1,20 @@
-import { harmony } from './harmony';
+import fetch from 'jest-fetch-mock';
+import { harmony, checkCalledMethod } from './harmony';
 // tslint:disable-next-line: no-implicit-dependencies
 import { Transaction, TxStatus } from '@harmony-js/transaction';
 // tslint:disable-next-line: no-implicit-dependencies
 import { isHash, numberToHex } from '@harmony-js/utils';
 import txnJsons from '../fixtures/transactions.json';
 import demoAccounts from '../fixtures/testAccount.json';
+import { RPCMethod } from '@harmony-js/network';
 
 const receiver = demoAccounts.Accounts[3];
 jest.useRealTimers();
 
 describe('test Transaction using SDK', () => {
+  beforeEach(() => {
+    fetch.resetMocks();
+  });
   let signed: Transaction;
   let sent: Transaction;
   let txId: string;
@@ -38,18 +43,56 @@ describe('test Transaction using SDK', () => {
     };
 
     const txn = harmony.transactions.newTx(txnObject);
-    signed = await harmony.wallet.signTransaction(txn);
+    signed = await harmony.wallet.signTransaction(txn, undefined, undefined, false);
 
     expect(signed.isSigned()).toEqual(true);
   });
   it('should send transaction', async () => {
+    fetch.mockResponseOnce(
+      JSON.stringify({
+        "jsonrpc": "2.0", "id": 1,
+        "result": "0x323A2B2C81d8948E5109FC32f9d0e4e6d178d14cC732C8E0a7Af74E81C7653eA"
+      }),
+    );
     const [sentTxn, id] = await signed.sendTransaction();
     expect(sentTxn.isPending()).toEqual(true);
     expect(harmony.utils.isHash(id)).toEqual(true);
+    expect(checkCalledMethod(0, RPCMethod.SendRawTransaction)).toEqual(true);
     txId = id;
     sent = sentTxn;
   });
   it('should confirm a transaction', async () => {
+    fetch.mockResponses(
+      [
+        JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x1"}),
+        { status: 200 },
+      ],
+      [
+        JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x2"}),
+        { status: 200 },
+      ],
+      [
+        JSON.stringify({
+          "jsonrpc": "2.0",
+          "id": 1,
+          "result": {
+            "contractAddress": null,
+            "blockNumber": harmony.utils.numberToHex(2),
+            "from": harmony.wallet.accounts[0],
+            "gasUsed": harmony.utils.numberToHex(5),
+            "cumulativeGasUsed": harmony.utils.numberToHex(5),
+            "logs": [],
+            "logsBloom": harmony.utils.numberToHex(5),
+            "shardID": 0,
+            "to": demoAccounts.Accounts[3].Address,
+            "transactionHash": "0x8c26EFdb6e4cAC6F8BeACE59F52fd95beD4Bfbfa8fF30F4a7cEd511fE5f869d9",
+            "transactionIndex": harmony.utils.numberToHex(10),
+            "blockHash": "0xFECCCCBFd5AC71902BcfE65dDB0b88EEbbD15AD6cDAE7A9FAEb773bF827320fd",
+          }
+        }),
+        {status: 200},
+      ]
+    )
     const toConfirm = await sent.confirm(txId, 20, 1000);
     expect(toConfirm.receipt !== undefined).toEqual(true);
     expect(checkTransactionReceipt(toConfirm.receipt)).toEqual(true);
@@ -58,6 +101,9 @@ describe('test Transaction using SDK', () => {
     } else if (toConfirm.isRejected()) {
       expect(toConfirm.txStatus).toEqual(TxStatus.REJECTED);
     }
+    expect(checkCalledMethod(0, RPCMethod.BlockNumber)).toEqual(true);
+    expect(checkCalledMethod(1, RPCMethod.BlockNumber)).toEqual(true);
+    expect(checkCalledMethod(2, RPCMethod.GetTransactionReceipt)).toEqual(true);
   });
   it('should test transaction observed events', async () => {
     const txnObject = {
@@ -84,10 +130,53 @@ describe('test Transaction using SDK', () => {
       .on('error', (error) => {
         expect(error).toBeTruthy();
       });
-    const txnSigned = await harmony.wallet.signTransaction(txn);
+    const txnSigned = await harmony.wallet.signTransaction(txn, undefined, undefined, false);
+    fetch.mockResponseOnce(
+      JSON.stringify({
+        "jsonrpc": "2.0", "id": 1,
+        "result": "0x323A2B2C81d8948E5109FC32f9d0e4e6d178d14cC732C8E0a7Af74E81C7653eA"
+      }),
+    );
     const [txnSent, id] = await txnSigned.sendTransaction();
     expect(txnSent.txStatus).toEqual(TxStatus.PENDING);
+    expect(checkCalledMethod(0, RPCMethod.SendRawTransaction)).toEqual(true);
+    console.log('Here');
+    fetch.mockResponses(
+      [
+        JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x1"}),
+        { status: 200 },
+      ],
+      [
+        JSON.stringify({"jsonrpc": "2.0", "id": 1, "result": "0x2"}),
+        { status: 200 },
+      ],
+      [
+        JSON.stringify({
+          "jsonrpc": "2.0",
+          "id": 1,
+          "result": {
+            "contractAddress": null,
+            "blockNumber": harmony.utils.numberToHex(2),
+            "from": harmony.wallet.accounts[0],
+            "gasUsed": harmony.utils.numberToHex(5),
+            "cumulativeGasUsed": harmony.utils.numberToHex(5),
+            "logs": [],
+            "logsBloom": harmony.utils.numberToHex(5),
+            "shardID": 0,
+            "to": demoAccounts.Accounts[3].Address,
+            "transactionHash": "0x8c26EFdb6e4cAC6F8BeACE59F52fd95beD4Bfbfa8fF30F4a7cEd511fE5f869d9",
+            "transactionIndex": harmony.utils.numberToHex(10),
+            "blockHash": "0xFECCCCBFd5AC71902BcfE65dDB0b88EEbbD15AD6cDAE7A9FAEb773bF827320fd",
+            "status": "0x1",
+          }
+        }),
+        {status: 200},
+      ]
+    );
     await txnSigned.confirm(id);
+    expect(checkCalledMethod(1, RPCMethod.BlockNumber)).toEqual(true);
+    expect(checkCalledMethod(2, RPCMethod.BlockNumber)).toEqual(true);
+    expect(checkCalledMethod(3, RPCMethod.GetTransactionReceipt)).toEqual(true);
   });
 });