Merge pull request #167 from HathorNetwork/dev

Release v0.11.1

Author: r4mmer

.eslintrc

@@ -0,0 +1,48 @@
+{
+  "extends": "airbnb-base",
+  "parser": "@babel/eslint-parser",
+  "rules": {
+    "arrow-parens": ["error", "as-needed"],
+    "import/no-named-as-default": 0,
+    "import/prefer-default-export": 0,
+    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
+    "comma-dangle": 0,
+    "object-curly-newline": ["error", {"ObjectPattern": { "multiline": true }}],
+    "eqeqeq": [1, "allow-null"],
+    "no-continue": 0,
+    "no-cond-assign": 1,
+    "no-constant-condition": 0,
+    "no-control-regex": 1,
+    "no-debugger": 1,
+    "no-dupe-keys": 1,
+    "no-ex-assign": 1,
+    "no-extra-boolean-cast": 1,
+    "no-func-assign": 1,
+    "no-regex-spaces": 1,
+    "no-unreachable": 1,
+    "no-fallthrough": 1,
+    "no-lone-blocks": 1,
+    "no-delete-var": 1,
+    "no-shadow": 1,
+    "no-shadow-restricted-names": 1,
+    "no-undef": 2,
+    "no-undef-init": 1,
+    "no-use-before-define": 0,
+    "no-unused-vars": [1, {"vars": "all", "args": "none"}],
+    "no-underscore-dangle": 0,
+    "no-restricted-syntax": ["error", "LabeledStatement", "WithStatement"],
+    "no-await-in-loop": "off",
+    "no-plusplus": "off",
+    "guard-for-in": "off"
+  },
+  "overrides": [
+    {
+      "files": [
+        "**/*.test.js"
+      ],
+      "env": {
+        "jest": true
+      }
+    }
+  ]
+}

.github/workflows/integration-test.yml

@@ -0,0 +1,44 @@
+name: integration-test
+on:
+  push:
+    branches:
+      - master
+      - dev
+    tags:
+      - v*
+    pull_request:
+      branches:
+        - dev
+        - master
+jobs:
+  itest:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 20
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Copy config file
+        run: cp ./__tests__/integration/configuration/config.js.template ./src/config.js
+
+      - name: Run the tests
+        run: npm run test_integration
+
+      - name: Upload debug transaction logs
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-transacion-logs
+          path: tmp

.gitignore

@@ -5,5 +5,6 @@ config.js
 node_modules/
 
 coverage
+coverage-integration
 
 .DS_Store

__tests__/__fixtures__/http-fixtures.js

@@ -527,6 +527,48 @@ export default {
         height: 19,
         tokens: ["03"]
       },
+      {
+        tx_id:
+          "00991cd24536f402ef60d37df3031e0cff1d4e78cdbf6101e3cde4217a7c4cc3",
+        version: 0,
+        weight: 21,
+        timestamp: 1615256216,
+        is_voided: false,
+        inputs: [],
+        outputs: [
+          {
+            value: 10,
+            token_data: 1,
+            script: "dqkUsmE9zshkgB58piBD7ETUV0e/NgmIrA==",
+            decoded: {
+              type: "P2PKH",
+              address: "WYBwT3xLpDnHNtYZiU52oanupVeDKhAvNp",
+            },
+            token: "04",
+            spent_by: null,
+            selected_as_input: false,
+          },
+          {
+            value: 10,
+            token_data: 0,
+            script: "dqkUsmE9zshkgB58piBD7ETUV0e/NgmIrA==",
+            decoded: {
+              type: "P2PKH",
+              address: "WYBwT3xLpDnHNtYZiU52oanupVeDKhAvNp",
+            },
+            token: "00",
+            spent_by: null,
+            selected_as_input: false,
+          },
+        ],
+        parents: [
+          "000004e31d32f699cc4d4cda8a31037f2197f2e18b2192f4f9225bf0fbb3760c",
+          "00975897028ceb037307327c953f5e7ad4d3f42402d71bd3d11ecb63ac39f01a",
+          "00e161a6b0bee1781ea9300680913fb76fd0fac4acab527cd9626cc1514abdc9",
+        ],
+        height: 19,
+        tokens: ["04"]
+      },
     ],
   },
   "/v1a/push_tx": {

__tests__/address.test.js

@@ -1,20 +1,20 @@
-import { wallet as walletUtils } from "@hathor/wallet-lib";
-import TestUtils from "./test-utils";
+import { wallet as walletUtils } from '@hathor/wallet-lib';
+import TestUtils from './test-utils';
 
 describe("address api", () => {
   it("should return 200 with a valid body", async () => {
     let response = await TestUtils.request
       .get("/wallet/address")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.address).toBe(TestUtils.addresses[1]);
+    expect(response.body.address).toBe(TestUtils.addresses[4]);
 
     // Should return the same address for a second call
     response = await TestUtils.request
       .get("/wallet/address")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.address).toBe(TestUtils.addresses[1]);
+    expect(response.body.address).toBe(TestUtils.addresses[4]);
   });
 
   it("should return 200 with a valid body for index = 0", async () => {
@@ -43,7 +43,9 @@ describe("address api", () => {
 
   it("should return a new address with mark_as_used until the gapLimit is reached", async () => {
     const gapLimit = walletUtils.getGapLimit();
-    for (let index = 1; index <= gapLimit; index++) {
+    const startingIndex = 4; // First unused address
+    const upperLimit = gapLimit + startingIndex - 1; // Last address within the gap limit
+    for (let index = startingIndex; index <= upperLimit; index++) {
       const response = await TestUtils.request
         .get("/wallet/address")
         .query({ mark_as_used: true })
@@ -57,6 +59,6 @@ describe("address api", () => {
       .get("/wallet/address")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.address).toBe(TestUtils.addresses[gapLimit]);
+    expect(response.body.address).toBe(TestUtils.addresses[upperLimit]);
   });
 });

__tests__/addresses.test.js

@@ -1,5 +1,5 @@
-import { wallet as walletUtils } from "@hathor/wallet-lib";
-import TestUtils from "./test-utils";
+import { wallet as walletUtils } from '@hathor/wallet-lib';
+import TestUtils from './test-utils';
 
 describe("addresses api", () => {
   it("should return 200 with a valid body", async () => {
@@ -8,7 +8,7 @@ describe("addresses api", () => {
       .get("/wallet/addresses")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.addresses.length).toBe(gapLimit + 1);
+    expect(response.body.addresses.length).toBe(gapLimit + 4);
     expect(response.body.addresses).toEqual(TestUtils.addresses);
   });
 
@@ -24,7 +24,7 @@ describe("addresses api", () => {
       .get("/wallet/addresses")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.addresses.length).toBe(gapLimit + 1);
+    expect(response.body.addresses.length).toBe(gapLimit + 4);
     expect(response.body.addresses.slice(0, TestUtils.addresses.length)).toEqual(TestUtils.addresses);
   });
 });

__tests__/balance.test.js

@@ -1,12 +1,12 @@
-import TestUtils from "./test-utils";
+import TestUtils from './test-utils';
 
 describe("balance api", () => {
   it("should return 200 with a valid body", async () => {
     const response = await TestUtils.request
       .get("/wallet/balance")
       .set({ "x-wallet-id": TestUtils.walletId });
     expect(response.status).toBe(200);
-    expect(response.body.available).toBe(76799);
+    expect(response.body.available).toBe(76809);
     expect(response.body.locked).toBe(6400);
   });