Update code for enigma 0.3.0

.env

@@ -0,0 +1,4 @@
+COMPOSE_PROJECT_NAME=enigma
+SGX_MODE=SW
+BUILD_CONTRACTS_PATH=/Users/santteegt/enigma/enigma-data-validation/build/enigma_contracts
+DOCKER_TAG=latest

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 build
 .idea
-.env
+test/*.txt

README.md

@@ -1,16 +1,24 @@
 # Secret Data Validation
 
+## About
+
+[Enigma](https://enigma.co/) is a secure computation protocol, where “secret nodes” perform computations over encrypted data. Enigma brings privacy to any kind of computation - not just transactions - helping to improve the adoption and usability of decentralized technologies.
+
+This application uses enigma's secret contracts to create secure a "data validation" module that enables users to encrypt data and check their encrypted data set against another user’s encrypted data set 
+
+## Key Features:
+
 This solution enables User A to upload a small dataset (email, phone number), 
 and also enables a second user to submit their own dataset (with the same fields).
 
-Then, the secret contract compares the two data sets.
-If they are equivalent, the secret contract sends an encrypted affirmation of this to User B,
-who has now verified their data set against user A.
+Then, the secret contract compares the two data sets. If they are equivalent, the secret contract sends an encrypted affirmation of this to User B, who has now verified their data set against user A.
 
 If they are not equivalent, the user receives a false response.
 
 ## Install
+
 ### 1. Start Discovery Network
+
 In a separate terminal:
 ```bash
 npm i -g @enigmampc/discovery-cli
@@ -30,6 +38,7 @@ npm start
 ```
 
 ## Using dApp
+
 1. Navigate browser to https://localhost:3000/
 2. Wait for Enigma to load.
 3. Select address.
@@ -38,6 +47,7 @@ npm start
 6. Go to step 2.
 
 ## Test Contracts
+
 From the root of your project:
 ```bash
 discovery test

client/src/build

@@ -0,0 +1 @@
+../../build/

client/src/utils/getEnigmaInit.js

@@ -12,14 +12,15 @@ export default async () => {
             web3,
             EnigmaContract.networks['4447'].address,
             EnigmaTokenContract.networks['4447'].address,
-            'http://localhost:3346',
+            'http://localhost:3333',
             {
                 gas: 4712388,
                 gasPrice: 100000000000,
                 from: (await web3.eth.getAccounts())[0],
             },
         );
         enigma.admin();
+        enigma.setTaskKeyPair('cupcake');
         return enigma;
     } catch (error) {
         // Catch any errors for any of the above operations.

config/nginx.conf

@@ -0,0 +1,14 @@
+user  nginx;
+
+events {
+    worker_connections   1000;
+}
+http {
+    client_max_body_size 20M;
+    server {
+        listen 3333;
+        location / {
+            proxy_pass http://p2p:3346;
+        }
+    }
+}

docker-compose.cli-hw.yml

@@ -34,10 +34,11 @@ services:
       - ./start_worker.bash; bash
     environment:
       - NETWORK=${COMPOSE_PROJECT_NAME}
+      - NODES
     volumes:
         - "${BUILD_CONTRACTS_PATH}:/root/enigma-p2p/test/ethereum/scripts/build/contracts"
-    ports:
-      - "3346:3346"
+    expose:
+      - "3346"
 
   client:
     image: enigmampc/enigma_contract:${DOCKER_TAG}
@@ -79,6 +80,18 @@ services:
     devices:
       - "/dev/isgx:/dev/isgx"
 
+  nginx:
+    image: nginx:latest
+    hostname: nginx
+    volumes:
+      - "./config/nginx.conf:/etc/nginx/nginx.conf:ro"
+    depends_on:
+      - p2p
+    ports:
+      - "3333:3333"
+    networks:
+      - net
+
 networks:
     net:
 

docker-compose.cli-sw.yml

@@ -34,10 +34,11 @@ services:
       - ./start_worker.bash; bash
     environment:
       - NETWORK=${COMPOSE_PROJECT_NAME}
+      - NODES
     volumes:
         - "${BUILD_CONTRACTS_PATH}:/root/enigma-p2p/test/ethereum/scripts/build/contracts"
-    ports:
-      - "3346:3346"
+    expose:
+      - "3346"
 
   client:
     image: enigmampc/enigma_contract:${DOCKER_TAG}
@@ -75,6 +76,18 @@ services:
     volumes:
       - "shared:/root/.enigma"
 
+  nginx:
+    image: nginx:latest
+    hostname: nginx
+    volumes:
+      - "./config/nginx.conf:/etc/nginx/nginx.conf:ro"
+    depends_on:
+      - p2p
+    ports:
+      - "3333:3333"
+    networks:
+      - net
+
 networks:
     net:
 

migrations/2_deploy_contracts.js

@@ -33,7 +33,6 @@ async function deploySecretContract(config){
 
   try {
     preCode = fs.readFileSync(path.resolve(migrationsFolder, '../build/secret_contracts', config.filename));
-    preCode = preCode.toString('hex');
   } catch(e) {
     console.log('Error:', e.stack);
   }
@@ -75,7 +74,7 @@ module.exports = async function(deployer, network, accounts) {
     web3,
     EnigmaContract.networks['4447'].address,
     EnigmaTokenContract.networks['4447'].address,
-    'http://localhost:3346',
+    'http://localhost:3333',
     {
       gas: 4712388,
       gasPrice: 100000000000,
@@ -84,6 +83,8 @@ module.exports = async function(deployer, network, accounts) {
   );
   enigma.admin();
 
+  enigma.setTaskKeyPair('cupcake');
+
   // Deploy your Smart and Secret contracts below this point:
 
   const config = {