From 7aff6833bdf89245d87794ba32506b096332ee65 Mon Sep 17 00:00:00 2001
From: OrenZak <orenzak24@gmail.com>
Date: Sun, 11 Aug 2019 11:08:18 +0300
Subject: [PATCH 01/30] add route - is player in game

---
 core/blockchain.js |  3 ++-
 game/gameEngine.js |  2 +-
 routes/users.js    | 48 +++++++++++++++++++++++++++++++---------------
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/core/blockchain.js b/core/blockchain.js
index c58e05f..39bcf9d 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -44,8 +44,9 @@ async function validateTransaction(transactionId) {
           && data.amount === config.game_fee 
           //check for transaction date
           && data.hasOwnProperty('timeStamp')
-          &&  new Date() - Date(data.timestamp) < 10
+          &&  new Date() - Date(data.timestamp) < 10 // 10 sec
 }
+
 async function createAccount(wallet_address) {
   console.log("buildCreateAccount -> " + wallet_address)
   // Sign the account creation transaction
diff --git a/game/gameEngine.js b/game/gameEngine.js
index e71d657..8632b3c 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -34,7 +34,7 @@ function gameEmit( {gameId, action, sender = "server", callerId, value } ) {
 module.exports = {
     eventEmitter: new events.EventEmitter()
     ,actions: actions
-    ,isInGame(callerId) {
+    ,isPlayerInGame(callerId) {
         return (gamesByUserId[callerId])
     }
     ,reset: () => {
diff --git a/routes/users.js b/routes/users.js
index f23d048..c471bc7 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -11,21 +11,39 @@ var express = require('express');
 var router = express.Router();
 const blockchain = require('../core/blockchain')
 const config = require('../config')
+const gameEngine = require('../game/gameEngine')
 
-router.get('/login', async function(req, res, next) {
-    const public_key = req.query.public_key
-    try {
-      if(!public_key) 
-        throw new Error("missing public_key")
-      
-      if(!await blockchain.isAccountExisting(public_key))
-        await blockchain.createAccount(public_key)
-      
-        res.json({ wallet_address: config.master_public_address})
-   }
-    catch (error) {
-      next(error)
-      //res.status(400).json({error:{message:error.message}});
-    }
+router.get('/login', async function (req, res, next) {
+  const public_key = req.query.public_key
+  try {
+    if (!public_key)
+      throw new Error("missing public_key")
+
+    if (!await blockchain.isAccountExisting(public_key))
+      await blockchain.createAccount(public_key)
+
+    res.json({
+      wallet_address: config.master_public_address
+    })
+  } catch (error) {
+    next(error)
+  }
 });
+
+router.get('/is-player-in-game', async function (req, res, next) {
+  const public_key = req.query.public_key
+  try {
+    if (!public_key)
+      throw new Error("missing public_key")
+
+    const is_player_in_game = gameEngine.isPlayerInGame(public_key)
+
+    res.json({
+      is_player_in_game: is_player_in_game
+    })
+  } catch (error) {
+    next(error)
+  }
+});
+
 module.exports = router;
\ No newline at end of file

From 0e41efca2c1b7986311a635914228d5106d4116c Mon Sep 17 00:00:00 2001
From: ass <alon@bootleg.co.il>
Date: Mon, 12 Aug 2019 10:49:37 +0300
Subject: [PATCH 02/30] fixed isPlayerInGame in game engine

---
 game/gameEngine.js |  2 +-
 routes/users.js    | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/game/gameEngine.js b/game/gameEngine.js
index 8632b3c..b16b02f 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -35,7 +35,7 @@ module.exports = {
     eventEmitter: new events.EventEmitter()
     ,actions: actions
     ,isPlayerInGame(callerId) {
-        return (gamesByUserId[callerId])
+        return gamesByUserId[callerId] !== undefined
     }
     ,reset: () => {
         games = []
diff --git a/routes/users.js b/routes/users.js
index c471bc7..7013d20 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -36,13 +36,11 @@ router.get('/is-player-in-game', async function (req, res, next) {
     if (!public_key)
       throw new Error("missing public_key")
 
-    const is_player_in_game = gameEngine.isPlayerInGame(public_key)
-
-    res.json({
-      is_player_in_game: is_player_in_game
-    })
+    const result = gameEngine.isPlayerInGame(public_key)
+    console.log(result)
+    res.json({ result: result })
   } catch (error) {
-    next(error)
+      next(error)
   }
 });
 

From 5ca9a9dbe8ec968cd1e2dde1a90e19c2b2fd17df Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Tue, 13 Aug 2019 08:53:27 +0300
Subject: [PATCH 03/30] fixed join bug where game allowed more then two players
 to join

---
 config.js          |  7 ++++---
 core/blockchain.js |  2 +-
 game/gameEngine.js | 27 +++++++++++++--------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config.js b/config.js
index 37a426a..b630a88 100644
--- a/config.js
+++ b/config.js
@@ -12,10 +12,11 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
                    board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
-                   game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 10,
+                   game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
                    total_bad_card_pairs: 1,
-                   flipped_card_symbol_index: 0
+                   flipped_card_symbol_index: 0,
+                   transaction_experation_in_sec: 10
                 };
diff --git a/core/blockchain.js b/core/blockchain.js
index 39bcf9d..afea426 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -44,7 +44,7 @@ async function validateTransaction(transactionId) {
           && data.amount === config.game_fee 
           //check for transaction date
           && data.hasOwnProperty('timeStamp')
-          &&  new Date() - Date(data.timestamp) < 10 // 10 sec
+          &&  new Date() - Date(data.timestamp) < config.transaction_experation_in_sec // 10 sec
 }
 
 async function createAccount(wallet_address) {
diff --git a/game/gameEngine.js b/game/gameEngine.js
index b16b02f..fb55d70 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -72,19 +72,19 @@ module.exports = {
             // Join
             //
             case actions.JOIN:
-            const result = await blockchain.isAccountExisting(callerId)
-            if(!result) throw new Error("Invalid public id")
-         
-            game = game || games.filter( game => game.state == Game.states.PENDING )[0] || new Game()
+            
+            if(game)
+                return game
+            
+            if(!await blockchain.isAccountExisting(callerId) ) throw new Error("Invalid public id")
+            //if( !value ) throw new Error("Missing transaction id" ) 
+            //if( await !blockchain.validateTransaction(value) ) throw new Error("Invalid transaction Id")
+            
+            game = games.filter( game => game.state == Game.states.PENDING && Object.keys(game.players).length < 2 )[0] || new Game()
+           
             if(games.indexOf(game) < 0 )
                 games.push(game)
-            
-            // If new game created , check player's transaction
-            if( game.players.length == 0 ) {
-                if( !value ) throw new Error("Missing transaction id")
-                if( await !blockchain.validateTransaction(value))
-                    throw new Error("Invalid transaction Id")
-            }
+        
             game.players[callerId] = new Player( { id:callerId, name:value } )
             gamesByUserId[callerId] = game
 
@@ -170,8 +170,7 @@ module.exports = {
             games.splice(games.indexOf(game),1)
             blockchain.payToUser(winnerId,config.game_fee)
             return winnerId
-            break
-    
+
             //
             // Leave
             //
@@ -185,7 +184,7 @@ module.exports = {
             break
 
             default:
-            throw new Error("Action",action," not supported")
+            throw new Error("Action",action,"not supported")
         }
     } 
 }
\ No newline at end of file

From 4e9dcbf3f0786da8ce3427c60e57640356dcd8b9 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Tue, 13 Aug 2019 12:24:45 +0300
Subject: [PATCH 04/30] fixed bug where game wasn"t abscring board

---
 game/Game.js          |  4 ++--
 game/gameEngine.js    | 44 ++++++++++++++++++++++++++++++++-----------
 game/socketManager.js | 15 ++++++++++-----
 public/socketio.html  |  4 +++-
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/game/Game.js b/game/Game.js
index cd5182a..fb8a048 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -15,14 +15,14 @@ for(var i = 0; i < config.board_width * config.board_height / 2.0; i++) {
     symbols.push(i + 1)
     symbols.push(i + 1)
 }
-const states = Object.freeze({ PENDING: 'pending', PLAYING: 'playing', COMPLETED: 'completed' }) 
+const states = Object.freeze({ PENDING: 'pending', STARTING:'starting', PLAYING: 'playing', COMPLETED: 'completed' }) 
 class Game {
 
     static get states() { return states }
     
     constructor() {
         this.id = newId(5)
-        this.state = 'pending'
+        this.state = states.PENDING
         this.players = {}
         this.flipped = []
         this.turn = null
diff --git a/game/gameEngine.js b/game/gameEngine.js
index fb55d70..f43f740 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -71,38 +71,60 @@ module.exports = {
             //
             // Join
             //
-            case actions.JOIN:
-            
+            case actions.JOIN: 
             if(game)
-                return game
+                return game//.userFriendly()
             
+            //Validate
+            if( !value ) throw new Error("Missing transaction id" )
+            if( !value.name ) throw new Error("Missing name" ) 
+            //if( !value.transactionId ) throw new Error("Missing transaction id" ) 
             if(!await blockchain.isAccountExisting(callerId) ) throw new Error("Invalid public id")
-            //if( !value ) throw new Error("Missing transaction id" ) 
-            //if( await !blockchain.validateTransaction(value) ) throw new Error("Invalid transaction Id")
             
+            //Validate transaction
+            try {
+                console.log(value)
+              //  let result =   await !blockchain.validateTransaction(value.transactionId)
+            } catch ( error ) {
+               // console.log(error)
+            }
+            
+            //Check for pending games
             game = games.filter( game => game.state == Game.states.PENDING && Object.keys(game.players).length < 2 )[0] || new Game()
            
+            //Push game to games list if not already there
             if(games.indexOf(game) < 0 )
                 games.push(game)
-        
-            game.players[callerId] = new Player( { id:callerId, name:value } )
+            
+            //Add player to game object
+            game.players[callerId] = new Player( { id:callerId, name:value.name } )
+            
+            //Index games by player
             gamesByUserId[callerId] = game
+           
+            //Change state to starting if two player's has joind
+            console.log(Object.keys(game.players).length)
+             if( Object.keys(game.players).length == 2 )
+                game.state = Game.states.STARTING
+            
+           
+           
 
-            game = game.userFriendly()
-            if( game.state == Game.states.PENDING && Object.keys(game.players).length == 2 ) {
+            //Start game
+            if( game.state == Game.states.STARTING ) {
                 setTimeout( async function() {
                     let result = await module.exports.doAction({ action:actions.TURN, callerId:callerId } )
                     gameEmit( { gameId:game.id, action:actions.TURN, value:result, callerId:callerId } )
                 }, 1000);
             }
-            return game
+            return game.userFriendly()
         
             //
             // Turn
             //
             case actions.TURN:
             if(!game) throw new Error("User not in game")
-            if(game.state != Game.states.PENDING && game.state != Game.states.PLAYING ) throw new Error("Turn not allowed")
+            if(game.state != Game.states.STARTING && game.state != Game.states.PLAYING ) throw new Error("Turn not allowed")
         
             const playersId = Object.keys(game.players)
             const i = playersId.indexOf(game.turn)
diff --git a/game/socketManager.js b/game/socketManager.js
index cf8aa8a..350835d 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -24,7 +24,7 @@ eventEmitter.on("action",( {gameId,action,callerId,value} ) => {
 // API
 module.exports = function (server,options,cb) {
     io = require('socket.io')(server)
-    io.on('connection', async function (socket,next) {
+    io.on('connection', async function (socket,next,a) {
         //console.log("Connecting",socket.handshake.query.token, socket.handshake.query.name)
         if (socket.handshake.query && 
             socket.handshake.query.token &&
@@ -32,15 +32,19 @@ module.exports = function (server,options,cb) {
             socket.handshake.query.name &&
             socket.handshake.query.name != 'undefined') {
             try {
-                //console.log(socket.handshake.query.token ,socket.handshake.query.name)
-                let game = await doAction({ action:actions.JOIN, callerId: socket.handshake.query.token ,value:socket.handshake.query.name,socket:socket })
+                let value = {
+                    name: socket.handshake.query.name,
+                    transactionId: socket.handshake.query.transactionId
+                }
+               
+                let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value:value, socket:socket })
                 socket.gameId = game.id
                 socket.join(game.id)
                 socket.token = socket.handshake.query.token
                 io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value:game}) 
             }
             catch(error) {
-                console.log("error",error)
+                console.log("*** error",error)
                 socket.disconnect()
             }
         } else {
@@ -50,7 +54,8 @@ module.exports = function (server,options,cb) {
            // console.log("socket recieved aciton",action,value, socket.isAuthorized)
             if( socket.token && allowedUserActions.indexOf(action) > -1 ) {
                 try {
-                   let result = await doAction({action:action,callerId:socket['token'], value:value,socket:socket})    
+                   let result = await doAction({action:action,callerId:socket['token'], value:value,socket:socket}) 
+                      
                     if(cb)
                        cb(result)
                        if(socket.gameId) 
diff --git a/public/socketio.html b/public/socketio.html
index 9829897..cc841be 100644
--- a/public/socketio.html
+++ b/public/socketio.html
@@ -1,7 +1,9 @@
 <script src="/socket.io/socket.io.js"></script>
 <script>
   console.log('token',window.name)
-  var socket = io.connect(location.href, {query: 'token='+ window.name +'&name=A Name'})
+  var socket = io.connect(location.href, {query: 'token='+ window.name +'&name=A Name'},(data) => {
+    alert("hello",data)
+  })
   socket.on('connect', data => { console.log('socket connected', data) })
   socket.on('disconnect', data => { console.log('socket disconnect') })
   socket.on('action', data => {  console.log('action',data) })

From 7c00bd8950f05590d2700e3ced3eb1c15e83c8be Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Tue, 13 Aug 2019 12:24:53 +0300
Subject: [PATCH 05/30] fixed bug where game wasn"t abscring board

---
 game/gameEngine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/gameEngine.js b/game/gameEngine.js
index f43f740..a464b58 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -73,7 +73,7 @@ module.exports = {
             //
             case actions.JOIN: 
             if(game)
-                return game//.userFriendly()
+                return game.userFriendly()
             
             //Validate
             if( !value ) throw new Error("Missing transaction id" )

From 6e6ed4a5582026c2e7a96913705abc39f10a5468 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 15 Aug 2019 13:55:19 +0300
Subject: [PATCH 06/30] changed timers for turn and result states

---
 app.js                | 21 +++++++++++----------
 game/gameEngine.js    |  7 ++-----
 game/socketManager.js |  1 +
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index b56d131..da04a2e 100644
--- a/app.js
+++ b/app.js
@@ -1,23 +1,24 @@
-var createError = require('http-errors');
-var express = require('express');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var logger = require('morgan');
-var indexRouter = require('./routes/index');
-var usersRouter = require('./routes/users');
+var createError = require('http-errors')
+var express = require('express')
+var path = require('path')
+var cookieParser = require('cookie-parser')
+var logger = require('morgan')
+var indexRouter = require('./routes/index')
+var usersRouter = require('./routes/users')
 const config = require('./config')
 const gameEngine = require('./game/gameEngine')
+const socketManager = require('./game/socketManager')
 var app = express();
 
 // view engine setup
-app.set('views', path.join(__dirname, 'views'));
+app.set('views', path.join(__dirname, 'views'))
 app.set('view engine', 'jade');
 
 app.use(logger('dev'));
 app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
+app.use(express.urlencoded({ extended: false }))
 app.use(cookieParser());
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'public')))
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
diff --git a/game/gameEngine.js b/game/gameEngine.js
index a464b58..8d2f97c 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -106,9 +106,6 @@ module.exports = {
             console.log(Object.keys(game.players).length)
              if( Object.keys(game.players).length == 2 )
                 game.state = Game.states.STARTING
-            
-           
-           
 
             //Start game
             if( game.state == Game.states.STARTING ) {
@@ -153,7 +150,7 @@ module.exports = {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.RESULT, value:result,callerId:callerId } )
-                }, 1000);
+                }, 500);
             }   
             return { position:value, symbol:game.board[value]}
            
@@ -179,7 +176,7 @@ module.exports = {
                     let result = await module.exports.doAction({action:actions.WIN,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.WIN, value:result } )
                 }
-            }, 3000);
+            }, 500);
             return  { match:match, callerId:callerId, positions:game.flipped,player:p}
     
             //
diff --git a/game/socketManager.js b/game/socketManager.js
index 350835d..f85ca40 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -7,6 +7,7 @@
  * @author Alon Genosar.
  */
 
+
 let config = require('../config')
 const { doAction, actions, eventEmitter,test } = require('./gameEngine')
 const gameEngine = require('./gameEngine')

From 10e3dd5fdd7e518d9557f66c4dd951f88a73851e Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 15 Aug 2019 14:01:23 +0300
Subject: [PATCH 07/30] a

---
 config.js          | 3 ++-
 game/gameEngine.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config.js b/config.js
index b630a88..aa5e6d7 100644
--- a/config.js
+++ b/config.js
@@ -18,5 +18,6 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    bad_card_symbol_index: 1,
                    total_bad_card_pairs: 1,
                    flipped_card_symbol_index: 0,
-                   transaction_experation_in_sec: 10
+                   transaction_experation_in_sec: 10,
+                   
                 };
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 8d2f97c..5af73fd 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -150,7 +150,7 @@ module.exports = {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.RESULT, value:result,callerId:callerId } )
-                }, 500);
+                }, 100);
             }   
             return { position:value, symbol:game.board[value]}
            
@@ -176,7 +176,7 @@ module.exports = {
                     let result = await module.exports.doAction({action:actions.WIN,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.WIN, value:result } )
                 }
-            }, 500);
+            }, 2000);
             return  { match:match, callerId:callerId, positions:game.flipped,player:p}
     
             //

From f00f02fe7da2aabdebc5da207ae9897d29490dd4 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 15 Aug 2019 14:03:27 +0300
Subject: [PATCH 08/30] a

---
 game/gameEngine.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/gameEngine.js b/game/gameEngine.js
index 5af73fd..4e846ea 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -150,7 +150,7 @@ module.exports = {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.RESULT, value:result,callerId:callerId } )
-                }, 100);
+                }, 2000);
             }   
             return { position:value, symbol:game.board[value]}
            
@@ -176,7 +176,7 @@ module.exports = {
                     let result = await module.exports.doAction({action:actions.WIN,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.WIN, value:result } )
                 }
-            }, 2000);
+            }, 200);
             return  { match:match, callerId:callerId, positions:game.flipped,player:p}
     
             //

From ac9e10e63718153b715f3893bb2ab75bc13d5d21 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Fri, 16 Aug 2019 09:53:40 +0300
Subject: [PATCH 09/30] iOS server version

---
 config.js          | 5 +++--
 game/gameEngine.js | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config.js b/config.js
index aa5e6d7..53993b7 100644
--- a/config.js
+++ b/config.js
@@ -19,5 +19,6 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    total_bad_card_pairs: 1,
                    flipped_card_symbol_index: 0,
                    transaction_experation_in_sec: 10,
-                   
-                };
+                   pre_result_timeout:200,
+                   result_timout:2000
+                }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 4e846ea..4594f69 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -150,7 +150,7 @@ module.exports = {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.RESULT, value:result,callerId:callerId } )
-                }, 2000);
+                }, 100 );
             }   
             return { position:value, symbol:game.board[value]}
            
@@ -176,8 +176,8 @@ module.exports = {
                     let result = await module.exports.doAction({action:actions.WIN,callerId:callerId})
                     gameEmit( { gameId:game.id,action:actions.WIN, value:result } )
                 }
-            }, 200);
-            return  { match:match, callerId:callerId, positions:game.flipped,player:p}
+            }, config.result_timout);
+            return { match:match, callerId:callerId, positions:game.flipped,player:p}
     
             //
             // Win

From 5f31b3074f654198d607d684ebc0934c1e2fff1a Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Sat, 17 Aug 2019 16:27:39 +0300
Subject: [PATCH 10/30] a

---
 game/Game.js          |  4 ++--
 game/gameEngine.js    | 45 +++++++++++++++++++------------------------
 game/socketManager.js | 26 +++++++++++++++++--------
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/game/Game.js b/game/Game.js
index fb8a048..a565981 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -15,7 +15,7 @@ for(var i = 0; i < config.board_width * config.board_height / 2.0; i++) {
     symbols.push(i + 1)
     symbols.push(i + 1)
 }
-const states = Object.freeze({ PENDING: 'pending', STARTING:'starting', PLAYING: 'playing', COMPLETED: 'completed' }) 
+const states = Object.freeze({ PENDING: 'pending', STARTING:'starting', PLAYING: 'playing', TURN: 'turn', RESULT: 'result', COMPLETED: 'completed' }) 
 class Game {
 
     static get states() { return states }
@@ -46,7 +46,7 @@ class Game {
         let cpy = JSON.parse(JSON.stringify(this))
         cpy.board = cpy.board.map( item => { return item == null ? null : Math.min(item,0) } )
         this.flipped.forEach( index => {  cpy.board[index] = this.board[index] });
-        delete cpy.flipped
+        //delete cpy.flipped
         return cpy
     }
    
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 4594f69..b1f2326 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -26,8 +26,8 @@ var games = []
 var gamesByUserId = {}
 
 //Utils
-function gameEmit( {gameId, action, sender = "server", callerId, value } ) {
-    module.exports.eventEmitter.emit('action', { action:action, gameId:gameId, callerId:callerId, value:value })
+function gameEmit( {gameId, action, sender = "server", callerId, value, result } ) {
+    module.exports.eventEmitter.emit('action', { action:action, gameId:gameId, callerId:callerId, value:value, result:result })
 }
 
 //API
@@ -59,7 +59,6 @@ module.exports = {
         var game = gamesByUserId[callerId]
 
         switch (action) {
-
             //
             // Recover
             //
@@ -103,7 +102,6 @@ module.exports = {
             gamesByUserId[callerId] = game
            
             //Change state to starting if two player's has joind
-            console.log(Object.keys(game.players).length)
              if( Object.keys(game.players).length == 2 )
                 game.state = Game.states.STARTING
 
@@ -111,7 +109,7 @@ module.exports = {
             if( game.state == Game.states.STARTING ) {
                 setTimeout( async function() {
                     let result = await module.exports.doAction({ action:actions.TURN, callerId:callerId } )
-                    gameEmit( { gameId:game.id, action:actions.TURN, value:result, callerId:callerId } )
+                    gameEmit( { gameId:game.id, action:actions.TURN, value:callerId, callerId:"server",result:result } )
                 }, 1000);
             }
             return game.userFriendly()
@@ -128,7 +126,7 @@ module.exports = {
             game.turn = playersId[ (i + 1) % playersId.length]
             game.state = Game.states.PLAYING
             game.flipped = []
-            return game.turn
+            return game.userFriendly()
         
             //
             // Flip
@@ -148,11 +146,13 @@ module.exports = {
             
             if( game.flipped.length == 2 ) {
                 setTimeout( async function() { 
-                    let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId})
-                    gameEmit( { gameId:game.id,action:actions.RESULT, value:result,callerId:callerId } )
-                }, 100 );
-            }   
-            return { position:value, symbol:game.board[value]}
+                    let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId })
+                    game.flipped = []
+                    gameEmit( { gameId:game.id,action:actions.RESULT, value: result, callerId: "server",result: game.userFriendly()} )
+                }, 1500 );
+            }  
+           
+            return game.userFriendly()
            
             //
             // Result
@@ -170,25 +170,20 @@ module.exports = {
             setTimeout( async function() { 
                 if( game.cardsLeft() > 1 && game.players[callerId].score > -1 ) {
                     let result = await module.exports.doAction({action:actions.TURN,callerId:callerId})
-                    gameEmit( { gameId:game.id,action:actions.TURN, value:result } )
+                    gameEmit( { gameId:game.id,action:actions.TURN, value:value,result:result } )
                 }
                 else {
-                    let result = await module.exports.doAction({action:actions.WIN,callerId:callerId})
-                    gameEmit( { gameId:game.id,action:actions.WIN, value:result } )
+                    let players = Object.values(game.players)
+                    var winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
+                    players.forEach( player => { delete gamesByUserId[player.id] })
+                    games.splice(games.indexOf(game),1)
+                    blockchain.payToUser(winnerId, config.game_fee * 2)
+                    game.state = Game.states.COMPLETED
+                    gameEmit( { gameId:game.id,action:actions.WIN, value:winner, result: game } )
                 }
             }, config.result_timout);
-            return { match:match, callerId:callerId, positions:game.flipped,player:p}
+            return match
     
-            //
-            // Win
-            //
-            case actions.WIN:
-            let players = Object.values(game.players)
-            var winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
-            players.forEach( player => { delete gamesByUserId[player.id] })
-            games.splice(games.indexOf(game),1)
-            blockchain.payToUser(winnerId,config.game_fee)
-            return winnerId
 
             //
             // Leave
diff --git a/game/socketManager.js b/game/socketManager.js
index f85ca40..d96785d 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -17,11 +17,10 @@ const socketByUserId = []
 const allowedUserActions = [ actions.FLIP, actions.JOIN, actions.RECOVER ]
 
 // Game engine event listener
-eventEmitter.on("action",( {gameId,action,callerId,value} ) => {
-    io.to(gameId).emit("action", { action:action, callerId:callerId, value:value }) 
+eventEmitter.on("action",( {gameId,action,callerId,value, result} ) => {
+    io.to(gameId).emit("action", { action:action, callerId:callerId, value:value,result:result }) 
 })
    
-
 // API
 module.exports = function (server,options,cb) {
     io = require('socket.io')(server)
@@ -41,8 +40,9 @@ module.exports = function (server,options,cb) {
                 let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value:value, socket:socket })
                 socket.gameId = game.id
                 socket.join(game.id)
+                console.log("joining to",game.id)
                 socket.token = socket.handshake.query.token
-                io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value:game}) 
+                io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value:value,result:game}) 
             }
             catch(error) {
                 console.log("*** error",error)
@@ -52,15 +52,25 @@ module.exports = function (server,options,cb) {
             socket.disconnect()
         }
         socket.on('action',async function (action,value,cb) { 
-           // console.log("socket recieved aciton",action,value, socket.isAuthorized)
             if( socket.token && allowedUserActions.indexOf(action) > -1 ) {
                 try {
-                   let result = await doAction({action:action,callerId:socket['token'], value:value,socket:socket}) 
+                   let result = await doAction({action:action, callerId:socket['token'], value:value, socket:socket }) 
                       
                     if(cb)
                        cb(result)
-                       if(socket.gameId) 
-                            io.to(socket.gameId).emit("action",{action:action,callerId:socket.token ,value:{result}}) 
+                    
+                    if( result && result.hasOwnProperty('id') && !socket.gameId ) {
+                        socket.gameId = result.id
+                        socket.join(result.id)
+                        socket.token = socket.handshake.query.token
+                    }
+        
+                    if(socket.gameId) 
+                        io.to(socket.gameId).emit("action", { action: action, 
+                                                              callerId:socket.token, 
+                                                              value: value, 
+                                                              result: result 
+                                                            }) 
                 }
                 catch(error) {
                     if(cb)

From 679c9c9b1aecd831ebb549abd820290cdb1073ab Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 21 Aug 2019 10:26:40 +0300
Subject: [PATCH 11/30] return game fee when user leaves an unstarted game

---
 config.js          |  2 +-
 game/Game.js       |  2 +-
 game/gameEngine.js | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config.js b/config.js
index 53993b7..33fb29b 100644
--- a/config.js
+++ b/config.js
@@ -12,7 +12,7 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
                    board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
                    game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
diff --git a/game/Game.js b/game/Game.js
index a565981..6cd2012 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -15,7 +15,7 @@ for(var i = 0; i < config.board_width * config.board_height / 2.0; i++) {
     symbols.push(i + 1)
     symbols.push(i + 1)
 }
-const states = Object.freeze({ PENDING: 'pending', STARTING:'starting', PLAYING: 'playing', TURN: 'turn', RESULT: 'result', COMPLETED: 'completed' }) 
+const states = Object.freeze({ PENDING: 'pending', STARTING:'starting', TURN: 'turn', RESULT: 'result', COMPLETED: 'completed' }) 
 class Game {
 
     static get states() { return states }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index b1f2326..8ecfd8f 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -13,9 +13,9 @@ const Game = require('./Game')
 const Player = require('./Player')
 const blockchain = require('../core/blockchain')
 const events = require('events')
-
 const Spinner = require('cli-spinner').Spinner;
 const spinner = new Spinner("Monitoring Games")
+
 spinner.setSpinnerString(2)
 
 //ENUMS
@@ -119,12 +119,12 @@ module.exports = {
             //
             case actions.TURN:
             if(!game) throw new Error("User not in game")
-            if(game.state != Game.states.STARTING && game.state != Game.states.PLAYING ) throw new Error("Turn not allowed")
+            if(game.state != Game.states.STARTING && game.state != Game.states.TURN  && game.state != Game.states.RESULT ) throw new Error("Turn not allowed")
         
             const playersId = Object.keys(game.players)
             const i = playersId.indexOf(game.turn)
             game.turn = playersId[ (i + 1) % playersId.length]
-            game.state = Game.states.PLAYING
+            game.state = Game.states.TURN
             game.flipped = []
             return game.userFriendly()
         
@@ -134,7 +134,7 @@ module.exports = {
             case actions.FLIP:
             value = parseInt(value)
             if( !game ) throw new Error("User not in game")
-            if( game.state != Game.states.PLAYING ) throw new Error("Turn not allowed in that state")
+            if( game.state != Game.states.TURN ) throw new Error("Turn not allowed in that state")
             if( game.turn != callerId) throw new Error("Not your turn")
             if( value === undefined || value !== parseInt(value)) throw new Error("Invalid value")
             if( game.flipped && game.flipped.indexOf(value) > -1 ) throw new Error("Card already flipeed")
@@ -148,6 +148,7 @@ module.exports = {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId })
                     game.flipped = []
+                    game.state = Game.states.RESULT
                     gameEmit( { gameId:game.id,action:actions.RESULT, value: result, callerId: "server",result: game.userFriendly()} )
                 }, 1500 );
             }  
@@ -181,7 +182,7 @@ module.exports = {
                     game.state = Game.states.COMPLETED
                     gameEmit( { gameId:game.id,action:actions.WIN, value:winner, result: game } )
                 }
-            }, config.result_timout);
+            }, 100);
             return match
     
 
@@ -190,10 +191,13 @@ module.exports = {
             //
             case actions.LEAVE:
             if( game && game.state == Game.states.PENDING ) {
+        
                 delete game.players[callerId]
                 delete gamesByUserId[callerId]
                 if(!Object.keys(game.players).length) 
                     games.splice(games.indexOf(game),1)
+            
+                blockchain.payToUser(callerId, config.game_fee )
             }
             break
 

From 97b403782387e0e38e3d2524f7786e4f8e37f75e Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 21 Aug 2019 16:08:14 +0300
Subject: [PATCH 12/30] a

---
 config.js             |  2 +-
 game/Player.js        |  3 ++-
 game/gameEngine.js    | 23 +++++++++--------------
 game/socketManager.js |  9 +++++----
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/config.js b/config.js
index 33fb29b..53993b7 100644
--- a/config.js
+++ b/config.js
@@ -12,7 +12,7 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
                    board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
                    game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
diff --git a/game/Player.js b/game/Player.js
index 8b73605..5087ee5 100644
--- a/game/Player.js
+++ b/game/Player.js
@@ -9,10 +9,11 @@
 
 class Player {
   
-    constructor({id,name}) {
+    constructor({id,name,facebookId}) {
         this.id = id
         this.name = name
         this.score = 0
+        this.facebookId = facebookId
     }
 }
 module.exports = Player
\ No newline at end of file
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 8ecfd8f..7a448d9 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -81,12 +81,7 @@ module.exports = {
             if(!await blockchain.isAccountExisting(callerId) ) throw new Error("Invalid public id")
             
             //Validate transaction
-            try {
-                console.log(value)
-              //  let result =   await !blockchain.validateTransaction(value.transactionId)
-            } catch ( error ) {
-               // console.log(error)
-            }
+            await !blockchain.validateTransaction(value.transactionId)
             
             //Check for pending games
             game = games.filter( game => game.state == Game.states.PENDING && Object.keys(game.players).length < 2 )[0] || new Game()
@@ -96,7 +91,7 @@ module.exports = {
                 games.push(game)
             
             //Add player to game object
-            game.players[callerId] = new Player( { id:callerId, name:value.name } )
+            game.players[callerId] = new Player( { id:callerId, name:value.name,facebookId: value.facebookId } )
             
             //Index games by player
             gamesByUserId[callerId] = game
@@ -123,7 +118,8 @@ module.exports = {
         
             const playersId = Object.keys(game.players)
             const i = playersId.indexOf(game.turn)
-            game.turn = playersId[ (i + 1) % playersId.length]
+            console.log("turn value",value)
+            game.turn = value || playersId[ (i + 1) % playersId.length]
             game.state = Game.states.TURN
             game.flipped = []
             return game.userFriendly()
@@ -146,7 +142,7 @@ module.exports = {
             
             if( game.flipped.length == 2 ) {
                 setTimeout( async function() { 
-                    let result = await module.exports.doAction({action:actions.RESULT,callerId:callerId })
+                    let result = await module.exports.doAction({ action: actions.RESULT, callerId })
                     game.flipped = []
                     game.state = Game.states.RESULT
                     gameEmit( { gameId:game.id,action:actions.RESULT, value: result, callerId: "server",result: game.userFriendly()} )
@@ -165,12 +161,12 @@ module.exports = {
                 const cardValue = game.board[game.flipped[0]]
                 game.flipped.forEach( i => { game.board[i] = null  })  
                 p = game.players[callerId]
-                p.score = cardValue != config.bad_card_symbol_index ? p.score + 1 : -1
+                p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
             }
             
             setTimeout( async function() { 
-                if( game.cardsLeft() > 1 && game.players[callerId].score > -1 ) {
-                    let result = await module.exports.doAction({action:actions.TURN,callerId:callerId})
+                if( game.cardsLeft() ) {
+                    let result = await module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
                     gameEmit( { gameId:game.id,action:actions.TURN, value:value,result:result } )
                 }
                 else {
@@ -185,13 +181,12 @@ module.exports = {
             }, 100);
             return match
     
-
             //
             // Leave
             //
             case actions.LEAVE:
             if( game && game.state == Game.states.PENDING ) {
-        
+
                 delete game.players[callerId]
                 delete gamesByUserId[callerId]
                 if(!Object.keys(game.players).length) 
diff --git a/game/socketManager.js b/game/socketManager.js
index d96785d..c5024ac 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -34,15 +34,16 @@ module.exports = function (server,options,cb) {
             try {
                 let value = {
                     name: socket.handshake.query.name,
-                    transactionId: socket.handshake.query.transactionId
+                    transactionId: socket.handshake.query.transactionId,
+                    facebookId: socket.handshake.query.facebookId
                 }
                
-                let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value:value, socket:socket })
+                let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value, socket })
                 socket.gameId = game.id
                 socket.join(game.id)
                 console.log("joining to",game.id)
                 socket.token = socket.handshake.query.token
-                io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value:value,result:game}) 
+                io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value,result:game}) 
             }
             catch(error) {
                 console.log("*** error",error)
@@ -54,7 +55,7 @@ module.exports = function (server,options,cb) {
         socket.on('action',async function (action,value,cb) { 
             if( socket.token && allowedUserActions.indexOf(action) > -1 ) {
                 try {
-                   let result = await doAction({action:action, callerId:socket['token'], value:value, socket:socket }) 
+                   let result = await doAction({action, callerId:socket['token'], value, socket}) 
                       
                     if(cb)
                        cb(result)

From c140726daef65cfd740df0fc41a928ce874c4684 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 21 Aug 2019 16:20:12 +0300
Subject: [PATCH 13/30] a

---
 a | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a

diff --git a/a b/a
new file mode 100644
index 0000000..e69de29

From bbfe03aec7baf52ea77101d95f787fe4cca56ff9 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 22 Aug 2019 10:41:08 +0300
Subject: [PATCH 14/30] support tie

---
 config.js          |  4 ++--
 game/Game.js       |  1 +
 game/gameEngine.js | 17 +++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/config.js b/config.js
index 53993b7..44d407f 100644
--- a/config.js
+++ b/config.js
@@ -11,8 +11,8 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    master_seed: process.env.hasOwnProperty('master_seed') ? process.env.master_seed : 'SC2RWEIWGJNKULQXSGM5J37RP3N5U6LHDURIHE6NBG5X6XOSIHBMMTQS',
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
-                   board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
+                   board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 3,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
                    game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
diff --git a/game/Game.js b/game/Game.js
index 6cd2012..6672948 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -26,6 +26,7 @@ class Game {
         this.players = {}
         this.flipped = []
         this.turn = null
+        this.stateValue = null
         this.boardSize = [config.board_width,config.board_height]
         this.board = this.shuffle(JSON.parse(JSON.stringify(symbols)))
     }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 7a448d9..8fd4395 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -163,24 +163,33 @@ module.exports = {
                 p = game.players[callerId]
                 p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
             }
-            
+          
             setTimeout( async function() { 
                 if( game.cardsLeft() ) {
                     let result = await module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
                     gameEmit( { gameId:game.id,action:actions.TURN, value:value,result:result } )
                 }
                 else {
+                    var winnerId = "tie"
                     let players = Object.values(game.players)
-                    var winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
+                    if( players[0].score !== players[1].score )
+                        winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
                     players.forEach( player => { delete gamesByUserId[player.id] })
                     games.splice(games.indexOf(game),1)
-                    blockchain.payToUser(winnerId, config.game_fee * 2)
+                    if(winnerId == 'tie') {
+                        blockchain.payToUser( players[0].id, config.game_fee)
+                        blockchain.payToUser( players[1].id, config.game_fee)
+                    }
+                    else {
+                        blockchain.payToUser(winnerId, config.game_fee * 2)
+                    }
                     game.state = Game.states.COMPLETED
-                    gameEmit( { gameId:game.id,action:actions.WIN, value:winner, result: game } )
+                    gameEmit( { gameId:game.id,action:actions.WIN, value:winnerId, result: game } )
                 }
             }, 100);
             return match
     
+            
             //
             // Leave
             //

From 239a3d2035ab4cb4a07121199df24a5d70d250e9 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Sun, 25 Aug 2019 15:34:39 +0300
Subject: [PATCH 15/30] keep flipped cards in result state

---
 game/gameEngine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/gameEngine.js b/game/gameEngine.js
index 8fd4395..1465d57 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -143,7 +143,7 @@ module.exports = {
             if( game.flipped.length == 2 ) {
                 setTimeout( async function() { 
                     let result = await module.exports.doAction({ action: actions.RESULT, callerId })
-                    game.flipped = []
+                    //game.flipped = []
                     game.state = Game.states.RESULT
                     gameEmit( { gameId:game.id,action:actions.RESULT, value: result, callerId: "server",result: game.userFriendly()} )
                 }, 1500 );

From b5d6b2933027bea4753c5273f01065f531105624 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Mon, 26 Aug 2019 10:21:29 +0300
Subject: [PATCH 16/30] changed result state

---
 config.js          |  4 ++--
 core/blockchain.js | 22 +++++++++++++---------
 game/Game.js       |  1 -
 game/gameEngine.js |  3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/config.js b/config.js
index 44d407f..53993b7 100644
--- a/config.js
+++ b/config.js
@@ -11,8 +11,8 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    master_seed: process.env.hasOwnProperty('master_seed') ? process.env.master_seed : 'SC2RWEIWGJNKULQXSGM5J37RP3N5U6LHDURIHE6NBG5X6XOSIHBMMTQS',
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
-                   board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 3,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
+                   board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
                    game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
diff --git a/core/blockchain.js b/core/blockchain.js
index afea426..c5a4426 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -36,15 +36,19 @@ async function isAccountExisting(wallet_address) {
 }
 
 async function validateTransaction(transactionId) {
-  const data = await client.getTransactionData(transactionId)
-
-  return  data 
-          //check for correct amount
-          && data.hasOwnProperty('amount') 
-          && data.amount === config.game_fee 
-          //check for transaction date
-          && data.hasOwnProperty('timeStamp')
-          &&  new Date() - Date(data.timestamp) < config.transaction_experation_in_sec // 10 sec
+  try {
+    const data = await client.getTransactionData(transactionId)
+    return  data 
+            //check for correct amount
+            && data.hasOwnProperty('amount') 
+            && data.amount === config.game_fee 
+            //check for transaction date
+            && data.hasOwnProperty('timeStamp')
+            &&  new Date() - Date(data.timestamp) < config.transaction_experation_in_sec // 10 sec
+    }
+    catch {
+      return false
+    }
 }
 
 async function createAccount(wallet_address) {
diff --git a/game/Game.js b/game/Game.js
index 6672948..cbd311d 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -47,7 +47,6 @@ class Game {
         let cpy = JSON.parse(JSON.stringify(this))
         cpy.board = cpy.board.map( item => { return item == null ? null : Math.min(item,0) } )
         this.flipped.forEach( index => {  cpy.board[index] = this.board[index] });
-        //delete cpy.flipped
         return cpy
     }
    
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 1465d57..90c4275 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -163,7 +163,7 @@ module.exports = {
                 p = game.players[callerId]
                 p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
             }
-          
+            console.log("1",game.flipped)
             setTimeout( async function() { 
                 if( game.cardsLeft() ) {
                     let result = await module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
@@ -187,6 +187,7 @@ module.exports = {
                     gameEmit( { gameId:game.id,action:actions.WIN, value:winnerId, result: game } )
                 }
             }, 100);
+            console.log("1",game.flipped)
             return match
     
             

From e0beef0534e4958dff055fcc617307afb46e18a4 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Mon, 26 Aug 2019 12:17:28 +0300
Subject: [PATCH 17/30] fixes

---
 config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.js b/config.js
index 53993b7..01d2837 100644
--- a/config.js
+++ b/config.js
@@ -20,5 +20,7 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    flipped_card_symbol_index: 0,
                    transaction_experation_in_sec: 10,
                    pre_result_timeout:200,
-                   result_timout:2000
+                   result_timout:2000,
+                   server_version:0.1
+
                 }

From 57a3268e48f65cefc80d7368bc296b2d92b737e6 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 28 Aug 2019 15:16:17 +0300
Subject: [PATCH 18/30] added turn timeouts

---
 config.js          |  6 +++---
 game/gameEngine.js | 37 +++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/config.js b/config.js
index 01d2837..9daace1 100644
--- a/config.js
+++ b/config.js
@@ -12,7 +12,7 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    appId: 'bkin',
                    board_width: process.env.hasOwnProperty('board_width') ? parseInt(process.env.board_width) : 4,
                    board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
-                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : true,
+                   monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
                    game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
                    bad_card_symbol_index: 1,
@@ -21,6 +21,6 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    transaction_experation_in_sec: 10,
                    pre_result_timeout:200,
                    result_timout:2000,
-                   server_version:0.1
-
+                   server_version:0.1,
+                   turn_timeout:5000
                 }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 90c4275..453895f 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -15,7 +15,7 @@ const blockchain = require('../core/blockchain')
 const events = require('events')
 const Spinner = require('cli-spinner').Spinner;
 const spinner = new Spinner("Monitoring Games")
-
+const timerByGameId = {}
 spinner.setSpinnerString(2)
 
 //ENUMS
@@ -103,8 +103,7 @@ module.exports = {
             //Start game
             if( game.state == Game.states.STARTING ) {
                 setTimeout( async function() {
-                    let result = await module.exports.doAction({ action:actions.TURN, callerId:callerId } )
-                    gameEmit( { gameId:game.id, action:actions.TURN, value:callerId, callerId:"server",result:result } )
+                    module.exports.doAction({ action:actions.TURN, callerId:callerId } )
                 }, 1000);
             }
             return game.userFriendly()
@@ -115,13 +114,24 @@ module.exports = {
             case actions.TURN:
             if(!game) throw new Error("User not in game")
             if(game.state != Game.states.STARTING && game.state != Game.states.TURN  && game.state != Game.states.RESULT ) throw new Error("Turn not allowed")
-        
+           
+            //Clear turn timeout
+            clearTimeout( timerByGameId[game.id])
+            delete game.stateTimeout
+           
             const playersId = Object.keys(game.players)
             const i = playersId.indexOf(game.turn)
-            console.log("turn value",value)
             game.turn = value || playersId[ (i + 1) % playersId.length]
             game.state = Game.states.TURN
             game.flipped = []
+            
+            //Set turn timout 
+            game.stateTimeout = new Date().getTime() + config.turn_timeout
+            timerByGameId[game.id] = setTimeout( async () => {
+                delete timerByGameId[game.id]
+                module.exports.doAction({ action:actions.RESULT, callerId:callerId } )
+            },config.turn_timeout )
+            gameEmit({ gameId:game.id,action:actions.TURN, value:value,result: game.userFriendly() } )
             return game.userFriendly()
         
             //
@@ -137,18 +147,17 @@ module.exports = {
             if( game.flipped && game.flipped.length == 2 ) throw new Error("Cards already flipped")
             if( game.board[value] === null ) throw new Error("Card alread removed")
            
+          
+
+
             game.flipped = game.flipped || []
             game.flipped.push(value)
             
             if( game.flipped.length == 2 ) {
                 setTimeout( async function() { 
-                    let result = await module.exports.doAction({ action: actions.RESULT, callerId })
-                    //game.flipped = []
-                    game.state = Game.states.RESULT
-                    gameEmit( { gameId:game.id,action:actions.RESULT, value: result, callerId: "server",result: game.userFriendly()} )
+                    module.exports.doAction({ action: actions.RESULT, callerId })
                 }, 1500 );
             }  
-           
             return game.userFriendly()
            
             //
@@ -163,11 +172,10 @@ module.exports = {
                 p = game.players[callerId]
                 p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
             }
-            console.log("1",game.flipped)
+     
             setTimeout( async function() { 
                 if( game.cardsLeft() ) {
-                    let result = await module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
-                    gameEmit( { gameId:game.id,action:actions.TURN, value:value,result:result } )
+                      module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
                 }
                 else {
                     var winnerId = "tie"
@@ -187,7 +195,8 @@ module.exports = {
                     gameEmit( { gameId:game.id,action:actions.WIN, value:winnerId, result: game } )
                 }
             }, 100);
-            console.log("1",game.flipped)
+            game.state = Game.states.RESULT
+            gameEmit( { gameId:game.id,action:actions.RESULT, value: match, callerId: "server",result: game.userFriendly()} )
             return match
     
             

From e8e61484bba1642ee163c2d0912816ae81f3c04d Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 28 Aug 2019 15:21:40 +0300
Subject: [PATCH 19/30] removed m

---
 a | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 a

diff --git a/a b/a
deleted file mode 100644
index e69de29..0000000

From 9db8c472afebd41249a6d402c746a79e57903ad9 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Sat, 31 Aug 2019 09:53:37 +0300
Subject: [PATCH 20/30] changed game rule

---
 config.js          |  2 +-
 game/Game.js       |  2 +-
 game/gameEngine.js | 75 +++++++++++++++++++++++-----------------------
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/config.js b/config.js
index 9daace1..646fb1e 100644
--- a/config.js
+++ b/config.js
@@ -14,7 +14,7 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    board_height: process.env.hasOwnProperty('board_height') ? parseInt(process.env.board_height) : 5,
                    monitor_tables: process.env.hasOwnProperty('monitor_tables') ? parseInt(process.env.monitor_tables) : false,
                    monitor_tables_interval: process.env.hasOwnProperty('monitor_tables_interval') ? parseInt(process.env.monitor_tables_interval) : 2000,
-                   game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 1,
+                   game_fee: process.env.hasOwnProperty('game_fee') ? parseFloat(process.env.game_fee) : 5,
                    bad_card_symbol_index: 1,
                    total_bad_card_pairs: 1,
                    flipped_card_symbol_index: 0,
diff --git a/game/Game.js b/game/Game.js
index cbd311d..8aa7c8a 100644
--- a/game/Game.js
+++ b/game/Game.js
@@ -51,7 +51,7 @@ class Game {
     }
    
     cardsLeft() {
-        return this.board.filter( item => { return item != null }).length
+        return this.board.filter( item => { return item != null })
     }
     
 }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 453895f..bbd5a6e 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -91,7 +91,7 @@ module.exports = {
                 games.push(game)
             
             //Add player to game object
-            game.players[callerId] = new Player( { id:callerId, name:value.name,facebookId: value.facebookId } )
+            game.players[callerId] = new Player( { id:callerId, name:value.name,facebookId: value.facebookId,avatar: value.avatar } )
             
             //Index games by player
             gamesByUserId[callerId] = game
@@ -142,14 +142,11 @@ module.exports = {
             if( !game ) throw new Error("User not in game")
             if( game.state != Game.states.TURN ) throw new Error("Turn not allowed in that state")
             if( game.turn != callerId) throw new Error("Not your turn")
-            if( value === undefined || value !== parseInt(value)) throw new Error("Invalid value")
+            if( value === undefined) throw new Error("Invalid value")
             if( game.flipped && game.flipped.indexOf(value) > -1 ) throw new Error("Card already flipeed")
             if( game.flipped && game.flipped.length == 2 ) throw new Error("Cards already flipped")
             if( game.board[value] === null ) throw new Error("Card alread removed")
            
-          
-
-
             game.flipped = game.flipped || []
             game.flipped.push(value)
             
@@ -164,42 +161,46 @@ module.exports = {
             // Result
             //
             case actions.RESULT:
-            const match = game.flipped.length == 2 && game.board[game.flipped[0]] === game.board[game.flipped[1] ]
-            var p = null
-            if(match) { 
-                const cardValue = game.board[game.flipped[0]]
-                game.flipped.forEach( i => { game.board[i] = null  })  
-                p = game.players[callerId]
-                p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
+            let match = false
+            if(game.flipped.length < 2) {
+                game.players[callerId].turnMissed =  game.players[callerId].turnMissed || 0 + 1
+            } else {
+                match = game.flipped.length == 2 && game.board[game.flipped[0]] === game.board[game.flipped[1] ]
+                var p = null
+                if(match) { 
+                    const cardValue = game.board[game.flipped[0]]
+                    game.flipped.forEach( i => { game.board[i] = null  })  
+                    p = game.players[callerId]
+                    p.score += cardValue != config.bad_card_symbol_index ? 1 : -1
+                }
+            }
+            game.state = Game.states.RESULT
+            gameEmit( { gameId:game.id,action:actions.RESULT, value: match, callerId: "server",result: game.userFriendly()} )
+
+            var cardsLeft = game.cardsLeft()
+            if( cardsLeft.length > 2 || cardsLeft[0] != config.bad_card_symbol_index) {
+                module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
             }
-     
-            setTimeout( async function() { 
-                if( game.cardsLeft() ) {
-                      module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
+            else {
+                var winnerId = "tie"
+                let players = Object.values(game.players)
+                if( players[0].score !== players[1].score )
+                    winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
+                players.forEach( player => { delete gamesByUserId[player.id] })
+                games.splice(games.indexOf(game),1)
+                if(winnerId == 'tie') {
+                    blockchain.payToUser( players[0].id, config.game_fee)
+                    blockchain.payToUser( players[1].id, config.game_fee)
                 }
                 else {
-                    var winnerId = "tie"
-                    let players = Object.values(game.players)
-                    if( players[0].score !== players[1].score )
-                        winnerId = players[0].score > players[1].score ? players[0].id : players[1].id
-                    players.forEach( player => { delete gamesByUserId[player.id] })
-                    games.splice(games.indexOf(game),1)
-                    if(winnerId == 'tie') {
-                        blockchain.payToUser( players[0].id, config.game_fee)
-                        blockchain.payToUser( players[1].id, config.game_fee)
-                    }
-                    else {
-                        blockchain.payToUser(winnerId, config.game_fee * 2)
-                    }
-                    game.state = Game.states.COMPLETED
-                    gameEmit( { gameId:game.id,action:actions.WIN, value:winnerId, result: game } )
+                    blockchain.payToUser(winnerId, config.game_fee * 2)
                 }
-            }, 100);
-            game.state = Game.states.RESULT
-            gameEmit( { gameId:game.id,action:actions.RESULT, value: match, callerId: "server",result: game.userFriendly()} )
-            return match
-    
-            
+                game.state = Game.states.COMPLETED
+                gameEmit( { gameId:game.id,action:actions.WIN, value:winnerId, result: game } )
+            }
+           // }, 100);
+            break
+ 
             //
             // Leave
             //

From e1b0628bb0d4b636411f2fd5c90fe4346ee35131 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 4 Sep 2019 07:52:03 +0300
Subject: [PATCH 21/30] a

---
 core/blockchain.js | 2 +-
 routes/users.js    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/blockchain.js b/core/blockchain.js
index c5a4426..9bc19d4 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -58,7 +58,7 @@ async function createAccount(wallet_address) {
   let createAccountBuilder = await masterAccount.buildCreateAccount({
     address: wallet_address,
     startingBalance: 100,
-    fee: 100,
+    fee: 0,
     memoText: "C" + createID(9)
   })
 
diff --git a/routes/users.js b/routes/users.js
index 7013d20..521c105 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -26,6 +26,7 @@ router.get('/login', async function (req, res, next) {
       wallet_address: config.master_public_address
     })
   } catch (error) {
+    console.log(error)
     next(error)
   }
 });

From 4ace5a4bb851a17be780c44c6c941fede9d9a30c Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Tue, 10 Sep 2019 13:41:30 +0300
Subject: [PATCH 22/30] a

---
 core/blockchain.js | 28 +++++++++++++++++++++++-----
 game/gameEngine.js |  5 ++++-
 routes/users.js    | 12 ++++++++++++
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/core/blockchain.js b/core/blockchain.js
index 9bc19d4..ea94d4c 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -7,12 +7,16 @@
  * @author Oren Zakay.
  */
 
-const KinClient = require('@kinecosystem/kin-sdk-node').KinClient;
+
+const { KinClient, Transaction} = require('@kinecosystem/kin-sdk-node')
 const Environment = require('@kinecosystem/kin-sdk-node').Environment;
+const XdrTransaction = require('@kinecosystem/kin-base').Transaction;
 const config = require('../config')
-
 const client = new KinClient(Environment.Testnet);
 
+setTimeout( ()=>{
+
+},3000)
 let masterAccount
 
 async function getMasterAccount() {
@@ -34,6 +38,7 @@ async function isAccountExisting(wallet_address) {
     return false
   } 
 }
+//console.log(Environment.Testnet.passphrase)
 
 async function validateTransaction(transactionId) {
   try {
@@ -68,13 +73,25 @@ async function createAccount(wallet_address) {
   console.log("createAccount transaction id  -> ", id)
 }
 
+async function payGameFee(walletPayload) {
+    try {
+      const account = await getMasterAccount()
+      const whitelistTx = await account.whitelistTransaction(walletPayload)
+     // const xdrTransaction = new XdrTransaction(whitelistTx)
+     // const txRecord = await client._server.submitTransaction(xdrTransaction)
+     // console.log(txRecord.hash)
+      return whitelistTx
+    } catch(error) {
+        throw error
+    }
+}
 async function payToUser(wallet_address, amount) {
-  //console.log("payToUser -> " + wallet_address + " with amount = " + amount)
+  console.log("payToUser -> " + wallet_address + " with amount = " + amount)
   const masterAccount = await getMasterAccount()
   const transactionBuilder = await masterAccount.buildSendKin({
     address: wallet_address,
     amount: amount,
-    fee: 100,
+    fee: 0,
     memoText: createID(10)
   })
 
@@ -96,5 +113,6 @@ module.exports = {
   validateTransaction,
   isAccountExisting,
   createAccount,
-  payToUser
+  payToUser,
+  payGameFee
 }
\ No newline at end of file
diff --git a/game/gameEngine.js b/game/gameEngine.js
index bbd5a6e..59431a8 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -178,7 +178,10 @@ module.exports = {
             gameEmit( { gameId:game.id,action:actions.RESULT, value: match, callerId: "server",result: game.userFriendly()} )
 
             var cardsLeft = game.cardsLeft()
-            if( cardsLeft.length > 2 || cardsLeft[0] != config.bad_card_symbol_index) {
+           
+            console.log("cards left", cardsLeft)
+           
+            if( cardsLeft.length > 2 || ( cardsLeft[0] && cardsLeft[0] != config.bad_card_symbol_index && cardsLeft[0] )) {
                 module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
             }
             else {
diff --git a/routes/users.js b/routes/users.js
index 521c105..ee0836a 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -31,6 +31,18 @@ router.get('/login', async function (req, res, next) {
   }
 });
 
+router.post('/payGameFee', async function (req, res, next) {
+  const jso = req.body
+  try {
+   
+    let result = await blockchain.payGameFee( req.body )
+    res.send(result)
+  } catch (error) {
+    next(error)
+  }
+});
+
+
 router.get('/is-player-in-game', async function (req, res, next) {
   const public_key = req.query.public_key
   try {

From 9216451f758aca0d677c4c8eff7050a4004bd8dd Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Tue, 10 Sep 2019 17:51:20 +0300
Subject: [PATCH 23/30] a

---
 a | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a

diff --git a/a b/a
new file mode 100644
index 0000000..e69de29

From 0ad31937d30965f3c25c701761301aed025e8db5 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 11 Sep 2019 14:13:06 +0300
Subject: [PATCH 24/30] a

---
 game/Player.js        | 3 ++-
 game/gameEngine.js    | 1 +
 game/socketManager.js | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/game/Player.js b/game/Player.js
index 5087ee5..1d84ef1 100644
--- a/game/Player.js
+++ b/game/Player.js
@@ -9,11 +9,12 @@
 
 class Player {
   
-    constructor({id,name,facebookId}) {
+    constructor({id,name,facebookId,avatar}) {
         this.id = id
         this.name = name
         this.score = 0
         this.facebookId = facebookId
+        this.avatar = avatar
     }
 }
 module.exports = Player
\ No newline at end of file
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 59431a8..b9d3726 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -127,6 +127,7 @@ module.exports = {
             
             //Set turn timout 
             game.stateTimeout = new Date().getTime() + config.turn_timeout
+            game.stateTotalTimeout = config.turn_timeout
             timerByGameId[game.id] = setTimeout( async () => {
                 delete timerByGameId[game.id]
                 module.exports.doAction({ action:actions.RESULT, callerId:callerId } )
diff --git a/game/socketManager.js b/game/socketManager.js
index c5024ac..459b5f1 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -35,7 +35,8 @@ module.exports = function (server,options,cb) {
                 let value = {
                     name: socket.handshake.query.name,
                     transactionId: socket.handshake.query.transactionId,
-                    facebookId: socket.handshake.query.facebookId
+                    facebookId: socket.handshake.query.facebookId,
+                    avatar: socket.handshake.query.avatar
                 }
                
                 let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value, socket })

From 3024decefd3550802314f55d7ad19c449233a42f Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 11 Sep 2019 14:18:58 +0300
Subject: [PATCH 25/30] a

---
 bin/www | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/www b/bin/www
index d814c1d..436865d 100755
--- a/bin/www
+++ b/bin/www
@@ -96,12 +96,12 @@ function onListening() {
 const figlet = require('figlet');
 process.stdout.write('\033c');
 process.stdout.write('\x1Bc'); 
-let result = figlet("Burger Kin",(error,result) => {
-  console.log('\n\n'+result)
-  console.log("written by Oren Zakay and Alon Genosar, Kin.org\n\nconfig:")
-  jclrz(config)
-  console.log('\n')
+// let result = figlet("Burger Kin",(error,result) => {
+//   console.log('\n\n'+result)
+//   console.log("written by Oren Zakay and Alon Genosar, Kin.org\n\nconfig:")
+//   jclrz(config)
+//   console.log('\n')
   
-})
-
+// })
+console.log("config",config)
 require('../game/socketManager')(server)
\ No newline at end of file

From a0d1b23ddb7a7ba6fdc8fcb421a598e1558e01b5 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 12 Sep 2019 07:43:44 +0300
Subject: [PATCH 26/30] changed config

---
 bin/www               | 14 +++++++-------
 config.js             |  2 +-
 game/gameEngine.js    |  3 ++-
 game/socketManager.js |  3 ---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/bin/www b/bin/www
index 436865d..d814c1d 100755
--- a/bin/www
+++ b/bin/www
@@ -96,12 +96,12 @@ function onListening() {
 const figlet = require('figlet');
 process.stdout.write('\033c');
 process.stdout.write('\x1Bc'); 
-// let result = figlet("Burger Kin",(error,result) => {
-//   console.log('\n\n'+result)
-//   console.log("written by Oren Zakay and Alon Genosar, Kin.org\n\nconfig:")
-//   jclrz(config)
-//   console.log('\n')
+let result = figlet("Burger Kin",(error,result) => {
+  console.log('\n\n'+result)
+  console.log("written by Oren Zakay and Alon Genosar, Kin.org\n\nconfig:")
+  jclrz(config)
+  console.log('\n')
   
-// })
-console.log("config",config)
+})
+
 require('../game/socketManager')(server)
\ No newline at end of file
diff --git a/config.js b/config.js
index 646fb1e..81040b8 100644
--- a/config.js
+++ b/config.js
@@ -22,5 +22,5 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    pre_result_timeout:200,
                    result_timout:2000,
                    server_version:0.1,
-                   turn_timeout:5000
+                   turn_timeout: process.env.hasOwnProperty('turn_timeout') ? parseInt(process.env.turn_timeout) : 5000
                 }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index b9d3726..b36c3f2 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -128,6 +128,7 @@ module.exports = {
             //Set turn timout 
             game.stateTimeout = new Date().getTime() + config.turn_timeout
             game.stateTotalTimeout = config.turn_timeout
+
             timerByGameId[game.id] = setTimeout( async () => {
                 delete timerByGameId[game.id]
                 module.exports.doAction({ action:actions.RESULT, callerId:callerId } )
@@ -180,7 +181,7 @@ module.exports = {
 
             var cardsLeft = game.cardsLeft()
            
-            console.log("cards left", cardsLeft)
+          
            
             if( cardsLeft.length > 2 || ( cardsLeft[0] && cardsLeft[0] != config.bad_card_symbol_index && cardsLeft[0] )) {
                 module.exports.doAction({ action: actions.TURN, callerId: callerId, value: match ? callerId : undefined })
diff --git a/game/socketManager.js b/game/socketManager.js
index 459b5f1..4aab956 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -25,7 +25,6 @@ eventEmitter.on("action",( {gameId,action,callerId,value, result} ) => {
 module.exports = function (server,options,cb) {
     io = require('socket.io')(server)
     io.on('connection', async function (socket,next,a) {
-        //console.log("Connecting",socket.handshake.query.token, socket.handshake.query.name)
         if (socket.handshake.query && 
             socket.handshake.query.token &&
             socket.handshake.query.token != 'undefined' &&
@@ -42,12 +41,10 @@ module.exports = function (server,options,cb) {
                 let game = await doAction({ action:actions.JOIN, callerId:socket.handshake.query.token, value, socket })
                 socket.gameId = game.id
                 socket.join(game.id)
-                console.log("joining to",game.id)
                 socket.token = socket.handshake.query.token
                 io.to(game.id).emit("action",{action:actions.JOIN, callerId:socket.token,value,result:game}) 
             }
             catch(error) {
-                console.log("*** error",error)
                 socket.disconnect()
             }
         } else {

From 0358b4d5fcee5fa385c23a81521f6b2ae76e7dbf Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 12 Sep 2019 07:50:47 +0300
Subject: [PATCH 27/30] clear timers on engine reset

---
 game/gameEngine.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/game/gameEngine.js b/game/gameEngine.js
index b36c3f2..c762b61 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -38,6 +38,10 @@ module.exports = {
         return gamesByUserId[callerId] !== undefined
     }
     ,reset: () => {
+        timerByGameId.forEach( timer => {
+            clearTimeout( timer )
+        })
+        timerByGameId = {}
         games = []
         gamesByUserId = {}
     }

From e330a239d039d7405084201ba78badcaacc2cb77 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 12 Sep 2019 09:35:42 +0300
Subject: [PATCH 28/30] fix

---
 config.js          | 2 +-
 game/gameEngine.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.js b/config.js
index 81040b8..2e51c65 100644
--- a/config.js
+++ b/config.js
@@ -22,5 +22,5 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    pre_result_timeout:200,
                    result_timout:2000,
                    server_version:0.1,
-                   turn_timeout: process.env.hasOwnProperty('turn_timeout') ? parseInt(process.env.turn_timeout) : 5000
+                   turn_timeout: process.env.hasOwnProperty('turn_timeout') ? parseInt(process.env.turn_timeout) : 10000
                 }
diff --git a/game/gameEngine.js b/game/gameEngine.js
index c762b61..48ed9af 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -155,8 +155,10 @@ module.exports = {
            
             game.flipped = game.flipped || []
             game.flipped.push(value)
-            
+        
+
             if( game.flipped.length == 2 ) {
+                clearTimeout( timerByGameId[game.id] )
                 setTimeout( async function() { 
                     module.exports.doAction({ action: actions.RESULT, callerId })
                 }, 1500 );

From 57e7bb2da82fd2540064c6e4c6344fc8b720d4d7 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Thu, 12 Sep 2019 12:49:45 +0300
Subject: [PATCH 29/30] a

---
 a | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 a

diff --git a/a b/a
deleted file mode 100644
index e69de29..0000000

From 800634e62296f47bf602243655e902222c6b6d99 Mon Sep 17 00:00:00 2001
From: Alon Genosar <alon@bootleg.co.il>
Date: Wed, 18 Sep 2019 10:05:49 +0300
Subject: [PATCH 30/30] added kin account channels

---
 bin/www               |  7 +++--
 config.js             |  3 +-
 core/blockchain.js    | 73 ++++++++++++++++++++++---------------------
 game/gameEngine.js    |  4 +--
 game/socketManager.js |  1 +
 routes/users.js       |  4 +--
 6 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/bin/www b/bin/www
index d814c1d..f13d8a1 100755
--- a/bin/www
+++ b/bin/www
@@ -101,7 +101,10 @@ let result = figlet("Burger Kin",(error,result) => {
   console.log("written by Oren Zakay and Alon Genosar, Kin.org\n\nconfig:")
   jclrz(config)
   console.log('\n')
-  
+  start()
 })
 
-require('../game/socketManager')(server)
\ No newline at end of file
+ const start = async () => {
+  await require('../core/blockchain').init()
+  require('../game/socketManager')(server)
+}
diff --git a/config.js b/config.js
index 2e51c65..ef6fd78 100644
--- a/config.js
+++ b/config.js
@@ -22,5 +22,6 @@ module.exports = { master_public_address: process.env.hasOwnProperty('master_pub
                    pre_result_timeout:200,
                    result_timout:2000,
                    server_version:0.1,
-                   turn_timeout: process.env.hasOwnProperty('turn_timeout') ? parseInt(process.env.turn_timeout) : 10000
+                   turn_timeout: process.env.hasOwnProperty('turn_timeout') ? parseInt(process.env.turn_timeout) : 10 * 1000,
+                   totalChannels: process.env.hasOwnProperty('totalChannels') ? parseInt(process.env.totalChannels) : 10
                 }
diff --git a/core/blockchain.js b/core/blockchain.js
index ea94d4c..02346ff 100644
--- a/core/blockchain.js
+++ b/core/blockchain.js
@@ -4,31 +4,38 @@
  *
  * Desc
  *
- * @author Oren Zakay.
+ * @author Oren Zakay, Alon Genosar
  */
 
-
-const { KinClient, Transaction} = require('@kinecosystem/kin-sdk-node')
-const Environment = require('@kinecosystem/kin-sdk-node').Environment;
-const XdrTransaction = require('@kinecosystem/kin-base').Transaction;
+const { KinClient, Transaction, Environment, Channels } = require('@kinecosystem/kin-sdk-node')
 const config = require('../config')
 const client = new KinClient(Environment.Testnet);
-
-setTimeout( ()=>{
-
-},3000)
 let masterAccount
 
-async function getMasterAccount() {
-  if (!masterAccount) {
-    masterAccount = await client.createKinAccount({
-      seed: config.master_seed,
-      appId: config.appId
-    });
-  }
-  return masterAccount
+async function init() {
+  console.log("Creating channels")
+  let keepers = await Channels.createChannels({
+    environment: Environment.Testnet,
+    baseSeed: config.master_seed,
+    salt: "Dubon Haya Po",
+    channelsCount: config.totalChannels,
+    startingBalance: 0
+  })
+ 
+  let keys = keepers.map( item => {
+      return item.seed
+  })
+  console.log("Creating master account")
+  masterAccount = await client.createKinAccount({
+    seed: config.master_seed,
+    appId: config.appId,
+    channelSecretKeys:keys
+  });
+  console.log("Channels created succsesfully")
 }
 
+
+
 async function isAccountExisting(wallet_address) {
   try {
     const result =  await client.isAccountExisting(wallet_address)
@@ -58,8 +65,6 @@ async function validateTransaction(transactionId) {
 
 async function createAccount(wallet_address) {
   console.log("buildCreateAccount -> " + wallet_address)
-  // Sign the account creation transaction
-  const masterAccount = await getMasterAccount()
   let createAccountBuilder = await masterAccount.buildCreateAccount({
     address: wallet_address,
     startingBalance: 100,
@@ -73,30 +78,25 @@ async function createAccount(wallet_address) {
   console.log("createAccount transaction id  -> ", id)
 }
 
-async function payGameFee(walletPayload) {
+async function whitelistTransaction(walletPayload) {
     try {
-      const account = await getMasterAccount()
-      const whitelistTx = await account.whitelistTransaction(walletPayload)
-     // const xdrTransaction = new XdrTransaction(whitelistTx)
-     // const txRecord = await client._server.submitTransaction(xdrTransaction)
-     // console.log(txRecord.hash)
+      const whitelistTx = await masterAccount.whitelistTransaction(walletPayload)
       return whitelistTx
     } catch(error) {
         throw error
     }
 }
 async function payToUser(wallet_address, amount) {
-  console.log("payToUser -> " + wallet_address + " with amount = " + amount)
-  const masterAccount = await getMasterAccount()
-  const transactionBuilder = await masterAccount.buildSendKin({
-    address: wallet_address,
-    amount: amount,
-    fee: 0,
-    memoText: createID(10)
+    masterAccount.channelsPool.acquireChannel( async channel => {
+      const transactionBuilder = await masterAccount.buildSendKin({
+        address: wallet_address,
+        amount: amount,
+        fee: 0,
+        memoText: createID(10),
+        channel: channel
+      })
+      return await masterAccount.submitTransaction(transactionBuilder)
   })
-
-  await masterAccount.submitTransaction(transactionBuilder)
-  console.log("payToUser submitTransaction -> ", transactionBuilder)
 }
 
 function createID(length) {
@@ -114,5 +114,6 @@ module.exports = {
   isAccountExisting,
   createAccount,
   payToUser,
-  payGameFee
+  whitelistTransaction,
+  init
 }
\ No newline at end of file
diff --git a/game/gameEngine.js b/game/gameEngine.js
index 48ed9af..51e4ff5 100644
--- a/game/gameEngine.js
+++ b/game/gameEngine.js
@@ -56,8 +56,8 @@ module.exports = {
         }, interval);
     }
     ,doAction: async ({action,callerId,value}) => { 
-        if(!config.monitor_tables)
-            console.log("[gameEngine] doAction",{action:action,callerId:callerId,value:value})
+       // if(!config.monitor_tables)
+         //   console.log("[gameEngine] doAction",{action:action,callerId:callerId,value:value})
 
         if( !callerId ) throw new Error("Missing callerId")
         var game = gamesByUserId[callerId]
diff --git a/game/socketManager.js b/game/socketManager.js
index 4aab956..36dade1 100644
--- a/game/socketManager.js
+++ b/game/socketManager.js
@@ -23,6 +23,7 @@ eventEmitter.on("action",( {gameId,action,callerId,value, result} ) => {
    
 // API
 module.exports = function (server,options,cb) {
+    console.log("Starting socket manager")
     io = require('socket.io')(server)
     io.on('connection', async function (socket,next,a) {
         if (socket.handshake.query && 
diff --git a/routes/users.js b/routes/users.js
index ee0836a..2feae99 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -31,11 +31,11 @@ router.get('/login', async function (req, res, next) {
   }
 });
 
-router.post('/payGameFee', async function (req, res, next) {
+router.post('/whitelistTransaction', async function (req, res, next) {
   const jso = req.body
   try {
    
-    let result = await blockchain.payGameFee( req.body )
+    let result = await blockchain.whitelistTransaction( req.body )
     res.send(result)
   } catch (error) {
     next(error)