improvements and fixes to docker dev

Author: makevoid

.gitignore

@@ -3,10 +3,6 @@
 # misc
 .DS_Store
 
-contracts/exportAddresses\.sh
-
-**/exportAddresses\.sh
-
 !*.gitkeep
 
 node_modules

README.md

@@ -70,9 +70,9 @@ Please follow detail instruction [here](https://github.com/appliedblockchain/lau
 
 ### Run this app with Docker Dev
 
-1. Install docker and docker compose
-2. In a terminal, run `source docker-aliases.sh`
-3. You might need to run `npm i && npm run compile` in the contracts folder if you haven't already.
+1. Cd into `stack`
+2. Run `source docker-aliases.sh`
+3. You might need to run `npm i && npm run compile` in the contracts directory if you haven't already.
 4. Start parity only: `launchpad-compose up parity`
 5. While parity is running, deploy the contracts(run `npm run deploy` from the contracts folder).
 6. Run `launchpad-compose build` to build the api and react images

api/config/custom-environment-variables.json

@@ -1,7 +1,7 @@
 {
   "PORT": "PORT",
   "ETHEREUM_JSONRPC_ENDPOINT": "ETHEREUM_JSONRPC_ENDPOINT",
-  "CONTRACT_ADDRESS": "CONTRACT_ADDRESS",
+  "CONTRACT_ADDRESSES": "CONTRACT_ADDRESSES",
   "ELASTICSEARCH": "ELASTICSEARCH",
   "API_MNEMONIC": "API_MNEMONIC"
 }

api/run.js

@@ -3,11 +3,14 @@
 const runApp = require('./src/app')
 const logger = require('./src/logger')
 const config = require('config')
+const { join } = require('path')
 
 const NODE_ENV = config.get('NODE_ENV')
 const PORT = config.get('PORT')
 
-const contracts = require('../contracts/build/contractABIs.json')
+const contractAbisPath = join(__dirname, './contracts/build/contractABIs.json')
+const contracts = require(contractAbisPath)
+console.log(`Contracts loaded: ${JSON.stringify(Object.keys(contracts))}`)
 
 const getCtrAddress = (contractName) => (
   contracts[contractName].address

api/src/util/web3.js

@@ -2,8 +2,12 @@ const Web3 = require('web3')
 const abiDecoder = require('abi-decoder')
 const config = require('config')
 const ETHEREUM_JSONRPC_ENDPOINT = config.get('ETHEREUM_JSONRPC_ENDPOINT')
+const { join } = require('path')
 
-const contractsJSON = require('../../../contracts/build/contractABIs.json')
+console.log('DIRNAME', __dirname)
+const contractAbisPath = join(__dirname, './contracts/build/contractABIs.json')
+const contractsJSON = require(contractAbisPath)
+console.log(`Contracts loaded: ${JSON.stringify(Object.keys(contractsJSON))}`)
 
 const web3 = new Web3(ETHEREUM_JSONRPC_ENDPOINT)
 

contracts/bin/deploy.js

@@ -4,6 +4,7 @@
 const { readdirSync, readFileSync, writeFileSync } = require('fs')
 const { join } = require('path')
 const Web3 = require('web3')
+const { remove } = require('lodash')
 
 const contractsDirectory = join(__dirname, '../build/contracts')
 const contractsFilenames = readdirSync(contractsDirectory).filter(f => /\.json$/.test(f))
@@ -43,10 +44,6 @@ const deployContracts = async ({ ctrNames, contracts, defaultAddress, eth }) =>
     const contractName = ctrNames[i]
     console.log(`Deploying contract: ${contractName}....\n`)
 
-    if (contractName === 'Migrations') {
-      continue
-    }
-
     const { abi, bytecode } = contracts[contractName]
     const sendParams = buildSendParams(defaultAddress)
 
@@ -76,7 +73,8 @@ const deploy = () => {
       //    const address = await web3.eth.getAccounts()[0]
       //    console.log(`current 'from' address: ${address}`)
 
-      const ctrNames = Object.keys(contracts)
+      let ctrNames = Object.keys(contracts)
+      ctrNames = remove('Migrations', ctrNames)
       console.log(`Contracts deployment - contracts: ${ctrNames.join(', ')}`)
 
       const contractABIs = await deployContracts({ ctrNames, contracts, defaultAddress, eth })

contracts/package.json

@@ -6,7 +6,6 @@
         "compile": "rm -rf ./build/* && truffle compile",
         "version": "truffle version",
         "deploy": "mkdir -p build/contracts && node ./bin/deploy",
-        "export-addresses": "source ./exportAddresses.sh",
         "install-contracts": "cp -f ./build/contractABIs.json ../api/contracts/contractABIs.json"
     },
     "dependencies": {

docker-compose.yml

@@ -17,7 +17,6 @@ services:
       - NODE_ENV=staging
       - PROVIDER=http://parity1:8545
       - SENTRY_DSN=http://6f20a6d7d8154e1f93593c634f943f7d@sentry-web:9000/3
-      - CONTRACT_ADDRESS=$CONTRACT_ADDRESS
     networks:
       - main
     ports:

stack/compose.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 cd "$(dirname "$0")" || exit 1
 
+set -xe
+
 configArgs=""
 configPathList=(docker-compose-dev.yml)
 npmrcPath="$HOME/.npmrc"
@@ -49,12 +51,9 @@ if [[ -z $npmToken ]]; then
   fi
 fi
 
-
-# TODO: remove this, not needed anymore
-# echo 'installing contracts in app folders(shared_modules)'
-# npm --prefix ../contracts run install-contracts
+CTR_ADDR_PATH=../contracts/build/contractAddresses.json
 
 echo 'Loading contracts addresses in env'
-source ../api/contracts/exportAddresses.sh
+CONTRACT_ADDRESSES=$(cat $CTR_ADDR_PATH)
 
 env COMPOSE_PROJECT_NAME="lauchpad" NPM_TOKEN="$npmToken" docker-compose $configArgs $@

stack/docker-compose-dev.yml

@@ -26,7 +26,7 @@ services:
     environment:
       NODE_ENV: development
       ETHEREUM_JSONRPC_ENDPOINT: http://parity:8545
-      CONTRACT_ADDRESS: "$CONTRACT_ADDRESS"
+      CONTRACT_ADDRESSES: "$CONTRACT_ADDRESSES"
     networks:
       - main
     ports: