Refine the multi-color mechanism #104 #126

hihiben · 2017-02-02T09:47:33Z

The original value handling type CAmount does not support multi-color. The original method to implement multi-color is simply adding a new type_Color member when this function is needed. However, value and color have to be handled separated, which leads to different problems when upgrading the original function or developing new functions.

A new object class CColorAmount is implemented to solve these issues. Needed member functions and operators are provided.
Operators

-CColorAmount
CColorAmount+CColorAmount
CColorAmount+CAmount
CColorAmount-CColorAmount
CColorAmount-CAmount
CColorAmount*CAmount
CColorAmount/CAmount
CColorAmount%CAmount
CColorAmount+=CColorAmount
CColorAmount+=CAmount
CColorAmount-=CColorAmount
CColorAmount-=CAmount
CColorAmount*=CAmount
CColorAmount/=CAmount
CColorAmount%=CAmount
CColorAmount>CColorAmount
CColorAmount>=CColorAmount
CColorAmount<CColorAmount
CColorAmount<=CColorAmount
CColorAmount==CColorAmount
CColorAmount!=CColorAmount
CColorAmount++
CColorAmount--

Functions

Color()
Value()
TotalValue()
IsPos()

The printing and parsing of color amount becomes color:amount, such as 1:1000 means color 1 with amount 1000.

lbyyy · 2017-02-13T10:15:17Z

src/amount.h

+            if (!lhs.count(it->first))
+                lhs[it->first] -= it->second;
+            else
+                lhs[it->first] = -it->second;


lbyyy · 2017-02-13T10:41:55Z

src/amount.h

+    {
+        CColorAmount lhs = (*this);
+        for (CColorAmount::const_iterator itr(rhs.begin()); itr != rhs.end(); itr++) {
+            CColorAmount::const_iterator itl = lhs.find(itr->first);


這樣寫會是兩層迴圈?

lbyyy · 2017-02-14T03:54:43Z

src/amount.h

+                ret.first->second += it->second;
+        }
+        return *this;
+    }


不能用上面已經寫好的+來做嗎

以下幾個一樣

換一個方式來implement了

lbyyy · 2017-02-14T04:37:13Z

src/coins.cpp

@@ -245,7 +245,7 @@ double CCoinsViewCache::GetPriority(const CTransaction &tx, int nHeight) const
        assert(coins);
        if (!coins->IsAvailable(txin.prevout.n)) continue;
        if (coins->nHeight < nHeight) {
-            dResult += coins->vout[txin.prevout.n].nValue * (nHeight-coins->nHeight);
+            dResult += (coins->vout[txin.prevout.n].mValue.TotalValue()) * (nHeight-coins->nHeight);


為何要加括號

lbyyy · 2017-02-14T08:23:19Z

src/main.cpp

-        }
-        if (it->second < 0) {
+        Input -= txout.mValue;
+        if (!Input.IsPos()) {


Pos蠻不容易看出來這function是要幹嘛的
或許可以打完整一點postive

lbyyy · 2017-02-14T08:38:54Z

src/main.cpp

 }

 void Fee::SetOutputForFee(CTxOut &txout, const CScript& scriptPubKeyIn, unsigned int cnt) {
    txout.scriptPubKey = scriptPubKeyIn;
-    txout.nValue = value * cnt;
-    txout.color = color;
+    txout.mValue = mValue;


lbyyy · 2017-02-15T04:19:59Z

src/miner.cpp

-        if (totalfee > 0) {
-            CTxOut txout(totalfee, scriptPubKeyIn, TxFee.GetColor());
+        if (totalfee.Value() > 0) {
+            CTxOut txout(totalfee, scriptPubKeyIn);


大概從303行開始到這邊,
totalfee應該是map, 這樣不會把fee以外的東西一起丟進去嗎

目前設計上fee應該只會有color 1，因此前面的部分在totalfee紀錄了所有Normal type transaction的差值之後，這邊應該只留下color 1而已，因此用Value來取值，避免出現有多個color在裡面的狀況。如果以後有修改到fee可能出現在不同的color下的話，應就可以改成用TotalValue()來取值

lbyyy · 2017-02-15T07:47:49Z

src/utilmoneystr.cpp

+
+bool ParseMoney(const string& str, CColorAmount& mRet)
+{
+    size_t found;


沒給初始值?

在105行found = str.find(",", i)的地方就會給值了

lbyyy · 2017-02-16T04:59:36Z

src/wallet/wallet.cpp

-
-    return nTotal;
+    CColorAmount balance = GetAddressBalance(strFromAddress, nMinDepth);
+    return balance[color];


balance[color]沒東西會怎麼樣?

以CColorAmount的value type是CAmount來說的話，會回傳0

lbyyy · 2017-02-16T06:54:33Z

src/wallet/wallet.cpp

+                        }
+                        else
+                            strFailReason = _("Transaction amount too small");
+                        */


為何要多加上上面那串然後再註解掉啊

lbyyy · 2017-02-16T06:57:33Z

src/wallet/wallet.cpp

+{
+    map<CTxDestination, CColorAmount> balances = GetAddressBalances();
+    CTxDestination address = CBitcoinAddress(strAddress).Get();
+    return balances[address];


空的會怎樣?

以這個map的value type是CColorAmount來說的話，會回傳一個空的map

sendtoaddress() listaddressgroupings() getreceivedbyaddress() getreceivedbyaccount()

coins_cache_simulation_test

DoS_mapOrphans

GetAccountBalance() getbalance()

MempoolRemoveTest

multisig_verify multisig_Sign

Verify() sign set AreInputsStandard

ConnectTransactions()

GetAccountBalance() GetAccountColorBalance() getbalance() getcolorbalance() getaddressbalance() getunconfirmedbalance() movecmd() sendfrom() sendfromfeeaddress() sendmany() ListReceived() ListTransactions() AcentryToJSON() listaccounts() gettransaction() getwalletinfo() mint() mintforlicense() mintforminer()

struct NormalHandlerCheckValidFixture NormalHandlerApplyNoMemberOnly

CreateLicenseHandlerCheckValidFixture CreateLicenseHandlerCheckValidInvalidInfo TransferLicenseHandlerCheckValidFixture

add_coin() coin_selection_tests

rpc_sendlicensetoaddress_test

fix operators

processTransaction()

AcceptToMemoryPool() unify fee to color 1 only

error msg of operators that amount size should be 1

change IsPos to IsPositive

CheckTxFeeandColor()

remove SetOutputForFee()

run the entire unit test

refine the operators

sendfrom() sendtoaddress()

hihiben force-pushed the CColorAmount branch from fb69d3d to e6eec97 Compare February 2, 2017 09:49

hihiben closed this Feb 3, 2017

hihiben reopened this Feb 3, 2017

hihiben force-pushed the CColorAmount branch 15 times, most recently from 2d8ab66 to bae76fc Compare February 10, 2017 07:55

lbyyy reviewed Feb 13, 2017

View reviewed changes

src/amount.h Outdated

if (!lhs.count(it->first))

lhs[it->first] -= it->second;

else

lhs[it->first] = -it->second;

Copy link

Contributor

lbyyy Feb 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

反了?

lbyyy reviewed Feb 13, 2017

View reviewed changes

lbyyy reviewed Feb 14, 2017

View reviewed changes

hihiben force-pushed the CColorAmount branch from 7526cd8 to ecd501d Compare February 14, 2017 07:18

lbyyy reviewed Feb 14, 2017

View reviewed changes

hihiben force-pushed the CColorAmount branch 3 times, most recently from 4250630 to ec92246 Compare February 15, 2017 10:16

lbyyy reviewed Feb 16, 2017

View reviewed changes

hihiben force-pushed the CColorAmount branch 2 times, most recently from e0d6fa1 to 3f2c0d5 Compare February 16, 2017 10:08

hihiben added 28 commits February 18, 2017 16:37

class CCoinsViewCache_UnitTest

2c56352

fix wallet/rpcwallet.cpp

23903dc

sendtoaddress() listaddressgroupings() getreceivedbyaddress() getreceivedbyaccount()

fix test/coins_tests.cpp

96e8dd7

coins_cache_simulation_test

fix test/DoS_tests.cpp

ddce5cc

DoS_mapOrphans

fix wallet/rpcwallet.cpp

f8bec1a

GetAccountBalance() getbalance()

fix test/mempool_tests.cpp

fa72779

MempoolRemoveTest

fix test/script_P2SH_tests.cpp

1adac92

multisig_verify multisig_Sign

fix test/script_P2SH_tests.cpp

5a978ab

Verify() sign set AreInputsStandard

fix test/test_gcoin.h test/test_gcoin.cpp

b9ce74c

ConnectTransactions()

class CAccountingEntry

82f8dc7

class CWalletDB

447d9f7

struct tallyitem

110faff

fix test/handler_normal.cpp

e457de3

struct NormalHandlerCheckValidFixture NormalHandlerApplyNoMemberOnly

acc_orderupgrade

3666111

fix test/handler_license.cpp

19e067e

CreateLicenseHandlerCheckValidFixture CreateLicenseHandlerCheckValidInvalidInfo TransferLicenseHandlerCheckValidFixture

fix wallet/test/wallet_tests.cpp

4057393

add_coin() coin_selection_tests

fix test/rpc_command.cpp

3692220

rpc_sendlicensetoaddress_test

class CWallet_UnitTest

8b02d50

class CColorAmount

3ca7b74

fix operators

class CBlockPolicyEstimator

d751ee6

processTransaction()

fix main.cpp

2afe736

AcceptToMemoryPool() unify fee to color 1 only

class CColorAmount

531e2ce

error msg of operators that amount size should be 1

class CColorAmount

1619c63

change IsPos to IsPositive

fix main.cpp

3831bab

CheckTxFeeandColor()

class Fee

3fad64b

remove SetOutputForFee()

travis

62b99b6

run the entire unit test

class CColorAmount

a64c426

refine the operators

hihiben force-pushed the CColorAmount branch from be54d0f to a64c426 Compare February 18, 2017 08:37

fix wallet/rpcwallet.cpp

ccee1b3

sendfrom() sendtoaddress()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refine the multi-color mechanism #104 #126

Refine the multi-color mechanism #104 #126

hihiben commented Feb 2, 2017

lbyyy Feb 13, 2017

lbyyy Feb 13, 2017

lbyyy Feb 14, 2017

lbyyy Feb 14, 2017

hihiben Feb 15, 2017

lbyyy Feb 14, 2017

lbyyy Feb 14, 2017

lbyyy Feb 14, 2017

lbyyy Feb 15, 2017

hihiben Feb 18, 2017

lbyyy Feb 15, 2017

hihiben Feb 18, 2017

lbyyy Feb 16, 2017

hihiben Feb 18, 2017

lbyyy Feb 16, 2017

hihiben Feb 20, 2017

lbyyy Feb 16, 2017

hihiben Feb 18, 2017

Refine the multi-color mechanism #104 #126

Are you sure you want to change the base?

Refine the multi-color mechanism #104 #126

Conversation

hihiben commented Feb 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment