Fleshed out data submission, and sending TRU to scrypt submitter contract

Author: hswick

deploy.js

@@ -34,9 +34,9 @@ async function deploy() {
     let options = {from: accounts[0].toLowerCase(), gas: 2000000}
 
     let args = [
-	artifacts.incentiveLayer.address.toLowerCase(),
-	artifacts.tru.address.toLowerCase(),
-	artifacts.fileSystem.address.toLowerCase(),
+	artifacts.incentiveLayer.address,
+	artifacts.tru.address,
+	artifacts.fileSystem,
 	info.ipfshash,
 	info.codehash
     ]
@@ -45,6 +45,10 @@ async function deploy() {
 
     let c = await contract.deploy({data: "0x" + bin, arguments: args}).send(options)
 
+    let tru = new web3.eth.Contract(artifacts.tru.abi, artifacts.tru.address)
+
+    tru.transfer(c._address, "100000000000", {from: accounts[0], gas:200000})
+
     fs.writeFileSync("export.json", JSON.stringify({
 	address: c._address,
 	abi: c._jsonInterface

index.js

@@ -7,8 +7,11 @@ const fs = require('fs')
 app.use(express.static('public'))
 
 app.get('/contracts', function (req, res) {
-    let artifacts = fs.readFileSync(__dirname + "/truebit-os/wasm-client/" + req.query.network + ".json")
-    res.send(artifacts)
+    let artifacts = JSON.parse(fs.readFileSync(__dirname + "/truebit-os/wasm-client/" + req.query.network + ".json"))
+
+    artifacts["scrypt"] = JSON.parse(fs.readFileSync(__dirname + "/export.json"))
+    
+    res.send(JSON.stringify(artifacts))
 })
 
 app.listen(port, () => console.log(`Example app listening on port ${port}!`))

public/js/app.js

@@ -6,26 +6,35 @@ function showTruebitScrypt(hash) {
     return "<div>Scrypt Hash from TrueBit solver:</div> <div>" + hash + "</div>"
 }
 
-var incentiveLayer, fileSystem
-
-const taskInfo = {
-    "ipfshash":"QmZGf6QCViGi7VPZSp97EkvDX9NuNyspZvgpXs1Wq73u4L",
-    "codehash":"0xcb1f3611566c137482d4a5b560896d2142a13450915d8e17e7dd9c24736a164c",
-    "memsize":20
-}
+var fileSystem, scryptSubmitter
 
 function getTruebitScrypt(data) {
 
-    //handle file system work
+    let hash = "default"    
 
+    scryptSubmitter.methods.submitData(data).send({gas: 200000}, function(error, txHash) {
+	scryptSubmitter.once('GotFiles', function(error, event) {
+	    if (event) {
+		let fileID = event.args.files[0]
+
+		fileSystem.methods.getData(fileID).call(function(error, result) {
+		    hash = result[0]
+		})
+	    }
+	})	
+    })   
+
+    return hash
 }
 
 function runScrypt() {
     data = document.getElementById('input-data').value
     hash = s.crypto_scrypt(data, "foo", 1024, 1, 1, 256)
     document.getElementById('js-scrypt').innerHTML = showJSScrypt(s.to_hex(hash))
 
-    document.getElementById('tb-scrypt').innerHTML = showTruebitScrypt("foobar")
+    truHash = getTruebitScrypt(data)
+
+    document.getElementById('tb-scrypt').innerHTML = showTruebitScrypt(truHash)
 }
 
 function getArtifacts(networkName) {
@@ -34,6 +43,10 @@ function getArtifacts(networkName) {
     httpRequest.onreadystatechange = function() {
 	if (httpRequest.readyState === XMLHttpRequest.DONE) {
 	    //get scrypt submitter artifact
+	    const artifacts = JSON.parse(httpRequest.responseText)
+
+	    fileSystem = window.web3.eth.contract(artifacts.fileSystem.abi, artifacts.fileSystem.address)
+	    scryptSubmitter = window.web3.eth.contract(artifacts.scrypt.abi, artifacts.scrypt.address)
 	}
     }