diff --git a/api.php b/api.php index 2765ef5..cd8539c 100755 --- a/api.php +++ b/api.php @@ -70,7 +70,7 @@ header('Content-Type: application/json'); use Arionum\Blacklist; require_once __DIR__.'/include/init.inc.php'; -error_reporting(0); + $ip = san_ip($_SERVER['REMOTE_ADDR']); $ip = filter_var($ip, FILTER_VALIDATE_IP); @@ -419,6 +419,8 @@ if ($q == "getAddress") { $version = 1; } + + if ($version==1) { if (!$acc->valid($dst)) { api_err("Invalid destination address"); @@ -435,7 +437,8 @@ if ($q == "getAddress") { } } - + + $public_key = san($data['public_key']); if (!$acc->valid_key($public_key)) { @@ -446,6 +449,9 @@ if ($q == "getAddress") { api_err("Blacklisted account"); } } + + + $private_key = san($data['private_key']); if (!$acc->valid_key($private_key)) { api_err("Invalid private key"); @@ -466,6 +472,7 @@ if ($q == "getAddress") { api_err("Invalid Date"); } + $message=$data['message']; if (strlen($message) > 128) { api_err("The message must be less than 128 chars"); @@ -484,6 +491,7 @@ if ($q == "getAddress") { api_err("Invalid value"); } + // set alias if ($version==3) { $fee=10; @@ -519,6 +527,9 @@ if ($q == "getAddress") { if (empty($private_key) && empty($signature)) { api_err("Either the private_key or the signature must be sent"); } + + + if (empty($public_key)) { $pk = coin2pem($private_key, true); $pkey = openssl_pkey_get_private($pk); @@ -547,11 +558,11 @@ if ($q == "getAddress") { + if (!$trx->check($transaction)) { api_err("Transaction signature failed"); } - $res = $db->single("SELECT COUNT(1) FROM mempool WHERE id=:id", [":id" => $hash]); if ($res != 0) { api_err("The transaction is already in mempool"); @@ -771,6 +782,25 @@ if ($q == "getAddress") { } } api_echo(true); +} elseif ($q === "assetBalance"){ + + $public_key = $data['public_key']; + $account = $data['account']; + if (!empty($public_key) && strlen($public_key) < 32) { + api_err("Invalid public key"); + } + if (!empty($public_key)) { + $account = $acc->get_address($public_key); + } + + if (empty($account)) { + api_err("Invalid account id"); + } + $account = san($account); + + $r=$db->run("SELECT asset, alias, assets_balance.balance FROM assets_balance LEFT JOIN accounts ON accounts.id=assets_balance.asset WHERE assets_balance.account=:account LIMIT 1000",[":account"=>$account]); + api_echo($r); + } else { api_err("Invalid request"); } diff --git a/include/account.inc.php b/include/account.inc.php index 4cd7846..1c313c6 100755 --- a/include/account.inc.php +++ b/include/account.inc.php @@ -138,7 +138,7 @@ class Account if ($orig!=$id) { return false; } - + // making sure the same alias can only be used in one place if ($db->single("SELECT COUNT(1) FROM accounts WHERE alias=:alias", [":alias"=>$id])==0) { return true; } else { diff --git a/include/block.inc.php b/include/block.inc.php index 54a6854..6801ec3 100755 --- a/include/block.inc.php +++ b/include/block.inc.php @@ -37,7 +37,7 @@ class Block } } // lock table to avoid race conditions on blocks - $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE"); + $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE, assets WRITE, assets_balance WRITE, assets_market WRITE"); $reward = $this->reward($height, $data); @@ -157,8 +157,12 @@ class Block $db->exec("UNLOCK TABLES"); return false; } + $this->do_hard_forks($height, $hash); + + + } // parse the block's transactions and insert them to db @@ -168,6 +172,16 @@ class Block $this->blacklist_masternodes(); $this->reset_fails_masternodes($public_key, $height, $hash); } + + // automated asset distribution, checked only every 1000 blocks to reduce load. Payouts every 10000 blocks. + + if($height>11111 && $height%50==1 && $res==true){ // every 50 for testing. No initial height set yet. + $res=$this->asset_distribute_dividends($height, $hash, $public_key, $date, $signature); + } + + if($height>11111 && $res==true){ + $res=$this->asset_market_orders($height, $hash, $public_key, $date, $signature); + } // if any fails, rollback if ($res == false) { $db->rollback(); @@ -179,6 +193,110 @@ class Block return true; } + public function asset_market_orders($height, $hash, $public_key, $date, $signature) + { + global $db; + $trx=new Transaction; + // checks all bid market orders ordered in the same way on all nodes + $r=$db->run("SELECT * FROM assets_market WHERE status=0 and val_donerun("SELECT * FROM assets_market WHERE status=0 and val_done$x['asset'], ":price"=>$x['price']]); + foreach($asks as $ask){ + //remaining part of the order + $remaining=$ask['val']-$ask['val_done']; + // how much of the ask should we use to fill the bid order + $use=0; + if($remaining>$val){ + $use=$remaining-$val; + } else { + $use=$remaining; + } + $val-=$use; + $db->run("UPDATE assets_market SET val_done=val_done+:done WHERE id=:id",[":id"=>$ask['id'], ":done"=>$use]); + $db->run("UPDATE assets_market SET val_done=val_done+:done WHERE id=:id",[":id"=>$x['id'], ":done"=>$use]); + // if we filled the order, we should exit the loop + $db->run("INSERT into assets_balance SET account=:account, asset=:asset, balance=:balance ON DUPLICATE KEY UPDATE balance=balance+:balance2",[":account"=>$x['account'], ":asset"=>$x['asset'], ":balance"=>$use, ":balance2"=>$use]); + $aro=$use*$x['price']; + $db->run("UPDATE accounts SET balance=balance+:balance WHERE id=:id",[":balance"=>$aro, ":id"=>$ask['account']]); + + $random = hex2coin(hash("sha512", $x['id'].$ask['id'].$val.$hash)); + $new = [ + "id" => $random, + "public_key" => $x['id'], + "dst" => $ask['id'], + "val" => $aro, + "fee" => 0, + "signature" => $signature, + "version" => 58, + "date" => $date, + "message" => $use + ]; + + $res=$trx->add($hash,$height,$new); + if(!$res){ + return false; + } + if($val<=0){ + break; + } + } + } + + + + return true; + } + + + public function asset_distribute_dividends($height, $hash, $public_key, $date, $signature) + { + global $db; + $trx=new Transaction; + _log("Starting automated dividend distribution",3); + // just the assets with autodividend + $r=$db->run("SELECT * FROM assets WHERE auto_dividend=1"); + + if($r===false){ + return true; + } + foreach($r as $x){ + $asset=$db->row("SELECT id, public_key, balance FROM accounts WHERE id=:id",[":id"=>$x['id']]); + // minimum balance 1 aro + if($asset['balance']<1) { + _log("Asset $asset[id] not enough balance",3); + continue; + } + _log("Autodividend $asset[id] - $asset[balance] ARO",3); + // every 10000 blocks and at minimum 10000 of asset creation or last distribution, manual or automated + $last=$db->single("SELECT height FROM transactions WHERE (version=54 OR version=50 or version=57) AND public_key=:pub ORDER by height DESC LIMIT 1",[":pub"=>$asset['public_key']]); + if($height<$last+100){ // 100 for testnet + continue; + } + // generate a pseudorandom id and version 54 transaction for automated dividend distribution. No fees for such automated distributions to encourage the system + $random = hex2coin(hash("sha512", $x['id'].$hash.$height)); + $new = [ + "id" => $random, + "public_key" => $asset['public_key'], + "dst" => $asset['id'], + "val" => $asset['balance'], + "fee" => 0, + "signature" => $signature, + "version" => 57, + "date" => $date, + "src" => $asset['id'], + "message" => '', + ]; + $res=$trx->add($hash,$height,$new); + if(!$res){ + return false; + } + } + return true; + } public function do_hard_forks($height, $block) { global $db; @@ -965,7 +1083,8 @@ class Block return; } $db->beginTransaction(); - $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE"); + $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE, assets WRITE, assets_balance WRITE, assets_market WRITE"); + foreach ($r as $x) { $res = $trx->reverse($x['id']); if ($res === false) { @@ -1002,7 +1121,8 @@ class Block } // avoid race conditions on blockchain manipulations $db->beginTransaction(); - $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE"); + $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE, assets WRITE, assets_balance WRITE, assets_market WRITE"); + // reverse all transactions of the block $res = $trx->reverse($x['id']); if ($res === false) { @@ -1066,7 +1186,7 @@ class Block $r = $db->run("SELECT * FROM transactions WHERE version>0 AND block=:block", [":block" => $block['id']]); $transactions = []; foreach ($r as $x) { - if ($x['version']>110) { + if ($x['version']>110||$x['version']==57||$x['version']==58||$x['version']==59) { //internal transactions continue; } diff --git a/include/init.inc.php b/include/init.inc.php index b679b13..f2b18ce 100755 --- a/include/init.inc.php +++ b/include/init.inc.php @@ -1,13 +1,13 @@ 1) { die("This application should only be run in the main directory /"); diff --git a/include/schema.inc.php b/include/schema.inc.php index 14b8e24..b0881eb 100755 --- a/include/schema.inc.php +++ b/include/schema.inc.php @@ -2,6 +2,7 @@ // when db schema modifications are done, this function is run. $dbversion = intval($_config['dbversion']); + $db->beginTransaction(); if ($dbversion == 0) { $db->run(" @@ -168,6 +169,56 @@ if ($dbversion = 9) { //dev only $dbversion++; } +if ($dbversion = 10) { + //assets system + $db->run(" + CREATE TABLE `assets` ( + `id` varbinary(128) NOT NULL, + `max_supply` bigint(18) NOT NULL DEFAULT '0', + `tradable` tinyint(1) NOT NULL DEFAULT '1', + `price` decimal(20,8) NOT NULL DEFAULT '0.00000000', + `dividend_only` tinyint(1) NOT NULL DEFAULT '0', + `auto_dividend` tinyint(1) NOT NULL DEFAULT '0', + `allow_bid` tinyint(1) NOT NULL DEFAULT '1', + `height` int(11) NOT NULL DEFAULT '0' + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + "); + $db->run(" + ALTER TABLE `assets` + ADD PRIMARY KEY (`id`) + "); + $db->run(" + CREATE TABLE `assets_market` ( + `id` varchar(128) COLLATE utf8mb4_bin NOT NULL, + `account` varbinary(128) NOT NULL, + `asset` varbinary(128) NOT NULL, + `price` decimal(20,8) NOT NULL, + `date` int(11) NOT NULL, + `status` tinyint(1) NOT NULL DEFAULT '0', + `type` enum('bid','ask') COLLATE utf8mb4_bin NOT NULL DEFAULT 'bid', + `val` bigint(18) NOT NULL, + `val_done` bigint(18) NOT NULL DEFAULT '0', + `cancelable` tinyint(1) NOT NULL DEFAULT '1' + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + "); + $db->run(" + ALTER TABLE `assets_market` + ADD PRIMARY KEY (`id`); + "); + $db->run("CREATE TABLE `assets_balance` ( + `account` varbinary(128) NOT NULL, + `asset` varbinary(128) NOT NULL, + `balance` bigint(128) NOT NULL DEFAULT '0' + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + "); + + $db->run(" + ALTER TABLE `assets_balance` + ADD PRIMARY KEY (`account`,`asset`); + "); + + $dbversion++; +} // update the db version to the latest one diff --git a/include/transaction.inc.php b/include/transaction.inc.php index e01ca76..5765cef 100755 --- a/include/transaction.inc.php +++ b/include/transaction.inc.php @@ -10,7 +10,7 @@ class Transaction global $db; $acc = new Account(); - $r = $db->run("SELECT * FROM transactions WHERE block=:block ORDER by `version` ASC", [":block" => $block]); + $r = $db->run("SELECT * FROM transactions WHERE block=:block ORDER by `version` DESC", [":block" => $block]); foreach ($r as $x) { _log("Reversing transaction $x[id]", 4); if (empty($x['src'])) { @@ -29,19 +29,19 @@ class Transaction } else { // other type of transactions - if ($x['version']!=100&&$x['version']<111) { + if ($x['version']!=100 && $x['version']<111 && $x['version'] != 54 && $x['version'] != 57 && $x['version'] != 58 ) { $rez=$db->run( "UPDATE accounts SET balance=balance-:val WHERE id=:id", [":id" => $x['dst'], ":val" => $x['val']] ); if ($rez!=1) { - _log("Update accounts balance minus failed", 3); + _log("Update accounts balance minus failed ", 3); return false; } } } // on version 0 / reward transaction, don't credit anyone - if ($x['version'] > 0 && $x['version']<111) { + if ($x['version'] > 0 && $x['version']<111 && $x['version'] != 54 && $x['version'] != 57 && $x['version'] != 58) { $rez=$db->run( "UPDATE accounts SET balance=balance+:val WHERE id=:id", [":id" => $x['src'], ":val" => $x['val'] + $x['fee']] @@ -121,8 +121,80 @@ class Transaction } } + + // asset transactions + if($x['version']==50){ + $db->run("DELETE FROM assets WHERE id=:id",[":id"=>$x['src']]); + $db->run("DELETE FROM assets_balance WHERE asset=:id",[":id"=>$x['src']]); + } elseif ($x['version']==51){ + $t=json_decode($x['message'],true); + $db->run("UPDATE assets_balance SET balance=balance-:balance WHERE account=:account and asset=:asset", + [":account"=>$x['dst'], ":asset"=>san($t[0]), ":balance"=>intval($t[1])]); + $db->run("UPDATE assets_balance SET balance=balance+:balance WHERE account=:account and asset=:asset",[":account"=>$x['src'], ":asset"=>san($t[0]), ":balance"=>intval($t[1])]); + } elseif ($x['version']==52){ + $t=json_decode($x['message'],true); + if($t[4]=="ask"){ + $type="ask"; + } else { + $type="bid"; + } + if($type=="ask"){ + $db->run("UPDATE assets_balance SET balance=balance+:val WHERE account=:account AND asset=:asset", [ + ":account"=>$x['src'], + ":asset"=>san($t[0]), + ":val"=>intval($t[2]) + ]); + } else { + $val=number_format($t[2]*$t[1], 8, '.', ''); + $db->run("UPDATE accounts SET balance=balance+:val WHERE id=:id",[":id"=>$x['src'], ":val"=>$val]); + } + $db->run("DELETE FROM assets_market WHERE id=:id",[':id'=>$x['id']]); + + } elseif ($x['version']==53){ + $order=$db->row("SELECT * FROM assets_market WHERE id=:id AND account=:account AND status=2",[":id"=>san($x['message']), ":account"=>$x['src']]); + if($order) + { + $remaining=$order['val']-$order['val_done']; + if ($remaining>0) { + if ($order['type']=="ask") { + $db->run("UPDATE assets_balance SET balance=balance-:val WHERE account=:account AND asset=:asset", [ + ":account"=>$x['src'], + ":asset"=>san($order['asset']), + ":val"=>intval($remaining) + ]); + } else { + $val=number_format($order['price']*$remaining, 8, '.', ''); + $db->run("UPDATE accounts SET balance=balance-:val WHERE id=:id",[":id"=>$x['src'], ":val"=>$val]); + } + $db->run("UPDATE assets_market SET status=0 WHERE id=:id", [":id"=>san($x['message'])]); + } + } + + } elseif ($x['version']==54||$x['version']==57){ + //nothing to be done + } elseif ($x['version']==55){ + // the message stores the increment value + $plus=intval($x['message']); + $db->run("UPDATE assets_balance SET balance=balance-:plus WHERE account=:account AND asset=:asset", [":account"=>$x['src'], ":asset"=>$x['src'], ":plus"=>$plus]); + } elseif ($x['version']==58){ + // the message stores the number of units + $use=intval($x['message']); + // we stored the bid order id in the public key field and the ask in the dst field + $db->run("UPDATE assets_market SET val_done=val_done-:done WHERE id=:id",[":id"=>$x['public_key'], ":done"=>$use]); + $db->run("UPDATE assets_market SET val_done=val_done-:done WHERE id=:id",[":id"=>$x['dst'], ":done"=>$use]); + + $bid=$db->row("SELECT * FROM assets_market WHERE id=:id",[':id'=>$x['public_key']]); + $ask=$db->row("SELECT * FROM assets_market WHERE id=:id",[':id'=>$x['dst']]); + + $db->run("UPDATE assets_balance SET balance=balance-:balance WHERE account=:account AND asset=:asset",[":account"=>$bid['account'], ":asset"=>$bid['asset'], ":balance"=>$use]); + $aro=$x['val']; + $db->run("UPDATE accounts SET balance=balance-:balance WHERE id=:id",[":balance"=>$aro, ":id"=>$ask['account']]); + + } + + // add the transactions to mempool - if ($x['version'] > 0 && $x['version']<=110) { + if ($x['version'] > 0 && $x['version']<=110 && $x['version'] != 59 && $x['version'] != 58 && $x['version'] != 57) { $this->add_mempool($x); } $res = $db->run("DELETE FROM transactions WHERE id=:id", [":id" => $x['id']]); @@ -160,6 +232,7 @@ class Transaction if (count($r) > 0) { $i = 0; $balance = []; + $assets=0; foreach ($r as $x) { $trans = [ "id" => $x['id'], @@ -177,6 +250,15 @@ class Transaction break; } + //only a single asset creation per block + if($x['version']==50){ + $assets++; + if($assets>1){ + continue; + } + } + + if (empty($x['public_key'])) { _log("$x[id] - Transaction has empty public_key"); continue; @@ -270,9 +352,14 @@ class Transaction { global $db; $acc = new Account(); - $acc->add($x['public_key'], $block); - if ($x['version']==1) { - $acc->add_id($x['dst'], $block); + // not a valid or useful public key for internal transactions + if ($x['version']!=58 && $x['version']!=59) { + // add the public key to the accounts table + $acc->add($x['public_key'], $block); + if ($x['version']==1 || $x['version'] == 51) { + // make sure the destination address in on the accounts table as well + $acc->add_id($x['dst'], $block); + } } $x['id'] = san($x['id']); $bind = [ @@ -295,8 +382,16 @@ class Transaction if ($res != 1) { return false; } + + // market order side chain + if($x['version']==58){ + return true; + } + if ($x['version'] == 2&&$height>=80000) { $db->run("UPDATE accounts SET balance=balance+:val WHERE alias=:alias", [":alias" => $x['dst'], ":val" => $x['val']]); + } elseif ($x['version']==50||$x['version']==54||$x['version']==57){ + // asset creation and dividend distribution } elseif ($x['version']==100&&$height>=80000) { //master node deposit } elseif ($x['version']==103&&$height>=80000) { @@ -310,8 +405,8 @@ class Transaction - // no debit when the transaction is reward - if ($x['version'] > 0) { + // no debit when the transaction is reward or dividend distribution + if ($x['version'] > 0 && $x['version'] != 54 && $x['version'] != 57) { $db->run( "UPDATE accounts SET balance=(balance-:val)-:fee WHERE id=:id", [":id" => $x['src'], ":val" => $x['val'], ":fee" => $x['fee']] @@ -344,7 +439,121 @@ class Transaction } } } - + // asset system + if($x['version']==50){ + // asset creation + $bind=[]; + $asset=json_decode($x['message'],true); + $bind[':max_supply']=intval($asset[0]); + $bind[':tradable']=intval($asset[1]); + $bind[':price']=number_format($asset[2], 8, '.', ''); + $bind[':dividend_only']=intval($asset[3]); + $bind[':auto_divident']=intval($asset[4]); + $bind[':allow_bid']=intval($asset[5]); + $bind[':height']=$height; + $bind[':id']=$x['src']; + $db->run("INSERT into assets SET id=:id, max_supply=:max_supply, tradable=:tradable, price=:price, dividend_only=:dividend_only, auto_dividend=:auto_divident, height=:height, allow_bid=:allow_bid",$bind); + if($bind[':max_supply']>0){ + $db->run("INSERT into assets_balance SET account=:account, asset=:asset, balance=:balance",[":account"=>$x['src'], ":asset"=>$x['src'], ":balance"=>$bind[':max_supply']]); + } + } elseif($x['version']==51){ + // send asset + $t=json_decode($x['message'],true); + $db->run("INSERT into assets_balance SET account=:account, asset=:asset, balance=:balance ON DUPLICATE KEY UPDATE balance=balance+:balance2", + [":account"=>$x['dst'], ":asset"=>san($t[0]), ":balance"=>intval($t[1]), ":balance2"=>intval($t[1])]); + $db->run("UPDATE assets_balance SET balance=balance-:balance WHERE account=:account and asset=:asset",[":account"=>$x['src'], ":asset"=>san($t[0]), ":balance"=>intval($t[1])]); + } elseif($x['version']==52){ + // market order + $t=json_decode($x['message'],true); + + if($t[4]=="ask"){ + $type="ask"; + } else { + $type="bid"; + } + + + + + $bind=[":id" => san($x['id']), + ":account" => $x['src'], + ":asset" => san($t[0]), + ":price" => number_format($t[1], 8, '.', ''), + ":date" => $x['date'], + ":val"=>intval($t[2]), + ":type" => $type, + ":cancel" => intval($t[3]) + ]; + $db->run("INSERT into assets_market SET id=:id, account=:account, asset=:asset, price=:price, `date`=:date, status=0, `type`=:type, val=:val, val_done=0, cancelable=:cancel",$bind); + + if($type=="ask"){ + $db->run("UPDATE assets_balance SET balance=balance-:val WHERE account=:account AND asset=:asset", [ + ":account"=>$x['src'], + ":asset"=>san($t[0]), + ":val"=>intval($t[2]) + ]); + } else { + $val=number_format($t[2]*$t[1], 8, '.', ''); + $db->run("UPDATE accounts SET balance=balance-:val WHERE id=:id",[":id"=>$x['src'], ":val"=>$val]); + } + } elseif($x['version']==53){ + // cancel order + $order=$db->row("SELECT * FROM assets_market WHERE id=:id AND account=:account AND status=0",[":id"=>san($x['message']), ":account"=>$x['src']]); + if($order) + { + $remaining=$order['val']-$order['val_done']; + if ($remaining>0) { + if ($order['type']=="ask") { + $db->run("UPDATE assets_balance SET balance=balance+:val WHERE account=:account AND asset=:asset", [ + ":account"=>$x['src'], + ":asset"=>san($order['asset']), + ":val"=>intval($remaining) + ]); + } else { + $val=number_format($order['price']*$remaining, 8, '.', ''); + $db->run("UPDATE accounts SET balance=balance+:val WHERE id=:id",[":id"=>$x['src'], ":val"=>$val]); + } + $db->run("UPDATE assets_market SET status=2 WHERE id=:id", [":id"=>san($x['message'])]); + } + } + + + } elseif($x['version']==54||$x['version']==57){ + //distribute dividends - only from asset wallet and only to other holders + + $r=$db->run("SELECT * FROM assets_balance WHERE asset=:asset AND balance>0 AND account!=:acc",[":asset"=>$x['src'], ":acc"=>$x['src']]); + $total=0; + foreach($r as $g){ + $total+=$g['balance']; + } + _log("Asset dividend distribution: $total units",3); + foreach ($r as $g){ + $coins=number_format(($g['balance']/$total)*$x['val'], 8, '.', ''); + $fee=number_format(($g['balance']/$total)*$x['fee'], 8, '.', ''); + $hash = hex2coin(hash("sha512", $x['id'].$g['account'])); + _log("Distributing to $g[account] for $g[balance] units - $coins ARO",3); + + $new = [ + "id" => $hash, + "public_key" => $x['public_key'], + "dst" => $g['account'], + "val" => $coins, + "fee" => $fee, + "signature" => $x['signature'], + "version" => 59, + "date" => $x['date'], + "src" => $x['src'], + "message" => '', + ]; + $res=$this->add($block,$height,$new); + if(!$res) return false; + } + + } elseif($x['version']==55){ + // increase max supply + $plus=intval($x['message']); + $db->run("INSERT into assets_balance SET balance=:plus, account=:account, asset=:asset ON DUPLICATE KEY UPDATE balance=balance+:plus2", [":account"=>$x['src'], ":asset"=>$x['src'], ":plus"=>$plus, ":plus2"=>$plus]); + } $db->run("DELETE FROM mempool WHERE id=:id", [":id" => $x['id']]); @@ -362,6 +571,7 @@ class Transaction // check the transaction for validity public function check($x, $height = 0) { + global $db; // if no specific block, use current if ($height === 0) { $block = new Block(); @@ -371,13 +581,15 @@ class Transaction $acc = new Account(); $info = $x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date']; + $src = $acc->get_address($x['public_key']); + // hard fork at 80000 to implement alias, new mining system, assets // if($x['version']>1 && $height<80000){ // return false; // } // internal transactions - if ($x['version']>110) { + if ($x['version']>110 || $x['version'] == 57 || $x['version'] == 58 || $x['version'] == 59) { return false; } @@ -411,6 +623,11 @@ class Transaction _log("The account already has an alias", 3); return false; } + if($x['dst']!=$src){ + // just to prevent some bypasses in the future + _log("DST must be SRC for this transaction", 3); + return false; + } } //masternode transactions @@ -436,7 +653,12 @@ class Transaction return false; } elseif ($x['version']!=100) { $mn=$acc->get_masternode($x['public_key']); - + + if($x['dst']!=$src){ + // just to prevent some bypasses in the future + _log("DST must be SRC for this transaction", 3); + return false; + } if (!$mn) { _log("The masternode does not exist", 3); return false; @@ -461,7 +683,211 @@ class Transaction } } } - + // assets + if ($x['version']==50) { + // asset creation + // fixed asset price 100 +. The 100 are burned and not distributed to miners. + if ($x['val']!=100) { + _log("The asset creation transaction is not 100", 3); + return false; + } + // stored in message in json format - [max supply, tradable, fixed price, dividend only, autodividend] + $asset=json_decode($x['message'],true); + if($asset==false){ + _log("Invalid asset creation json", 3); + return false; + } + + // minimum 0 (for inflatable assets) and maximum 1.000.000.000 + if($asset[0]>1000000000||$asset[0]<0||intval($asset[0])!=$asset[0]){ + _log("Invalid asset max supply", 3); + return false; + } + // 0 for non-tradable, 1 for tradable on the blockchain market + if($asset[1]!==1&&$asset[1]!==0){ + _log("Invalid asset tradable", 3); + return false; + } + // If the price is set, it cannot be sold by the asset wallet at a dfferent price. Max price 1.000.000 aro + if(number_format($asset[2], 8, '.', '')!=$asset[2]||$asset[2]<0||$asset[2]>1000000){ + _log("Invalid asset price", 3); + return false; + } + // 1 to allow only dividend distribution, 0 to allow all transfers + if($asset[3]!==1&&$asset[3]!==0){ + _log("Invalid asset dividend setting", 3); + return false; + } + // automatic dividend distribution every 10000 blocks + if($asset[4]!==1&&$asset[4]!==0){ + _log("Invalid asset autodividend setting", 3); + return false; + } + // do not allow this asset to buy other assets via the market + if($asset[5]!==1&&$asset[5]!==0){ + _log("Invalid asset bid_only setting", 3); + return false; + } + // make sure there is no similar asset with the same alias + $chk=$db->single("SELECT COUNT(1) FROM assets WHERE id=:id",[":id"=>$src]); + if($chk!==0){ + _log("The asset already exists", 3); + return false; + } + } + + // asset transfer + if($x['version']==51){ + // Transfer details in json format, stored in the message. format: [asset id, units] + // The transfer is done to the dst address of the transactions + $asset=json_decode($x['message'],true); + if($asset==false){ + _log("Invalid asset creation json", 3); + return false; + } + // check if the asset exists + $blockasset=$db->row("SELECT id, price FROM assets WHERE id=:id",[":id"=>san($asset[0])]); + if(!$blockasset){ + _log("Invalid asset", 3); + return false; + } + // minimum 1 unit is transfered + if(intval($asset[1])!=$asset[1]||$asset[1]<1){ + _log("Invalid amount", 3); + return false; + } + //make sure the wallet has enough asset units + $balance=$db->single("SELECT balance FROM assets_balance WHERE account=:account AND asset=:asset",[":account"=>$src, ":asset"=>san($asset[0])]); + if($balance<=$asset[1]){ + _log("Not enough balance", 3); + return false; + } + if($blockasset['price']>0 && $src == $blockasset['id'] && $blockasset['price']!=$asset[1] && $blockasset['tradable'] ==1 ){ + // if the asset has a price defined, check if the asset wallet owns all the asset units and only in this case allow transfers. In such cases, the asset should be sold on market + // on a fixed price always + $chk=$db->single("SELECT COUNT(1) FROM assets_balance WHERE asset=:asset AND account!=:account",[":account"=>$src, ":asset"=>$src]); + if($chk!=0){ + _log("Initial asset distribution already done. Market orders only on fixed price.", 3); + return false; + } + } + + + } + // make sure the dividend only function is not bypassed after height X + if(($x['version']==1||$x['version']==2)&&$height>11111){ + $check=$db->single("SELECT COUNT(1) FROM assets WHERE id=:id AND dividend_only=1",[":id"=>$src]); + if($check==1){ + _log("This asset wallet cannot send funds directly", 3); + return false; + } + + } + + + // asset market orders + + if ($x['version']==52) { + + // we store the order details in a json array on the format [asset_id, price, amount of asset units, cancelable, order type ] + $asset=json_decode($x['message'], true); + if ($asset==false) { + _log("Invalid asset creation json", 3); + return false; + } + // only ask and bid allowed + if($asset[4]!="ask"&&$asset[4]!="bid"){ + _log("Invalid asset order type", 3); + return false; + } + $type=san($asset[4]); + + $blockasset=$db->row("SELECT * FROM assets WHERE id=:id",[":id"=>san($asset[0])]); + if(!$blockasset||$blockasset['tradable']!=1){ + _log("Invalid asset", 3); + return false; + } + // the sale price per unit has to be at least 0.00000001 or max 1000000 aro + if(number_format($asset[1], 8, '.', '')!=$asset[1]||$asset[1]<=0||$asset[1]>1000000){ + _log("Invalid asset price", 3); + return false; + } + // integer min 1 and max 1000000 + if(intval($asset[2])!=$asset[2]||$asset[2]<1||$asset[2]>1000000){ + _log("Invalid asset value", 3); + return false; + } + // if the order should be cancelable or not + if($asset[3]!=1&&$asset[3]!=0){ + _log("Invalid asset cancel setting", 3); + return false; + } + // the type of order, ask or bid + if($type=="ask"){ + $balance=$db->single("SELECT balance FROM assets_balance WHERE asset=:asset AND account=:account",[":account"=>$src, ":asset"=>$asset[0]]); + if($balance<$asset[2]){ + _log("Not enough asset balance", 3); + return false; + } + } else { + $balance=$acc->balance($src); + if ($balance<$asset[2]*$asset[1]) { + _log("Not enough aro balance", 3); + return false; + } + if($blockasset['id']!=$src){ + $asset_bids_allowed=$db->single("SELECT COUNT(1) FROM assets WHERE id=:id AND allow_bid=0",[":id"=>$src]); + if($asset_bids_allowed==1){ + _log("This wallet asset is not allowed to buy other assets", 3); + return false; + } + } + + + } + if($blockasset['id']==$src && $blockasset['price']>0 && $blockasset['price']!=$asset[1]){ + // In case the asset has fixed price, the asset wallet cannot sell on a different price (to prevent abuse by the owner) + _log("This asset has fixed market price when sold by it's wallet", 3); + return false; + } + } + if($x['version']==53){ + if(san($x['message'])!=$x['message']){ + _log("Invalid order id - $x[message]", 3); + return false; + } + $chk=$db->single("SELECT COUNT(1) FROM assets_market WHERE id=:id AND account=:src AND val_donesan($x['message']), ":src"=>$src]); + if($chk!=1){ + _log("Invalid order - $x[message]", 3); + return false; + } + } + if($x['version']==54){ + $balance=$acc->balance($src); + if ($balance<$x['val']||$x['val']<0.00000001) { + _log("Not enough aro balance", 3); + return false; + } + } + + if($x['version']==55){ + $plus=intval($x['message']); + if($x['message']!=$plus){ + _log("Invalid asset value", 3); + return false; + } + $test=$db->single("SELECT COUNT(1) FROM assets WHERE id=:id AND max_supply=0",[":id"=>$src]); + if($test!=1){ + _log("Asset not inflatable", 3); + return false; + } + $total=$db->single("SELECT SUM(balance) FROM assets_balance WHERE asset=:id",[":id"=>$src]); + $total+=$db->single("SELECT SUM(val-val_done) FROM assets_market WHERE status=0 AND type='ask' AND asset=:id",[":id"=>$src]); + if($total+$plus>1000000000){ + _log("Maximum asset unit limits reached", 3); + return false; + } + } // max fee after block 10800 is 10 if ($height > 10800 && $fee > 10) { diff --git a/sanity.php b/sanity.php index d8cafa9..c0bbabf 100755 --- a/sanity.php +++ b/sanity.php @@ -308,9 +308,9 @@ if ($total_peers == 0 && $_config['testnet'] == false) { } $peered[$pid] = 1; - if($_config['passive_peering'] == true){ + if ($_config['passive_peering'] == true) { // does not peer, just add it to DB in passive mode - $db->run("INSERT into peers set hostname=:hostname, ping=0, reserve=0,ip=:ip",[":hostname"=>$peer, ":ip"=>md5($peer)]); + $db->run("INSERT into peers set hostname=:hostname, ping=0, reserve=0,ip=:ip", [":hostname"=>$peer, ":ip"=>md5($peer)]); $res=true; } else { // forces the other node to peer with us. @@ -348,8 +348,8 @@ foreach ($r as $x) { _log("Peer $x[hostname] unresponsive"); // if the peer is unresponsive, mark it as failed and blacklist it for a while $db->run( - "UPDATE peers SET fails=fails+1, blacklisted=UNIX_TIMESTAMP()+((fails+1)*3600) WHERE id=:id", - [":id" => $x['id']] + "UPDATE peers SET fails=fails+1, blacklisted=UNIX_TIMESTAMP()+((fails+1)*3600) WHERE id=:id", + [":id" => $x['id']] ); continue; } @@ -380,8 +380,8 @@ foreach ($r as $x) { } // make sure there's no peer in db with this ip or hostname if (!$db->single( - "SELECT COUNT(1) FROM peers WHERE ip=:ip or hostname=:hostname", - [":ip" => $peer['ip'], ":hostname" => $peer['hostname']] + "SELECT COUNT(1) FROM peers WHERE ip=:ip or hostname=:hostname", + [":ip" => $peer['ip'], ":hostname" => $peer['hostname']] )) { $i++; // check a max_test_peers number of peers from each peer @@ -649,7 +649,8 @@ if ($current['height'] < $largest_height && $largest_height > 1) { if ($resyncing==true) { _log("Resyncing accounts"); $db->run("INSERT into config SET val=UNIX_TIMESTAMP(), cfg='last_resync' ON DUPLICATE KEY UPDATE val=UNIX_TIMESTAMP()"); - $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE"); + $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE, assets WRITE, assets_balance WRITE, assets_market WRITE"); + $r=$db->run("SELECT * FROM accounts"); foreach ($r as $x) { @@ -707,13 +708,15 @@ if ($_config['sanity_rebroadcast_locals'] == true && $_config['disable_repropaga if ($_config['disable_repropagation'] == false) { $forgotten = $current['height'] - $_config['sanity_rebroadcast_height']; $r1 = $db->run( - "SELECT id FROM mempool WHERE height<:forgotten ORDER by val DESC LIMIT 10", - [":forgotten" => $forgotten]); + "SELECT id FROM mempool WHERE height<:forgotten ORDER by val DESC LIMIT 10", + [":forgotten" => $forgotten] + ); // getting some random transactions as well $r2 = $db->run( - "SELECT id FROM mempool WHERE height<:forgotten ORDER by RAND() LIMIT 10", - [":forgotten" => $forgotten]); - $r=array_merge($r1,$r2); + "SELECT id FROM mempool WHERE height<:forgotten ORDER by RAND() LIMIT 10", + [":forgotten" => $forgotten] + ); + $r=array_merge($r1, $r2); _log("Rebroadcasting external transactions - ".count($r)); @@ -807,6 +810,21 @@ if ($_config['sanity_recheck_blocks'] > 0 && $_config['testnet'] == false) { } } +// not too often to not cause load +if (rand(0, 10)==1) { + // after 10000 blocks, clear asset internal transactions + $db->run("DELETE FROM transactions WHERE (version=57 or version=58 or version=59) AND height<:height", [":height"=>$current['height']-10000]); + + // remove market orders that have been filled, after 10000 blocks + $r=$db->run("SELECT id FROM assets_market WHERE val_done=val or status=2"); + foreach ($r as $x) { + $last=$db->single("SELECT height FROM transactions WHERE (public_key=:id or dst=:id2) ORDER by height DESC LIMIT 1", [":id"=>$x['id'], ":id2"=>$x['id']]); + if ($current['height']-$last>10000) { + $db->run("DELETE FROM assets_market WHERE id=:id", [":id"=>$x['id']]); + } + } +} + _log("Finishing sanity"); @unlink(SANITY_LOCK_PATH); diff --git a/util.php b/util.php index 71190d6..b36221a 100755 --- a/util.php +++ b/util.php @@ -463,7 +463,8 @@ elseif ($cmd == 'get-address') { } touch("tmp/sanity-lock"); // lock table to avoid race conditions on blocks - $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE"); + $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE, assets WRITE, assets_balance WRITE, assets_market WRITE"); + $r=$db->run("SELECT * FROM accounts"); foreach ($r as $x) {