attempt at daily snapshot

2019-04-27 02:21:40 +08:00
parent dd063f7913
commit ed6fd7e8c6
10 changed files with 190 additions and 126 deletions
--- a/src/cc/CCPayments.h
+++ b/src/cc/CCPayments.h
@@ -20,6 +20,7 @@
 #include "CCinclude.h"

 #define PAYMENTS_TXFEE 10000
+bool komodo_snapshot2(std::map <std::string, CAmount> &addressAmounts);

 bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn);

@@ -28,6 +29,7 @@ UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr);
 UniValue PaymentsFund(struct CCcontract_info *cp,char *jsonstr);
 UniValue PaymentsTxidopret(struct CCcontract_info *cp,char *jsonstr);
 UniValue PaymentsCreate(struct CCcontract_info *cp,char *jsonstr);
+UniValue PaymentsAirdrop(struct CCcontract_info *cp,char *jsonstr);
 UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr);
 UniValue PaymentsList(struct CCcontract_info *cp,char *jsonstr);

--- a/src/cc/hempcoin_notes.txt
+++ b/src/cc/hempcoin_notes.txt
@@ -56,7 +56,7 @@ get the payment fund scriptpubkey hex from vout 0: (the split it at OP_CHECKCRYP
    put the second half into an OP_RETURN: (the remaining part of the the above scriptpubkey) eg.
        ./komodo-cli -ac_name=TESTHC opreturn_burn 1 2a0401f00101246a22f046337db779358deaa69b9af053e27d85cb8e8e48b0b13805c084b04f87be6577ee75
            opret_burn takes any burn amount and arbitrary hex string. (RPC works, but may have bugs, likely use this for LABS too with some fixes)
-    this gives a raw hex. Decode it and check the OP_RETURN is right before sending (using this RPC currently adds 3 extra bytes to the front (6a2d2c), which is truncated later on, this should be fixed if possible before making any real chains as its consensus code. Need to try diffrent methods to decode the hex correctly.)
+    this gives a raw hex. Decode it and check the OP_RETURN is right before sending. 
        -earlytxid=810bd62fb8353fad20267ff2050684b8829affa3edf6b366633931530791dfce
    restart the chain with earlytxid param before height 100 on all nodes (if not using -testnode=1) 
    ./komodod -ac_name=TESTHC -ac_supply=1000000 -ac_reward=100000000000 -ac_cc=2 -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 -ac_founders=150 -ac_blocktime=20 -ac_nk=96,5 -earlytxid=810bd62fb8353fad20267ff2050684b8829affa3edf6b366633931530791dfce
--- a/src/cc/payments.cpp
+++ b/src/cc/payments.cpp
@@ -16,6 +16,18 @@
 #include "CCPayments.h"

 /* 
+payments airdrop:
+    - extra RPC to merge all payments inputs to a single utxo, this must be called first and be confirmed before payments release, 
+        or tx will be too big, we can check add payments inputs is only 1 input, at RPC and in validation very early on. 
+    - do getsnapshot2 every 1440 blocks and save the result into some global sorted vector or DB?
+        -this allows any address balance to be calculated by only iterating each 1439 blocks maximum. 
+    - calculate scriptpubkey to pay from each address, set allocations from balance of each address. allocation = balance?
+
+payments airdrop paying a token:  ( maybe this is more reasonable speed wise? )
+    - tokenid, top number of tokens to pay, list of pubkeys to exclude as optional param
+    - add vector of tokenids to getsnapshot2 - then sort each tokenid by balance. 
+        put the pubkey to pay to as scriptpubkey in the saved vector. 
+
 0) txidopret <- allocation, scriptPubKey, opret
 1) create <-  locked_blocks, minrelease, list of txidopret
 
@@ -781,76 +793,14 @@ UniValue PaymentsCreate(struct CCcontract_info *cp,char *jsonstr)
    return(result);
 }

+extern bool komodo_dailysnapshot(int32_t height);
+
 UniValue PaymentsAirdrop(struct CCcontract_info *cp,char *jsonstr)
 {
-    // need to code: exclude list of tokenid, dust threshold, maxpayees, excluded pubkeys[]
-    CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), komodo_nextheight());
-    UniValue result(UniValue::VOBJ); CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::vector<uint256> txidoprets; uint256 hashBlock; int32_t i,n,numoprets=0,lockedblocks,minrelease; std::string rawtx; int64_t totalallocations = 0;
-    cJSON *params = payments_reparse(&n,jsonstr);
-    if ( params != 0 && n >= 4 )
-    {
-        lockedblocks = juint(jitem(params,0),0);
-        minrelease = juint(jitem(params,1),0);
-        if ( lockedblocks < 0 || minrelease < 0 )
-        {
-            result.push_back(Pair("result","error"));
-            result.push_back(Pair("error","negative parameter"));
-            if ( params != 0 )
-                free_json(params);
-            return(result);
-        }
-        for (i=0; i<n-2; i++)
-            txidoprets.push_back(payments_juint256(jitem(params,2+i)));
-        for (i=0; i<txidoprets.size(); i++)
-        {
-            std::vector<uint8_t> scriptPubKey,opret; int64_t allocation;
-            if ( myGetTransaction(txidoprets[i],tx,hashBlock) != 0 && tx.vout.size() > 1 && DecodePaymentsTxidOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' )
-            {
-                totalallocations += allocation;
-                if ( opret.size() > 0 )
-                    numoprets++;
-            }
-            else
-            {
-                result.push_back(Pair("result","error"));
-                result.push_back(Pair("error","invalid txidopret"));
-                result.push_back(Pair("txid",txidoprets[i].GetHex()));
-                result.push_back(Pair("txi",(int64_t)i));
-                if ( params != 0 )
-                    free_json(params);
-                return(result);
-            }
-        }
-        if ( numoprets > 1 )
-        {
-            result.push_back(Pair("result","error"));
-            result.push_back(Pair("error","too many opreturns"));
-            result.push_back(Pair("numoprets",(int64_t)numoprets));
-            if ( params != 0 )
-                free_json(params);
-            return(result);
-        }
-        mypk = pubkey2pk(Mypubkey());
-        Paymentspk = GetUnspendable(cp,0);
-        if ( AddNormalinputs(mtx,mypk,2*PAYMENTS_TXFEE,60) > 0 )
-        {
-            mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,PAYMENTS_TXFEE,Paymentspk,Paymentspk));
-            rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,EncodePaymentsOpRet(lockedblocks,minrelease,totalallocations,txidoprets));
-            if ( params != 0 )
-                free_json(params);
-            return(payments_rawtxresult(result,rawtx,1));
-        }
-        result.push_back(Pair("result","error"));
-        result.push_back(Pair("error","not enough normal funds"));
-    }
-    else
-    {
-        result.push_back(Pair("result","error"));
-        result.push_back(Pair("error","parameters error"));
-    }
-    if ( params != 0 )
-        free_json(params);
-    return(result);
+    uint64_t start = time(NULL);
+    komodo_dailysnapshot(chainActive.Height());
+    //CScript scriptPubKey = GetScriptForDestination(dest);
+    return(time(NULL)-start);
 }

 UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr)