Merge pull request #46 from jl777/jl777

Jl777

src/cc/CCinclude.h

@@ -197,6 +197,7 @@ int64_t IsTokensvout(bool goDeeper, bool checkPubkeys, struct CCcontract_info *c
 bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx);
 void komodo_sendmessage(int32_t minpeers,int32_t maxpeers,const char *message,std::vector<uint8_t> payload);
 int32_t payments_parsehexdata(std::vector<uint8_t> &hexdata,cJSON *item,int32_t len);
+int32_t komodo_blockload(CBlock& block,CBlockIndex *pindex);
 
 CScript EncodeTokenCreateOpRet(uint8_t funcid, std::vector<uint8_t> origpubkey, std::string name, std::string description, vscript_t vopretNonfungible);
 CScript EncodeTokenCreateOpRet(uint8_t funcid, std::vector<uint8_t> origpubkey, std::string name, std::string description, std::vector<std::pair<uint8_t, vscript_t>> oprets);

src/cc/cclib.cpp

@@ -52,6 +52,8 @@ std::string MYCCLIBNAME = (char *)"sudoku";
 void komodo_netevent(std::vector<uint8_t> payload) {}
 #endif
 
+extern std::string MYCCLIBNAME;
+
 char *CClib_name() { return((char *)MYCCLIBNAME.c_str()); }
 
 struct CClib_rpcinfo
@@ -691,8 +693,8 @@ int32_t cclib_parsehash(uint8_t *hash32,cJSON *item,int32_t len)
 #include "customcc.cpp"
 
 #elif BUILD_GAMESCC
-#include "gamescc.cpp"
 #include "rogue/cursesd.c"
+#include "gamescc.cpp"
 
 #else
 #include "sudoku.cpp"

src/cc/dapps/dappstd.c

@@ -761,11 +761,11 @@ int32_t games_progress(struct games_state *rs,int32_t waitflag,uint64_t seed,gam
         for (i=0; i<num; i++)
         {
             if ( sizeof(gamesevent) ==  1 )
-                sprintf(&hexstr[i<<1],"%02x",keystrokes[i]&0xff);
+                sprintf(&hexstr[i<<1],"%02x",(uint8_t)keystrokes[i]&0xff);
             else if ( sizeof(gamesevent) ==  2 )
-                sprintf(&hexstr[i<<2],"%04x",keystrokes[i]&0xffff);
+                sprintf(&hexstr[i<<2],"%04x",(uint16_t)keystrokes[i]&0xffff);
             else if ( sizeof(gamesevent) ==  4 )
-                sprintf(&hexstr[i<<3],"%08x",keystrokes[i]&0xffffffff);
+                sprintf(&hexstr[i<<3],"%08x",(uint32_t)keystrokes[i]&0xffffffff);
             else if ( sizeof(gamesevent) ==  8 )
                 sprintf(&hexstr[i<<4],"%016llx",(long long)(keystrokes[i]&0xffffffffffffffffLL));
         }

src/cc/games/prices.c

@@ -0,0 +1,289 @@
+
+#include "prices.h"
+#include <time.h>
+#include <unistd.h>
+#ifdef BUILD_GAMESCC
+#include "../rogue/cursesd.h"
+#else
+#include <curses.h>
+#endif
+
+#define SATOSHIDEN ((uint64_t)100000000L)
+#define issue_curl(cmdstr) bitcoind_RPC(0,(char *)"prices",cmdstr,0,0,0)
+extern int64_t Net_change,Betsize;
+
+int random_tetromino(struct games_state *rs)
+{
+    rs->seed = _games_rngnext(rs->seed);
+    return(rs->seed % NUM_TETROMINOS);
+}
+
+int32_t pricesdata(struct games_player *P,void *ptr)
+{
+    tetris_game *tg = (tetris_game *)ptr;
+    P->gold = tg->points;
+    P->dungeonlevel = tg->level;
+    //fprintf(stderr,"score.%d level.%d\n",tg->points,tg->level);
+    return(0);
+}
+
+void sleep_milli(int milliseconds)
+{
+    struct timespec ts;
+    ts.tv_sec = 0;
+    ts.tv_nsec = milliseconds * 1000 * 1000;
+    nanosleep(&ts, NULL);
+}
+
+struct games_state globalR;
+extern char Gametxidstr[];
+int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c);
+uint64_t get_btcusd();
+int32_t issue_bet(struct games_state *rs,int64_t x,int64_t betsize);
+
+void *gamesiterate(struct games_state *rs)
+{
+    bool running = true; uint32_t eventid = 0; int64_t price;
+    if ( rs->guiflag != 0 || rs->sleeptime != 0 )
+    {
+        initscr();             // initialize curses
+        cbreak();              // pass key presses to program, but not signals
+        noecho();              // don't echo key presses to screen
+        timeout(0); 
+    }
+    while ( running != 0 )
+    {
+        //running = tg_tick(rs,tg,move);
+        if ( rs->guiflag != 0 || rs->sleeptime != 0 )
+        {
+        }
+        if ( rs->guiflag != 0 )
+        {
+#ifdef STANDALONE
+            price = get_btcusd();
+            //fprintf(stderr,"%llu -> t%u %.4f\n",(long long)price,(uint32_t)(price >> 32),(double)(price & 0xffffffff)/10000);
+            //issue_games_events(rs,Gametxidstr,eventid,price);
+            issue_bet(rs,price,Betsize);
+            eventid++;
+            doupdate();
+            sleep(10);
+            switch ( getch() )
+            {
+                case '+': Net_change++; break;
+                case '-': Net_change--; break;
+                case '0': Net_change = 0; break;
+                case '$': Betsize = SATOSHIDEN; break;
+                case '^': Betsize += (Betsize >> 3); break;
+                case '/': Betsize -= (Betsize >> 3); break;
+            }
+            /*if ( (counter++ % 10) == 0 )
+                doupdate();
+            c = games_readevent(rs);
+            if ( c <= 0x7f || skipcount == 0x3fff )
+            {
+                if ( skipcount > 0 )
+                    issue_games_events(rs,Gametxidstr,eventid-skipcount,skipcount | 0x4000);
+                if ( c <= 0x7f )
+                    issue_games_events(rs,Gametxidstr,eventid,c);
+                if ( tg->level != prevlevel )
+                {
+                    flushkeystrokes(rs,0);
+                    prevlevel = tg->level;
+                }
+                skipcount = 0;
+            } else skipcount++;*/
+#endif
+        }
+        else
+        {
+            if ( rs->replaydone != 0 )
+                break;
+            if ( rs->sleeptime != 0 )
+            {
+                sleep_milli(1);
+            }
+            /*if ( skipcount == 0 )
+            {
+                c = games_readevent(rs);
+                //fprintf(stderr,"%04x score.%d level.%d\n",c,tg->points,tg->level);
+                if ( (c & 0x4000) == 0x4000 )
+                {
+                    skipcount = (c & 0x3fff);
+                    c = 'S';
+                }
+            }
+            if ( skipcount > 0 )
+                skipcount--;*/
+        }
+        eventid++;
+    }
+    return(0);
+}
+
+#ifdef STANDALONE
+#include <ncurses.h>
+#include "dapps/dappstd.c"
+int64_t Net_change,Betsize = SATOSHIDEN;
+
+char *send_curl(char *url,char *fname)
+{
+    char *retstr;
+    retstr = issue_curl(url);
+    return(retstr);
+}
+
+cJSON *get_urljson(char *url,char *fname)
+{
+    char *jsonstr; cJSON *json = 0;
+    if ( (jsonstr= send_curl(url,fname)) != 0 )
+    {
+        //printf("(%s) -> (%s)\n",url,jsonstr);
+        json = cJSON_Parse(jsonstr);
+        free(jsonstr);
+    }
+    return(json);
+}
+
+//////////////////////////////////////////////
+// start of dapp
+//////////////////////////////////////////////
+
+uint64_t get_btcusd()
+{
+    cJSON *pjson,*bpi,*usd; char str[512]; uint64_t x,newprice,mult,btcusd = 0;
+    if ( (pjson= get_urljson((char *)"http://api.coindesk.com/v1/bpi/currentprice.json",(char *)"/tmp/oraclefeed.json")) != 0 )
+    {
+        if ( (bpi= jobj(pjson,(char *)"bpi")) != 0 && (usd= jobj(bpi,(char *)"USD")) != 0 )
+        {
+            btcusd = jdouble(usd,(char *)"rate_float") * SATOSHIDEN;
+            mult = 10000 + Net_change*10;
+            newprice = (btcusd * mult) / 10000;
+            x = ((uint64_t)time(NULL) << 32) | ((newprice / 10000) & 0xffffffff);
+            sprintf(str,"BTC/USD %.4f -> Betsize %.8f (^ / to change) && %.4f Net %.1f%% [+ - to change]\n",dstr(btcusd),dstr(Betsize),dstr(newprice),(double)100*(mult-10000)/10000);
+            mvaddstr(0, 0, str);
+            clrtoeol();
+            doupdate();
+        }
+        free_json(pjson);
+    }
+    return(x);
+}
+
+char *clonestr(char *str)
+{
+    char *clone; int32_t len;
+    if ( str == 0 || str[0] == 0 )
+    {
+        printf("warning cloning nullstr.%p\n",str);
+#ifdef __APPLE__
+        while ( 1 ) sleep(1);
+#endif
+        str = (char *)"<nullstr>";
+    }
+    len = strlen(str);
+    clone = (char *)calloc(1,len+16);
+    strcpy(clone,str);
+    return(clone);
+}
+
+int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c)
+{
+    static FILE *fp;
+    char params[512],*retstr; cJSON *retjson,*resobj; int32_t retval = -1;
+    if ( fp == 0 )
+        fp = fopen("events.log","wb");
+    rs->buffered[rs->num++] = c;
+    if ( 1 )
+    {
+        if ( sizeof(c) == 1 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",(uint8_t)c&0xff,gametxidstr,eventid);
+        else if ( sizeof(c) == 2 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",(uint16_t)c&0xffff,gametxidstr,eventid);
+        else if ( sizeof(c) == 4 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%08x%%22,%%22%s%%22,%u]\"]",(uint32_t)c&0xffffffff,gametxidstr,eventid);
+        else if ( sizeof(c) == 8 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%016llx%%22,%%22%s%%22,%u]\"]",(long long)c,gametxidstr,eventid);
+        if ( (retstr= komodo_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 )
+        {
+            if ( (retjson= cJSON_Parse(retstr)) != 0 )
+            {
+                if ( (resobj= jobj(retjson,(char *)"result")) != 0 )
+                {
+                    retval = 0;
+                    if ( fp != 0 )
+                    {
+                        fprintf(fp,"%s\n",jprint(resobj,0));
+                        fflush(fp);
+                    }
+                }
+                free_json(retjson);
+            } else fprintf(fp,"error parsing %s\n",retstr);
+            free(retstr);
+        } else fprintf(fp,"error issuing method %s\n",params);
+        return(retval);
+    } else return(0);
+}
+
+int32_t issue_bet(struct games_state *rs,int64_t x,int64_t betsize)
+{
+    char params[512],hexstr[64],*retstr; cJSON *retjson,*resobj; int32_t i,retval = -1;
+    memset(hexstr,0,sizeof(hexstr));
+    for (i=0; i<8; i++)
+    {
+        sprintf(&hexstr[i<<1],"%02x",(uint8_t)(x & 0xff));
+        x >>= 8;
+    }
+    sprintf(params,"[\"bet\",\"17\",\"[%.8f,%%22%s%%22]\"]",dstr(betsize),hexstr);
+    if ( (retstr= komodo_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 )
+    {
+        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        {
+            if ( (resobj= jobj(retjson,(char *)"result")) != 0 )
+            {
+                retval = 0;
+                //fprintf(stderr,"%s\n",jprint(resobj,0));
+            }
+            free_json(retjson);
+        }
+        free(retstr);
+    }
+    return(retval);
+}
+
+int prices(int argc, char **argv)
+{
+    struct games_state *rs = &globalR;
+    int32_t c,skipcount=0; uint32_t eventid = 0;
+    memset(rs,0,sizeof(*rs));
+    rs->guiflag = 1;
+    rs->sleeptime = 1; // non-zero to allow refresh()
+    if ( argc >= 2 && strlen(argv[2]) == 64 )
+    {
+#ifdef _WIN32
+#ifdef _MSC_VER
+        rs->origseed = _strtoui64(argv[1], NULL, 10);
+#else
+        rs->origseed = atol(argv[1]); // windows, but not MSVC
+#endif // _MSC_VER
+#else
+        rs->origseed = atol(argv[1]); // non-windows
+#endif // _WIN32
+        rs->seed = rs->origseed;
+        if ( argc >= 3 )
+        {
+            strcpy(Gametxidstr,argv[2]);
+            fprintf(stderr,"setplayerdata %s\n",Gametxidstr);
+            if ( games_setplayerdata(rs,Gametxidstr) < 0 )
+            {
+                fprintf(stderr,"invalid gametxid, or already started\n");
+                return(-1);
+            }
+        }
+    } else rs->seed = 777;
+    gamesiterate(rs);
+    //gamesbailout(rs);
+    return 0;
+}
+
+#endif
+

src/cc/games/prices.cpp

@@ -0,0 +1,214 @@
+
+/******************************************************************************
+ * Copyright © 2014-2019 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+std::string MYCCLIBNAME = (char *)"prices";
+
+#define PRICES_BETPERIOD 3
+UniValue games_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcastflag);
+extern uint8_t ASSETCHAINS_OVERRIDE_PUBKEY33[33];
+
+// generate bars
+
+int64_t prices_blockinfo(int32_t height,char *acaddr)
+{
+    std::vector<uint8_t> vopret; CBlockIndex *pindex; CBlock block; CTransaction tx,vintx; uint64_t pricebits; char destaddr[64]; uint32_t timestamp,uprice; uint256 hashBlock; int64_t prizefund = 0; int32_t i,n,vini,numvouts;
+    if ( (pindex= komodo_chainactive(height)) != 0 )
+    {
+        if ( komodo_blockload(block,pindex) == 0 )
+        {
+            n = block.vtx.size();
+            vini = 0;
+            for (i=0; i<n; i++)
+            {
+                tx = block.vtx[i];
+                if ( myGetTransaction(tx.vin[vini].prevout.hash,vintx,hashBlock) == 0 )
+                    continue;
+                else if ( tx.vin[vini].prevout.n >= vintx.vout.size() || Getscriptaddress(destaddr,vintx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 )
+                    continue;
+                else if ( (numvouts= tx.vout.size()) > 1 && tx.vout[numvouts-1].scriptPubKey[0] == 0x6a )
+                {
+                    prizefund += tx.vout[0].nValue;
+                    GetOpReturnData(tx.vout[numvouts-1].scriptPubKey,vopret);
+                    if ( vopret.size() == 8 )
+                    {
+                        E_UNMARSHAL(vopret,ss >> pricebits);
+                        timestamp = (uint32_t)(pricebits >> 32);
+                        uprice = (uint32_t)pricebits;
+                        if ( strcmp(acaddr,destaddr) == 0 )
+                            fprintf(stderr,"REF ");
+                        fprintf(stderr,"[%02x] i.%d %.8f %llx t%u %.4f numvouts.%d %s lag.%d\n",tx.vout[numvouts-1].scriptPubKey[0],i,(double)tx.vout[0].nValue/COIN,(long long)pricebits,timestamp,(double)uprice/10000,numvouts,destaddr,(int32_t)(pindex->nTime-timestamp));
+                    } else return(-3);
+                }
+            }
+            return(prizefund);
+        } else return(-2);
+    } else return(-1);
+}
+
+UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
+{
+    UniValue result(UniValue::VOBJ);  char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = komodo_nextheight();
+    if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 )
+    {
+        result.push_back(Pair("result","error"));
+        result.push_back(Pair("error"," no -ac_pubkey for price reference"));
+        return(result);
+    }
+    mypk = pubkey2pk(Mypubkey());
+    gamespk = GetUnspendable(cp,0);
+    acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33);
+    Getscriptaddress(acaddr,CScript() << ParseHex(HexStr(acpk)) << OP_CHECKSIG);
+    if ( params != 0 && cJSON_GetArraySize(params) == 1 )
+    {
+        height = juint(jitem(params,0),0);
+        result.push_back(Pair("height",(int64_t)height));
+        if ( (prizefund= prices_blockinfo(height,acaddr)) < 0 )
+        {
+            result.push_back(Pair("result","error"));
+            result.push_back(Pair("errorcode",prizefund));
+            result.push_back(Pair("error","blockinfo error"));
+        }
+        else
+        {
+            // display bets
+            if ( height <= nextheight-PRICES_BETPERIOD )
+            {
+                // settle bets by first nonzero reference bar
+            }
+            result.push_back(Pair("prizefund",ValueFromAmount(prizefund)));
+            result.push_back(Pair("result","success"));
+        }
+    }
+    else
+    {
+        result.push_back(Pair("result","error"));
+        result.push_back(Pair("error","couldnt parse"));
+    }
+    return(result);
+}
+
+UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
+{
+    CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
+    UniValue result(UniValue::VOBJ); std::string rawtx; int64_t amount,inputsum; uint64_t price; CPubKey gamespk,mypk,acpk;
+    if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 )
+    {
+        result.push_back(Pair("result","error"));
+        result.push_back(Pair("error"," no -ac_pubkey for price reference"));
+        return(result);
+    }
+    mypk = pubkey2pk(Mypubkey());
+    gamespk = GetUnspendable(cp,0);
+    acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33);
+    if ( params != 0 && cJSON_GetArraySize(params) == 2 )
+    {
+        amount = jdouble(jitem(params,0),0) * COIN + 0.0000000049;
+        if ( cclib_parsehash((uint8_t *)&price,jitem(params,1),8) < 0 )
+        {
+            result.push_back(Pair("result","error"));
+            result.push_back(Pair("error","couldnt parsehash"));
+            return(result);
+        }
+        if ( mypk == acpk )
+        {
+            amount = 0; // i am the reference price feed
+            //fprintf(stderr,"i am the reference\n");
+        }
+        //fprintf(stderr,"amount %llu price %llx\n",(long long)amount,(long long)price);
+        if ( (inputsum= AddNormalinputs(mtx,mypk,amount+GAMES_TXFEE,64)) >= amount+GAMES_TXFEE )
+        {
+            mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,gamespk));
+            rawtx = FinalizeCCTx(0,cp,mtx,mypk,GAMES_TXFEE,CScript() << OP_RETURN << price);
+            return(games_rawtxresult(result,rawtx,1));
+        }
+        else
+        {
+            result.push_back(Pair("result","error"));
+            result.push_back(Pair("error","not enough funds"));
+        }
+    }
+    else
+    {
+        result.push_back(Pair("result","error"));
+        result.push_back(Pair("error","couldnt parse"));
+    }
+    return(result);
+}
+
+void prices_update(uint32_t timestamp,uint32_t uprice,int32_t ismine)
+{
+    //fprintf(stderr,"%s t%u %.4f %16llx\n",ismine!=0?"mine":"ext ",timestamp,(double)uprice/10000,(long long)((uint64_t)timestamp<<32) | uprice);
+}
+
+// game specific code for daemon
+void games_packitemstr(char *packitemstr,struct games_packitem *item)
+{
+    strcpy(packitemstr,"");
+}
+
+int64_t games_cashout(struct games_player *P)
+{
+    int32_t dungeonlevel = P->dungeonlevel; int64_t mult=1000,cashout = 0;
+    cashout = (uint64_t)P->gold * mult * dungeonlevel * dungeonlevel;
+    return(cashout);
+}
+
+void pricesplayerjson(UniValue &obj,struct games_player *P)
+{
+    obj.push_back(Pair("packsize",(int64_t)P->packsize));
+    obj.push_back(Pair("hitpoints",(int64_t)P->hitpoints));
+    obj.push_back(Pair("strength",(int64_t)(P->strength&0xffff)));
+    obj.push_back(Pair("maxstrength",(int64_t)(P->strength>>16)));
+    obj.push_back(Pair("level",(int64_t)P->level));
+    obj.push_back(Pair("experience",(int64_t)P->experience));
+    obj.push_back(Pair("dungeonlevel",(int64_t)P->dungeonlevel));
+}
+
+int32_t disp_gamesplayer(char *str,struct games_player *P)
+{
+    str[0] = 0;
+    //if ( P->gold <= 0 )//|| P->hitpoints <= 0 || (P->strength&0xffff) <= 0 || P->level <= 0 || P->experience <= 0 || P->dungeonlevel <= 0 )
+    //    return(-1);
+    sprintf(str," <- playerdata: gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d",P->gold,P->hitpoints,P->strength&0xffff,P->strength>>16,P->level,P->experience,P->dungeonlevel);
+    return(0);
+}
+
+int32_t games_payloadrecv(CPubKey pk,uint32_t timestamp,std::vector<uint8_t> payload)
+{
+    uint256 gametxid; int32_t i,len; char str[67]; int64_t price; uint32_t eventid = 0;
+    if ( (len= payload.size()) > 36 )
+    {
+        len -= 36;
+        for (i=0; i<32; i++)
+            ((uint8_t *)&gametxid)[i] = payload[len+i];
+        eventid = (uint32_t)payload[len+32];
+        eventid |= (uint32_t)payload[len+33] << 8;
+        eventid |= (uint32_t)payload[len+34] << 16;
+        eventid |= (uint32_t)payload[len+35] << 24;
+        for (i=0; i<len&&i<sizeof(price); i++)
+            ((uint8_t *)&price)[7-i] = payload[i];
+        prices_update((uint32_t)(price >> 32),(uint32_t)(price & 0xffffffff),pk == pubkey2pk(Mypubkey()));
+        //fprintf(stderr,"%llu -> t%u %.4f ",(long long)price,(uint32_t)(price >> 32),(double)(price & 0xffffffff)/10000);
+        //fprintf(stderr," got payload, from %s %s/e%d\n",pubkey33_str(str,(uint8_t *)&pk),gametxid.GetHex().c_str(),eventid);
+        return(0);
+    } else return(-1);
+}
+
+bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx)
+{
+    return(true);
+}
+

src/cc/games/prices.h

@@ -0,0 +1,208 @@
+
+#ifndef H_PRICES_H
+#define H_PRICES_H
+
+/***************************************************************************/
+/** https://github.com/brenns10/tetris
+ @file         main.c
+ @author       Stephen Brennan
+ @date         Created Wednesday, 10 June 2015
+ @brief        Main program for tetris.
+ @copyright    Copyright (c) 2015, Stephen Brennan.  Released under the Revised
+ BSD License.  See LICENSE.txt for details.
+ *******************************************************************************/
+
+/*
+ Convert a tetromino type to its corresponding cell.
+ */
+#define TYPE_TO_CELL(x) ((x)+1)
+
+/*
+ Strings for how you would print a tetris board.
+ */
+#define TC_EMPTY_STR " "
+#define TC_BLOCK_STR "\u2588"
+
+/*
+ Questions about a tetris cell.
+ */
+#define TC_IS_EMPTY(x) ((x) == TC_EMPTY)
+#define TC_IS_FILLED(x) (!TC_IS_EMPTY(x))
+
+/*
+ How many cells in a tetromino?
+ */
+#define TETRIS 4
+/*
+ How many tetrominos?
+ */
+#define NUM_TETROMINOS 7
+/*
+ How many orientations of a tetromino?
+ */
+#define NUM_ORIENTATIONS 4
+
+/*
+ Level constants.
+ */
+#define MAX_LEVEL 19
+#define LINES_PER_LEVEL 10
+
+/*
+ A "cell" is a 1x1 block within a tetris board.
+ */
+typedef enum {
+    TC_EMPTY, TC_CELLI, TC_CELLJ, TC_CELLL, TC_CELLO, TC_CELLS, TC_CELLT, TC_CELLZ
+} tetris_cell;
+
+/*
+ A "type" is a type/shape of a tetromino.  Not including orientation.
+ */
+typedef enum {
+    TET_I, TET_J, TET_L, TET_O, TET_S, TET_T, TET_Z
+} tetris_type;
+
+/*
+ A row,column pair.  Negative numbers allowed, because we need them for
+ offsets.
+ */
+typedef struct {
+    int row;
+    int col;
+} tetris_location;
+
+/*
+ A "block" is a struct that contains information about a tetromino.
+ Specifically, what type it is, what orientation it has, and where it is.
+ */
+typedef struct {
+    int typ;
+    int ori;
+    tetris_location loc;
+} tetris_block;
+
+/*
+ All possible moves to give as input to the game.
+ */
+typedef enum {
+    TM_LEFT, TM_RIGHT, TM_CLOCK, TM_COUNTER, TM_DROP, TM_HOLD, TM_NONE
+} tetris_move;
+
+/*
+ A game object!
+ */
+typedef struct {
+    /*
+     Game board stuff:
+     */
+    int rows;
+    int cols;
+    /*
+     Scoring information:
+     */
+    int points;
+    int level;
+    /*
+     Falling block is the one currently going down.  Next block is the one that
+     will be falling after this one.  Stored is the block that you can swap out.
+     */
+    tetris_block falling;
+    tetris_block next;
+    tetris_block stored;
+    /*
+     Number of game ticks until the block will move down.
+     */
+    int ticks_till_gravity;
+    /*
+     Number of lines until you advance to the next level.
+     */
+    int lines_remaining;
+    char board[];
+} tetris_game;
+
+/*
+ This array stores all necessary information about the cells that are filled by
+ each tetromino.  The first index is the type of the tetromino (i.e. shape,
+ e.g. I, J, Z, etc.).  The next index is the orientation (0-3).  The final
+ array contains 4 tetris_location objects, each mapping to an offset from a
+ point on the upper left that is the tetromino "origin".
+ */
+extern const tetris_location TETROMINOS[NUM_TETROMINOS][NUM_ORIENTATIONS][TETRIS];
+
+/*
+ This array tells you how many ticks per gravity by level.  Decreases as level
+ increases, to add difficulty.
+ */
+extern const int GRAVITY_LEVEL[MAX_LEVEL+1];
+
+// Data structure manipulation.
+void tg_init(tetris_game *obj, int rows, int cols);
+tetris_game *tg_create(struct games_state *rs,int rows, int cols);
+void tg_destroy(tetris_game *obj);
+void tg_delete(tetris_game *obj);
+tetris_game *tg_load(FILE *f);
+void tg_save(tetris_game *obj, FILE *f);
+
+// Public methods not related to memory:
+char tg_get(tetris_game *obj, int row, int col);
+bool tg_check(tetris_game *obj, int row, int col);
+bool tg_tick(struct games_state *rs,tetris_game *obj, tetris_move move);
+void tg_print(tetris_game *obj, FILE *f);
+
+/******************************************************************************
+ * Copyright © 2014-2019 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+#define GAMENAME "prices"    // name of executable
+#define GAMEMAIN prices      // main program of game
+#define GAMEPLAYERJSON pricesplayerjson  // displays game specific json
+#define GAMEDATA pricesdata  // extracts data from game specific variables into games_state
+#define CHAINNAME "PRICES"    // -ac_name=
+typedef uint64_t gamesevent; // can be 8, 16, 32, or 64 bits
+
+#define MAXPACK 23
+struct games_packitem
+{
+    int32_t type,launch,count,which,hplus,dplus,arm,flags,group;
+    char damage[8],hurldmg[8];
+};
+
+struct games_player
+{
+    int32_t gold,hitpoints,strength,level,experience,packsize,dungeonlevel,amulet;
+    struct games_packitem gamespack[MAXPACK];
+};
+
+struct games_state
+{
+    uint64_t seed,origseed;
+    char *keystrokeshex;
+    uint32_t needflush,replaydone;
+    int32_t numkeys,ind,num,guiflag,counter,sleeptime,playersize,restoring,lastnum;
+    FILE *logfp;
+    struct games_player P;
+    gamesevent buffered[5000],*keystrokes;
+    uint8_t playerdata[8192];
+};
+extern struct games_state globalR;
+void *gamesiterate(struct games_state *rs);
+int32_t flushkeystrokes(struct games_state *rs,int32_t waitflag);
+
+void games_packitemstr(char *packitemstr,struct games_packitem *item);
+uint64_t _games_rngnext(uint64_t initseed);
+int32_t games_replay2(uint8_t *newdata,uint64_t seed,gamesevent *keystrokes,int32_t num,struct games_player *player,int32_t sleepmillis);
+gamesevent games_revendian(gamesevent revx);
+int32_t disp_gamesplayer(char *str,struct games_player *P);
+
+#endif
+

src/cc/games/tetris.c

@@ -43,7 +43,7 @@ int32_t tetrisdata(struct games_player *P,void *ptr)
 #include <string.h>
 
 #ifdef BUILD_GAMESCC
-#include "rogue/cursesd.h"
+#include "../rogue/cursesd.h"
 #else
 #include <curses.h>
 #endif
@@ -801,32 +801,35 @@ int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eve
     if ( fp == 0 )
         fp = fopen("events.log","wb");
     rs->buffered[rs->num++] = c;
-    if ( sizeof(c) == 1 )
-        sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",c&0xff,gametxidstr,eventid);
-    else if ( sizeof(c) == 2 )
-        sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",c&0xffff,gametxidstr,eventid);
-    else if ( sizeof(c) == 4 )
-        sprintf(params,"[\"events\",\"17\",\"[%%22%08x%%22,%%22%s%%22,%u]\"]",c&0xffffffff,gametxidstr,eventid);
-    else if ( sizeof(c) == 8 )
-        sprintf(params,"[\"events\",\"17\",\"[%%22%016llx%%22,%%22%s%%22,%u]\"]",(long long)c,gametxidstr,eventid);
-    if ( (retstr= komodo_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 )
+    if ( 0 )
     {
-        if ( (retjson= cJSON_Parse(retstr)) != 0 )
+        if ( sizeof(c) == 1 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",(uint8_t)c&0xff,gametxidstr,eventid);
+        else if ( sizeof(c) == 2 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",(uint16_t)c&0xffff,gametxidstr,eventid);
+        else if ( sizeof(c) == 4 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%08x%%22,%%22%s%%22,%u]\"]",(uint32_t)c&0xffffffff,gametxidstr,eventid);
+        else if ( sizeof(c) == 8 )
+            sprintf(params,"[\"events\",\"17\",\"[%%22%016llx%%22,%%22%s%%22,%u]\"]",(long long)c,gametxidstr,eventid);
+        if ( (retstr= komodo_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 )
         {
-            if ( (resobj= jobj(retjson,(char *)"result")) != 0 )
+            if ( (retjson= cJSON_Parse(retstr)) != 0 )
             {
-                retval = 0;
-                if ( fp != 0 )
+                if ( (resobj= jobj(retjson,(char *)"result")) != 0 )
                 {
-                    fprintf(fp,"%s\n",jprint(resobj,0));
-                    fflush(fp);
+                    retval = 0;
+                    if ( fp != 0 )
+                    {
+                        fprintf(fp,"%s\n",jprint(resobj,0));
+                        fflush(fp);
+                    }
                 }
-            }
-            free_json(retjson);
-        } else fprintf(fp,"error parsing %s\n",retstr);
-        free(retstr);
-    } else fprintf(fp,"error issuing method %s\n",params);
-    return(retval);
+                free_json(retjson);
+            } else fprintf(fp,"error parsing %s\n",retstr);
+            free(retstr);
+        } else fprintf(fp,"error issuing method %s\n",params);
+        return(retval);
+    } else return(0);
 }
 
 int tetris(int argc, char **argv)

src/cc/games/tetris.cpp

@@ -14,6 +14,8 @@
  *                                                                            *
  ******************************************************************************/
 
+std::string MYCCLIBNAME = (char *)"gamescc";
+
 // game specific code for daemon
 void games_packitemstr(char *packitemstr,struct games_packitem *item)
 {
@@ -22,8 +24,8 @@ void games_packitemstr(char *packitemstr,struct games_packitem *item)
 
 int64_t games_cashout(struct games_player *P)
 {
-    int32_t dungeonlevel = P->dungeonlevel; int64_t mult=1000,cashout = 0;
-    cashout = (uint64_t)P->gold * mult * dungeonlevel * dungeonlevel;
+    int32_t dungeonlevel = P->dungeonlevel; int64_t mult=10000,cashout = 0;
+    cashout = (uint64_t)P->gold * mult;
     return(cashout);
 }
 
@@ -66,6 +68,18 @@ int32_t games_payloadrecv(CPubKey pk,uint32_t timestamp,std::vector<uint8_t> pay
     } else return(-1);
 }
 
+UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
+{
+    UniValue result;
+    return(result);
+}
+
+UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
+{
+    UniValue result;
+    return(result);
+}
+
 bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx)
 {
     return(true);

src/cc/gamescc.cpp

@@ -14,7 +14,11 @@
  ******************************************************************************/
 
 #include "gamescc.h"
-#include "tetris.c" // replace with game code
+#ifdef BUILD_PRICES
+#include "games/prices.c"
+#else
+#include "games/tetris.c"
+#endif
 
 int32_t GAMEDATA(struct games_player *P,void *ptr);
 
@@ -161,8 +165,11 @@ int32_t games_replay2(uint8_t *newdata,uint64_t seed,gamesevent *keystrokes,int3
 }
 
 #ifndef STANDALONE
-
-#include "tetris.cpp" // replace with game specific functions
+#ifdef BUILD_PRICES
+#include "games/prices.cpp"
+#else
+#include "games/tetris.cpp"
+#endif
 
 void GAMEJSON(UniValue &obj,struct games_player *P);
 
@@ -470,7 +477,9 @@ int32_t games_event(uint32_t timestamp,uint256 gametxid,int32_t eventid,std::vec
         games_payloadrecv(mypk,timestamp,payload);
         komodo_sendmessage(4,8,"events",vopret);
         return(0);
-    } else return(-1);
+    }
+    fprintf(stderr,"games_eventsign error\n");
+    return(-1);
 }
 
 UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
@@ -546,14 +555,14 @@ void komodo_netevent(std::vector<uint8_t> message)
             {
                 if ( (rand() % 10) == 0 )
                 {
-                    fprintf(stderr,"relay message.[%d]\n",(int32_t)message.size());
+                    //fprintf(stderr,"relay message.[%d]\n",(int32_t)message.size());
                     komodo_sendmessage(2,2,"events",message);
                 }
             }
         }
         //for (i=0; i<payload.size(); i++)
         //    fprintf(stderr,"%02x",payload[i]);
-        //fprintf(stderr," payload, got pk.%s siglen.%d lag.[%d]\n",pubkey33_str(str,(uint8_t *)&pk),(int32_t)sig.size(),lag);
+        fprintf(stderr," payload, got pk.%s siglen.%d lag.[%d]\n",pubkey33_str(str,(uint8_t *)&pk),(int32_t)sig.size(),lag);
     }
     else
     {
@@ -1454,13 +1463,13 @@ UniValue games_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
                     switch ( sizeof(gamesevent) )
                     {
                         case 1:
-                            sprintf(&hexstr[i<<1],"%02x",keystrokes[i]);
+                            sprintf(&hexstr[i<<1],"%02x",(uint8_t)keystrokes[i]);
                             break;
                         case 2:
-                            sprintf(&hexstr[i<<2],"%04x",keystrokes[i]);
+                            sprintf(&hexstr[i<<2],"%04x",(uint16_t)keystrokes[i]);
                             break;
                         case 4:
-                            sprintf(&hexstr[i<<3],"%08x",keystrokes[i]);
+                            sprintf(&hexstr[i<<3],"%08x",(uint32_t)keystrokes[i]);
                             break;
                         case 8:
                             sprintf(&hexstr[i<<4],"%016llxx",(long long)keystrokes[i]);
@@ -1510,15 +1519,8 @@ UniValue games_finish(uint64_t txfee,struct CCcontract_info *cp,cJSON *params,ch
     result.push_back(Pair("method",method));
     result.push_back(Pair("mygamesaddr",mygamesaddr));
     if ( strcmp(method,"bailout") == 0 )
-    {
         funcid = 'Q';
-        //mult = 10; //100000;
-    }
-    else
-    {
-        funcid = 'H';
-        //mult = 20; //200000;
-    }
+    else funcid = 'H';
     if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 )
     {
         if ( n > 0 )
@@ -1570,13 +1572,13 @@ UniValue games_finish(uint64_t txfee,struct CCcontract_info *cp,cJSON *params,ch
                             fprintf(stderr,"\ncashout %.8f extracted %s\n",(double)cashout/COIN,str);
                             if ( funcid == 'H' && maxplayers > 1 )
                             {
-                                if ( P.amulet == 0 )
+                                /*if ( P.amulet == 0 )
                                 {
                                     if ( numplayers != maxplayers )
                                         return(cclib_error(result,"numplayers != maxplayers"));
                                     else if ( games_playersalive(tmp,tmp,gametxid,maxplayers,gameheight,gametx) > 1 )
                                         return(cclib_error(result,"highlander must be a winner or last one standing"));
-                                }
+                                }*/
                                 cashout += games_buyins(gametxid,maxplayers);//numplayers * buyin;
                             }
                             if ( cashout > 0 )

src/cc/gamescc.h

@@ -15,7 +15,6 @@ extern CWallet* pwalletMain;
 #include "CCinclude.h"
 #include "secp256k1.h"
 
-std::string MYCCLIBNAME = (char *)"gamescc";
 
 #define EVAL_GAMES (EVAL_FAUCET2+1)
 #define GAMES_TXFEE 10000
@@ -46,6 +45,8 @@ std::string Games_pname;
     { (char *)MYCCNAME, (char *)"highlander", (char *)"gametxid", 1, 1, 'H', EVAL_GAMES }, \
     { (char *)MYCCNAME, (char *)"events", (char *)"eventshex [gametxid [eventid]]", 1, 3, ' ', EVAL_GAMES }, \
     { (char *)MYCCNAME, (char *)"extract", (char *)"gametxid [pubkey]", 1, 2, ' ', EVAL_GAMES }, \
+    { (char *)MYCCNAME, (char *)"bet", (char *)"amount hexstr", 2, 2, ' ', EVAL_GAMES }, \
+    { (char *)MYCCNAME, (char *)"settle", (char *)"height", 1, 1, ' ', EVAL_GAMES }, \
     { (char *)MYCCNAME, (char *)"register", (char *)"gametxid [playertxid]", 1, 2, 'R', EVAL_GAMES },
 
 bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx);
@@ -65,6 +66,8 @@ UniValue games_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
 UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
 UniValue games_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
 UniValue games_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
+UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
+UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
 
 #define CUSTOM_DISPATCH \
 if ( cp->evalcode == EVAL_GAMES ) \
@@ -100,12 +103,15 @@ if ( cp->evalcode == EVAL_GAMES ) \
     else if ( strcmp(method,"highlander") == 0 ) \
         return(games_highlander(txfee,cp,params)); \
     else if ( strcmp(method,"fund") == 0 ) \
-    return(games_fund(txfee,cp,params)); \
+        return(games_fund(txfee,cp,params)); \
+    else if ( strcmp(method,"bet") == 0 ) \
+        return(games_bet(txfee,cp,params)); \
+    else if ( strcmp(method,"settle") == 0 ) \
+        return(games_settle(txfee,cp,params)); \
     else \
     { \
         result.push_back(Pair("result","error")); \
         result.push_back(Pair("error","invalid gamescc method")); \
-        result.push_back(Pair("method",method)); \
         return(result); \
     } \
 }

src/cc/makecclib

@@ -1,2 +1,19 @@
 #!/bin/sh
-gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o ../libcc.so cclib.cpp
+rm *.so rogue/rogue games/tetris games/prices
+
+echo rogue
+make -f Makefile_rogue
+./makerogue
+
+echo sudoku/musig/dilithium
+gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o sudokucc.so cclib.cpp
+
+echo games tetris
+./maketetris
+
+echo games prices
+./makeprices
+
+echo customcc stub
+gcc -O3 -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o customcc.so cclib.cpp
+

src/cc/makeprices

@@ -0,0 +1,8 @@
+echo pricescc.so
+gcc -O3 -DBUILD_GAMESCC -DBUILD_PRICES -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o pricescc.so cclib.cpp
+echo prices
+cd games
+gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -DSTANDALONE -DBUILD_PRICES ../gamescc.cpp -lncurses -lcurl -o prices
+cd ..
+
+

src/cc/maketetris

@@ -1,2 +1,7 @@
-gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -DSTANDALONE gamescc.cpp -lncurses -lcurl -o tetris
+echo gamescc.so with tetris
+gcc -O3 -DBUILD_GAMESCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o gamescc.so cclib.cpp
+echo tetris dapp
+cd games
+gcc -O3 -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -DSTANDALONE ../gamescc.cpp -lncurses -lcurl -o tetris
+cd ..
 

src/cc/prices.cpp

@@ -451,4 +451,3 @@ std::string PricesFinish(uint64_t txfee,uint256 refbettoken,uint256 fundingtxid,
 }
 
 
-

src/cc/rogue_rpc.cpp

@@ -283,7 +283,7 @@ int32_t rogue_iamregistered(int32_t maxplayers,uint256 gametxid,CTransaction tx,
     return(0);
 }
 
-int64_t rogue_buyins(uint256 gametxid)
+int64_t rogue_buyins(uint256 gametxid,int32_t maxplayers)
 {
     int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; int64_t buyins = 0;
     for (i=0; i<maxplayers; i++)
@@ -708,7 +708,7 @@ uint64_t rogue_gamefields(UniValue &obj,int64_t maxplayers,int64_t buyin,uint256
         obj.push_back(Pair("alive",rogue_playersalive(openslots,numplayers,gametxid,maxplayers,ht,tx)));
         obj.push_back(Pair("openslots",openslots));
         obj.push_back(Pair("numplayers",numplayers));
-        obj.push_back(Pair("buyins",ValueFromAmount(rogue_buyins(gametxid))));
+        obj.push_back(Pair("buyins",ValueFromAmount(rogue_buyins(gametxid,maxplayers))));
     }
     obj.push_back(Pair("maxplayers",maxplayers));
     obj.push_back(Pair("buyin",ValueFromAmount(buyin)));
@@ -1114,7 +1114,7 @@ UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
 
 int64_t rogue_cashout(struct rogue_player *P)
 {
-    int32_t dungeonlevel; int64_t mult = 10;
+    int32_t dungeonlevel; int64_t cashout,mult = 10;
     if ( P->amulet != 0 )
         mult *= 5;
     dungeonlevel = P->dungeonlevel;
@@ -1341,12 +1341,12 @@ UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *param
 
 UniValue rogue_bailout(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
 {
-    return(rogue_finishgame(txfee,cp,params,"bailout"));
+    return(rogue_finishgame(txfee,cp,params,(char *)"bailout"));
 }
 
 UniValue rogue_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
 {
-    return(rogue_finishgame(txfee,cp,params,"highlander"));
+    return(rogue_finishgame(txfee,cp,params,(char *)"highlander"));
 }
 
 UniValue rogue_gameinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
@@ -1521,7 +1521,7 @@ bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const C
     if ( (numvouts= tx.vout.size()) > 1 )
     {
         txid = tx.GetHash();
-        if ( txid == Parseuint256("1ae04dc0c5f2fca2053819a3a1b2efe5d355c34f58d6f16d59e5e2573e7baf7f") ) // osx rogue chain ht.50902
+        if ( txid == Parseuint256("1ae04dc0c5f2fca2053819a3a1b2efe5d355c34f58d6f16d59e5e2573e7baf7f") || txid == Parseuint256("2a34b36cc1292aecfaabdad79b42cab9989fa6dcc87ac8ca88aa6162dab1e2c4") ) // osx rogue chain ht.50902, 69522
             enabled = 0;
         scriptPubKey = tx.vout[numvouts-1].scriptPubKey;
         GetOpReturnData(scriptPubKey,vopret);
@@ -1618,7 +1618,7 @@ bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const C
                                 if ( funcid == 'H' )
                                 {
                                     cashout *= 2;
-                                    cashout += rogue_buyins(gametxid);
+                                    cashout += rogue_buyins(gametxid,maxplayers);
                                 }
                                 sprintf(cashstr,"tokentx.(%c) decoded.%d ht.%d txid.%s %.8f vs vout2 %.8f",tokentx,decoded,height,txid.GetHex().c_str(),(double)cashout/COIN,(double)tx.vout[2].nValue/COIN);
                                 if ( strcmp(laststr,cashstr) != 0 )

src/miner.cpp

@@ -941,6 +941,7 @@ void komodo_sendmessage(int32_t minpeers,int32_t maxpeers,const char *message,st
             continue;
         if ( numsent < minpeers || (rand() % 10) == 0 )
         {
+            //fprintf(stderr,"pushmessage\n");
             pnode->PushMessage(message,payload);
             if ( numsent++ > maxpeers )
                 break;