Skip to content
This repository has been archived by the owner on Jan 9, 2019. It is now read-only.

Commit

Permalink
little fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alexstep committed Oct 27, 2017
1 parent b2ea814 commit aa1da1e
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "BankRollerApp",
"version": "0.2.0",
"version": "0.2.1",
"description": "Dao.Casino app for bankroller",
"author": "Dao Casino <team@dao.casino>",
"repository": {
Expand Down
66 changes: 48 additions & 18 deletions src/model/DApps/DApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@ const default_paymentchannel_contract = {
}


/*
TODO: Bankroller
- выпилить eth-ligthwallet - заменить его на web3
- избавиться от RPC - юзать web3
- написать открытие закрытие каналов
- написать подпись и валидацию подписи сообщений
- заменить мессенджинг на ipfs
- написать ведение статистики игр
- сделать красивый интерфейс таба разработчика
- написать деплой игры в ipfs
- написать установку игры из ipfs
*/



const max_users = 9

/*
Expand Down Expand Up @@ -102,32 +117,47 @@ export default class DApp {

const signMsg = async (rawMsg=false)=>{
if (!rawMsg) return ''
return Eth.Wallet.lib.signing.concatSig( Eth.Wallet.lib.signing.signMsg(
Eth.Wallet.getKs(),
await Eth.Wallet.getPwDerivedKey(),
rawMsg,
Eth.Wallet.get().openkey
) )

return new Promise(async (resolve, reject) => {

console.log('signMsg', rawMsg)

const sig = Eth.Wallet.lib.signing.concatSig( Eth.Wallet.lib.signing.signMsg(
Eth.Wallet.getKs(),
await Eth.Wallet.getPwDerivedKey(),
rawMsg,
Eth.Wallet.get().openkey
) )

console.log('sig:',sig)
resolve(sig)
return sig
})
}

const prepareArgs = (args)=>{
if (!args || !args.length) return []
const prepareArgs = async (args=[])=>{
args = args || []

let new_args = []
args.forEach( arg => {
if (arg && (''+arg).indexOf('confirm')!=-1) {
let seed = arg.split('confirm(')[1].split(')')[0]
arg = signMsg(seed)
return new Promise(async (resolve, reject) => {

let new_args = []
for(let k in args){
let arg = args[k]
if (arg && (''+arg).indexOf('confirm')!=-1) {
let seed = arg.split('confirm(')[1].split(')')[0]
arg = (await signMsg(seed)).substr(2)
}

new_args.push(arg)
}

new_args.push(arg)
resolve(new_args)
})
return new_args
}


// Listen personal user room messages
const listen_all = data => {
const listen_all = async data => {
if (!data || !data.action || !data.user_id || !this.users[data.user_id]) return

let User = this.users[data.user_id]
Expand All @@ -137,7 +167,7 @@ export default class DApp {
if (!data.func || !data.func.name || !data.func.args) return
if (!User.logic[data.func.name]) return

let args = prepareArgs(data.func.args)
let args = await prepareArgs(data.func.args)
let returns = User.logic[data.func.name].apply(this, args)

this.response(data, {
Expand Down

0 comments on commit aa1da1e

Please sign in to comment.