Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,28 +96,48 @@ static MapCheckpoints mapCheckpoints =
( 1700000, uint256("0x00000000081e77dff6fd5ca48b1012d2c04f6d59e09b5cf0b0bc8a74c78c205b"))
( 1800000, uint256("0x00000000006734c1736337acc694e74cbb674763c91cff56a0d014c48d8f2167"))
( 1900000, uint256("0x0000000006aa7494b327e2767eb790176917925395f794dd7fb708b39fd1bab9"))

//checkpoints added 21/8/2017 presstab
( 2064500, uint256("0x00000000015848cf381157b335786667402b58a4d171ece58dd1793853279c4e"))

//checkpoints added 11/2/2018 madross
( 2100000, uint256("0xd428aa58530e556a93b7af2a13fb1a080d64315496446feaa5dc8e11a1a899dd"))
( 2150000, uint256("0x00000000000125d7f537d99a20725b9df4d4a3f9fe582135d8700f35971921cc"))
( 2200000, uint256("0x000000000002df6c44eaf8c0e42a10c0f3ba5a5b27c12f8203d8aed8366e6fc3"))
( 2250000, uint256("0xe5d4c7951c07bf56405efdbcd42c1950ceb1319e79330fd2f417e92d02f5f5fa"))
( 2300000, uint256("0x112d7beb0f7d1e2c4d2d1a774d9c3e45724c99218cf81f44ca9b2ca28c73061b"))
( 2350000, uint256("0x42c68399cb9254c88fbd2e32bc8cedcc332aab01ab6015824005fa49a9367aec"))

//checkpoints added 11/10/2018 bmyatt (Bill)
( 2400000, uint256("0xd62622af4882ceeb6bf109c37c80c8af8e6c0456a338f0e78ecc16fc8d47bac7"))
( 2450000, uint256("0x0000000000001b3f8f8b1c23089093341227540fc4f22159e3b81e7d2b99e134"))
( 2500000, uint256("7430dcb530a036c211231db7525ba45a0d799899a0711b4143c72d61a290fe1c"))
//( 2500000, uint256("7430dcb530a036c211231db7525ba45a0d799899a0711b4143c72d61a290fe1c")) disabled dont know why labmin
( 2550000, uint256("0xf4dfffbfe4c7ebd9fbfc6df48059bbfeeb1394c450d08a5116844e7d3409e99e"))
( 2600000, uint256("0x000000000002761cff7589856f250b26d0a66cfaedbfc770888a47e418699c21"))
( 2650000, uint256("0x034df10f4af2ace20b820ff194d2f7eef5c20eeeda4c732a4b890ace5812f1ed"))
( 2700000, uint256("0x00000000000002ebe4a33f21d204271f163d8ff7e62c316dba669d6bded015f1"))
( 2750000, uint256("0x0000000000004bc92b6eb64f95398dc16735a6d1af6f46b06d431ec5d435c90c"))
( 2800000, uint256("0x000000000021e35200bb18bd559b05c2cf9c0a730780e4fc190ff6ce2cd28efd"))
//checkpoints added 12/4/2024 labmin
( 2900000, uint256("0x00000000000008ad49c981266f05d466ce74e3c1133731c1c7db2b21de9923fb"))
( 3000000, uint256("0x0000000000039c6776d0d293ff8967686ad1f1c4499b836396cd70094c375438"))
( 3250000, uint256("0x00000000000010e3e300b1da2c1ce11280cba7fd0f2aeb55c39880c05bea804e"))
( 3500000, uint256("0x00000000000077e54b0cb145638b0fdb48b469318d9481169881562dd38b182a"))
( 3750000, uint256("0x0000000004563712fef4bf312ada9d73c5895bf9772e134407a6e4bd99d38bba"))
( 4000000, uint256("0xb9769a00ca70a1982416f21cb95a48dba6346bdce8d4146862ce6ddfd8c8f1f9"))
( 4250000, uint256("0x000000001957fdc3da6a5a918cf8e23d03faa021d591e34f6cfa2f9fd91a9e5e"))
( 4500000, uint256("0xce5a96014378ffea542229be9407322fd2c6181f0835e258db1403ac26e88721"))
( 4750000, uint256("0x00000000061b307fddd2168b42f78270b964887c035868aa0afc5279ac376102"))
( 5000000, uint256("0x0000000007a9daf9d9f48ca5ea1f506edde3aa3e689ca7ae7fe66f6fd183bb71"))
( 5100000, uint256("0x883d21ad9d101301293d8887e3a065fb09d71c99443cc4adf647557699ba59d9"))
( 5200000, uint256("0x000000000226e8c753c33f71b5cd59c5dd6082db566f02b959c90076dfcfa37f"))
( 5300000, uint256("0x000000000bad3f716fa7ab2d0cc7652131c277e4d4e4bbc20bcc782ca3efd049"))
( 5400000, uint256("0x00000000111df49cf7febcb342550944e40e270068ea6ebb8e5891d4216763be"))
( 5500000, uint256("0x000001e9dbf04fed3e6539fb110ccfb82f9256e4587ccef1a5dbaed02aa198bb"))
( 5600000, uint256("0x0000000067f23b4f56c46b7c753e1c47633d551363a1ccf1cec3512cfec03b67"))
( 5700000, uint256("0x000000000ca6f8990e43dce4f7fc968c91da22a4d3b7c6736740a4fe741359c8"))
( 5800000, uint256("0xa1d920c13ae2b09351df844227b49a797704748d1dc764662d19a47a9800c54e"))
( 5897814, uint256("0xd7fe8232e4460e157f87509b7ea5ec68fb0a0fc605f3b49375162a879846f4d8")) //mico fork
( 5900000, uint256("0xa19b97b98923b9a38abe642ba8d27e5b2756be2f9e036456ff3c06d89dc3a617"))


;


Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// These need to be macros, as version.cpp's and IncaKoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 5
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 1
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 0

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
10 changes: 9 additions & 1 deletion src/kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ unsigned int nModifierInterval = MODIFIER_INTERVAL;
// Hard checkpoints of stake modifiers to ensure they are deterministic
static std::map<int, unsigned int> mapStakeModifierCheckpoints =
boost::assign::map_list_of
( 0, 0x0e00670bu )
( 0, 0x0e00670bu )
( 1000000, 0x4d323882 )
( 2000000, 0xd0a84a72 )
( 3000000, 0x8e642c5c )
( 4000000, 0xc133140d )
( 5000000, 0x116386dc )
( 5900000, 0xadde2492 )


;

// Get time weight - added for weight calc in coin control
Expand Down
14 changes: 12 additions & 2 deletions src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,8 @@ bool GetMyExternalIP(CNetAddr& ipRet)
// <?php echo $_SERVER["REMOTE_ADDR"]; ?>
if (nHost == 1)
{
addrConnect = CService("91.198.22.70",80); // checkip.dyndns.org
addrConnect = CService("193.122.130.0",80); // checkip.dyndns.org
// addrConnect = CService("91.198.22.70",80); // checkip.dyndns.org has moved (Labmin)

if (nLookup == 1)
{
Expand Down Expand Up @@ -1152,7 +1153,16 @@ void MapPort()
// The first name is used as information source for addrman.
// The second name should resolve to a list of seed addresses.
static const char *strDNSSeed[][2] = {
{"173.212.233.242", "81.100.233.136"},
{"Explorer", "000.nerdlabs.dev"},
{"Lab-Node", "001.nerdlabs.dev"},
{"Lab-Node", "002.nerdlabs.dev"},
{"Lab-Node", "nka1.nerdlabs.dev"},
{"Lab-Node", "nka2.nerdlabs.dev"},
{"Lab-Node", "nka3.nerdlabs.dev"},
{"Lab-Node", "nka4.nerdlabs.dev"},
{"Lab-Node", "nka5.nerdlabs.dev"},
{"Lab-Node", "nka5.nerdlabs.dev"},
{"devnode", "na"}
};

void ThreadDNSAddressSeed(void* parg)
Expand Down
2 changes: 1 addition & 1 deletion src/qt/IncaKoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ IncaKoinGUI::IncaKoinGUI(QWidget *parent):
nWeight(0)
{
resize(850, 550);
setWindowTitle(tr("IncaKoin") + " - " + tr("Wallet"));
setWindowTitle(tr("IncaKoin") + " - " + tr("1.5.3"));
#ifndef Q_OS_MAC
qApp->setWindowIcon(QIcon(":icons/IncaKoin"));
setWindowIcon(QIcon(":icons/IncaKoin"));
Expand Down
16 changes: 14 additions & 2 deletions src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
Expand Down Expand Up @@ -272,11 +275,14 @@
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand Down Expand Up @@ -326,6 +332,12 @@
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
Expand Down
Binary file modified src/qt/res/icons/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/address-book.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/blexp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/configure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editcopy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editpaste.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/export.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/filesave.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/history.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/lock_open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/qrcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/quit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/send.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_inout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_mined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/tx_output.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
const std::string CLIENT_NAME("IncaKoin");

// Client version number
#define CLIENT_VERSION_SUFFIX "-Mama_Quilla"
#define CLIENT_VERSION_SUFFIX "IncaKoin"


// The following part of the code determines the CLIENT_BUILD variable.
Expand Down
4 changes: 2 additions & 2 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern const std::string CLIENT_DATE;
// network protocol versioning
//

static const int PROTOCOL_VERSION = 90060;
static const int PROTOCOL_VERSION = 90062;

// intial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
Expand All @@ -51,7 +51,7 @@ static const int MEMPOOL_GD_VERSION = 60002;

#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 5
#define DISPLAY_VERSION_REVISION 2
#define DISPLAY_VERSION_REVISION 3
#define DISPLAY_VERSION_BUILD 0

#endif