Merge branch 'master' into ss-parallel-track-upload-8/12

AudiusProject · Aug 13, 2019 · c945574 · c945574
2 parents 4affb3b + 5d4b4de
commit c945574
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 332 deletions.
diff --git a/content-service/default-config.json b/content-service/default-config.json
@@ -1,12 +1,17 @@
 {
   "ipfsHost": "localhost",
   "ipfsPort": "6001",
-  "ipfsPeerAddresses": "/ip4/172.19.0.2/tcp/4001/ipfs/QmTbpbQx2x54KLY7EWYpHEhHxoHusiDKU6j2N2humSz2ji",
+  "ipfsPeerAddresses": "",
   "dbUrl": "postgres://postgres:postgres@localhost:8432/audius_content_service",
   "port": 8000,
   "logLevel": "debug",
   "web3ProviderUrl": "http://localhost:8545",
   "registryAddress": "",
   "delegateOwnerWallet": "",
-  "delegatePrivateKey": ""
+  "delegatePrivateKey": "",
+  "ethProviderUrl": "http://localhost:8546",
+  "ethNetworkId": "",
+  "ethTokenAddress": "",
+  "ethRegistryAddress": "",
+  "ethOwnerWallet": ""
 }
diff --git a/content-service/docker-compose/development.env b/content-service/docker-compose/development.env
@@ -5,17 +5,24 @@
 dbUrl=postgres://postgres:postgres@docker.for.mac.localhost:8432/audius_content_service
 ipfsHost=docker.for.mac.localhost
 ipfsPort=6001
-ipfsPeerAddresses=/ip4/172.19.0.2/tcp/4001/ipfs/QmTbpbQx2x54KLY7EWYpHEhHxoHusiDKU6j2N2humSz2ji
 logLevel=debug
 port=8000
 web3ProviderUrl=http://docker.for.mac.localhost:8545
+ethProviderUrl=http://docker.for.mac.localhost:8546
+
+# Address information required on all environments
+registryAddress=
+ethNetworkId=
+ethTokenAddress=
+ethRegistryAddress=
+ethOwnerWallet=
 
 # wallet information required on all environments
 delegateOwnerWallet=
 delegatePrivateKey=
 
-# required params on staging and production, optional on development
-# registryAddress=
+# optional parameter
+ipfsPeerAddresses=
 
 # not part of the config itself, but required for docker to know when ports are available
 WAIT_HOSTS=docker.for.mac.localhost:8432