Cnode sync Improvements (debounce + sync/write protections) + code cl…

…eanup (#36)
AudiusProject · Sep 16, 2019 · 89c46fb · 89c46fb
1 parent 4d8bb28
commit 89c46fb
Show file tree

Hide file tree

Showing 56 changed files with 4,776 additions and 1,678 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -249,6 +249,7 @@ jobs:
             export POSTGRES_TEST_PORT=5432
             cd creator-node
             export redisPort=6379
+            export spOwnerWallet='yes'
             npm run test
 
   test-discovery-provider:

diff --git a/creator-node/.gitignore b/creator-node/.gitignore
@@ -7,3 +7,5 @@ local-config.json
 node_modules/
 npm-debug.log
 local-test/
+eth-contract-config.json
+local-storage/
diff --git a/creator-node/default-config.json b/creator-node/default-config.json
@@ -20,6 +20,17 @@
   "serviceLatitude": "",
   "serviceLongitude": "",
   "serviceCountry": "",
+
   "delegateOwnerWallet": "",
-  "delegatePrivateKey": ""
+  "delegatePrivateKey": "",
+
+  "ethProviderUrl": "http://docker.for.mac.localhost:8546",
+  "ethNetworkId": "",
+  "ethTokenAddress": "",
+  "ethRegistryAddress": "",
+  "ethOwnerWallet": "",
+  "ethWallets": "",
+  "spOwnerWalletIndex": 1,
+  "spOwnerWallet": "",
+  "debounceTime": 30000
 }
diff --git a/creator-node/docker-compose/dev/development2.env b/creator-node/docker-compose/dev/development2.env
@@ -3,4 +3,5 @@ ipfsHost=docker.for.mac.localhost
 ipfsPort=6011
 redisHost=docker.for.mac.localhost
 redisPort=4389
-WAIT_HOSTS=docker.for.mac.localhost:4389,docker.for.mac.localhost:4442
+WAIT_HOSTS=docker.for.mac.localhost:4389,docker.for.mac.localhost:4442
+spOwnerWalletIndex=2
diff --git a/creator-node/docker-compose/dev/docker-compose.full2.yml b/creator-node/docker-compose/dev/docker-compose.full2.yml
@@ -22,6 +22,9 @@ services:
     volumes:
       - file_storage2:/file_storage
       - '../..:/usr/src/app'
+      # Prevent hiding node_modules on container with host volume
+      # From https://github.com/barrysteyn/node-scrypt/issues/148
+      - /usr/src/app/node_modules
   redis2:
     image: redis:5.0.4
     ports:

diff --git a/creator-node/docker-compose/dev/docker-compose.full3.yml b/creator-node/docker-compose/dev/docker-compose.full3.yml
@@ -22,6 +22,9 @@ services:
     volumes:
       - file_storage3:/file_storage
       - '../..:/usr/src/app'
+      # Prevent hiding node_modules on container with host volume
+      # From https://github.com/barrysteyn/node-scrypt/issues/148
+      - /usr/src/app/node_modules
   redis3:
     image: redis:5.0.4
     ports:

diff --git a/creator-node/docker-compose/development.env b/creator-node/docker-compose/development.env
@@ -30,8 +30,14 @@ serviceCountry=
 # ipfsClusterPort=0
 
 # wallet information required on all environments
-delegateOwnerWallet=
-delegatePrivateKey=
+# delegateOwnerWallet=
+# delegatePrivateKey=
+spOwnerWalletIndex=1
+
+# Run as creator node by default
+isUserMetadataNode=false
+
+debounceTime=5000
 
 # not part of the config itself, but required for docker to know when ports are available
-WAIT_HOSTS=docker.for.mac.localhost:4379,docker.for.mac.localhost:4432
+WAIT_HOSTS=docker.for.mac.localhost:4379,docker.for.mac.localhost:4432
diff --git a/creator-node/docker-compose/docker-compose.full.yml b/creator-node/docker-compose/docker-compose.full.yml
@@ -21,7 +21,10 @@ services:
       - '4000:4000'
     volumes:
       - file_storage:/file_storage
-      - '..:/usr/src/app'
+      - ..:/usr/src/app
+      # Prevent hiding node_modules on container with host volume
+      # From https://github.com/barrysteyn/node-scrypt/issues/148
+      - /usr/src/app/node_modules
   redis:
     image: redis:5.0.4
     ports: