grant flow by account and user

wilmveel · Apr 4, 2016 · d3a357e · d3a357e
1 parent 0c1516e
commit d3a357e
Show file tree

Hide file tree

Showing 5 changed files with 201 additions and 11 deletions.
diff --git a/src/contracts/Grant.sol b/src/contracts/Grant.sol
@@ -11,4 +11,9 @@ contract Grant {
         user = msg.sender;
     }
 
+    function state() constant returns (address b, address a){
+        a = app;
+        b = user;
+    }
+
 }
diff --git a/src/wallet.js b/src/wallet.js
@@ -11,6 +11,8 @@ module.exports =  function(privateKey){
     if(!privateKey)
         privateKey = crypto.randomBytes(32);
 
+    var address = ethereumjsUtil.privateToAddress(privateKey);
+
     var web3 = new Web3();
 
     var signer = require('./signer')(privateKey);
@@ -21,9 +23,10 @@ module.exports =  function(privateKey){
     });
 
     web3.setProvider(hookedWeb3Provider);
+    web3.eth.defaultAccount = ethereumjsUtil.bufferToHex(address);
 
     return {
-        address: ethereumjsUtil.privateToAddress(privateKey),
+        address: ethereumjsUtil.bufferToHex(address),
         eth: web3.eth
     }
 

diff --git a/src/watch.js b/src/watch.js
@@ -6,8 +6,8 @@ module.exports = function watch(web3) {
         var filter = web3.eth.filter("latest");
         filter.watch(function (error, log) {
             web3.eth.getTransaction(transaction, function (err, t) {
+                console.log("watch", t);
                 if (t.blockHash) {
-                    console.log("transaction", t);
                     filter.stopWatching();
                     callback();
                 }

diff --git a/test/grantFlow.spec.js → test/grantByAccount.spec.js b/test/grantFlow.spec.js → test/grantByAccount.spec.js
@@ -32,7 +32,7 @@ describe('GrantFlow', function () {
         appWallet = new Wallet();
         var transaction = web3.eth.sendTransaction({
                 from: web3.eth.coinbase,
-                to: ethereumjsUtil.bufferToHex(appWallet.address),
+                to: appWallet.address,
                 value: web3.toWei(1, "ether")
             }
         )
@@ -50,7 +50,7 @@ describe('GrantFlow', function () {
         userWallet = new Wallet();
         var transaction = web3.eth.sendTransaction({
                 from: web3.eth.coinbase,
-                to: ethereumjsUtil.bufferToHex(userWallet.address),
+                to: userWallet.address,
                 value: web3.toWei(1, "ether")
             }
         )
@@ -63,15 +63,14 @@ describe('GrantFlow', function () {
 
     });
 
-    it('app creates grant contract', function (done) {
+    it('should create grant contract by app', function (done) {
 
         var abi = compiled.Grant.info.abiDefinition;
         var code = compiled.Grant.code;
 
         appWallet.eth.contract(abi).new({
             gas: 5000000000000000000000,
-            data: code,
-            from: ethereumjsUtil.bufferToHex(appWallet.address)
+            data: code
         }, function (err, contract) {
             if (err) {
                 console.log("Contract creation error", err);
@@ -84,7 +83,7 @@ describe('GrantFlow', function () {
         });
     });
 
-    it('app creates grant contract', function (done) {
+    it('should authorize grant contract by user', function (done) {
 
         var abi = compiled.Grant.info.abiDefinition;
         var code = compiled.Grant.code;
@@ -94,9 +93,38 @@ describe('GrantFlow', function () {
                 console.log("Contract creation error", err);
                 done(err);
             } else if (contract.address) {
-                console.log("Contract Created", contract.address);
-                grantContract = contract.address;
-                done();
+                console.log("Contract Fetch", contract.address);
+                contract.authorize({
+                    gas: 5000000000000000000000
+                }, function (err, transaction) {
+                    console.log(err, transaction);
+                    watch(transaction, function (err, res) {
+                        console.log(err, res);
+                        done();
+                    });
+                });
+            }
+        });
+    });
+
+
+    it('should get state of grant contract', function (done) {
+
+        var abi = compiled.Grant.info.abiDefinition;
+        var code = compiled.Grant.code;
+
+        web3.eth.contract(abi).at(grantContract, function (err, contract) {
+            if (err) {
+                console.log("Contract creation error", err);
+                done(err);
+            } else if (contract.address) {
+                console.log("Contract Fetch", contract.address);
+                contract.state(function (err, res) {
+                    console.log('state', res);
+                    assert.equal(userWallet.address, res[0]);
+                    assert.equal(appWallet.address, res[1]);
+                    done();
+                });
             }
         });
     });

diff --git a/test/grantByUser.spec.js b/test/grantByUser.spec.js
@@ -0,0 +1,154 @@
+var assert = require('assert');
+
+var Web3 = require('web3');
+var ethereumjsUtil = require('ethereumjs-util');
+
+var Watch = require('../src/watch');
+var Wallet = require('../src/wallet');
+
+var contracts = require('../src/contracts');
+
+describe('GrantFlow', function () {
+
+    this.timeout(1000000);
+
+    var web3 = new Web3();
+    var watch = new Watch(web3);
+
+    var defaultProvider = new web3.providers.HttpProvider("http://128.199.53.68:8545")
+
+    web3.setProvider(defaultProvider);
+    web3.eth.defaultAccount = web3.eth.coinbase;
+
+    var compiled = web3.eth.compile.solidity(contracts);
+
+    var appWallet;
+    var userWallet;
+
+    var grantContract;
+    var userContract;
+
+    it('should create a app wallet and transfer 1 ether', function (done) {
+
+        appWallet = new Wallet();
+        var transaction = web3.eth.sendTransaction({
+                from: web3.eth.coinbase,
+                to: appWallet.address,
+                value: web3.toWei(1, "ether")
+            }
+        )
+        console.log(transaction);
+
+        watch(transaction, function (err, res) {
+            console.log(err, res);
+            done();
+        })
+
+    });
+
+    it('should create a user wallet and transfer 1 ether', function (done) {
+
+        userWallet = new Wallet();
+        var transaction = web3.eth.sendTransaction({
+                from: web3.eth.coinbase,
+                to: userWallet.address,
+                value: web3.toWei(1, "ether")
+            }
+        )
+        console.log(transaction);
+
+        watch(transaction, function (err, res) {
+            console.log(err, res);
+            done();
+        })
+
+    });
+
+    it('should create grant contract by app', function (done) {
+
+        var abi = compiled.Grant.info.abiDefinition;
+        var code = compiled.Grant.code;
+
+        appWallet.eth.contract(abi).new({
+            gas: 5000000000000000000000,
+            data: code
+        }, function (err, contract) {
+            if (err) {
+                console.log("Contract creation error", err);
+                done(err);
+            } else if (contract.address) {
+                console.log("Contract Created", contract.address);
+                grantContract = contract.address;
+                done();
+            }
+        });
+    });
+
+    it('should create user contract by user', function (done) {
+
+        var abi = compiled.User.info.abiDefinition;
+        var code = compiled.User.code;
+
+        userWallet.eth.contract(abi).new({
+            gas: 5000000000000000000000,
+            data: code,
+        }, function (err, contract) {
+            if (err) {
+                console.log("Contract creation error", err);
+                done(err);
+            } else if (contract.address) {
+                console.log("Contract Created", contract.address);
+                userContract = contract.address;
+                done();
+            }
+        });
+    });
+
+    it('should authorize grant contract by user contract', function (done) {
+
+        var abi = compiled.User.info.abiDefinition;
+        var code = compiled.User.code;
+
+        userWallet.eth.contract(abi).at(userContract, function (err, contract) {
+            if (err) {
+                console.log("Contract creation error", err);
+                done(err);
+            } else if (contract.address) {
+                console.log("Contract Fetch", contract.address);
+                contract.authorize(grantContract, {
+                    gas: 5000000000000000000000
+                }, function (err, transaction) {
+                    console.log(err, transaction);
+                    watch(transaction, function (err, res) {
+                        console.log(err, res);
+                        done();
+                    });
+                });
+            }
+        });
+    });
+
+
+    it('should get state of grant contract', function (done) {
+
+        var abi = compiled.Grant.info.abiDefinition;
+        var code = compiled.Grant.code;
+
+        web3.eth.contract(abi).at(grantContract, function (err, contract) {
+            if (err) {
+                console.log("Contract creation error", err);
+                done(err);
+            } else if (contract.address) {
+                console.log("Contract Fetch", contract.address);
+                contract.state(function (err, res) {
+                    console.log('state', res);
+                    assert.equal(userContract, res[0]);
+                    assert.equal(appWallet.address, res[1]);
+                    done();
+                });
+            }
+        });
+    });
+
+
+});