Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Update the engine to use the new simplified calculation method.

Browse source
This commit is contained in:
Eric Frias 2017-04-27 19:27:21 -04:00
parent 4074b40adf
commit 04f5e9744b
1 changed files with 466 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

551
betting_simulator.html
View file

@ -4,11 +4,13 @@
<title>Peerplays Bookie Sandbox</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/slate/bootstrap.min.css" rel="stylesheet" integrity="sha384-RpX8okQqCyUNG7PlOYNybyJXYTtGQH+7rIKiVvg1DLg6jahLEk47VvpUyS+E2/uJ" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-notification/0.3.6/angular-ui-notification.css" integrity="sha256-nUDje0at3OX3LxmQBmrtDzK/G4AdRqKBS14DHuwvCPk=" crossorigin="anonymous" />
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-route.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/big.js/3.1.3/big.min.js" integrity="sha256-db2rMJ0e5hPHK2tpOTcLuoD+hNPwds4hJmXa2tKb9vg=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-notification/0.3.6/angular-ui-notification.js" integrity="sha256-VTliIwXOO5VUVjSukUkAqP3+hSM2U3aLJGtv3xvGOag=" crossorigin="anonymous"></script>
<script type="text/javascript">
var startApp=angular.module('startApp',['ngRoute']);
var startApp=angular.module('startApp',['ngRoute', 'ui-notification']);
startApp.config(['$routeProvider',
function($routeProvider) {
@ -26,13 +28,25 @@
});
}]);
startApp.controller('Page1Controller', ['$scope', function($scope) {
startApp.controller('Page1Controller', ['$scope', 'Notification', function($scope, Notification) {
let precision = 5;
let percentage_fee = new Big(0);//new Big('0.02');
let bet_id_sequence = 0;
class LogEntry {
constructor(description) {
this.description = description;
this.subentries = [];
}
add_log_message(description) {
let newLogEntry = new LogEntry(description);
this.subentries.push(newLogEntry);
return newLogEntry;
}
}
class Position {
constructor(account_name, balance, win = 0, not_win = 0, cancel = 0, not_cancel = 0, fees_paid = 0, refundable_unmatched_bets = 0) {
constructor(account_name, balance, win = 0, not_win = 0, cancel = 0, not_cancel = 0, fees_paid = 0, refundable_unmatched_bets = 0, unmatched_back_bets = 0, unmatched_lay_bets = 0, unused_lay_exposure = 0, unused_back_exposure = 0, unused_locked_in_profit = 0) {
this.account_name = account_name;
this.balance = new Big(balance);
this.win = new Big(win);
@ -41,19 +55,31 @@
this.not_cancel = new Big(not_cancel);
this.fees_paid = new Big(fees_paid);
this.refundable_unmatched_bets = new Big(refundable_unmatched_bets);
this.unmatched_back_bets = new Big(unmatched_back_bets);
this.unmatched_lay_bets = new Big(unmatched_lay_bets);
this.unused_lay_exposure = new Big(unused_lay_exposure);
this.unused_back_exposure = new Big(unused_back_exposure);
this.unused_locked_in_profit = new Big(unused_locked_in_profit);
}
clone(new_account_name = this.account_name) {
return new Position(new_account_name, this.balance, this.win, this.not_win, this.cancel, this.not_cancel, this.fees_paid, this.refundable_unmatched_bets);
return new Position(new_account_name, this.balance, this.win, this.not_win, this.cancel, this.not_cancel,
this.fees_paid, this.refundable_unmatched_bets, this.unmatched_back_bets, this.unmatched_lay_bets,
this.unused_lay_exposure, this.unused_back_exposure, this.unused_locked_in_profit);
}
minus(otherPosition) {
let differencePosition = this.clone(this.account_name + '_difference');
differencePosition.balance = differencePosition.balance.minus(otherPosition.balance);
differencePosition.win = differencePosition.balance.minus(otherPosition.win);
differencePosition.not_win = differencePosition.balance.minus(otherPosition.not_win);
differencePosition.cancel = differencePosition.balance.minus(otherPosition.cancel);
differencePosition.not_cancel = differencePosition.balance.minus(otherPosition.not_cancel);
differencePosition.fees_paid = differencePosition.balance.minus(otherPosition.fees_paid);
differencePosition.refundable_unmatched_bets = differencePosition.balance.minus(otherPosition.refundable_unmatched_bets);
differencePosition.win = differencePosition.win.minus(otherPosition.win);
differencePosition.not_win = differencePosition.not_win.minus(otherPosition.not_win);
differencePosition.cancel = differencePosition.cancel.minus(otherPosition.cancel);
differencePosition.not_cancel = differencePosition.not_cancel.minus(otherPosition.not_cancel);
differencePosition.fees_paid = differencePosition.fees_paid.minus(otherPosition.fees_paid);
differencePosition.refundable_unmatched_bets = differencePosition.refundable_unmatched_bets.minus(otherPosition.refundable_unmatched_bets);
differencePosition.unmatched_back_bets = differencePosition.unmatched_back_bets.minus(otherPosition.unmatched_back_bets);
differencePosition.unmatched_lay_bets = differencePosition.unmatched_lay_bets.minus(otherPosition.unmatched_lay_bets);
differencePosition.unused_lay_exposure = differencePosition.unused_lay_exposure.minus(otherPosition.unused_lay_exposure);
differencePosition.unused_back_exposure = differencePosition.unused_back_exposure.minus(otherPosition.unused_back_exposure);
differencePosition.unused_locked_in_profit = differencePosition.unused_locked_in_profit.minus(otherPosition.unused_locked_in_profit);
return differencePosition;
}
reduce(parent_event_log_entry) {
@ -65,27 +91,46 @@
let immediate_winnings = big_min(this.cancel, this.not_cancel);
this.cancel = this.cancel.minus(immediate_winnings);
this.not_cancel = this.not_cancel.minus(immediate_winnings);
parent_event_log_entry.add_log_message(`reducing position, returning immediate winnings of ${immediate_winnings}`);
return immediate_winnings;
}
adjust_betting_position(back_or_lay, amount_bet, amount_matched, fee_paid, parent_event_log_entry) {
adjust_betting_position(back_or_lay, amount_bet, amount_matched, fee_paid, parent_event_log_entry, deduct_amount_bet = true){
if (back_or_lay == 'back')
this.win = this.win.plus(amount_bet).plus(amount_matched);
else
this.not_win = this.not_win.plus(amount_bet).plus(amount_matched);
this.cancel = this.cancel.plus(amount_bet);
this.fees_paid = this.fees_paid.plus(fee_paid);
if (deduct_amount_bet)
{
parent_event_log_entry.add_log_message(`in adjust_betting_position, reducing refundable_unmatched_bets from ${this.refundable_unmatched_bets.toFixed()} to ${this.refundable_unmatched_bets.minus(amount_bet).toFixed()} to pay for the bet`);
this.refundable_unmatched_bets = this.refundable_unmatched_bets.minus(amount_bet);
}
return this.reduce(parent_event_log_entry);
}
apply_full_bet(bet, parent_event_log_entry) {
this.refundable_unmatched_bets = this.refundable_unmatched_bets.plus(this.adjust_betting_position(bet.back_or_lay,
bet.amount_to_bet, bet.get_matching_amount(),
bet.amount_reserved_for_fees, parent_event_log_entry));
bet.amount_reserved_for_fees, parent_event_log_entry, true));
this.refundable_unmatched_bets = this.refundable_unmatched_bets.minus(bet.amount_to_bet);
}
}
let make_starting_balance = (account_name) => new Position(account_name, 10000);
$scope.account_balances = { alice: make_starting_balance('alice'), bob: make_starting_balance('bob'), charlie: make_starting_balance('charlie'), dave: make_starting_balance('dave') };
let all_account_names = ['alice', 'bob', 'charlie', 'dave'];
let make_all_account_balances = () => {
return all_account_names.reduce( (balances, name) => {
balances[name] = make_starting_balance(name);
return balances;
}, {});
};
$scope.account_balances = { simple: make_all_account_balances(), complex: make_all_account_balances()};
$scope.position_element_is_inconsistent = (account_name, position_element) => {
return !$scope.account_balances.simple[account_name][position_element].eq($scope.account_balances.complex[account_name][position_element])
};
$scope.order_book = { backs: [], lays: [] };
let compute_matching_amount = (bet_amount, backer_multiplier, back_or_lay) => {
@ -93,7 +138,7 @@
return bet_amount.times(backer_multiplier.minus(1)).round(precision, 0);
else
return bet_amount.div(backer_multiplier.minus(1)).round(precision, 0);
}
};
class Bet {
constructor(bettor, back_or_lay, amount_to_bet, backer_multiplier, amount_reserved_for_fees) {
@ -113,7 +158,9 @@
}
$scope.bet_to_place = {bettor: 'alice', back_or_lay: 'back', backer_multiplier: null, amount_to_bet: null};
$scope.event_log = [];
let clear_event_log = () => $scope.event_log = new LogEntry('Betting Engine Log');
$scope.clear_event_log = clear_event_log;
clear_event_log();
// for sorting order books
let order_compare = (a, b) => Number(a.backer_multiplier.minus(b.backer_multiplier));
@ -121,22 +168,6 @@
let big_min = (a, b) => a.lt(b) ? a : b;
let big_max = (a, b) => a.gt(b) ? a : b;
let reduce_balances = (account_name, parent_event_log_entry) => {
let balances = $scope.account_balances[account_name];
let additional_not_cancel_balance = big_min(balances.win, balances.not_win);
balances.win = balances.win.minus(additional_not_cancel_balance);
balances.not_win = balances.not_win.minus(additional_not_cancel_balance);
balances.not_cancel = balances.not_cancel.plus(additional_not_cancel_balance);
let immediate_winnings = big_min(balances.cancel, balances.not_cancel);
balances.cancel = balances.cancel.minus(immediate_winnings);
balances.not_cancel = balances.not_cancel.minus(immediate_winnings);
balances.balance = balances.balance.plus(immediate_winnings);
if (immediate_winnings.gt(0))
parent_event_log_entry.subentries.push({ description: `returning guaranteed winnings of ${immediate_winnings.toFixed()} to ${account_name}`, subentries: [] });
return immediate_winnings;
};
let remove_bet_from_order_books = (bet) => {
let order_book = bet.back_or_lay == 'back' ? $scope.order_book['backs'] : $scope.order_book['lays'];
let bet_index = order_book.findIndex( (x) => x.bet_id == bet.bet_id );
@ -147,18 +178,83 @@
let bet_was_matched = (bet, amount_bet, amount_matched, actual_multiplier, parent_event_log_entry) => {
let fee_paid = bet.amount_reserved_for_fees.times(amount_bet).div(bet.amount_to_bet).round(precision, 3);
let match_log_entry = { description: `${bet.bettor} bet matched ${amount_bet.toFixed()} against ${amount_matched.toFixed()} (actual decimal odds: ${actual_multiplier.toFixed()}, paid fees of ${fee_paid.toFixed()})`, subentries: [] };
parent_event_log_entry.subentries.push(match_log_entry);
// adjust balances in the simple system
let simple_system_log_entry = parent_event_log_entry.add_log_message(`[simple] Computing refundable amount for ${bet.bettor}, matched ${amount_bet.toFixed()}`);
let bettor_balances_simple_system = $scope.account_balances['simple'][bet.bettor];
let original_bettor_balances_simple_system = bettor_balances_simple_system.clone();
let bettor_balances = $scope.account_balances[bet.bettor];
let immediate_winnings = bettor_balances.adjust_betting_position(bet.back_or_lay, amount_bet, amount_matched,
fee_paid, match_log_entry);
let exposure = null;
if (bet.back_or_lay == 'back')
{
exposure = bettor_balances_simple_system.not_win;
bettor_balances_simple_system.unmatched_back_bets = bettor_balances_simple_system.unmatched_back_bets.minus(amount_bet);
}
else
{
exposure = bettor_balances_simple_system.win;
bettor_balances_simple_system.unmatched_lay_bets = bettor_balances_simple_system.unmatched_lay_bets.minus(amount_bet);
}
let locked_in_profit = bettor_balances_simple_system.not_cancel;
simple_system_log_entry.add_log_message(`exposure: ${exposure.toFixed()}, locked_in_profit: ${locked_in_profit.toFixed()}`);
// pay for the bet and take our winnings into refundable. later we'll move anything we can into the actual balance
bettor_balances.refundable_unmatched_bets = bettor_balances.refundable_unmatched_bets.plus(immediate_winnings).minus(amount_matched);
//let amount_covered_by_exposure = big_min(amount_bet, exposure);
//let amount_not_covered_by_exposure = amount_bet.minus(amount_covered_by_exposure);
//let amount_of_locked_in_profit_leaned_on = big_min(amount_not_covered_by_exposure, locked_in_profit);
//let amount_of_locked_in_profit_not_leaned_on = locked_in_profit.minus(amount_of_locked_in_profit_leaned_on);
//simple_system_log_entry.add_log_message(`amount_covered_by_exposure: ${amount_covered_by_exposure.toFixed()}, amount_not_covered_by_exposure: ${amount_not_covered_by_exposure.toFixed()}, amount_of_locked_in_profit_leaned_on: ${amount_of_locked_in_profit_leaned_on.toFixed()}, amount_of_locked_in_profit_not_leaned_on: ${amount_of_locked_in_profit_not_leaned_on.toFixed()}`);
if (immediate_winnings.gt(0))
match_log_entry.subentries.push({ description: `bet produced ${immediate_winnings.toFixed()} immediate winnings for ${bet.bettor}`, subentries: [] });
// ===================> match happens <========================
let potential_return_amount = bettor_balances_simple_system.adjust_betting_position(bet.back_or_lay, amount_bet, amount_matched,
fee_paid, simple_system_log_entry, false);
// ===================> match happened <=======================
simple_system_log_entry.add_log_message(`potential_return_amount: ${potential_return_amount.toFixed()}`);
let delta_position = bettor_balances_simple_system.minus(original_bettor_balances_simple_system);
let lay_exposure_used_by_unmatched_back_bets = big_min(bettor_balances_simple_system.unmatched_back_bets, bettor_balances_simple_system.not_win);
let back_exposure_used_by_unmatched_lay_bets = big_min(bettor_balances_simple_system.unmatched_lay_bets, bettor_balances_simple_system.win);
let allowable_exposure_for_unmatched_bets = lay_exposure_used_by_unmatched_back_bets.plus(back_exposure_used_by_unmatched_lay_bets);
simple_system_log_entry.add_log_message(`allowable_exposure_for_unmatched_bets: ${allowable_exposure_for_unmatched_bets.toFixed()}`);
bettor_balances_simple_system.unused_back_exposure = bettor_balances_simple_system.win.minus(back_exposure_used_by_unmatched_lay_bets);
bettor_balances_simple_system.unused_lay_exposure = bettor_balances_simple_system.not_win.minus(lay_exposure_used_by_unmatched_back_bets);
let unmatched_bets_not_covered_by_exposure = bettor_balances_simple_system.unmatched_back_bets.plus(
bettor_balances_simple_system.unmatched_lay_bets).minus(
allowable_exposure_for_unmatched_bets);
let amount_of_locked_in_profit_leaned_on = big_min(unmatched_bets_not_covered_by_exposure, bettor_balances_simple_system.not_cancel);
bettor_balances_simple_system.unused_locked_in_profit = bettor_balances_simple_system.not_cancel.minus(amount_of_locked_in_profit_leaned_on);
let unmatched_bets_not_covered_by_exposure_profit = unmatched_bets_not_covered_by_exposure.minus(amount_of_locked_in_profit_leaned_on);
simple_system_log_entry.add_log_message(`unmatched_bets_not_covered_by_exposure_profit = ${unmatched_bets_not_covered_by_exposure_profit.toFixed()}`);
bettor_balances_simple_system.refundable_unmatched_bets = big_max(unmatched_bets_not_covered_by_exposure_profit, new Big(0));
let delta_refundable_unmatched_bets = bettor_balances_simple_system.refundable_unmatched_bets.minus(
original_bettor_balances_simple_system.refundable_unmatched_bets);
simple_system_log_entry.add_log_message(`refundable_unmatched_bets: ${bettor_balances_simple_system.refundable_unmatched_bets.toFixed()}, refundable_unmatched_bets changed by ${delta_refundable_unmatched_bets.toFixed()}`);
let return_amount = potential_return_amount.minus(
amount_bet).minus(
delta_refundable_unmatched_bets)
simple_system_log_entry.add_log_message(`return_amount: ${return_amount.toFixed()}`);
console.assert(return_amount.gte(0), 'Error, negative return amount');
bettor_balances_simple_system.balance = bettor_balances_simple_system.balance.plus(return_amount);
// end simple system
// Adjust balances in the complex system
let complex_system_log_entry = parent_event_log_entry.add_log_message(`${bet.bettor} bet matched ${amount_bet.toFixed()} against ${amount_matched.toFixed()} (actual decimal odds: ${actual_multiplier.toFixed()}, paid fees of ${fee_paid.toFixed()})`);
let bettor_balances_complex_system = $scope.account_balances['complex'][bet.bettor];
let immediate_winnings_complex_system = bettor_balances_complex_system.adjust_betting_position(bet.back_or_lay, amount_bet, amount_matched,
fee_paid, complex_system_log_entry);
// take our winnings into refundable. later we'll move anything we can into the actual balance
bettor_balances_complex_system.refundable_unmatched_bets = bettor_balances_complex_system.refundable_unmatched_bets.plus(immediate_winnings_complex_system);
if (immediate_winnings_complex_system.gt(0))
complex_system_log_entry.add_log_message(`bet produced ${immediate_winnings_complex_system.toFixed()} immediate winnings for ${bet.bettor}, adding them to refundable_unmatched_bets until we figure out if we can pay them out`);
// adjust the bet, removing it if it is completely matched
if (bet.amount_to_bet.eq(amount_bet)) {
remove_bet_from_order_books(bet);
return true;
@ -176,11 +272,26 @@
let match_bet = (taker_bet, maker_bet, parent_event_log_entry) => {
let result = 0;
let maximum_amount_to_match = taker_bet.get_matching_amount();
if (taker_bet.bettor == maker_bet.bettor) {
Notification.error({message: 'You just matched your own bet. The simple algorithm does not yet account for this, so the results may be incorrect', delay: 10000});
// let bettor_balances = $scope.account_balances['simple'][taker_bet.account_name];
// // we are matching our own bet... just cancel out the taker bet, and cancel that amount of the maker bet
// if (taker_bet.back_or_lay == 'back')
// bettor_balances.unmatched_back_bets = bettor_balances.unmatched_back_bets.minus(taker_bet.amount_to_bet);
// else
// bettor_balances.unmatched_lay_bets = bettor_balances.unmatched_lay_bets.minus(taker_bet.amount_to_bet);
// remove_bet_from_order_books(taker_bet);
}
let maximum_amount_to_match = compute_matching_amount(taker_bet.amount_to_bet, maker_bet.backer_multiplier, taker_bet.back_or_lay);
if (maximum_amount_to_match.lte(maker_bet.amount_to_bet)) {
// we will consume the entire taker bet
result |= bet_was_matched(taker_bet, taker_bet.amount_to_bet, maximum_amount_to_match, maker_bet.backer_multiplier, parent_event_log_entry);
result |= bet_was_matched(maker_bet, maximum_amount_to_match, maker_bet.amount_to_bet, maker_bet.backer_multiplier, parent_event_log_entry) << 1;
result |= bet_was_matched(maker_bet, maximum_amount_to_match, taker_bet.amount_to_bet, maker_bet.backer_multiplier, parent_event_log_entry) << 1;
}
else
{
@ -197,11 +308,10 @@
let accounts_affected = new Set();
while (!finished && order_book_to_match_against.length) {
let top_of_order_book = order_book_to_match_against[0];
if (new_bet.backer_multiplier.gt(top_of_order_book.backer_multiplier))
return bet_matched; // new_bet was not fully consumed
if (new_bet.backer_multiplier.lt(top_of_order_book.backer_multiplier))
return accounts_affected; // new_bet was not fully consumed
let match_log_entry = { description: `matched a bet from ${new_bet.bettor} to bet from ${top_of_order_book.bettor}`, subentries: [] };
parent_event_log_entry.subentries.push(match_log_entry);
let match_log_entry = parent_event_log_entry.add_log_message(`matched a bet from ${new_bet.bettor} to bet from ${top_of_order_book.bettor}`);
orders_matched_flags = match_bet(new_bet, top_of_order_book, match_log_entry);
accounts_affected.add(new_bet.bettor);
accounts_affected.add(top_of_order_book.bettor);
@ -212,52 +322,76 @@
let simulate_order_book = (order_book, bettor_balances, back_or_lay, parent_event_log_entry) => {
let simulated_balances = bettor_balances.clone();
let simulation_log_entry = { description: `simulating ${order_book.length} ${back_or_lay} bets`, subentries: [] };
parent_event_log_entry.subentries.push(simulation_log_entry);
let simulation_log_entry = parent_event_log_entry.add_log_message(`simulating ${order_book.length} ${back_or_lay} bets`);
let minimum_refundable = bettor_balances.refundable_unmatched_bets;
order_book.forEach((bet) => {
simulated_balances.apply_full_bet(bet, simulation_log_entry);
if (simulated_balances.refundable_unmatched_bets.lt(minimum_refundable))
minimum_refundable = simulated_balances.refundable_unmatched_bets;
});
simulation_log_entry.subentries.push({ description: `when executing the ${back_or_lay} order book, minimum_refundable: ${minimum_refundable.toFixed()}`, subentries: []});
simulation_log_entry.add_log_message(`when executing the ${back_or_lay} order book, refundable_unmatched_bets never dropped below ${minimum_refundable.toFixed()}`);
return minimum_refundable;
};
let simulate_order_book_for_bettor = (bettor, parent_event_log_entry, new_bet = null) => {
let simulation_event_log_entry = { description: `simulating order book for ${bettor}`, subentries: [] };
parent_event_log_entry.subentries.push(simulation_event_log_entry);
let simulation_event_log_entry = parent_event_log_entry.add_log_message(`simulating order book for ${bettor}`);
// only consider our orders
let bettor_backs = $scope.order_book['backs'].filter( (x) => x.bettor == bettor );
let bettor_lays = $scope.order_book['lays'].filter( (x) => x.bettor == bettor );
let bettor_balances = $scope.account_balances[bettor].clone();
let current_bettor_balances = $scope.account_balances['complex'][bettor];
let fake_bettor_balances = current_bettor_balances.clone();
simulation_event_log_entry.add_log_message(`balances for ${bettor}: refundable: ${fake_bettor_balances.refundable_unmatched_bets.toFixed()}`);
if (new_bet) {
simulation_event_log_entry.subentries.push({ description: `simulating with new bet, assuming ${new_bet.bettor} puts all ${new_bet.amount_to_bet.toFixed()} into refundable_unmatched_bets`, subentries: [] });
simulation_event_log_entry.add_log_message(`simulating with new bet, assuming ${new_bet.bettor} puts all ${new_bet.amount_to_bet.toFixed()} into refundable_unmatched_bets`);
// add the new order to the filtered order book
let new_bet_order_book = new_bet.back_or_lay == 'back' ? bettor_backs : bettor_lays;
new_bet_order_book.push(new_bet);
new_bet_order_book.sort(order_compare);
// fake a balance object where we paid the full bet amount into refundable
bettor_balances.refundable_unmatched_bets = bettor_balances.refundable_unmatched_bets.plus(new_bet.amount_to_bet);
fake_bettor_balances.refundable_unmatched_bets = fake_bettor_balances.refundable_unmatched_bets.plus(new_bet.amount_to_bet);
simulation_event_log_entry.add_log_message(`pretending we pay the full bet amount of ${new_bet.amount_to_bet.toFixed()} into refundable, so the fake refundable is now ${fake_bettor_balances.refundable_unmatched_bets.toFixed()}`);
}
// run the (filtered) order books -- this returns the lowest balance in refundable_unmatched_bets during the simulation
let backs_minimum_refundable_unmatched_bets = simulate_order_book(bettor_backs, bettor_balances, 'back', simulation_event_log_entry);
let lays_minimum_refundable_unmatched_bets = simulate_order_book(bettor_lays, bettor_balances, 'lay', simulation_event_log_entry);
let backs_minimum_refundable_unmatched_bets = simulate_order_book(bettor_backs, fake_bettor_balances, 'back', simulation_event_log_entry);
fake_bettor_balances.refundable_unmatched_bets = backs_minimum_refundable_unmatched_bets;
simulation_event_log_entry.add_log_message(`after simulating backs, we reduce our simulated refundable ${fake_bettor_balances.refundable_unmatched_bets.toFixed()} to before simulating lays`);
let lays_minimum_refundable_unmatched_bets = simulate_order_book(bettor_lays, fake_bettor_balances, 'lay', simulation_event_log_entry);
fake_bettor_balances.refundable_unmatched_bets = lays_minimum_refundable_unmatched_bets;
simulation_event_log_entry.add_log_message(`after simulating lays, our simulated refundable is ${fake_bettor_balances.refundable_unmatched_bets.toFixed()}`);
// TODO: THIS IS WRONG:
// let minimum_refundable_unmatched_bets = big_min(backs_minimum_refundable_unmatched_bets, lays_minimum_refundable_unmatched_bets);
// but so is this:
//let minimum_refundable_unmatched_bets = backs_minimum_refundable_unmatched_bets.plus(lays_minimum_refundable_unmatched_bets);
//simulation_event_log_entry.add_log_message(`minimum_refundable_unmatched_bets = ${minimum_refundable_unmatched_bets.toFixed()}`);
// this should be right:
let minimum_refundable_unmatched_bets = lays_minimum_refundable_unmatched_bets;
let minimum_refundable_unmatched_bets = big_min(backs_minimum_refundable_unmatched_bets, lays_minimum_refundable_unmatched_bets);
if (new_bet)
{
parent_event_log_entry.add_log_message(`At the end of simulation, minimum_refundable was ${minimum_refundable_unmatched_bets.toFixed()}`);
let amount_to_refund_from_refundable = minimum_refundable_unmatched_bets.minus(new_bet.amount_to_bet);
parent_event_log_entry.subentries.push({ description: `At the end of simulation, minimum_refundable was ${minimum_refundable_unmatched_bets.toFixed()}`, subentries: []});
if (amount_to_refund_from_refundable.lte(0))
parent_event_log_entry.subentries.push({ description: `To place this bet, ${bettor} must deposit ${amount_to_refund_from_refundable.times(-1).toFixed()}`, subentries: []});
if (amount_to_refund_from_refundable.lt(0)) {
// if any of the defecit can be covered by the not_cancel balance, account for that here
let amount_bettor_must_pay = amount_to_refund_from_refundable.times(-1); // flip the sign so it's easier to understand
amount_bettor_must_pay = amount_bettor_must_pay.minus(current_bettor_balances.not_cancel);
if (amount_bettor_must_pay.gt(0))
parent_event_log_entry.add_log_message(`To place this bet, ${bettor} must deposit ${amount_bettor_must_pay.toFixed()}`);
else
parent_event_log_entry.subentries.push({ description: `When ${bettor} places this bet, they will immediately get back ${amount_to_refund_from_refundable.toFixed()}`, subentries: []});
parent_event_log_entry.add_log_message(`${bettor} can place this bet using exposure + locked-in winnings}`);
} else if (amount_to_refund_from_refundable.gt(0)) {
parent_event_log_entry.add_log_message(`When ${bettor} places this bet, they will immediately get back ${amount_to_refund_from_refundable.toFixed()}`);
} else /* amount to refund == 0 */ {
parent_event_log_entry.add_log_message(`${bettor} can place this bet entirely on exposure`);
}
return amount_to_refund_from_refundable;
}
else
@ -266,46 +400,111 @@
}
};
let register_bet_simple_system = (new_bet, parent_event_log_entry) => {
let initial_simulation_event_log = parent_event_log_entry.add_log_message(`[simple] evaluating new bet to determine how much ${new_bet.bettor} must pay to refundable_unmatched_bets`);
let bettor_balances_simple_system = $scope.account_balances['simple'][new_bet.bettor];
let exposure = null;
if (new_bet.back_or_lay == 'back')
{
exposure = bettor_balances_simple_system.unused_lay_exposure;
bettor_balances_simple_system.unmatched_back_bets = bettor_balances_simple_system.unmatched_back_bets.plus(new_bet.amount_to_bet);
}
else
{
exposure = bettor_balances_simple_system.unused_back_exposure;
bettor_balances_simple_system.unmatched_lay_bets = bettor_balances_simple_system.unmatched_lay_bets.plus(new_bet.amount_to_bet);
}
let amount_of_exposure_leaned_on = big_min(new_bet.amount_to_bet, exposure);
let bet_amount_not_covered_by_exposure = new_bet.amount_to_bet.minus(amount_of_exposure_leaned_on);
let amount_of_locked_in_profit_leaned_on = big_min(bet_amount_not_covered_by_exposure, bettor_balances_simple_system.unused_locked_in_profit);
let required_funds = new_bet.amount_to_bet.minus(amount_of_exposure_leaned_on).minus(amount_of_locked_in_profit_leaned_on);
initial_simulation_event_log.add_log_message(`The new bet leans on ${amount_of_exposure_leaned_on.toFixed()} exposure, ${amount_of_locked_in_profit_leaned_on.toFixed()} locked-in profit, and requires ${required_funds.toFixed()} to be paid in cash`);
if (required_funds.lte(bettor_balances_simple_system.balance))
{
if (new_bet.back_or_lay == 'back')
bettor_balances_simple_system.unused_lay_exposure = bettor_balances_simple_system.unused_lay_exposure.minus(amount_of_exposure_leaned_on);
else
bettor_balances_simple_system.unused_back_exposure = bettor_balances_simple_system.unused_back_exposure.minus(amount_of_exposure_leaned_on);
bettor_balances_simple_system.unused_locked_in_profit = bettor_balances_simple_system.unused_locked_in_profit.minus(amount_of_locked_in_profit_leaned_on);
if (required_funds.gt(0))
{
bettor_balances_simple_system.balance = bettor_balances_simple_system.balance.minus(required_funds);
bettor_balances_simple_system.refundable_unmatched_bets = bettor_balances_simple_system.refundable_unmatched_bets.plus(required_funds);
initial_simulation_event_log.add_log_message(`Determined ${new_bet.bettor} needs to deposit ${required_funds.toFixed()} to place the bet`);
}
else
initial_simulation_event_log.add_log_message(`Determined ${new_bet.bettor} can place the bet without depositing any funds into refundable_unmatched_Bets`);
return true;
}
else
{
initial_simulation_event_log.add_log_message(`Unable to place bet, determined ${new_bet.bettor} would need ${required_funds.toFixed()} to place the bet`);
return false;
}
};
let register_bet_complex_system = (new_bet, parent_event_log_entry) => {
let initial_simulation_event_log = parent_event_log_entry.add_log_message(`[complex] simulating order book with new bet to determine how much ${new_bet.bettor} must pay to refundable_unmatched_bets`);
// compute how much it costs to place the bet
let amount_to_refund_from_refundable_complex_system = simulate_order_book_for_bettor(new_bet.bettor, initial_simulation_event_log, new_bet);
initial_simulation_event_log.add_log_message(`Determined ${new_bet.bettor} needs to deposit ${amount_to_refund_from_refundable_complex_system.times(-1).toFixed()} to place the bet`);
let bettor_balances_complex_system = $scope.account_balances['complex'][new_bet.bettor];
let bet_is_allowed_complex_system = bettor_balances_complex_system.balance.gte(amount_to_refund_from_refundable_complex_system.times(-1));
if (bet_is_allowed_complex_system)
{
// pay what is required into refundable_unmatched_bets
bettor_balances_complex_system.balance = bettor_balances_complex_system.balance.plus(amount_to_refund_from_refundable_complex_system);
bettor_balances_complex_system.refundable_unmatched_bets = bettor_balances_complex_system.refundable_unmatched_bets.minus(amount_to_refund_from_refundable_complex_system);
return true;
}
else
{
initial_simulation_event_log.add_log_message(`Unable to place bet, determined ${new_bet.bettor} would need ${amount_to_refund_from_refundable_complex_system.times(-1).toFixed()} to place the bet`);
return false;
}
};
$scope.place_bet = (new_bet) => {
let event_log_entry = { description: `${new_bet.bettor} places a ${new_bet.back_or_lay} bet for ${new_bet.amount_to_bet.toFixed()} at decimal odds ${new_bet.backer_multiplier.toFixed()}`, subentries: [] };
let event_log_entry = $scope.event_log.add_log_message(`${new_bet.bettor} places a ${new_bet.back_or_lay} bet for ${new_bet.amount_to_bet.toFixed()} at decimal odds ${new_bet.backer_multiplier.toFixed()}`);
$scope.event_log.push(event_log_entry);
let bettor_balances_complex_system = $scope.account_balances['complex'][new_bet.bettor];
let bet_is_allowed_complex_system = register_bet_complex_system(new_bet, event_log_entry);
let bet_is_allowed_simple_system = register_bet_simple_system(new_bet, event_log_entry);
let initial_simulation_event_log = { description: `simulating order book with new bet to determine how much ${new_bet.bettor} must pay to refundable_unmatched_bets`, subentries: [] };
event_log_entry.subentries.push(initial_simulation_event_log);
let amount_to_refund_from_refundable = simulate_order_book_for_bettor(new_bet.bettor, initial_simulation_event_log, new_bet);
let bettor_balances = $scope.account_balances[new_bet.bettor];
if (bettor_balances.balance.gt(amount_to_refund_from_refundable.times(-1))) {
// if we were allowed to palce the bet, add it to the order books and then see if we can match it now
if (bet_is_allowed_complex_system || bet_is_allowed_simple_system) {
let order_book = new_bet.back_or_lay == 'back' ? $scope.order_book.backs : $scope.order_book.lays;
let order_book_to_match_against = new_bet.back_or_lay == 'back' ? $scope.order_book.lays : $scope.order_book.backs;
bettor_balances.balance = bettor_balances.balance.plus(amount_to_refund_from_refundable);
bettor_balances.refundable_unmatched_bets = bettor_balances.refundable_unmatched_bets.minus(amount_to_refund_from_refundable);
order_book.push(new_bet);
order_book.sort(order_compare);
let accounts_affected = try_to_match_bet(new_bet, new_bet.back_or_lay, order_book_to_match_against, event_log_entry);
if (accounts_affected.size) {
let secondary_simulation_event_log = { description: `The bet matched and affected the accounts ${Array.from(accounts_affected).join(',')}. Now simulating the order books of their accounts to determine whether we can refund any of their refundable_unmatched_bets to their balances}`, subentries: [] };
event_log_entry.subentries.push(secondary_simulation_event_log);
let secondary_simulation_event_log = event_log_entry.add_log_message(`[complex] The bet matched and affected the accounts ${Array.from(accounts_affected).join(',')}. Now simulating the order books of their accounts to determine whether we can refund any of their refundable_unmatched_bets to their balances}`);
accounts_affected.forEach((account) => {
let partial_match_event_log_entry = { description: `A match (possibly partial) occurred involving account ${account}, now simulating order book for that account to find out what we can refund`, subentries: [] };
amount_to_refund_from_refundable = simulate_order_book_for_bettor(account, partial_match_event_log_entry);
secondary_simulation_event_log.subentries.push(partial_match_event_log_entry);
let partial_match_event_log_entry = secondary_simulation_event_log.add_log_message(`A match (possibly partial) occurred involving account ${account}, now simulating order book for that account to find out what we can refund`);
let amount_to_refund_from_refundable_for_account = simulate_order_book_for_bettor(account, partial_match_event_log_entry);
if (amount_to_refund_from_refundable.gt(0)) {
secondary_simulation_event_log.subentries.push({ description: `Refunding ${amount_to_refund_from_refundable.toFixed()} to ${account}`, subentries: []});
let account_balances = $scope.account_balances[account];
account_balances.refundable_unmatched_bets = account_balances.refundable_unmatched_bets.minus(amount_to_refund_from_refundable);
account_balances.balance = account_balances.balance.plus(amount_to_refund_from_refundable);
if (amount_to_refund_from_refundable_for_account.gt(0)) {
partial_match_event_log_entry.add_log_message(`Refunding ${amount_to_refund_from_refundable_for_account.toFixed()} to ${account}`);
let account_balances = $scope.account_balances['complex'][account];
account_balances.refundable_unmatched_bets = account_balances.refundable_unmatched_bets.minus(amount_to_refund_from_refundable_for_account);
account_balances.balance = account_balances.balance.plus(amount_to_refund_from_refundable_for_account);
} else {
partial_match_event_log_entry.add_log_message(`Unable to refund anything to ${account}`);
}
});
}
}
};
$scope.place_bet_from_form = () => {
@ -318,41 +517,69 @@
};
let cancel_all_bets_on_side = (order_book_side, parent_log_entry) => {
order_book_side.forEach( (bet) => {
$scope.account_balances[bet.bettor].balance = $scope.account_balances[bet.bettor].balance.plus(bet.amount_to_bet);
parent_log_entry.subentries.push({ description: `Returning ${bet.amount_to_bet} to ${bet.bettor}`, subentries: []});
});
// order_book_side.forEach( (bet) => {
// for (var balance_system_name in $scope.account_balances) {
// let balance_system = $scope.account_balances[balance_system_name];
// balance_system[bet.bettor].balance = balance_system[bet.bettor].balance.plus(bet.amount_to_bet);
// balance_system[bet.bettor].refundable_unmatched_bets = 0;
// parent_log_entry.add_log_message(`Returning ${bet.amount_to_bet} to ${bet.bettor} in ${balance_system_name}`);
// }
// });
order_book_side = [];
};
let cancel_all_bets = (parent_log_entry) => {
let cancel_event_log_entry = { description: `Canceling all bets`, subentries: []};
let cancel_event_log_entry = parent_log_entry.add_log_message(`Canceling all bets`);
cancel_all_bets_on_side($scope.order_book.backs, cancel_event_log_entry);
$scope.order_book.backs = [];
cancel_all_bets_on_side($scope.order_book.lays, cancel_event_log_entry);
$scope.order_book.lays = [];
parent_log_entry.subentries.push(cancel_event_log_entry);
for (var balance_system_name in $scope.account_balances) {
if ($scope.account_balances.hasOwnProperty(balance_system_name)) {
let balance_system = $scope.account_balances[balance_system_name];
for (var account_name in balance_system) {
if (balance_system.hasOwnProperty(account_name)) {
let balance_object = balance_system[account_name];
if (balance_object.refundable_unmatched_bets.gt(0)) {
cancel_event_log_entry.add_log_message(`Restored ${balance_object.refundable_unmatched_bets} to ${account_name} from refundable_unmatched_bets`);
balance_object.balance = balance_object.balance.plus(balance_object.refundable_unmatched_bets);
balance_object.refundable_unmatched_bets = new Big(0);
}
}
}
}
}
};
$scope.payout = (condition) => {
let payout_event_log_entry = { description: `Paying out a ${condition}`, subentries: []};
let payout_event_log_entry = $scope.event_log.add_log_message(`Paying out a ${condition}`);
cancel_all_bets(payout_event_log_entry);
for (var account_name in $scope.account_balances) {
if ($scope.account_balances.hasOwnProperty(account_name)) {
let balance_object = $scope.account_balances[account_name];
for (var balance_system_name in $scope.account_balances) {
if ($scope.account_balances.hasOwnProperty(balance_system_name)) {
let balance_system = $scope.account_balances[balance_system_name];
let payout_balance_system_event_log_entry = payout_event_log_entry.add_log_message(`Paying out balance system ${balance_system_name}`);
for (var account_name in balance_system) {
if (balance_system.hasOwnProperty(account_name)) {
let balance_object = balance_system[account_name];
let total_paid = null;
let fees_paid = null;
if (condition == 'win') {
total_paid = balance_object.win.plus(balance_object.not_cancel);
fees_paid = balance_object.fees_paid;
if (total_paid.gt(0))
payout_balance_system_event_log_entry.add_log_message(`Paying ${total_paid.toFixed()} from win (${balance_object.win.toFixed()}) + not_cancel (${balance_object.not_cancel.toFixed()}) to ${account_name}, paying system fees of ${fees_paid}`);
} else if (condition == 'not win') {
total_paid = balance_object.not_win.plus(balance_object.not_cancel);
fees_paid = balance_object.fees_paid;
if (total_paid.gt(0))
payout_balance_system_event_log_entry.add_log_message(`Paying ${total_paid.toFixed()} from not_win (${balance_object.not_win.toFixed()}) + not_cancel (${balance_object.not_cancel.toFixed()}) to ${account_name}, paying system fees of ${fees_paid}`);
} else {
total_paid = balance_object.cancel.plus(balance_object.fees_paid);
fees_paid = new Big(0);
if (total_paid.gt(0))
payout_balance_system_event_log_entry.add_log_message(`Paying ${total_paid.toFixed()} from cancel balance to ${account_name}, paying system fees of ${fees_paid}`);
}
balance_object.win = new Big(0);
@ -360,19 +587,38 @@
balance_object.not_cancel = new Big(0);
balance_object.cancel = new Big(0);
balance_object.fees_paid = new Big(0);
if (total_paid) {
payout_event_log_entry.subentries.push({ description: `Paying ${total_paid.toFixed()} to ${account_name}, paying system fees of ${fees_paid}`, subentries: []});
balance_object.balance = balance_object.balance.plus(total_paid);
}
}
}
$scope.event_log.push(payout_event_log_entry);
}
};
// $scope.place_bet(new Bet("alice", "back", 10, 10, 0));
// $scope.place_bet(new Bet("bob", "lay", 90, 10, 0));
// $scope.place_bet(new Bet("alice", "lay", 50, 2, 0));
// $scope.place_bet(new Bet("bob", "back", 50, 2, 0)); // locked in profit of 40 for alice
// $scope.place_bet(new Bet("alice", "back", 50, 2, 0));
// $scope.place_bet(new Bet("bob", "lay", 50, 2, 0));
$scope.place_bet(new Bet("alice", "back", 100, 2, 0));
$scope.place_bet(new Bet("bob", "lay", 100, 2, 0));
$scope.place_bet(new Bet("alice", "lay", 200, 2, 0));
//$scope.place_bet("bob", "lay", 500, 1000);
$scope.place_bet(new Bet("alice", "back", 100, 4, 0));
$scope.place_bet(new Bet("alice", "back", 100, 6, 0));
$scope.place_bet(new Bet("alice", "back", 100, 8, 0));
$scope.place_bet(new Bet("alice", "back", 100, 10, 0));
$scope.place_bet(new Bet("bob", "lay", 400, 4, 0));
$scope.place_bet(new Bet("charlie", "lay", 850, 8, 0));
//$scope.place_bet(new Bet("bob", "lay", 500, 6, 0));
//$scope.place_bet(new Bet("bob", "lay", 500, 6, 0));
//$scope.place_bet(new Bet("bob", "lay", 500, 6, 0));
//$scope.place_bet(new Bet("bob", "lay", 500, 6, 0));
//$scope.place_bet(new Bet("bob", "lay", 500, 6, 0));
//$scope.place_bet(new Bet("alice", "lay", 100, 2, 0));
//$scope.place_bet(new Bet("alice", "back", 100, 4, 0));
//$scope.place_bet(new Bet("bob", "lay", 300, 4, 0));
//$scope.place_bet(new Bet("alice", "lay", 301, 8, 0));
//$scope.place_bet(new Bet("bob", "back", 50, 2, 0));
//$scope.place_bet("bob", "lay", 100, 1100);
//$scope.place_bet("bob", "lay", 1000, 1500);
@ -393,12 +639,63 @@ startApp.controller('Page2Controller', ['$scope', function($scope) {
<h1>Peerplays Engine Playground</h1>
</div>
<div class="row">
<div class="col-sm-7">
<div class="col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">Available Balances</div>
<div class="panel-heading">Simple Available Balances</div>
<table class="table">
<col>
<col>
<colgroup span="4"></colgroup>
<col>
<col>
<colgroup span="2"></colgroup>
<colgroup span="3"></colgroup>
<tr>
<th></th>
<th></th>
<th colspan="4">position</th>
<th></th>
<th></th>
<th colspan="2">unmatched</th>
<th colspan="3">unused</th>
</tr>
<tr>
<th></th>
<th>balance</th>
<th>win</th>
<th>not win</th>
<th>cancel</th>
<th>not cancel</th>
<th>refundable</th>
<th>fees_paid</th>
<th>backs</th>
<th>lays</th>
<th>lay exposure</th>
<th>back exposure</th>
<th>locked-in profit</th>
</tr>
<tr ng-repeat="(account_name, balance_record) in account_balances.simple">
<td>{{account_name}}</td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'balance')}">{{balance_record.balance.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'win')}">{{balance_record.win.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'not_win')}">{{balance_record.not_win.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'cancel')}">{{balance_record.cancel.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'not_cancel')}">{{balance_record.not_cancel.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'refundable_unmatched_bets')}">{{balance_record.refundable_unmatched_bets.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'fees_paid')}">{{balance_record.fees_paid.toFixed()}}</span></td>
<td>{{balance_record.unmatched_back_bets.toFixed()}}</td>
<td>{{balance_record.unmatched_lay_bets.toFixed()}}</td>
<td>{{balance_record.unused_lay_exposure.toFixed()}}</td>
<td>{{balance_record.unused_back_exposure.toFixed()}}</td>
<td>{{balance_record.unused_locked_in_profit.toFixed()}}</td>
</tr>
</table>
</div>
<div class="panel panel-default">
<div class="panel-heading">Complex Available Balances</div>
<table class="table">
<tr>
<th>account</th>
<th></th>
<th>balance</th>
<th>win</th>
<th>not win</th>
@ -407,32 +704,23 @@ startApp.controller('Page2Controller', ['$scope', function($scope) {
<th>refundable</th>
<th>fees_paid</th>
</tr>
<tr ng-repeat="(account_name, balance_record) in account_balances">
<tr ng-repeat="(account_name, balance_record) in account_balances.complex">
<td>{{account_name}}</td>
<td>{{balance_record.balance.toFixed()}}</td>
<td>{{balance_record.win.toFixed()}}</td>
<td>{{balance_record.not_win.toFixed()}}</td>
<td>{{balance_record.cancel.toFixed()}}</td>
<td>{{balance_record.not_cancel.toFixed()}}</td>
<td>{{balance_record.refundable_unmatched_bets.toFixed()}}</td>
<td>{{balance_record.fees_paid.toFixed()}}</td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'balance')}">{{balance_record.balance.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'win')}">{{balance_record.win.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'not_win')}">{{balance_record.not_win.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'cancel')}">{{balance_record.cancel.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'not_cancel')}">{{balance_record.not_cancel.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'refundable_unmatched_bets')}">{{balance_record.refundable_unmatched_bets.toFixed()}}</span></td>
<td><span ng-class="{'text-warning': position_element_is_inconsistent(account_name, 'fees_paid')}">{{balance_record.fees_paid.toFixed()}}</span></td>
</tr>
</table>
</div>
<div class="panel panel-default">
<div class="panel-heading">Resolve Market</div>
<div class="container">
<form class="form">
<div class="form-group">
<button type="button" class="btn btn-primary" ng-click="payout('win')">Win</button>
<button type="button" class="btn btn-primary" ng-click="payout('not win')">Not Win</button>
<button type="button" class="btn btn-primary" ng-click="payout('cancel')">Cancel</button>
</div>
</form>
</div>
</div>
</div>
<div class="col-sm-5">
<div class="row">
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Place Bet</div>
<form class="form-horizontal">
@ -440,7 +728,7 @@ startApp.controller('Page2Controller', ['$scope', function($scope) {
<label for="account" class="control-label col-sm-2">Account:</label>
<div class="col-sm-10">
<select id="account" class="form-control" ng-model="bet_to_place.bettor">
<option ng-repeat="(account_name, balance) in account_balances" value="{{account_name}}">{{account_name}}</option>
<option ng-repeat="(account_name, balance) in account_balances.simple" value="{{account_name}}">{{account_name}}</option>
</select>
</div>
</div>
@ -473,6 +761,20 @@ startApp.controller('Page2Controller', ['$scope', function($scope) {
</form>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Resolve Market</div>
<div class="container">
<form class="form">
<div class="form-group">
<button type="button" class="btn btn-primary" ng-click="payout('win')">Win</button>
<button type="button" class="btn btn-primary" ng-click="payout('not win')">Not Win</button>
<button type="button" class="btn btn-primary" ng-click="payout('cancel')">Cancel</button>
</div>
</form>
</div>
</div>
</div>
</div>
@ -521,9 +823,10 @@ startApp.controller('Page2Controller', ['$scope', function($scope) {
<h2>Event log</h2>
<div class="well">
<ul>
<li ng-repeat="event in event_log" ng-include="'logEntryTree'"></li>
<li ng-repeat="event in event_log.subentries" ng-include="'logEntryTree'"></li>
</li>
</ul>
<button type="button" class="btn btn-primary" ng-click="clear_event_log()">Clear Log</button>
</div>
</div>
</script>