ALM docker improvements (#380)

alm/.env.example

@@ -11,4 +11,5 @@ ALM_HOME_EXPLORER_TX_TEMPLATE=https://blockscout.com/poa/sokol/tx/%s
 ALM_FOREIGN_EXPLORER_TX_TEMPLATE=https://blockscout.com/eth/kovan/tx/%s
 
 ALM_HOME_EXPLORER_API=https://blockscout.com/poa/sokol/api
-ALM_FOREIGN_EXPLORER_API=https://kovan.etherscan.io/api
+ALM_FOREIGN_EXPLORER_API=https://kovan.etherscan.io/api?apikey=YourApiKeyToken
+PORT=8080

alm/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:12 as alm-builder
 
 WORKDIR /mono
 COPY package.json .
@@ -19,5 +19,11 @@ ARG DOT_ENV_PATH=./alm/.env
 COPY ${DOT_ENV_PATH} ./alm/.env
 
 WORKDIR /mono/alm
-CMD echo "To start the application run:" \
-  "yarn start"
+RUN yarn run build
+
+
+FROM node:12 as alm-production
+RUN yarn global add serve
+WORKDIR /app
+COPY --from=alm-builder /mono/alm/build .
+CMD serve -p $PORT -s .

alm/docker-compose.yml

@@ -5,8 +5,10 @@ services:
     build:
       context: ..
       dockerfile: alm/Dockerfile
+    ports:
+      - "${PORT}:${PORT}"
     env_file: ./.env
     environment: 
       - NODE_ENV=production
     restart: unless-stopped
-    entrypoint: yarn start
+    entrypoint: serve -p ${PORT} -s .

alm/package.json

@@ -26,7 +26,8 @@
     "react-scripts": "3.0.1",
     "styled-components": "^5.1.1",
     "typescript": "^3.5.2",
-    "web3": "1.2.7"
+    "web3": "1.2.7",
+    "web3-eth-contract": "1.2.7"
   },
   "scripts": {
     "start": "./load-env.sh react-app-rewired start",

alm/src/utils/explorer.ts

@@ -70,7 +70,7 @@ export const fetchAccountTransactionsFromBlockscout = async ({
 }
 
 export const getBlockByTimestampUrl = (api: string, timestamp: number) =>
-  `${api}?module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before`
+  `${api}&module=block&action=getblocknobytime&timestamp=${timestamp}&closest=before`
 
 export const fetchAccountTransactionsFromEtherscan = async ({
   account,
@@ -101,7 +101,7 @@ export const fetchAccountTransactionsFromEtherscan = async ({
     return []
   }
 
-  const url = `${api}?module=account&action=txlist&address=${account}&startblock=${fromBlock}&endblock=${toBlock}`
+  const url = `${api}&module=account&action=txlist&address=${account}&startblock=${fromBlock}&endblock=${toBlock}`
 
   try {
     const result = await fetch(url).then(res => res.json())