From 0f1ef686cec7535626de890d9760aa5c71de89b8 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Fri, 29 Nov 2019 14:49:25 +0300 Subject: [PATCH] Refactored shared folder usage, using same dir structure in docker --- src/oracle/bncWatcher/Dockerfile | 5 +++-- src/oracle/bncWatcher/bncWatcher.js | 12 ++++++------ src/oracle/bncWatcher/package.json | 5 ++++- src/oracle/ethWatcher/Dockerfile | 5 +++-- src/oracle/ethWatcher/ethWatcher.js | 10 +++++----- src/oracle/ethWatcher/package.json | 5 ++++- src/oracle/proxy/Dockerfile | 5 +++-- src/oracle/proxy/encode.js | 2 +- src/oracle/proxy/expressUtils.js | 2 +- src/oracle/proxy/index.js | 6 +++--- src/oracle/proxy/package.json | 5 ++++- src/oracle/proxy/sendTx.js | 4 ++-- src/oracle/proxy/utils.js | 2 +- src/oracle/tss-keygen/Dockerfile | 8 +++++--- src/oracle/tss-keygen/keygen.js | 8 ++++---- src/oracle/tss-keygen/package.json | 5 ++++- src/oracle/tss-sign/Dockerfile | 8 +++++--- src/oracle/tss-sign/package.json | 5 ++++- src/oracle/tss-sign/signer.js | 10 +++++----- src/oracle/tss-sign/tx.js | 4 ++-- 20 files changed, 69 insertions(+), 47 deletions(-) diff --git a/src/oracle/bncWatcher/Dockerfile b/src/oracle/bncWatcher/Dockerfile index 6e68ca1..5d97eb9 100644 --- a/src/oracle/bncWatcher/Dockerfile +++ b/src/oracle/bncWatcher/Dockerfile @@ -9,6 +9,7 @@ COPY ./bncWatcher/package.json /watcher/ RUN npm install -COPY ./bncWatcher/bncWatcher.js ./shared/db.js ./shared/logger.js ./shared/crypto.js ./shared/amqp.js ./shared/wait.js ./shared/binanceClient.js /watcher/ +COPY ./bncWatcher/bncWatcher.js /watcher/src/ +COPY ./shared/db.js ./shared/logger.js ./shared/crypto.js ./shared/amqp.js ./shared/wait.js ./shared/binanceClient.js /watcher/shared/ -ENTRYPOINT ["node", "bncWatcher.js"] +ENTRYPOINT ["node", "src/bncWatcher.js"] diff --git a/src/oracle/bncWatcher/bncWatcher.js b/src/oracle/bncWatcher/bncWatcher.js index de8a2c9..799fd78 100644 --- a/src/oracle/bncWatcher/bncWatcher.js +++ b/src/oracle/bncWatcher/bncWatcher.js @@ -3,12 +3,12 @@ const BN = require('bignumber.js') const fs = require('fs') const { computeAddress } = require('ethers').utils -const logger = require('./logger') -const redis = require('./db') -const { publicKeyToAddress } = require('./crypto') -const { delay } = require('./wait') -const { connectRabbit, assertQueue } = require('./amqp') -const { getTx, getBlockTime, fetchNewTransactions } = require('./binanceClient') +const logger = require('../shared/logger') +const redis = require('../shared/db') +const { publicKeyToAddress } = require('../shared/crypto') +const { delay } = require('../shared/wait') +const { connectRabbit, assertQueue } = require('../shared/amqp') +const { getTx, getBlockTime, fetchNewTransactions } = require('../shared/binanceClient') const { PROXY_URL, RABBITMQ_URL diff --git a/src/oracle/bncWatcher/package.json b/src/oracle/bncWatcher/package.json index 08a6559..5c1a75c 100644 --- a/src/oracle/bncWatcher/package.json +++ b/src/oracle/bncWatcher/package.json @@ -13,7 +13,10 @@ }, "engines": { "node": ">=10.6.0" - } + }, + "files": [ + "../shared" + ] } diff --git a/src/oracle/ethWatcher/Dockerfile b/src/oracle/ethWatcher/Dockerfile index 320bbaa..9d97003 100644 --- a/src/oracle/ethWatcher/Dockerfile +++ b/src/oracle/ethWatcher/Dockerfile @@ -9,6 +9,7 @@ COPY ./ethWatcher/package.json /watcher/ RUN npm install -COPY ./ethWatcher/ethWatcher.js ./shared/db.js ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js /watcher/ +COPY ./ethWatcher/ethWatcher.js /watcher/src/ +COPY ./shared/db.js ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js /watcher/shared/ -ENTRYPOINT ["node", "ethWatcher.js"] +ENTRYPOINT ["node", "src/ethWatcher.js"] diff --git a/src/oracle/ethWatcher/ethWatcher.js b/src/oracle/ethWatcher/ethWatcher.js index 82e7632..ae49468 100644 --- a/src/oracle/ethWatcher/ethWatcher.js +++ b/src/oracle/ethWatcher/ethWatcher.js @@ -2,11 +2,11 @@ const ethers = require('ethers') const BN = require('bignumber.js') const axios = require('axios') -const logger = require('./logger') -const redis = require('./db') -const { connectRabbit, assertQueue } = require('./amqp') -const { publicKeyToAddress } = require('./crypto') -const { delay, retry } = require('./wait') +const logger = require('../shared/logger') +const redis = require('../shared/db') +const { connectRabbit, assertQueue } = require('../shared/amqp') +const { publicKeyToAddress } = require('../shared/crypto') +const { delay, retry } = require('../shared/wait') const { HOME_RPC_URL, HOME_BRIDGE_ADDRESS, RABBITMQ_URL, HOME_START_BLOCK, VALIDATOR_PRIVATE_KEY diff --git a/src/oracle/ethWatcher/package.json b/src/oracle/ethWatcher/package.json index a7517af..8096339 100644 --- a/src/oracle/ethWatcher/package.json +++ b/src/oracle/ethWatcher/package.json @@ -13,5 +13,8 @@ }, "engines": { "node": ">=10.6.0" - } + }, + "files": [ + "../shared" + ] } diff --git a/src/oracle/proxy/Dockerfile b/src/oracle/proxy/Dockerfile index 6e028ef..b776276 100644 --- a/src/oracle/proxy/Dockerfile +++ b/src/oracle/proxy/Dockerfile @@ -6,6 +6,7 @@ COPY ./proxy/package.json /proxy/ RUN npm install -COPY ./proxy/index.js ./proxy/encode.js ./proxy/decode.js ./proxy/sendTx.js ./proxy/contractsAbi.js ./proxy/utils.js ./proxy/expressUtils.js ./shared/logger.js ./shared/crypto.js ./shared/wait.js ./shared/binanceClient.js /proxy/ +COPY ./proxy/index.js ./proxy/encode.js ./proxy/decode.js ./proxy/sendTx.js ./proxy/contractsAbi.js ./proxy/utils.js ./proxy/expressUtils.js /proxy/src/ +COPY ./shared/logger.js ./shared/crypto.js ./shared/wait.js ./shared/binanceClient.js /proxy/shared/ -ENTRYPOINT ["node", "index.js"] +ENTRYPOINT ["node", "src/index.js"] diff --git a/src/oracle/proxy/encode.js b/src/oracle/proxy/encode.js index 13361f3..526c1f2 100644 --- a/src/oracle/proxy/encode.js +++ b/src/oracle/proxy/encode.js @@ -1,6 +1,6 @@ const BN = require('bignumber.js') -const { padZeros } = require('./crypto') +const { padZeros } = require('../shared/crypto') function makeBuffer(value, length = 32, base = 16) { return Buffer.from(padZeros(new BN(value, base).toString(16), length * 2), 'hex') diff --git a/src/oracle/proxy/expressUtils.js b/src/oracle/proxy/expressUtils.js index 483ef27..4078563 100644 --- a/src/oracle/proxy/expressUtils.js +++ b/src/oracle/proxy/expressUtils.js @@ -1,6 +1,6 @@ const ethers = require('ethers') -const logger = require('./logger') +const logger = require('../shared/logger') function parseNumber(fromQuery, field, defaultValue = null) { return (req, res, next) => { diff --git a/src/oracle/proxy/index.js b/src/oracle/proxy/index.js index 6594110..c91ebc2 100644 --- a/src/oracle/proxy/index.js +++ b/src/oracle/proxy/index.js @@ -10,12 +10,12 @@ const { const encode = require('./encode') const decode = require('./decode') const { createSender, waitForReceipt } = require('./sendTx') -const logger = require('./logger') -const { publicKeyToAddress, padZeros } = require('./crypto') +const logger = require('../shared/logger') +const { publicKeyToAddress, padZeros } = require('../shared/crypto') const { parseNumber, parseAddress, parseBool, logRequest } = require('./expressUtils') -const { getForeignBalances } = require('./binanceClient') +const { getForeignBalances } = require('../shared/binanceClient') const { HOME_RPC_URL, HOME_BRIDGE_ADDRESS, SIDE_RPC_URL, SIDE_SHARED_DB_ADDRESS, VALIDATOR_PRIVATE_KEY, diff --git a/src/oracle/proxy/package.json b/src/oracle/proxy/package.json index 33c7e10..86af594 100644 --- a/src/oracle/proxy/package.json +++ b/src/oracle/proxy/package.json @@ -14,5 +14,8 @@ }, "engines": { "node": ">=10.6.0" - } + }, + "files": [ + "../shared" + ] } diff --git a/src/oracle/proxy/sendTx.js b/src/oracle/proxy/sendTx.js index f73adf3..add626d 100644 --- a/src/oracle/proxy/sendTx.js +++ b/src/oracle/proxy/sendTx.js @@ -2,8 +2,8 @@ const axios = require('axios') const ethers = require('ethers') const BN = require('bignumber.js') -const logger = require('./logger') -const { delay, retry } = require('./wait') +const logger = require('../shared/logger') +const { delay, retry } = require('../shared/wait') const { GAS_LIMIT_FACTOR, MAX_GAS_LIMIT } = process.env diff --git a/src/oracle/proxy/utils.js b/src/oracle/proxy/utils.js index d9c31f7..b8abbc6 100644 --- a/src/oracle/proxy/utils.js +++ b/src/oracle/proxy/utils.js @@ -1,4 +1,4 @@ -const { padZeros } = require('./crypto') +const { padZeros } = require('../shared/crypto') const Action = { CONFIRM_KEYGEN: 0, diff --git a/src/oracle/tss-keygen/Dockerfile b/src/oracle/tss-keygen/Dockerfile index 074acc5..cc96bc9 100644 --- a/src/oracle/tss-keygen/Dockerfile +++ b/src/oracle/tss-keygen/Dockerfile @@ -9,10 +9,12 @@ COPY ./tss-keygen/package.json /tss/ RUN npm install -COPY ./tss-keygen/keygen-entrypoint.sh ./tss-keygen/keygen.js ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js /tss/ - COPY --from=tss /tss/target/release/gg18_keygen_client /tss/ +COPY ./tss-keygen/keygen-entrypoint.sh /tss/ +COPY ./tss-keygen/keygen.js /tss/src/ +COPY ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js /tss/shared/ + RUN mkdir /keys -ENTRYPOINT ["node", "keygen.js"] +ENTRYPOINT ["node", "src/keygen.js"] diff --git a/src/oracle/tss-keygen/keygen.js b/src/oracle/tss-keygen/keygen.js index 18fcfc4..7d15000 100644 --- a/src/oracle/tss-keygen/keygen.js +++ b/src/oracle/tss-keygen/keygen.js @@ -3,10 +3,10 @@ const fs = require('fs') const express = require('express') const axios = require('axios') -const logger = require('./logger') -const { connectRabbit, assertQueue } = require('./amqp') -const { publicKeyToAddress } = require('./crypto') -const { delay } = require('./wait') +const logger = require('../shared/logger') +const { connectRabbit, assertQueue } = require('../shared/amqp') +const { publicKeyToAddress } = require('../shared/crypto') +const { delay } = require('../shared/wait') const { RABBITMQ_URL, PROXY_URL } = process.env const KEYGEN_ATTEMPT_TIMEOUT = parseInt(process.env.KEYGEN_ATTEMPT_TIMEOUT, 10) diff --git a/src/oracle/tss-keygen/package.json b/src/oracle/tss-keygen/package.json index fb1d8db..13b5540 100644 --- a/src/oracle/tss-keygen/package.json +++ b/src/oracle/tss-keygen/package.json @@ -11,5 +11,8 @@ }, "engines": { "node": ">=10.6.0" - } + }, + "files": [ + "../shared" + ] } diff --git a/src/oracle/tss-sign/Dockerfile b/src/oracle/tss-sign/Dockerfile index ea684a8..7192fe7 100644 --- a/src/oracle/tss-sign/Dockerfile +++ b/src/oracle/tss-sign/Dockerfile @@ -9,8 +9,10 @@ COPY ./tss-sign/package.json /tss/ RUN npm install --no-optional -COPY ./tss-sign/sign-entrypoint.sh ./tss-sign/signer.js ./tss-sign/tx.js ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js ./shared/binanceClient.js /tss/ - COPY --from=tss /tss/target/release/gg18_sign_client /tss/ -ENTRYPOINT ["node", "signer.js"] +COPY ./tss-sign/sign-entrypoint.sh /tss/ +COPY ./tss-sign/signer.js ./tss-sign/tx.js /tss/src/ +COPY ./shared/logger.js ./shared/amqp.js ./shared/crypto.js ./shared/wait.js ./shared/binanceClient.js /tss/shared/ + +ENTRYPOINT ["node", "src/signer.js"] diff --git a/src/oracle/tss-sign/package.json b/src/oracle/tss-sign/package.json index 7d0c822..342ae14 100644 --- a/src/oracle/tss-sign/package.json +++ b/src/oracle/tss-sign/package.json @@ -12,5 +12,8 @@ }, "engines": { "node": ">=10.6.0" - } + }, + "files": [ + "../shared" + ] } diff --git a/src/oracle/tss-sign/signer.js b/src/oracle/tss-sign/signer.js index 0c0cbb5..5acf86c 100644 --- a/src/oracle/tss-sign/signer.js +++ b/src/oracle/tss-sign/signer.js @@ -4,11 +4,11 @@ const BN = require('bignumber.js') const axios = require('axios') const express = require('express') -const logger = require('./logger') -const { connectRabbit, assertQueue } = require('./amqp') -const { publicKeyToAddress, sha256 } = require('./crypto') -const { delay } = require('./wait') -const { getAccount, getFee, sendTx } = require('./binanceClient') +const logger = require('../shared/logger') +const { connectRabbit, assertQueue } = require('../shared/amqp') +const { publicKeyToAddress, sha256 } = require('../shared/crypto') +const { delay } = require('../shared/wait') +const { getAccount, getFee, sendTx } = require('../shared/binanceClient') const Transaction = require('./tx') diff --git a/src/oracle/tss-sign/tx.js b/src/oracle/tss-sign/tx.js index 032d4e8..c6395c1 100644 --- a/src/oracle/tss-sign/tx.js +++ b/src/oracle/tss-sign/tx.js @@ -2,8 +2,8 @@ const TransactionBnc = require('@binance-chain/javascript-sdk/lib/tx').default const { crypto } = require('@binance-chain/javascript-sdk') const BN = require('bignumber.js') -const logger = require('./logger') -const { padZeros } = require('./crypto') +const logger = require('../shared/logger') +const { padZeros } = require('../shared/crypto') const { FOREIGN_CHAIN_ID } = process.env