diff --git a/configure.ac b/configure.ac index 5c8dc9fec255e..2c860e458a4f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) -define(_CLIENT_VERSION_MINOR, 0) +define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 3) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/src/amount.h b/src/amount.h index 9849def8d71e4..541c72bcd78de 100644 --- a/src/amount.h +++ b/src/amount.h @@ -28,7 +28,7 @@ extern const std::string CURRENCY_UNIT; * critical; in unusual circumstances like a(nother) overflow bug that allowed * for the creation of coins out of thin air modification could lead to a fork. * */ -static const CAmount MAX_MONEY = 123456789 * COIN; +static const CAmount MAX_MONEY = 10800000 * COIN; inline bool MoneyRange(const CAmount& nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } /** diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c9d5746d0c9a1..73fd217d3aff9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -70,7 +70,7 @@ class CMainParams : public CChainParams { public: CMainParams() { strNetworkID = "main"; - consensus.nSubsidyHalvingInterval = 1051200; + consensus.nSubsidyHalvingInterval = 2628000; consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityRejectBlockOutdated = 950; consensus.nMajorityWindow = 1000; @@ -90,6 +90,9 @@ class CMainParams : public CChainParams { /** DarkGravityWell v3 Fork Params - Humwerthuz @ 30/12/2017 **/ consensus.nPowDGWHeight = 147000; //DGW on starting from block 147.000 + // Propuestas de Mejora para Chaucha (PMC) + consensus.PMC1 = 220000; + // Deployment of BIP68, BIP112, and BIP113. consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1515726001; // January 12, 2018 @@ -165,7 +168,7 @@ class CTestNetParams : public CChainParams { public: CTestNetParams() { strNetworkID = "test"; - consensus.nSubsidyHalvingInterval = 1051200; + consensus.nSubsidyHalvingInterval = 250; consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityRejectBlockOutdated = 950; consensus.nMajorityWindow = 1000; @@ -185,6 +188,9 @@ class CTestNetParams : public CChainParams { /** DarkGravityWell v3 Fork Params - Humwerthuz @ 30/12/2017 **/ consensus.nPowDGWHeight = 200; //DGW always on + // Propuestas de Mejora para Chaucha (PMC) + consensus.PMC1 = 235; + // Deployment of BIP68, BIP112, and BIP113. consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0; consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1485561600; // January 28, 2017 @@ -220,6 +226,8 @@ class CTestNetParams : public CChainParams { // nodes with support for servicebits filtering should be at the top vSeeds.push_back(CDNSSeedData("fn1.cha.harc.cl", "fn1.cha.harc.cl")); vSeeds.push_back(CDNSSeedData("fn2.cha.harc.cl", "fn2.cha.harc.cl")); + // PMC1 testnet + vSeeds.push_back(CDNSSeedData("testnet.chaucha.party", "testnet.chaucha.party")); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,65); diff --git a/src/clientversion.h b/src/clientversion.h index e0d043ad2aa17..780cbb744df06 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -14,9 +14,9 @@ */ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 0 -#define CLIENT_VERSION_MINOR 13 -#define CLIENT_VERSION_REVISION 3 +#define CLIENT_VERSION_MAJOR 2 +#define CLIENT_VERSION_MINOR 1 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build @@ -26,7 +26,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2016 +#define COPYRIGHT_YEAR 2018 #endif //HAVE_CONFIG_H diff --git a/src/consensus/params.h b/src/consensus/params.h index 8e8c50647faf0..3bb27fa38608d 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -65,6 +65,9 @@ struct Params { /** DarkGravityWell v3 Fork Params - Humwerthuz @ 30/12/2017 **/ int nPowDGWHeight; + + // Propuestas de Mejora para Chaucha + int PMC1; }; } // namespace Consensus diff --git a/src/main.cpp b/src/main.cpp index 14d903a68ee75..9d4c07b5ded86 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1723,17 +1723,20 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) { int halvings = nHeight / consensusParams.nSubsidyHalvingInterval; // Force block reward to zero when right shift is undefined. - if (halvings >= 64) + if (halvings >= 25) return 0; CAmount nSubsidy = 10 * COIN; // 50000 primer bloque, 10 hacia adelante, variable desde el 2834 hasta el 50000, luego fijo a 10 denuevo if (nHeight == 1) - nSubsidy = 50000 * COIN; + nSubsidy = 50000 * COIN; if (nHeight > 2834 && nHeight <= 50000) //En realidad partio desde el 2835. - nSubsidy = (50000/nHeight + 10) * COIN; + nSubsidy = (50000/nHeight + 10) * COIN; + + if (nHeight >= consensusParams.PMC1) + nSubsidy = 1.5 * COIN; // Subsidy is cut in half every 210,000 blocks which will occur approximately every 4 years. nSubsidy >>= halvings; diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 97596d3827db1..48d703c6a6fd5 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -11,7 +11,7 @@ &New - y nueva + Nueva Copy the currently selected address to the system clipboard @@ -19,11 +19,11 @@ &Copy - y copiar + Copiar C&lose - C y perder + Cerrar Delete the currently selected address from the list @@ -35,11 +35,11 @@ &Export - y exportar + Exportar &Delete - &Borrar + Borrar @@ -49,7 +49,7 @@ AskPassphraseDialog Enter passphrase - Introduce contraseña actual + Introduce contraseña actual New passphrase @@ -67,7 +67,7 @@ BitcoinGUI Sign &message... - Firmar &Mensaje... + Firmar Mensaje... Synchronizing with network... @@ -91,7 +91,7 @@ E&xit - &Salir + Salir Quit application @@ -99,11 +99,11 @@ &About %1 - S&obre %1 + Acerca de %1 About &Qt - Acerca de + Acerca de Qt Show information about Qt @@ -127,15 +127,15 @@ &Sending addresses... - Mandando direcciones + Direcciones de salida &Receiving addresses... - Recibiendo direcciones + Direcciones de entrada Open &URI... - Abrir y url... + Abrir URI... Reindexing blocks on disk... @@ -175,15 +175,15 @@ &Send - &Envía + Enviar &Receive - y recibir + Recibir &Show / Hide - &Mostrar/Ocultar + &Mostrar / Ocultar Sign messages with your Chaucha addresses to prove you own them @@ -219,7 +219,7 @@ Warning - Atención + Advertencia Information @@ -262,8 +262,7 @@ Fee: - comisión: - + comisión: Amount @@ -353,7 +352,7 @@ Reset all client options to default. - Reestablece todas las opciones. + Reestablecer todas las opciones. &Network @@ -389,8 +388,7 @@ &Window - y windows - + Ventana Show only a tray icon after minimizing the window. @@ -406,7 +404,7 @@ &Display - &Mostrado + Visualización &Unit to show amounts in: @@ -422,7 +420,7 @@ &Cancel - &Cancela + &Cancelar default @@ -551,7 +549,7 @@ Copy &Address - &Copia dirección + &Copiar dirección &Save Image... @@ -581,12 +579,11 @@ Fee: - comisión: - + comisión: Transaction Fee: - Comisión transacción: + Comisión de transacción: normal @@ -602,11 +599,11 @@ Add &Recipient - &Agrega destinatario + Agregar destinatario Clear &All - &Borra todos + Borrar todo Balance: @@ -618,7 +615,7 @@ S&end - &Envía + Enviar @@ -698,15 +695,15 @@ Clear &All - &Borra todos + Restablecer &Verify Message - &Firmar Mensaje + Verificar Mensaje Verify &Message - &Firmar Mensaje + Verificar Mensaje diff --git a/src/qt/res/icons/bitcoin.ico b/src/qt/res/icons/bitcoin.ico index cea9be8497135..0983476c18a04 100755 Binary files a/src/qt/res/icons/bitcoin.ico and b/src/qt/res/icons/bitcoin.ico differ diff --git a/src/qt/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png index 0ef5df718d5c2..ff6d413c9e0f3 100755 Binary files a/src/qt/res/icons/bitcoin.png and b/src/qt/res/icons/bitcoin.png differ diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico index cea9be8497135..0983476c18a04 100755 Binary files a/src/qt/res/icons/bitcoin_testnet.ico and b/src/qt/res/icons/bitcoin_testnet.ico differ diff --git a/src/qt/res/icons/bitcoin_testnet.png b/src/qt/res/icons/bitcoin_testnet.png index 0ef5df718d5c2..ff6d413c9e0f3 100755 Binary files a/src/qt/res/icons/bitcoin_testnet.png and b/src/qt/res/icons/bitcoin_testnet.png differ diff --git a/src/script/standard.h b/src/script/standard.h index 72aaea0b7bebe..05fe3b4093c20 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -27,7 +27,7 @@ class CScriptID : public uint160 CScriptID(const uint160& in) : uint160(in) {} }; -static const unsigned int MAX_OP_RETURN_RELAY = 83; //!< bytes (+1 for OP_RETURN, +2 for the pushdata opcodes) +static const unsigned int MAX_OP_RETURN_RELAY = 259; //!< bytes (+1 for OP_RETURN, +2 for the pushdata opcodes) extern bool fAcceptDatacarrier; extern unsigned nMaxDatacarrierBytes;