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

Commit

Permalink
add findtheethereum
Browse files Browse the repository at this point in the history
  • Loading branch information
@Harzu
Harzu committed Nov 24, 2017
1 parent 58bb647 commit 5206039
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 65 deletions.
1 change: 1 addition & 0 deletions DApps/FindTheEthereum
Submodule FindTheEthereum added at a944ed
8 changes: 7 additions & 1 deletion DApps/dicedapp_v2/bankroller.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion DApps/dicedapp_v2/dapp_logic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DCLib.defineDAppLogic('dicedapp_v2', function(){

var Roll = function(user_bet, user_num, random_hash){
// convert 1BET to 100000000
user_bet = DCLib.Utils.bet4dec(user_bet)
user_bet = DCLib.Utils.bet2dec(user_bet)

// generate random number
const random_num = DCLib.numFromHash(random_hash, 0, 65536)
Expand Down
19 changes: 13 additions & 6 deletions DApps/dicedapp_v2/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@

// Create our DApp
DCLib.on('ready', function(){
window.MyDApp = new DCLib.DApp({code :'dicedapp_v2'})
window.MyDApp = new DCLib.DApp({
code : 'dicedapp_v2',
contract: {
contract_address: '0xCC71CA7F799781c096bd3ce6032eB504dA61AaC8',
contract_abi: JSON.parse('[{"constant":true,"inputs":[],"name":"rndMinNumber","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"totalMoneySend","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"disputes","outputs":[{"name":"round","type":"uint256"},{"name":"disputeSeed","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"refererReward","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"erc20Address","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"sigseed","type":"bytes"}],"name":"closeDispute","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"rndMaxNumber","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"sigseed","type":"bytes"},{"name":"min","type":"uint256"},{"name":"max","type":"uint256"}],"name":"createRnd","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"pure","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"session","type":"uint256"},{"name":"round","type":"uint256"},{"name":"seed","type":"bytes32"},{"name":"gameData","type":"uint256[]"},{"name":"sig","type":"bytes"},{"name":"sigSeed","type":"bytes"}],"name":"updateGame","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalChannels","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"channels","outputs":[{"name":"player","type":"address"},{"name":"bankroller","type":"address"},{"name":"playerBalance","type":"uint256"},{"name":"bankrollBalance","type":"uint256"},{"name":"bankrollDeposit","type":"uint256"},{"name":"session","type":"uint256"},{"name":"endBlock","type":"uint256"},{"name":"round","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"bet","type":"uint256"},{"name":"eth","type":"uint256"}],"name":"withdrawAll","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"player","type":"address"},{"name":"bankroller","type":"address"},{"name":"playerDeposit","type":"uint256"},{"name":"bankrollDeposit","type":"uint256"},{"name":"session","type":"uint256"},{"name":"time","type":"uint256"},{"name":"gameData","type":"uint256[]"},{"name":"sig","type":"bytes"}],"name":"openChannel","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"h","type":"bytes32"},{"name":"signature","type":"bytes"}],"name":"recoverSigner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"pure","type":"function"},{"constant":true,"inputs":[],"name":"gameDevReward","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"playerBalance","type":"uint256"},{"name":"bankrollBalance","type":"uint256"},{"name":"session","type":"uint256"},{"name":"close","type":"bool"},{"name":"sig","type":"bytes"}],"name":"closeByConsent","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalMoneyPaids","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"playerBalance","type":"uint256"},{"name":"bankrollBalance","type":"uint256"},{"name":"session","type":"uint256"},{"name":"sig","type":"bytes"}],"name":"updateChannel","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"refContractAddress","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"developer","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"},{"name":"round","type":"uint256"},{"name":"disputeSeed","type":"bytes32"},{"name":"gameData","type":"uint256[]"}],"name":"openDispute","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"id","type":"bytes32"}],"name":"closeByTime","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"signature","type":"bytes"}],"name":"signatureSplit","outputs":[{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"},{"name":"v","type":"uint8"}],"payable":false,"stateMutability":"pure","type":"function"},{"constant":true,"inputs":[{"name":"oldGameData","type":"uint256[]"},{"name":"newGameData","type":"uint256[]"}],"name":"checkGameData","outputs":[],"payable":false,"stateMutability":"pure","type":"function"},{"constant":true,"inputs":[],"name":"bankrollReward","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"platformReward","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"action","type":"string"},{"indexed":false,"name":"id","type":"bytes32"},{"indexed":false,"name":"playerBalance","type":"uint256"},{"indexed":false,"name":"bankrollBalance","type":"uint256"},{"indexed":false,"name":"session","type":"uint256"}],"name":"logChannel","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"action","type":"string"},{"indexed":false,"name":"id","type":"bytes32"},{"indexed":false,"name":"session","type":"uint256"},{"indexed":false,"name":"seed","type":"bytes32"}],"name":"logDispute","type":"event"}]')
}
})
})


Expand All @@ -43,15 +49,16 @@

function startGame(deposit){
MyDApp.connect({
bankroller : 'auto',
paychannel : { deposit : deposit }
bankroller : '0x146c5e3b9395738eb67feceb5e37cd5a56d63342',
paychannel : { deposit : deposit } ,
gamedata : {type:'uint', value: [0, 0, 0]}
},
function(connected, info){
console.log('connect result:', connected)
console.log('connect info:', info)
if (!connected) return

let maxbet = DCLib.Utils.bet2dec( info.channel.player_deposit )
let maxbet = DCLib.Utils.dec2bet( info.channel.player_deposit )

$('#user_bet')[0].max = Math.ceil( maxbet )
$('#user_bet').val( (maxbet*0.1).toFixed(2) )
Expand Down Expand Up @@ -198,7 +205,7 @@ <h3>1. Open game-channel</h3>
<form>
<label>
Set game deposit:
<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.1">
<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.001">
</label>
<input type="submit" value="Set">
</form>
Expand All @@ -212,7 +219,7 @@ <h3>1. Open game-channel</h3>
<h3>2. Play</h3>
<label>
your bet:
<input id="user_bet" type="number" value="1" min="0" max="4" step="0.1">
<input id="user_bet" type="number" value="1" min="0" max="4" step="0.001">
</label>
<label>
your num:
Expand Down
2 changes: 1 addition & 1 deletion DApps/dicedapp_v2/lib/DC.js
View file

Large diffs are not rendered by default.

Binary file modified DApps/example.zip
View file
Binary file not shown.
Loading

0 comments on commit 5206039

Please sign in to comment.