Fix identity-service libs init + local dev

content-service/.gitignore

@@ -9,3 +9,4 @@ npm-debug.log
 local-test/
 local-storage/
 contract-config.json
+eth-contract-config.json

content-service/docker-compose/development.env

@@ -10,10 +10,10 @@ port=8000
 ethProviderUrl=http://docker.for.mac.localhost:8546
 
 # Address information required on all environments
-ethNetworkId=
-ethTokenAddress=
-ethRegistryAddress=
-ethOwnerWallet=
+# ethNetworkId=
+# ethTokenAddress=
+# ethRegistryAddress=
+# ethOwnerWallet=
 
 # wallet information required on all environments
 delegateOwnerWallet=

content-service/src/config.js

@@ -102,6 +102,19 @@ if (defaultConfigExists) config.loadFile('default-config.json')
 const contractConfigExists = fs.existsSync('contract-config.json')
 if (contractConfigExists) config.loadFile('contract-config.json')
 
+// the eth-contract-config.json file is used to load registry address locally
+// during development
+const ethContractConfigExists = fs.existsSync('eth-contract-config.json')
+if (ethContractConfigExists) {
+ let ethContractConfig = require('../eth-contract-config.json')
+
+ config.load({
+ 'ethTokenAddress': ethContractConfig.audiusTokenAddress,
+ 'ethRegistryAddress': ethContractConfig.registryAddress,
+ 'ethOwnerWallet': ethContractConfig.ownerWallet
+ })
+}
+
 // Perform validation and error any properties are not present on schema
 config.validate()
 

eth-contracts/scripts/migrate-contracts.js

@@ -5,6 +5,9 @@ const os = require('os');
 const AudiusToken = artifacts.require('AudiusToken')
 const Registry = artifacts.require('Registry')
 
+const AudiusIdentityService = 'identity-service'
+const AudiusContentService = 'content-service'
+
 const Libs = 'libs'
 
 const getDefaultAccount = async () => {
@@ -78,6 +81,22 @@ module.exports = async callback => {
 
  copyBuildDirectory(libsDirRoot + '/ABIs')
  outputJsonConfigFile(libsDirRoot + '/config.json')
+
+ // output to Identity Service
+ try {
+ outputJsonConfigFile(getDirectoryRoot(AudiusIdentityService) + '/eth-contract-config.json') 
+ }
+ catch(e){
+ console.log("Identity service doesn't exist, probably running via E2E setup scripts")
+ }
+
+ // special case for content service which isn't run locally for E2E test or during front end dev
+ try {
+ outputJsonConfigFile(getDirectoryRoot(AudiusContentService) + '/eth-contract-config.json')
+ }
+ catch(e){
+ console.log("Content service folder doesn't exist, probably running via E2E setup scripts")
+ }
 
  const dappOutput = os.homedir() + '/.audius'
  if (!fs.existsSync(dappOutput)) {

identity-service/.gitignore

@@ -9,4 +9,5 @@ npm-debug.log
 file_storage/
 local-storage/
 local-test/
-contract-config.json
+contract-config.json
+eth-contract-config.json

identity-service/package.json

@@ -3,15 +3,15 @@
  "version": "0.1.0",
  "description": "",
  "main": "src/index.js",
+ "keywords": [],
+ "author": "",
+ "license": "Apache-2.0",
  "scripts": {
  "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
  "test": "./scripts/run-tests.sh",
  "lint": "./node_modules/.bin/standard",
  "lint-fix": "./node_modules/.bin/standard --fix"
  },
- "keywords": [],
- "author": "",
- "license": "Apache-2.0",
  "dependencies": {
  "@audius/libs": "^0.10.0",
  "aws-sdk": "^2.313.0",

identity-service/src/audiusLibsInstance.js

@@ -1,19 +1,31 @@
 const AudiusLibs = require('@audius/libs')
-const Web3 = require('web3')
 const config = require('./config.js')
 
+const registryAddress = config.get('registryAddress')
+const web3ProviderUrl = config.get('web3Provider')
+
+let audiusInstance = {}
+
 async function setupAndRun () {
- const registryAddress = config.get('registryAddress')
- const web3ProviderUrl = config.get('web3Provider')
- const dataWeb3 = new Web3(new Web3.providers.HttpProvider(web3ProviderUrl))
+ const dataWeb3 = await AudiusLibs.Utils.configureWeb3(web3ProviderUrl, null, false)
+ if (!dataWeb3) throw new Error('Web3 incorrectly configured')
 
- const audiusInstance = new AudiusLibs({
- web3Config: AudiusLibs.configExternalWeb3(registryAddress, dataWeb3),
+ audiusInstance.libs = new AudiusLibs({
+ web3Config: {
+ registryAddress,
+ useExternalWeb3: true,
+ externalWeb3Config: {
+ web3: dataWeb3,
+ // this is a stopgap since libs external web3 init requires an ownerWallet
+ // this is never actually used in the service's libs calls
+ ownerWallet: config.get('relayerPublicKey')
+ }
+ },
  isServer: true
  })
 
- await audiusInstance.init()
- return audiusInstance
+ return audiusInstance.libs.init()
 }
 
 module.exports = setupAndRun
+module.exports.audiusLibsInstance = audiusInstance

identity-service/src/index.js

@@ -8,6 +8,9 @@ const txRelay = require('./txRelay')
 const { sequelize } = require('./models')
 const { runMigrations } = require('./migrationManager')
 const { logger } = require('./logging')
+
+const initAudiusLibs = require('./audiusLibsInstance')
+
 let appInfo
 
 // run all migrations
@@ -18,6 +21,9 @@ setTimeout(async () => {
  logger.info('Executing database migrations...')
  runMigrations().then(async () => {
  logger.info('Migrations completed successfully')
+
+ await initAudiusLibs()
+
  appInfo = initializeApp(config.get('port'))
  }).error((err) => {
  logger.error('Error in migrations: ', err)

identity-service/src/routes/twitter.js

@@ -4,7 +4,7 @@ const config = require('../config.js')
 const models = require('../models')
 const uuidv4 = require('uuid/v4')
 const txRelay = require('../txRelay')
-const getAudiusLibsInstance = require('../audiusLibsInstance')
+let { audiusLibsInstance } = require('../audiusLibsInstance')
 
 const { handleResponse, successResponse, errorResponseBadRequest } = require('../apiHelpers')
 
@@ -112,8 +112,8 @@ module.exports = function (app) {
  * the blockchainUserId with the twitter profile so we can write the verified flag on chain
  */
  app.post('/twitter/associate', handleResponse(async (req, res, next) => {
+ audiusLibsInstance = audiusLibsInstance.libs
  let { uuid, userId, handle } = req.body
- let audiusLibsInstance = await getAudiusLibsInstance()
  try {
  let twitterObj = await models.TwitterUser.findOne({ where: { uuid: uuid } })
  // only set blockchainUserId if not already set

libs/examples/local_initStakingOperations.js

@@ -5,10 +5,9 @@ const initAudiusLibs = require('./initAudiusLibs')
 const serviceTypeList = ['discovery-provider', 'creator-node', 'content-service']
 const spDiscProvType = serviceTypeList[0]
 const spCreatorNodeType = serviceTypeList[1]
-const discProvEndpoint1 = 'http://localhost:5000'
-const creatorNodeEndpoint1 = 'http://localhost:4000'
-const creatorNodeEndpoint2 = 'http://localhost:4010'
-const spEndpoint2 = 'http://localhost:5001'
+const discProvEndpoint1 = 'http://docker.for.mac.localhost:5000'
+const creatorNodeEndpoint1 = 'http://docker.for.mac.localhost:4000'
+const creatorNodeEndpoint2 = 'http://docker.for.mac.localhost:4010'
 
 function throwArgError () {
  throw new Error('missing argument - format: node examples/initiateStakingOperations.js [distribute, fundclaim, getclaim, stakeinfo, initversions, register-sps, query-sps, init-all]')
@@ -183,11 +182,12 @@ async function registerLocalServices () {
  console.log(`\n${discProvEndpoint1} already registered`)
  }
  }
+
  // Initialize w/different acct
  const audius2 = await initAudiusLibs(true, null, ethAccts[1])
  try {
  // Register creator node
- console.log('\nregistering creator node 2')
+ console.log('\nregistering creator node 1')
  let tx = await audius2.ethContracts.ServiceProviderFactoryClient.register(
  spCreatorNodeType,
  creatorNodeEndpoint1,
@@ -197,7 +197,7 @@ async function registerLocalServices () {
  if (!e.toString().includes('already registered')) {
  console.log(e)
  } else {
- console.log(`\n${creatorNodeEndpoint2} already registered`)
+ console.log(`\n${creatorNodeEndpoint1} already registered`)
  }
  }
 }