Quote from: sidhujag on December 26, 2013, 08:07:17 AM

Quote from: cyke64 on December 26, 2013, 07:09:19 AM

Quote from: Unthinkingbit on December 25, 2013, 06:41:27 AM

Sidhujag get 48 shares provisionally, on the condition that a code report shows that the changes are the same as that of the most recent source from Twobits:
https://gitorious.org/devcoin/devcoin

The changes must be identical or else there could be a network fork. Since we now need a quick code report, the bounty for that has been boosted to 12 shares for the first report and 6 shares for the second report.

Hello,

Here's a detailled code report.
I took ALL the commits made by Twobits or twobits in the devcoin client.
I made a list from all the changes made by twobits and compare with the code of Sidhujag.

historical commits from twobits

May 26 2013   #fd07754 don't need stack randomization macro with [...] (twobits)
https://gitorious.org/devcoin/devcoin/commit/fd07754b44b6fb4d4f402085c9321f9cfbff6737

May 26 2013   #bdce5f0 Make things say devcoin (twobits)
https://gitorious.org/devcoin/devcoin/commit/bdce5f0526530a8bc24128cd0428403795373ce2

Jul 5 2013   #1785cc4 Add RPC commands: getblockhash and getblock (twobits)
https://gitorious.org/devcoin/devcoin/commit/1785cc420cd280abdb68b3af83d9dd3a28e5ef2d

Jul 16 2013   #fba32e5 Clean up headers. (Twobits)
https://gitorious.org/devcoin/devcoin/commit/fba32e5e31dcaa9d0f60d7c24000b24bb1dbcea2

Jul 18 2013   #29ddd73 only the ui files need to include xbm files (Twobits)
https://gitorious.org/devcoin/devcoin/commit/29ddd73a8b3dd6cf49e38ac5b2f98a32eab35cc6

Jul 18 2013   #f1d5b3c devcoin graphics (twobits)
https://gitorious.org/devcoin/devcoin/commit/f1d5b3c56c74ea80a8aa21111dca2d4d17d077d1

Aug 20 2013   #ce01e7a match rpc port change to 52332 in official repo (twobits)
https://gitorious.org/devcoin/devcoin/commit/ce01e7af882ae6579204168e3c4d1a0871936a37

Aug 20 2013   #6241096 BIP 30 (twobits)
https://gitorious.org/devcoin/devcoin/commit/62410960cc5c23921a18040529e2524780af8b6c

Aug 20 2013   #4e23c18 add DNSSeeds (twobits)
https://gitorious.org/devcoin/devcoin/commit/4e23c180945785c49bbab682b7f6c6e1eda29b05

historical commits from twobits with commited files

May 26 2013   #fd07754 don't need stack randomization macro with [...] (twobits)
src/db.cpp (2) -+
src/irc.cpp (1) -
src/net.cpp (4) ----
src/rpc.cpp (1) -
src/util.h (13) -------------
May 26 2013   #bdce5f0 Make things say devcoin (twobits)
share/pixmaps/devcoin.ico (0)
share/pixmaps/favicon.ico (0)
share/pixmaps/nsis-header.bmp (0)
share/pixmaps/nsis-wizard.bmp (0)
share/ui.rc (2) -+
src/ui.cpp (2) -+
src/uibase.cpp (14) -------+++++++
src/uibase.h (6) ---+++
Jul 5 2013   #1785cc4 Add RPC commands: getblockhash and getblock (twobits)
src/main.h (1) -
src/rpc.cpp (92) -------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Jul 16 2013   #fba32e5 Clean up headers. (Twobits)
src/headers.h (21) ------------+++++++++
src/net.cpp (3) +++
src/protocol.h (11) -++++++++++
Jul 18 2013   #29ddd73 only the ui files need to include xbm files (Twobits)
src/headers.h (15) ---------------
src/ui.cpp (5) +++++
src/xpm/bitcoin80.xpm (2) -+
Jul 18 2013   #f1d5b3c devcoin graphics (twobits)
src/xpm/bitcoin16.xpm (350) -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin20.xpm (315) ------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin32.xpm (341) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin48.xpm (401) ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin80.xpm (492) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Aug 20 2013   #ce01e7a match rpc port change to 52332 in official repo (twobits)
src/init.cpp (2) -+
src/rpc.cpp (6) ---+++
Aug 20 2013   #6241096 BIP 30 (twobits)
src/main.cpp (26) --++++++++++++++++++++++++
Aug 20 2013   #4e23c18 add DNSSeeds (twobits)
src/net.cpp (9) ------+++

30 committed files list by twobits

src/db.cpp (2) -+
src/irc.cpp (1) -
src/net.cpp (4) ----
src/rpc.cpp (1) -
src/util.h (13) -------------
share/pixmaps/devcoin.ico (0)
share/pixmaps/favicon.ico (0)
share/pixmaps/nsis-header.bmp (0)
share/pixmaps/nsis-wizard.bmp (0)
share/ui.rc (2) -+
src/ui.cpp (2) -+
src/uibase.cpp (14) -------+++++++
src/uibase.h (6) ---+++
src/main.h (1) -
src/rpc.cpp (92) -------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/headers.h (21) ------------+++++++++
src/net.cpp (3) +++
src/protocol.h (11) -++++++++++
src/headers.h (15) ---------------
src/ui.cpp (5) +++++
src/xpm/bitcoin80.xpm (2) -+
src/xpm/bitcoin16.xpm (350) -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin20.xpm (315) ------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin32.xpm (341) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin48.xpm (401) ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin80.xpm (492) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/init.cpp (2) -+
src/rpc.cpp (6) ---+++
src/main.cpp (26) --++++++++++++++++++++++++
src/net.cpp (9) ------+++

remarks :
src/net.cpp appearing in two commits !
src/rpc.cpp appearing in three commits !
src/ui.cpp appearing in two commits !
src/headers.h appearing in two commits !

25 unique files by twobits

src/db.cpp (2) -+
src/irc.cpp (1) -
src/net.cpp (4) ----
(9) ------+++
src/rpc.cpp (1) -
(92) -------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
(6) ---+++
src/util.h (13) -------------
share/pixmaps/devcoin.ico (0)
share/pixmaps/favicon.ico (0)
share/pixmaps/nsis-header.bmp (0)
share/pixmaps/nsis-wizard.bmp (0)
share/ui.rc (2) -+
src/ui.cpp (2) -+
(5) +++++
src/uibase.cpp (14) -------+++++++
src/uibase.h (6) ---+++
src/main.h (1) -
src/headers.h (21) ------------+++++++++
(15) ---------------
src/net.cpp (3) +++
src/protocol.h (11) -++++++++++
src/xpm/bitcoin80.xpm (2) -+
src/xpm/bitcoin16.xpm (350) -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin20.xpm (315) ------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin32.xpm (341) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin48.xpm (401) ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin80.xpm (492) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/init.cpp (2) -+
src/main.cpp (26) --++++++++++++++++++++++++

Compare Twobits changed files with same Sidhujag files

Twobits Files not used or cosmetic changes in Sidhujag

share/pixmaps/nsis-header.bmp (0)
share/pixmaps/nsis-wizard.bmp (0)
share/pixmaps/devcoin.ico (0)
share/pixmaps/favicon.ico (0)
ok (bmp files replaced by .png files !)
ok (ico files replaced by good ico files)

src/xpm/bitcoin80.xpm (2) -+
src/xpm/bitcoin16.xpm (350) -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin20.xpm (315) ------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin32.xpm (341) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin48.xpm (401) ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/xpm/bitcoin80.xpm (492) ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ok (xpm file not used by qt version -> use png instead)

src/ui.cpp (2) -+
src/uibase.cpp (14) -------+++++++
src/uibase.h (6) ---+++
ok (these files are not used by QT version -> not important : only bitcoin replace by devcoin string !)

Jul 16 2013   #fba32e5 Clean up headers. (Twobits)
src/headers.h (21) ------------+++++++++
Jul 18 2013   #29ddd73 only the ui files need to include xbm files (Twobits)
src/headers.h (15) ---------------
ok (file doesn't exist in qt version -> other file used for headers ?)

Twobits Files changes important in Sidhujag

Aug 20 2013 #4e23c18 add DNSSeeds (twobits)
https://gitorious.org/devcoin/devcoin/commit/4e23c180945785c49bbab682b7f6c6e1eda29b05

src/net.cpp
ok ("dvcstable01.dvcnode.org" , "dvc-seed.21stcenturymoneytalk.org", "dvcstable01.devtome.com")

Aug 20 2013   #ce01e7a match rpc port change to 52332 in official repo (twobits)
https://gitorious.org/devcoin/devcoin/commit/ce01e7af882ae6579204168e3c4d1a0871936a37

src/init.cpp (2) -+
src/rpc.cpp (6) ---+++
ok (in init.cpp replace "8332" string port by "52332" string port)
ok (rpc.cpp is subdivided in many files with rpc prefix but no string containing 52332 or 8332 -> perhaps defined in another place ? )

Jul 16 2013   #fba32e5 Clean up headers. (Twobits)
https://gitorious.org/devcoin/devcoin/commit/fba32e5e31dcaa9d0f60d7c24000b24bb1dbcea2

src/headers.h (21) ------------+++++++++
* file doesn't exist in qt version
but for BSD version need these lines
https://gitorious.org/devcoin/devcoin/commit/fba32e5e31dcaa9d0f60d7c24000b24bb1dbcea2
#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h    #include

src/net.cpp (3) +++
* missing (stdint include)
https://gitorious.org/devcoin/devcoin/commit/fba32e5e31dcaa9d0f60d7c24000b24bb1dbcea2
#include

src/protocol.h (11) -++++++++++
* missing (idef for win)
https://gitorious.org/devcoin/devcoin/commit/fba32e5e31dcaa9d0f60d7c24000b24bb1dbcea2
#ifndef _WIN32 #include #include #include #include #include #endif

Jul 5 2013   #1785cc4 Add RPC commands: getblockhash and getblock (twobits)
https://gitorious.org/devcoin/devcoin/commit/1785cc420cd280abdb68b3af83d9dd3a28e5ef2d

src/main.h (1) -
* not removed (class declaration in qt version -> used in qt version ?)
//class CBlockIndex;

src/rpc.cpp (92) -------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ok (rpc.cpp replaced by rpcblockchain.cpp)
ok (change in fonction double GetDifficulty()
ok (functions getblock and getblockhash added (same code)
* differences (in function block on three Pairs names)
In twobits |in sidhujag
result.push_back(Pair("blockcount", blockindex->nHeight)); | result.push_back(Pair("height", blockindex->nHeight));
result.push_back(Pair("hashprevious", blockindex->pprev->GetBlockHash().GetHex())); | result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
result.push_back(Pair("hashnext", blockindex->pnext->GetBlockHash().GetHex())); | result.push_back(Pair("nextblockhash", blockindex->pnext->GetBlockHash().GetHex()));

Aug 20 2013   #6241096 BIP 30 (twobits)
https://gitorious.org/devcoin/devcoin/commit/62410960cc5c23921a18040529e2524780af8b6c

src/main.cpp (26) --++++++++++++++++++++++++
* differences
https://gitorious.org/devcoin/devcoin/commit/62410960cc5c23921a18040529e2524780af8b6c
In twobits commit , the rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC (1331769600)
and on testnet it is enabled as of februari 20, 2012, 0:00 UTC. (1329696000)
In Sidjuhag version , for DVC the rule BIP30 for Devcoin will go into effect on 2013-09-01 0:00 UTC (1377993600)
I think that Sidjuhag version is correct !

May 26 2013   #fd07754 don't need stack randomization macro with [...] (twobits)
https://gitorious.org/devcoin/devcoin/commit/fd07754b44b6fb4d4f402085c9321f9cfbff6737

ok (no stack random macro implemented in util.h and not used in any files !)

src/db.cpp (2) -+

ok (change applied in void CDB::Flush() in Sidjuhag version)

src/irc.cpp (1) -
* no irc.cpp file in Sidjuhag version !

src/net.cpp (4) ----
ok (macro not used)

src/rpc.cpp (1) -
ok (macro not used in rpcblockchain.cpp)

src/util.h (13) -------------
ok (no stack random macro implemented)

Before reaching to a conclusion I would like comments from Sidhujag on my code report. Now I can't show if changes are the same or not (fork or not fork ?) Embarrassed

Cyke64

The first difference about the timestamp on bip30 I think that is to avert a potential problem in the future so since blocks are already created and patch is applied I think its safe? Unless someone can prove me wrong?

On the blockcount to height rename etc looks like simple rename if these are rpc calls We just need to ensure that the merged mine proxy doesnt make the old calls. i downloaded latest one from i0coin and dbl checked with namecoin so it will use renamed rpc calls if thats the casse. i will check.

Do merged mine pools run thru this merged mine proxy in the contrib folder?

The main stuff is the createnewblock processblock where the reciever stuff is the small changes there but we already talked about that... Am i right in saying that since i take a fresh database and fill it with the blockchain from block 1 and it downloads all blocks that the block processing and bip stuff is all good?

Merged mining will test any rpc differences since i did internal mining I didnt jog the getworkaux stuff. You can merge mine on testnet too using the nerged mine proxy and the three nodes I have setup in the src folder just run the three batch files and then comnect the proxy.. Then point miner to proxy.. Getworkaux gets called but i got no new blocks i thought ut was a setup issue since my network is locked down from blockchain downloads on my dev machine.

Did you look at the devtome technical page and compare with new code? Also receiver.h was changed did you catch that?

On the blockcount to height rename etc looks like simple rename if these are rpc calls We just need to ensure that the merged mine proxy doesnt make the old calls. i downloaded latest one from i0coin and dbl checked with namecoin so it will use renamed rpc calls if thats the casse. i will check.

Jul 5 2013   #1785cc4 Add RPC commands: getblockhash and getblock (twobits)
src/rpc.cpp (92) -------+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

* differences (in function block on three Pairs names)
twobits | sidjuhag
result.push_back(Pair("blockcount", blockindex->nHeight)); | result.push_back(Pair("height", blockindex->nHeight));
result.push_back(Pair("hashprevious", blockindex->pprev->GetBlockHash().GetHex())); | result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
result.push_back(Pair("hashnext", blockindex->pnext->GetBlockHash().GetHex())); | result.push_back(Pair("nextblockhash", blockindex->pnext->GetBlockHash().GetHex()));

not important because these pairs are only used here locally in this file (no definition in another place)

Here are more details and check about BIP.
Aug 20 2013   #6241096 BIP 30 (twobits)
src/main.cpp (26) --++++++++++++++++++++++++
* differences
https://gitorious.org/devcoin/devcoin/commit/62410960cc5c23921a18040529e2524780af8b6c
In twobits commit , the rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC (1331769600)
and on testnet it is enabled as of februari 20, 2012, 0:00 UTC. (1329696000)
In Sidjuhag version , for DVC the rule BIP30 for Devcoin will go into effect on 2013-09-01 0:00 UTC (1377993600)

In twobits | In Sidhujag
no BIP16 | BIP16 enabled
BIP30 after March 15,2012 | BIP30 after 2013-09-01

Getworkaux gets called but i got no new blocks i thought ut was a setup issue since my network is locked down from blockchain downloads on my dev machine.

Aug 20 2013   #ce01e7a match rpc port change to 52332 in official repo (twobits)
src/init.cpp (2) -+
src/rpc.cpp (6) ---+++

PROBLEM :
port used by RPCPORT is always 52332 (there's no testnet) in twobits instead of bitcoin RPCPORT 8332.
In Sidhujag , port used is 7332 defaut and for testnet 17332 (src\bitcoinrpc.cpp,src\init.cpp)
Could it be the source of your problem ?

Did you look at the devtome technical page and compare with new code?"

CreateNewBlock

Everything is correct (like twobits)
I check out also the GetKeyID function you used instead of finding the hash160.

pblock->vtx[0].vout[0].nValue = GetBlockValue(pindexPrev->nHeight+1, nFees);
   txNew.vout[0].nValue = minerValue + nFees;
in devtome wiki technical

But in all codes (twobits,Sidjuhag) , it's pblock->vtx[0].vout[0].nValue = minerValue + nFees;
so wiki content should be corrected with the right assign statement.

GetNextWorkRequired
code contents are the same except your difficulty rule code for testnet you added.

generation rate

devtome wiki :
//static const int64 MIN_TX_FEE = 50000; static const int64 MIN_TX_FEE = 500000000; //static const int64 MIN_RELAY_TX_FEE = 10000; static const int64 MIN_RELAY_TX_FEE = MIN_TX_FEE; //static const int64 MAX_MONEY = 21000000 * COIN; static const int64 MAX_MONEY = 21000000000 * COIN;

Twobits | Sidjuhag :
static const int64 MAX_MONEY = 21000000000 * COIN; | static const int64 MAX_MONEY = (int64)21000000 * (int64)1000 * COIN; static const int64 COIN = 100000000; | static const int64 COIN = 100000000; MIN_TX_FEE | int64 CTransaction::nMinTxFee = COIN; MIN_RELAY_TX_FEE | int64 CTransaction::nMinRelayTxFee = COIN;

MIN_TX_FEE = MIN_RELAY_TX_FEE = 500,000,000 but in Twobits and Sidhujag values are
100,000,000 = COIN
Why ?

Disbursing the Share
Code is the same.

receiver.h was changed

Yes but I don't see any problem (you add code for testnet and some debug code)

I'm waiting for your comments about this code report
Cyke64

cyke64

Posts

Merits