diff --git a/src/ac/ccl b/src/ac/ccl new file mode 100755 index 000000000..c3d03a0a4 --- /dev/null +++ b/src/ac/ccl @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=CCL $1 $2 $3 $4 $5 $6 diff --git a/src/assetchains.json b/src/assetchains.json index 5f0d3464f..b74d953a0 100644 --- a/src/assetchains.json +++ b/src/assetchains.json @@ -132,5 +132,15 @@ "ac_name": "SEC", "ac_supply": "1000000000", "ac_cc": "333" + }, + { + "ac_name": "CCL", + "ac_supply": "200000000", + "ac_end": "1", + "ac_cc": "2", + "addressindex": "1", + "spentindex": "1", + "addnode": "142.93.136.89", + "addnode": "195.201.22.89" } ] diff --git a/src/assetchains.old b/src/assetchains.old index cbf976dd9..d7a18811d 100755 --- a/src/assetchains.old +++ b/src/assetchains.old @@ -38,3 +38,4 @@ echo $pubkey ./komodod -pubkey=$pubkey -ac_name=RFOX -ac_supply=1000000000 -ac_reward=100000000 -addnode=78.47.196.146 & ~/VerusCoin/src/komodod -pubkey=$pubkey -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_veruspos=50 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -addnode=185.25.48.236 -addnode=185.64.105.111 & ./komodod -pubkey=$pubkey -ac_name=SEC -ac_cc=333 -ac_supply=1000000000 -addnode=185.148.145.43 & +./komodod -pubkey=$pubkey -ac_name=CCL -ac_supply=200000000 -ac_end=1 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=142.93.136.89 -addnode=195.201.22.89 & diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index 61dfcbba1..50b9cba78 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -16,30 +16,29 @@ #include "CCdice.h" extern std::string CCerror; -#define ERR_RESULT(x) result.push_back(Pair("result", "error")) , result.push_back(Pair("error", x)); // timeout /* in order to implement a dice game, we need a source of entropy, reasonably fast completion time and a way to manage the utxos. - + 1. CC vout locks "house" funds with hash(entropy) 2. bettor submits bet, with entropy, odds, houseid and sends combined amount into another CC vout. 3. house account sends funds to winner/loser with proof of entropy 4. if timeout, bettor gets refund - + 2. and 3. can be done in mempool - + The house commits to an entropy value by including the hash of the entropy value in the 'E' transaction. - + To bet, one of these 'E' transactions is used as the first input and its hashed entropy is combined with the unhashed entropy attached to the bet 'B' transaction. - + The house node monitors the 'B' transactions and if it sees one of its own, it creates either a winner 'W' or loser 'L' transaction, with proof of hash of entropy. - + In the even the house node doesnt respond before timeoutblocks, then anybody (including bettor) can undo the bet with funds going back to the house and bettor - + In order for people to play dice, someone (anyone) needs to create a funded dice plan and addfunding with enough utxo to allow players to find one. - + createfunding: vins.*: normal inputs vout.0: CC vout for funding @@ -73,7 +72,7 @@ loser: vout.1: tag to owner address for entropy funds vout.2: change to fundingpk vout.n-1: opreturn 'L' sbits fundingtxid hentropy proof - + winner: same as loser, but vout.2 is winnings vout.3: change to fundingpk @@ -81,12 +80,12 @@ winner: timeout: same as winner, just without hentropy or proof - + WARNING: there is an attack vector that precludes betting any large amounts, it goes as follows: 1. do dicebet to get the house entropy revealed 2. calculate bettor entropy that would win against the house entropy 3. reorg the chain and make a big bet using the winning entropy calculated in 2. - + In order to mitigate this, the disclosure of the house entropy needs to be delayed beyond a reasonable reorg depth (notarization). It is recommended for production dice game with significant amounts of money to use such a delayed disclosure method. */ diff --git a/src/dpowassets b/src/dpowassets index 6506c54d0..88e6f72b8 100755 --- a/src/dpowassets +++ b/src/dpowassets @@ -39,3 +39,4 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"RFOX\",\"freq\":10,\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"VRSC\",\"freq\":10,\"pubkey\":\"$pubkey\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SEC\",\"pubkey\":\"$pubkey\"}" +curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CCL\",\"pubkey\":\"$pubkey\"}" diff --git a/src/fiat/ccl b/src/fiat/ccl new file mode 100755 index 000000000..c3d03a0a4 --- /dev/null +++ b/src/fiat/ccl @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=CCL $1 $2 $3 $4 $5 $6 diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ffb75983a..1012a0205 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -38,7 +38,6 @@ #include -#define ERR_RESULT(x) result.push_back(Pair("result", "error")) , result.push_back(Pair("error", x)); using namespace std; @@ -119,9 +118,9 @@ string AccountFromValue(const UniValue& value) return strAccount; } -char *komodo_chainname() -{ - return(ASSETCHAINS_SYMBOL[0] == 0 ? (char *)"KMD" : ASSETCHAINS_SYMBOL); +char *komodo_chainname() +{ + return(ASSETCHAINS_SYMBOL[0] == 0 ? (char *)"KMD" : ASSETCHAINS_SYMBOL); } UniValue getnewaddress(const UniValue& params, bool fHelp) @@ -4567,7 +4566,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33) utxovout = out.i; best_scriptPubKey = out.tx->vout[out.i].scriptPubKey; //fprintf(stderr,"check %s/v%d %llu\n",(char *)utxotxid.GetHex().c_str(),utxovout,(long long)utxovalue); - + txNew.vin.resize(1); txNew.vout.resize(1); txfee = utxovalue / 2; @@ -5779,5 +5778,3 @@ UniValue getbalance64(const UniValue& params, bool fHelp) ret.push_back(Pair("notstaking", b)); return ret; } - - diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 0c6a90840..70df32bef 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1148,7 +1148,7 @@ public: int minDepth=1, bool ignoreSpent=true, bool ignoreUnspendable=true); - + }; /** A key allocated from the key pool. */ @@ -1204,4 +1204,8 @@ public: READWRITE(vchPubKey); } }; + +/** Error status printout */ +#define ERR_RESULT(x) result.push_back(Pair("result", "error")) , result.push_back(Pair("error", x)); + #endif // BITCOIN_WALLET_WALLET_H