Merge pull request #40 from orbs-network/matic-integration

Matic integration

.circleci/config.yml

@@ -1,48 +1,52 @@
 version: 2.1
 orbs:
-  node: circleci/node@3.0.1
+  node: circleci/node@4.9.0
   docker: circleci/[email protected]
 jobs:
   build-and-test:
-    machine: true
+    machine:
+      image: ubuntu-2004:202010-01 # recommended linux image
     steps:
       - checkout
       - node/install:
-          node-version: '12.18.0'
+          node-version: '16.13.1'
       - docker/install-docker
       - run: node --version
       - run: npm --version
       - run: docker --version
+      - run: python --version
       - run: env
       - node/install-packages
       - run: npm install --no-save tap-xunit
       - run: mkdir -p _out/unit _out/e2e
       - run: npm test --  --timeout=1m --tap| npx tap-xunit > _out/unit/test.xml
       - run: npm run build
-      - run: npm run test:e2e --  --timeout=1m --tap| npx tap-xunit > _out/e2e/test.xml     
+      - run: npm run test:e2e --  --timeout=1m --tap| npx tap-xunit > _out/e2e/test.xml
       - store_test_results:
           path: _out
       - store_artifacts:
-          path: _out    
+          path: _out
 
   build-and-release:
-    machine: true
+    machine:
+      image: ubuntu-2004:202010-01 # recommended linux image
     steps:
       - checkout
       - node/install:
-          node-version: '12.18.0'
+          node-version: '16.13.1'
       - docker/install-docker
       - run: ./boyar/create-version-file.sh
       - node/install-packages
       - run: ./boyar/docker-build.sh
       - run: ./.circleci/release.sh
 
   build-and-release-to-staging:
-    machine: true
+    machine:
+      image: ubuntu-2004:202010-01 # recommended linux image
     steps:
       - checkout
       - node/install:
-          node-version: '12.18.0'
+          node-version: '16.13.1'
       - docker/install-docker
       - run: ./boyar/create-version-file.sh
       - node/install-packages

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:16-alpine
 
 ENV NODE_ENV production
 
@@ -8,6 +8,18 @@ COPY package*.json ./
 COPY .version ./version
 
 RUN apk add --no-cache git
+
+# see https://github.com/nodejs/docker-node/issues/282
+
+# --no-cache: download package index on-the-fly, no need to cleanup afterwards
+# --virtual: bundle packages, remove whole bundle at once, when done
+RUN apk --no-cache --virtual build-dependencies add \
+    python3 \
+    make \
+    g++ \
+    && npm install \
+    && apk del build-dependencies
+
 RUN npm install
 
 COPY dist ./dist

custom_typings/orbs-signer-client/index.d.ts

@@ -1,8 +1,9 @@
 declare module 'orbs-signer-client' {
-  import { TransactionConfig, SignedTransaction } from 'web3-core';
+  import { SignedTransaction } from 'web3-core';
+  import {TxData} from "@ethereumjs/tx";
 
   export default class Signer {
     public constructor(host: string);
-    sign(transaction: TransactionConfig): Promise<SignedTransaction>;
+    sign(transaction: TxData, chainId?: Number, expectedSenderAddress?: String): Promise<SignedTransaction>;
   }
 }

e2e/Dockerfile-chain-43.test

@@ -6,4 +6,4 @@ COPY chain-43/*.js ./
 RUN npm install
 
 CMD [ "node", "index.js" ]
-EXPOSE 8080
+EXPOSE 8080

e2e/Dockerfile-management-service.test

@@ -6,4 +6,4 @@ COPY management-service/*.js ./
 RUN npm install
 
 CMD [ "node", "index.js" ]
-EXPOSE 8080
+EXPOSE 8080

e2e/driver.ts

@@ -20,7 +20,7 @@ export class TestEnvironment {
   public nodeOrbsAddress: string;
   public testLogger: (lines: string) => void;
 
-  constructor(private pathToDockerCompose: string) {}
+  constructor(private pathToDockerCompose: string) { }
 
   getAppConfig() {
     return {
@@ -80,13 +80,20 @@ export class TestEnvironment {
       t.log('[E2E] deploy ethereum PoS contracts to ganache');
       t.timeout(5 * 60 * 1000);
       const ganacheAddress = await getAddressForService(this.envName, this.pathToDockerCompose, 'ganache', 7545);
+      console.log(ganacheAddress);
       console.log(`[posv2] about to deploy contracts`);
+      await new Promise((resolve) => {
+        console.log('waiting...')
+        setTimeout(resolve, 20000);
+
+      })
+      console.log('Done!');
       this.ethereumPosDriver = await EthereumPosDriver.new({
         web3Provider: () => {
           return new Web3(
             new (HDWalletProvider as any)(
               'vanish junk genuine web seminar cook absurd royal ability series taste method identify elevator liquid',
-              `http://localhost:${portFromAddress(ganacheAddress)}`,
+              `http://${ganacheAddress}`,
               0,
               100,
               false
@@ -124,14 +131,14 @@ export class TestEnvironment {
       const configFilePath = join(__dirname, 'app-config.json');
       try {
         unlinkSync(configFilePath);
-      } catch (err) {}
+      } catch (err) { }
       const config = this.getAppConfig();
       if (require('./signer/keys.json')['node-address'] != config.NodeOrbsAddress) {
         throw new Error(
           `Incorrect address in ./signer/keys.json, use address ${config.NodeOrbsAddress} with private key ${(this
             .ethereumPosDriver.web3.currentProvider as any).wallets['0x' + config.NodeOrbsAddress]._privKey.toString(
-            'hex'
-          )}`
+              'hex'
+            )}`
         );
       }
       writeFileSync(configFilePath, JSON.stringify(config));