Bitcoin Forum

$ diff solidcoin-source-103/src soldcoin-source-104/src
Les sous-répertoires solidcoin-source-103/src/cryptopp et soldcoin-source-104/src/cryptopp sont identiques.
diff solidcoin-source-103/src/init.cpp soldcoin-source-104/src/init.cpp
323c323
<             HWND hwndPrev = FindWindowA("wxWindowNR", "SolidCoin 1.03");
---
>             HWND hwndPrev = FindWindowA("wxWindowNR", "SoldCoin 1.04");
Les sous-répertoires solidcoin-source-103/src/json et soldcoin-source-104/src/json sont identiques.
diff solidcoin-source-103/src/main.cpp soldcoin-source-104/src/main.cpp
424a425
>         {
425a427
>         }
1241,1247d1242
<     // Get prev block index
<     map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);
<     if (mi == mapBlockIndex.end())
<         return error("AcceptBlock() : prev block not found");
<     CBlockIndex* pindexPrev = (*mi).second;
<     int nHeight = pindexPrev->nHeight+1;
< 
1258a1254,1260
>     // Get prev block index
>     map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashPrevBlock);
>     if (mi == mapBlockIndex.end())
>         return true;
>     CBlockIndex* pindexPrev = (*mi).second;
>     int nHeight = pindexPrev->nHeight+1;
> 
1296c1298
<         return error("AcceptBlock() : prev block not found");
---
>         return true;
1374,1379c1376,1378
<         mapOrphanBlocks.insert(make_pair(hash, pblock2));
<         mapOrphanBlocksByPrev.insert(make_pair(pblock2->hashPrevBlock, pblock2));
< 
<         // Ask this guy to fill in what we're missing
<         if (pfrom)
<             pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(pblock2));
---
>         /*mapOrphanBlocks.insert(make_pair(hash, pblock2));
>         mapOrphanBlocksByPrev.insert(make_pair(pblock2->hashPrevBlock, pblock2));*/
>         if (pfrom)  pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(pblock2));   // Ask this guy to fill in what we're missing
1382,1385c1381,1383
< 
<     // Store to disk
<     if (!pblock->AcceptBlock())
<         return error("ProcessBlock() : AcceptBlock FAILED");
---
>      // Store to disk
>      if (!pblock->AcceptBlock())
>          return error("ProcessBlock() : AcceptBlock FAILED");
2092,2093c2090
<                 // When this block is requested, we'll send an inv that'll make them
<                 // getblocks the next batch of inventory.
---
>                 // When this block is requested, we'll send an inv that'll make them getblocks the next batch of inventory.
2185c2182,2183
<             printf("storing orphan tx %s\n", inv.hash.ToString().substr(0,10).c_str());
---
>             pfrom->nShitSent++;
>             printf("got sent orphan tx %s from %s\n", inv.hash.ToString().substr(0,10).c_str(), pfrom->addr.ToString().c_str());
2187a2186,2194
>         else
>         {
>             printf("got sent badtx from %s\n",pfrom->addr.ToString().c_str());
>             pfrom->nBadtxsent+=5;
>         }
>         if(pfrom->nBadtxsent>10)
>         {
>             pfrom->fDisconnect=true;
>         }
diff solidcoin-source-103/src/net.h soldcoin-source-104/src/net.h
519a520
>     int nBadtxsent;
580a582
>         nBadtxsent=0;
Les sous-répertoires solidcoin-source-103/src/test et soldcoin-source-104/src/test sont identiques.
diff solidcoin-source-103/src/uibase.cpp soldcoin-source-104/src/uibase.cpp
595c595
< 	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2011 SolidCoin Developers\n\nThis is software based on bitcoin, improving the network performance and security whilst\nalso making connecting to the SolidCoin network easier for businesses and users.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard."), wxDefaultPosition, wxDefaultSize, 0 );
---
> 	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("Copyright (c) 2011 SoldCoin Developers\n\nThis is software based on bitcoin, trying but failing to improve the network performance and security whilst\nalso making connecting to the SoldCoin network easier for businesses and users.\n\nThis product includes software developed by the OpenSSL Project for use in the \nOpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by \nEric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard."), wxDefaultPosition, wxDefaultSize, 0 );
diff solidcoin-source-103/src/uibase.h soldcoin-source-104/src/uibase.h
132c132
< 		CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = _("SolidCoin 1.03"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 723,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
---
> 		CMainFrameBase( wxWindow* parent, wxWindowID id = wxID_MAINFRAME, const wxString& title = _("SoldCoin 1.04"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 723,484 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
diff solidcoin-source-103/src/ui.cpp soldcoin-source-104/src/ui.cpp
2022c2022
<     m_staticTextVersion->SetLabel(strprintf(_("version 1.03"), FormatFullVersion().c_str()));
---
>     m_staticTextVersion->SetLabel(strprintf(_("version 1.04"), FormatFullVersion().c_str()));
diff solidcoin-source-103/src/wallet.cpp soldcoin-source-104/src/wallet.cpp
1002,1005d1001
< 
<     unsigned int nTxSize = ::GetSerializeSize(wtxNew, SER_NETWORK);
<     if(nTxSize>MAX_TX_SIZE) return false;   //new size limits on transactions
< 

~/soldcoin/src$ make -f ../build/makefile.unix solidcoind
g++ -c -O2 -Wno-invalid-offsetof -Wformat -g -D__WXDEBUG__ -DNOPCH -DUSE_SSL -DUSE_UPNP=0 -o ../obj/nogui/util.o util.cpp
Assembler messages:
Fatal error: can't create ../obj/nogui/util.o: No such file or directory
make: *** [../obj/nogui/util.o] Error 1

soldcoin-source-104/src$ make -f ../build/makefile.unix solidcoind

make -f ../build/makefile.unix solidcoind
g++ -c -O2 -Wno-invalid-offsetof -Wformat -g -D__WXDEBUG__ -DNOPCH -DUSE_SSL -DUSE_UPNP=0 -o ../obj/nogui/util.o util.cpp
g++ -c -O2 -Wno-invalid-offsetof -Wformat -g -D__WXDEBUG__ -DNOPCH -DUSE_SSL -DUSE_UPNP=0 -o ../obj/nogui/script.o script.cpp
g++ -c -O2 -Wno-invalid-offsetof -Wformat -g -D__WXDEBUG__ -DNOPCH -DUSE_SSL -DUSE_UPNP=0 -o ../obj/nogui/db.o db.cpp
g++ -c -O2 -Wno-invalid-offsetof -Wformat -g -D__WXDEBUG__ -DNOPCH -DUSE_SSL -DUSE_UPNP=0 -o ../obj/nogui/net.o net.cpp
net.cpp: In function ‘void ThreadMapPort2(void*)’:
net.cpp:1085:63: error: too few arguments to function ‘UPNPDev* upnpDiscover(int, const char*, const char*, int, int, int*)’
/usr/include/miniupnpc/miniupnpc.h:53:1: note: declared here
net.cpp:1100:72: error: too few arguments to function ‘int UPNP_AddPortMapping(const char*, const char*, const char*, const char*, const char*, const char*, const char*, const char*, const char*)’
/usr/include/miniupnpc/upnpcommands.h:117:1: note: declared here
make: *** [../obj/nogui/net.o] Error 1

make -f ../build/makefile.unix solidcoind USE_UPNP=

[quote author=EskimoBob link=topic=41345.msg510468#msg510468 date=1315347039]
[quote author=jackjack link=topic=41345.msg504115#msg504115 date=1315157431]
This fork uses SolidCoin 1.03 and fixes all the recent problems in the code
Here's Soldcoin (SLC) 1.04:
https://github.com/jackjack-jj/soldcoin
...