diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 098e4da47..a1621749e 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -290,6 +290,7 @@ RES_ICONS = \ qt/res/icons/ic-transaction-sent.svg \ qt/res/icons/ic-transaction-staked.svg \ qt/pivx/res/img/bg-dashboard-banner.png \ + qt/pivx/res/img/bg-dashboard-banner-dark.png \ qt/pivx/res/img/bg-multi-number-dark.svg \ qt/pivx/res/img/ic-check-locked.svg \ qt/pivx/res/img/ic-check-console.svg \ diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b6294235c..828c8ff91 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -390,7 +390,7 @@ class CTestNetParams : public CMainParams vFixedSeeds.clear(); vSeeds.clear(); // nodes with support for servicebits filtering should be at the top - vSeeds.push_back(CDNSSeedData("tseeder", "tseeder.__decenomy.net__", true)); + vSeeds.push_back(CDNSSeedData("tseeder", "tseeder.ucrcoin.net", true)); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1, 139); // Testnet Ultra Clear addresses start with 'x' or 'y' base58Prefixes[SCRIPT_ADDRESS] = std::vector(1, 19); // Testnet Ultra Clear script addresses start with '8' or '9' diff --git a/src/chainparams.h b/src/chainparams.h index 979475ba0..a8b29fb71 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -9,10 +9,6 @@ #ifndef BITCOIN_CHAINPARAMS_H #define BITCOIN_CHAINPARAMS_H -#define __PORT_MAINNET__ 9999 -#define __PORT_TESTNET__ 19999 -#define __PORT_REGTEST__ 29999 - #include "chainparamsbase.h" #include "checkpoints.h" #include "consensus/params.h" diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index c93b240cd..3cd35a734 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,166 +8,166 @@ * IPv4 as well as onion addresses are wrapped inside an IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x01,0x45,0xf6}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x4f,0x4f,0x09}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x4d,0x4c,0x31}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x5e,0xbc,0x1b}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x8a,0x10,0x5f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x8a,0x25,0xcb}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xc9,0x3d,0xb9}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd3,0x47,0x46}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd3,0x47,0xd2}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x2c,0x14,0x8c}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x28,0x75,0xd1,0x49}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0c,0x20,0x3a}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0d,0xe8,0xae}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0f,0xa8,0x37}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xd9,0x2a}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xe4,0x57}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x21,0x0a}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x23,0xfb,0x45}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x51,0x94,0x1c}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x24,0x28,0xc9}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x60,0x0e,0x75}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x61,0xb3,0xeb}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x64,0xea}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x26,0xe8,0x66}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x44,0xaf,0x01}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xc7,0xeb,0x5d}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb2,0x18,0xf8}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x0a,0x98}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x38,0x1d,0x59}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x6f,0x54,0xe1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xbc,0xe5,0xd1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x5a,0x75,0x9b}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x36,0xd6,0x4a}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x37,0xd9,0x1b}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xaa,0x20,0x4f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x80,0x63,0xe1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x8a,0x02,0xd2}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0x1b,0x92}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x58,0xd2,0x31}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd0,0x11,0xaa}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x63,0xf5,0x14}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x3b,0x6f,0xbc}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0x74,0x05}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x95,0x8f,0x26}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x2b,0xa4}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd9,0xaa,0xce}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x77,0xa1,0x65}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x28,0x00,0x44}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2f,0xa3,0x6d}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xea,0xc3}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf2}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf4}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf6}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb0,0xed,0x71}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0xb8,0x2d}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd9,0x4d,0xd1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0xe1,0xad,0x21}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0xbc}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9c,0xfe,0x12}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xed,0x02,0xbf}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf2}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf4}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf5}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xdc,0x6d,0x62}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0x8d,0x58,0x44}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd1,0x16,0xe3}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x5d,0x98,0x99}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x45,0xd2,0x31}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x41,0x8b,0xe1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0xa0,0x42}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x5b,0x15}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0xb6}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x68,0x4a,0x99}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xc6,0x76}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xc7,0x20}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf9,0x27,0x72}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x1f,0xb6,0xc8}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0x89,0xeb}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x3f,0xd1}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xee,0x6d,0x70}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0d,0x26,0xf4}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb9,0x28,0xcf}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x44,0x2e,0x32}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x7f,0xf9,0x1d}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xd2,0xda,0x8c}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x24,0xed,0x1f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x25,0xd5,0x18}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x54,0x6f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x59,0x3f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xe4,0x0c,0x3d}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x05,0x15,0x1f}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xb4,0xee,0xc7}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xf6,0x77,0x1b}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x66,0x01}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x56,0x72,0xcf}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x3b,0x7b,0x0c}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9a,0xe7,0x27}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xca,0xff,0x23}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x96,0x51}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x96,0x8e}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x79,0x24,0xc8}, 51472}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xda,0xeb,0xb7,0x35}, 51472}, - // {{0x20,0x01,0x0b,0xc8,0x18,0x24,0x1b,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51472}, - // {{0x24,0x02,0x9e,0x80,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x33,0x29}, 51472}, - // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x08}, 51472}, - // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x33}, 51472}, - // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x53}, 51472}, - // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x72}, 51472}, - // {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0x77,0x72}, 51472}, - // {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0xed,0xaf}, 51472}, - // {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x11,0x42,0xd0,0x0d,0x00,0x00,0xba,0xbe,0xfa,0xce}, 51472}, - // {{0x2a,0x01,0x04,0xf8,0x0c,0x2c,0x5a,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51472}, - // {{0x2a,0x01,0x0e,0x0a,0x01,0xdc,0x02,0x40,0xd9,0x9b,0x2a,0xdf,0x28,0x83,0x0a,0xbd}, 51472}, - // {{0x2a,0x02,0x01,0x68,0xac,0x05,0x00,0x03,0x00,0x00,0x02,0x42,0xac,0x11,0x00,0x04}, 51472}, - // {{0x2a,0x02,0x01,0x68,0xac,0x05,0x00,0x03,0x00,0x00,0x02,0x42,0xac,0x11,0x00,0x05}, 51472}, - // {{0x2a,0x02,0x25,0xb0,0xaa,0xaa,0xaa,0xaa,0xe8,0x05,0x43,0x4d,0x5b,0x1a,0x00,0x1f}, 51472}, - // {{0x2a,0x07,0x57,0x41,0x00,0x00,0x09,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51472}, - // {{0x2a,0x07,0x57,0x41,0x00,0x00,0x0d,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51472}, - // {{0x2a,0x02,0x7b,0x40,0xc2,0x87,0x59,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51472}, - // {{0x26,0x02,0xff,0xc5,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe0,0xa7}, 51472}, - // {{0x26,0x02,0xff,0xc5,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3c,0xef}, 51472}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x03,0x01,0x45,0xf6}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x4f,0x4f,0x09}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x4d,0x4c,0x31}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x5e,0xbc,0x1b}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x8a,0x10,0x5f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x12,0x8a,0x25,0xcb}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xc9,0x3d,0xb9}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd3,0x47,0x46}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd3,0x47,0xd2}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x2c,0x14,0x8c}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x28,0x75,0xd1,0x49}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0c,0x20,0x3a}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0d,0xe8,0xae}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x0f,0xa8,0x37}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xd9,0x2a}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0xe4,0x57}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x21,0x21,0x0a}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x23,0xfb,0x45}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x51,0x94,0x1c}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x24,0x28,0xc9}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x60,0x0e,0x75}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x61,0xb3,0xeb}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x64,0xea}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x26,0xe8,0x66}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x44,0xaf,0x01}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xc7,0xeb,0x5d}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb2,0x18,0xf8}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0x0a,0x98}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x38,0x1d,0x59}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x6f,0x54,0xe1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0xbc,0xe5,0xd1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x5a,0x75,0x9b}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x36,0xd6,0x4a}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x37,0xd9,0x1b}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xaa,0x20,0x4f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x80,0x63,0xe1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x8a,0x02,0xd2}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x65,0x1b,0x92}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x58,0xd2,0x31}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd0,0x11,0xaa}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x63,0xf5,0x14}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x3b,0x6f,0xbc}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0x74,0x05}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x95,0x8f,0x26}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x2b,0xa4}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd9,0xaa,0xce}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x77,0xa1,0x65}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x28,0x00,0x44}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x2f,0xa3,0x6d}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xea,0xc3}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf2}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf4}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x63,0x00,0xf6}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb0,0xed,0x71}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0xb8,0x2d}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd9,0x4d,0xd1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0xe1,0xad,0x21}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0xbc}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9c,0xfe,0x12}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xed,0x02,0xbf}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf2}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf4}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xa3,0x24,0xf5}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xdc,0x6d,0x62}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0x8d,0x58,0x44}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xd1,0x16,0xe3}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x5d,0x98,0x99}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x45,0xd2,0x31}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x41,0x8b,0xe1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0xac,0xa0,0x42}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x5b,0x15}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa7,0x56,0x75,0xb6}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x68,0x4a,0x99}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xc6,0x76}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x69,0xc7,0x20}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf9,0x27,0x72}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x1f,0xb6,0xc8}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0x89,0xeb}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x3e,0x3f,0xd1}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xee,0x6d,0x70}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0d,0x26,0xf4}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb9,0x28,0xcf}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x44,0x2e,0x32}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x7f,0xf9,0x1d}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xd2,0xda,0x8c}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x24,0xed,0x1f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x25,0xd5,0x18}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x54,0x6f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x59,0x3f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xe4,0x0c,0x3d}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x05,0x15,0x1f}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xb4,0xee,0xc7}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xf6,0x77,0x1b}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x66,0x01}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x56,0x72,0xcf}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x3b,0x7b,0x0c}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9a,0xe7,0x27}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xca,0xff,0x23}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x96,0x51}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xbd,0x96,0x8e}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x79,0x24,0xc8}, 32628}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xda,0xeb,0xb7,0x35}, 32628}, + // {{0x20,0x01,0x0b,0xc8,0x18,0x24,0x1b,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 32628}, + // {{0x24,0x02,0x9e,0x80,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x33,0x29}, 32628}, + // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x08}, 32628}, + // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x33}, 32628}, + // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x53}, 32628}, + // {{0x26,0x00,0x2b,0x00,0xa2,0x14,0xf1,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x72}, 32628}, + // {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0x77,0x72}, 32628}, + // {{0x26,0x02,0xff,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc5,0xed,0xaf}, 32628}, + // {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x11,0x42,0xd0,0x0d,0x00,0x00,0xba,0xbe,0xfa,0xce}, 32628}, + // {{0x2a,0x01,0x04,0xf8,0x0c,0x2c,0x5a,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 32628}, + // {{0x2a,0x01,0x0e,0x0a,0x01,0xdc,0x02,0x40,0xd9,0x9b,0x2a,0xdf,0x28,0x83,0x0a,0xbd}, 32628}, + // {{0x2a,0x02,0x01,0x68,0xac,0x05,0x00,0x03,0x00,0x00,0x02,0x42,0xac,0x11,0x00,0x04}, 32628}, + // {{0x2a,0x02,0x01,0x68,0xac,0x05,0x00,0x03,0x00,0x00,0x02,0x42,0xac,0x11,0x00,0x05}, 32628}, + // {{0x2a,0x02,0x25,0xb0,0xaa,0xaa,0xaa,0xaa,0xe8,0x05,0x43,0x4d,0x5b,0x1a,0x00,0x1f}, 32628}, + // {{0x2a,0x07,0x57,0x41,0x00,0x00,0x09,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 32628}, + // {{0x2a,0x07,0x57,0x41,0x00,0x00,0x0d,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 32628}, + // {{0x2a,0x02,0x7b,0x40,0xc2,0x87,0x59,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 32628}, + // {{0x26,0x02,0xff,0xc5,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe0,0xa7}, 32628}, + // {{0x26,0x02,0xff,0xc5,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3c,0xef}, 32628}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x08,0xe0,0x2d,0x64,0x78,0x9d,0x9c,0xf8,0xc1,0xe0}, 9960}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x15,0x45,0x35,0x43,0xe9,0x4f,0x14,0xc2,0xee,0x27}, 9911}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x29,0x3e,0xd9,0xd7,0xe7,0xd3,0xa1,0x51,0xfd,0x3d}, 8938}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x27,0x3c,0x0c,0x29,0x56,0xdc,0xce,0x50,0xe3}, 9942}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x46,0xc2,0x43,0x2a,0x91,0x98,0x96,0xf8,0x56,0x2e}, 51472}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x46,0xc2,0x43,0x2a,0x91,0x98,0x96,0xf8,0x56,0x2e}, 32628}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x44,0xa9,0xde,0xa1,0xe2,0x9e,0x94,0x34,0x01,0x6c}, 9906}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5c,0xa9,0x86,0x4f,0xfd,0x6c,0xa6,0xad,0x1e,0x73}, 9831}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5d,0xf2,0x8b,0x76,0xd9,0xc5,0xdf,0x24,0xcb,0x78}, 9940}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x69,0x00,0xe0,0xa0,0x3b,0x38,0xb9,0xf1,0xde}, 51472}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x69,0x00,0xe0,0xa0,0x3b,0x38,0xb9,0xf1,0xde}, 32628}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x79,0xdb,0x2e,0x46,0x75,0xfe,0x5b,0x31,0x29,0x6f}, 9934}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x83,0xe0,0xc0,0xf6,0x57,0x1d,0x11,0x85,0xeb,0x2f}, 9929}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8f,0x22,0xda,0xa3,0x6b,0x4e,0x64,0x79,0x8a,0xe7}, 9995}, // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9a,0x61,0xff,0xa1,0x00,0x91,0xec,0x8d,0x0b,0x7c}, 9912}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x43,0xc8,0xda,0xb1,0x39,0x1f,0xc5,0x93,0x02,0xee}, 51472}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfe,0x65,0x5c,0xc5,0x5a,0xcb,0xa1,0xc1,0xcc,0xf3}, 51472}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x46,0xc2,0x43,0x2a,0x91,0x98,0x96,0xf8,0x56,0x2e}, 51472}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x54,0x41,0x0f,0x58,0x41,0x7b,0xe3,0x02,0x57,0x81}, 51472}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7b,0xab,0x64,0x75,0x56,0xc7,0x2e,0x97,0x31,0x49}, 51472}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x69,0x00,0xe0,0xa0,0x3b,0x38,0xb9,0xf1,0xde}, 51472} + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x43,0xc8,0xda,0xb1,0x39,0x1f,0xc5,0x93,0x02,0xee}, 32628}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfe,0x65,0x5c,0xc5,0x5a,0xcb,0xa1,0xc1,0xcc,0xf3}, 32628}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x46,0xc2,0x43,0x2a,0x91,0x98,0x96,0xf8,0x56,0x2e}, 32628}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x54,0x41,0x0f,0x58,0x41,0x7b,0xe3,0x02,0x57,0x81}, 32628}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7b,0xab,0x64,0x75,0x56,0xc7,0x2e,0x97,0x31,0x49}, 32628}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6a,0x69,0x00,0xe0,0xa0,0x3b,0x38,0xb9,0xf1,0xde}, 32628} }; static SeedSpec6 pnSeed6_test[] = { - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x23,0xfb,0x45}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x59,0x2e,0xe6}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0xbc}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x51,0xa6,0x3c}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x54,0x6f}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x59,0x3f}, 51474}, - // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x66,0x01}, 51474}, - // {{0x2a,0x02,0x7b,0x40,0xc2,0x87,0x59,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51474}, - // {{0x26,0x02,0xff,0xc5,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe0,0xa7}, 51474}, - // {{0x26,0x02,0xff,0xc5,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3c,0xef}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb9,0x78,0x28,0x21,0xcb,0x89,0x95,0x66,0xda,0xb0}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x90,0xcc,0x09,0x4e,0x04,0x89,0x76,0x42,0x3c,0x0c}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa3,0xe1,0xaf,0xa8,0xbd,0xfc,0x7a,0xe0,0xa0,0x63}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc1,0x35,0x0f,0x23,0x8e,0x15,0x10,0xda,0xa3,0x60}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x24,0xd3,0xb1,0x53,0xf2,0x6a,0x4f,0x75,0xf2,0xb8}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x09,0xde,0xde,0x93,0x3d,0xbc,0x33,0x08,0xfb,0x2a}, 51474}, - // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x2b,0xbe,0x13,0xc0,0x7c,0x61,0x6e,0x6b,0xf6}, 51474} + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x23,0xfb,0x45}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x59,0x2e,0xe6}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x80,0xe0,0xbc}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x51,0xa6,0x3c}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x54,0x6f}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x87,0x59,0x3f}, 51230}, + // {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x18,0x66,0x01}, 51230}, + // {{0x2a,0x02,0x7b,0x40,0xc2,0x87,0x59,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 51230}, + // {{0x26,0x02,0xff,0xc5,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xe0,0xa7}, 51230}, + // {{0x26,0x02,0xff,0xc5,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x3c,0xef}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb9,0x78,0x28,0x21,0xcb,0x89,0x95,0x66,0xda,0xb0}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x90,0xcc,0x09,0x4e,0x04,0x89,0x76,0x42,0x3c,0x0c}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa3,0xe1,0xaf,0xa8,0xbd,0xfc,0x7a,0xe0,0xa0,0x63}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc1,0x35,0x0f,0x23,0x8e,0x15,0x10,0xda,0xa3,0x60}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x24,0xd3,0xb1,0x53,0xf2,0x6a,0x4f,0x75,0xf2,0xb8}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x09,0xde,0xde,0x93,0x3d,0xbc,0x33,0x08,0xfb,0x2a}, 51230}, + // {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x2b,0xbe,0x13,0xc0,0x7c,0x61,0x6e,0x6b,0xf6}, 51230} }; #endif // BITCOIN_CHAINPARAMSSEEDS_H diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index c9b24d2f5..962bbcb55 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -446,7 +446,8 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st } // reject old signature version - if (winner.nMessVersion != MessageVersion::MESS_VER_HASH) { + if (Params().GetConsensus().NetworkUpgradeActive(chainActive.Tip()->nHeight, Consensus::UPGRADE_V4_0) && + winner.nMessVersion != MessageVersion::MESS_VER_HASH) { LogPrint(BCLog::MASTERNODE, "mnw - rejecting old message version %d\n", winner.nMessVersion); return; } diff --git a/src/masternode.cpp b/src/masternode.cpp index 77b5538a4..038bc718f 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -318,14 +318,58 @@ bool CMasternode::IsInputAssociatedWithPubkey() const CAmount CMasternode::GetMasternodeNodeCollateral(int nHeight) { - if (nHeight <= 100000) { + if (nHeight <= 1000 && nHeight > Params().LAST_POW_BLOCK()) { + return 10 * COIN; + } else if (nHeight <= 2000 && nHeight > 1000) { + return 50 * COIN; + } else if (nHeight <= 10000 && nHeight > 2000) { + return 100 * COIN; + } else if (nHeight <= 20000 && nHeight > 10000) { + return 500 * COIN; + } else if (nHeight <= 30000 && nHeight > 20000) { + return 750 * COIN; + } else if (nHeight <= 40000 && nHeight > 30000) { + return 250 * COIN; + } else if (nHeight <= 50000 && nHeight > 40000) { + return 375 * COIN; + } else if (nHeight <= 60000 && nHeight > 50000) { + return 750 * COIN; + } else if (nHeight <= 70000 && nHeight > 60000) { + return 1125 * COIN; + } else if (nHeight <= 80000 && nHeight > 70000) { + return 1750 * COIN; + } else if (nHeight <= 100000 && nHeight > 80000) { + return 2500 * COIN; + } else if (nHeight <= 120000 && nHeight > 100000) { + return 3500 * COIN; + } else if (nHeight <= 145000 && nHeight > 120000) { + return 5000 * COIN; + } else if (nHeight <= 170000 && nHeight > 145000) { + return 6500 * COIN; + } else if (nHeight <= 200000 && nHeight > 170000) { + return 8000 * COIN; + } else if (nHeight <= 230000 && nHeight > 200000) { + return 10000 * COIN; + } else if (nHeight <= 265000 && nHeight > 230000) { + return 12000 * COIN; + } else if (nHeight <= 300000 && nHeight > 265000) { return 15000 * COIN; - } else if (nHeight <= 200000 && nHeight > 100000) { - return 17500 * COIN; - } else if (nHeight > 200000) { + } else if (nHeight <= 350000 && nHeight > 300000) { return 20000 * COIN; + } else if (nHeight <= 400000 && nHeight > 350000) { + return 35000 * COIN; + } else if (nHeight <= Params().UltraClearStart() && nHeight > 400000) { + return 50000 * COIN; + } else if (nHeight <= 700000 && nHeight > Params().UltraClearStart()) { + return 60000 * COIN; + } else if (nHeight <= 800000 && nHeight > 700000) { + return 70000 * COIN; + } else if (nHeight <= 900000 && nHeight > 800000) { + return 80000 * COIN; + } else if (nHeight <= 1000000 && nHeight > 900000) { + return 90000 * COIN; } - return 0; + return 100000 * COIN; } CAmount CMasternode::GetBlockValue(int nHeight) @@ -418,11 +462,6 @@ CAmount CMasternode::GetMasternodePayment(int nHeight) { int64_t ret = 0; - if (Params().NetworkID() == CBaseChainParams::TESTNET) { - if (nHeight < 200) - return 0; - } - if (nHeight <= Params().LAST_POW_BLOCK()) { return 0; } else if (nHeight <=12000 && nHeight > Params().LAST_POW_BLOCK()){ @@ -434,6 +473,8 @@ CAmount CMasternode::GetMasternodePayment(int nHeight) if(nHeight > Params().UltraClearStart()) { ret = GetBlockValue(nHeight) - (5 * COIN); } + + return ret; } CMasternodeBroadcast::CMasternodeBroadcast() : @@ -535,20 +576,40 @@ bool CMasternodeBroadcast::Create(CTxIn txin, CService service, CKey keyCollater bool CMasternodeBroadcast::Sign(const CKey& key, const CPubKey& pubKey) { + sigTime = GetAdjustedTime(); + std::string strError = ""; - nMessVersion = MessageVersion::MESS_VER_HASH; - const std::string strMessage = GetSignatureHash().GetHex(); + std::string strMessage; - if (!CMessageSigner::SignMessage(strMessage, vchSig, key)) { - return error("%s : SignMessage() (nMessVersion=%d) failed", __func__, nMessVersion); - } + if(Params().GetConsensus().NetworkUpgradeActive(chainActive.Height(), Consensus::UPGRADE_V3_4)) { + nMessVersion = MessageVersion::MESS_VER_HASH; + strMessage = GetSignatureHash().GetHex(); - if (!CMessageSigner::VerifyMessage(pubKey, vchSig, strMessage, strError)) { - return error("%s : VerifyMessage() (nMessVersion=%d) failed, error: %s\n", - __func__, nMessVersion, strError); - } + if (!CMessageSigner::SignMessage(strMessage, vchSig, key)) { + return error("%s : SignMessage() (nMessVersion=%d) failed", __func__, nMessVersion); + } - return true; + if (!CMessageSigner::VerifyMessage(pubKey, vchSig, strMessage, strError)) { + return error("%s : VerifyMessage() (nMessVersion=%d) failed, error: %s\n", + __func__, nMessVersion, strError); + } + + return true; + } else { + nMessVersion = MessageVersion::MESS_VER_STRMESS; + strMessage = GetOldStrMessage(); + + CHashWriter ss(SER_GETHASH, 0); + ss << strMessageMagic; + ss << strMessage; + + if (!key.SignCompact(ss.GetHash(), vchSig)) { + return error("%s : VerifyMessage() (nMessVersion=%d) failed, error: Signing failed.\n", + __func__, nMessVersion); + } + + return true; + } } bool CMasternodeBroadcast::Sign(const std::string strSignKey) @@ -577,16 +638,16 @@ std::string CMasternodeBroadcast::GetOldStrMessage() const bool CMasternodeBroadcast::CheckSignature() const { std::string strError = ""; - const std::string strMessage = ( - nMessVersion == MessageVersion::MESS_VER_HASH ? - GetSignatureHash().GetHex() : - GetStrMessage() - ); - - if(!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError) && - !CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, GetOldStrMessage(), strError)) { + std::string strMessage = (nMessVersion == MessageVersion::MESS_VER_HASH ? + GetSignatureHash().GetHex() : + GetStrMessage()); + std::string oldStrMessage = (nMessVersion == MessageVersion::MESS_VER_HASH ? + GetSignatureHash().GetHex() : + GetOldStrMessage()); + + if (!CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, oldStrMessage, strError) && + !CMessageSigner::VerifyMessage(pubKeyCollateralAddress, vchSig, strMessage, strError)) return error("%s : VerifyMessage (nMessVersion=%d) failed: %s", __func__, nMessVersion, strError); - } return true; } @@ -832,7 +893,7 @@ std::string CMasternodePing::GetStrMessage() const { int64_t salt = sporkManager.GetSporkValue(SPORK_103_PING_MESSAGE_SALT); - if (salt == 4070908800ULL) { + if (salt != 0) { return vin.ToString() + blockHash.ToString() + std::to_string(sigTime) + std::to_string(salt); } else { return vin.ToString() + blockHash.ToString() + std::to_string(sigTime); diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp index 0228ee58a..94863224a 100644 --- a/src/messagesigner.cpp +++ b/src/messagesigner.cpp @@ -79,16 +79,30 @@ bool CHashSigner::VerifyHash(const uint256& hash, const CKeyID& keyID, const std bool CSignedMessage::Sign(const CKey& key, const CPubKey& pubKey) { - nMessVersion = MessageVersion::MESS_VER_HASH; std::string strError = ""; - uint256 hash = GetSignatureHash(); - if(!CHashSigner::SignHash(hash, key, vchSig)) { - return error("%s : SignHash() failed", __func__); - } + if (Params().GetConsensus().NetworkUpgradeActive(chainActive.Height(), Consensus::UPGRADE_V3_4)) { + nMessVersion = MessageVersion::MESS_VER_HASH; + uint256 hash = GetSignatureHash(); + + if (!CHashSigner::SignHash(hash, key, vchSig)) { + return error("%s : SignHash() failed", __func__); + } + + if (!CHashSigner::VerifyHash(hash, pubKey, vchSig, strError)) { + return error("%s : VerifyHash() failed, error: %s", __func__, strError); + } + } else { + nMessVersion = MessageVersion::MESS_VER_STRMESS; + std::string strMessage = GetStrMessage(); + + if (!CMessageSigner::SignMessage(strMessage, vchSig, key)) { + return error("%s : SignMessage() failed", __func__); + } - if (!CHashSigner::VerifyHash(hash, pubKey, vchSig, strError)) { - return error("%s : VerifyHash() failed, error: %s", __func__, strError); + if (!CMessageSigner::VerifyMessage(pubKey, vchSig, strMessage, strError)) { + return error("%s : VerifyMessage() failed, error: %s\n", __func__, strError); + } } return true; diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp index eb55e8524..c94b54840 100644 --- a/src/qt/pivx.cpp +++ b/src/qt/pivx.cpp @@ -570,6 +570,22 @@ int main(int argc, char* argv[]) QFontDatabase::addApplicationFont(":/font/Nunito-SemiBold.ttf"); QFontDatabase::addApplicationFont(":/font/Nunito-SemiBoldItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Black.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-BlackItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Bold.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-BoldItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-ExtraBold.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-ExtraBoldItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-ExtraLight.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-ExtraLightItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Italic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Light.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-LightItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Regular.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-SemiBold.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-SemiBoldItalic.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-Thin.ttf"); + QFontDatabase::addApplicationFont(":/font/Montserrat-ThinItalic.ttf"); // Register meta types used for QMetaObject::invokeMethod qRegisterMetaType(); diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc index 673383097..03ecdc7cc 100644 --- a/src/qt/pivx.qrc +++ b/src/qt/pivx.qrc @@ -201,6 +201,7 @@ pivx/res/img/bg-welcome-container@2x.png pivx/res/img/bg-welcome-container@3x.png pivx/res/img/bg-dashboard-banner.png + pivx/res/img/bg-dashboard-banner-dark.png pivx/res/img/ic-check-box-dark-active.svg pivx/res/img/ic-check-box-indeterminate.svg pivx/res/img/ic-check-liliac-indeterminate.svg @@ -240,5 +241,21 @@ pivx/res/font/Nunito-Regular.ttf pivx/res/font/Nunito-SemiBold.ttf pivx/res/font/Nunito-SemiBoldItalic.ttf + pivx/res/font/Montserrat-Black.ttf + pivx/res/font/Montserrat-BlackItalic.ttf + pivx/res/font/Montserrat-Bold.ttf + pivx/res/font/Montserrat-BoldItalic.ttf + pivx/res/font/Montserrat-ExtraBold.ttf + pivx/res/font/Montserrat-ExtraBoldItalic.ttf + pivx/res/font/Montserrat-ExtraLight.ttf + pivx/res/font/Montserrat-ExtraLightItalic.ttf + pivx/res/font/Montserrat-Italic.ttf + pivx/res/font/Montserrat-Light.ttf + pivx/res/font/Montserrat-LightItalic.ttf + pivx/res/font/Montserrat-Regular.ttf + pivx/res/font/Montserrat-SemiBold.ttf + pivx/res/font/Montserrat-SemiBoldItalic.ttf + pivx/res/font/Montserrat-Thin.ttf + pivx/res/font/Montserrat-ThinItalic.ttf diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/pivx/dashboardwidget.cpp index dce8f70e4..0062422a6 100644 --- a/src/qt/pivx/dashboardwidget.cpp +++ b/src/qt/pivx/dashboardwidget.cpp @@ -54,6 +54,7 @@ DashboardWidget::DashboardWidget(PIVXGUI* parent) : setCssSubtitleScreen(ui->labelSubtitle); // Staking Information + ui->labelMessage->setText(tr("Amount of UCR earned via Staking & Masternodes")); setCssSubtitleScreen(ui->labelMessage); setCssProperty(ui->labelSquarePiv, "square-chart-piv"); setCssProperty(ui->labelPiv, "text-chart-piv"); @@ -575,6 +576,7 @@ const QMap> DashboardWidget::getAmountBy() } else if (isMN) { amountBy[time]["piv"] = 0; amountBy[time]["mn"] = amount; + hasMNRewards = true; } } } @@ -614,7 +616,8 @@ bool DashboardWidget::loadChartData(bool withMonthNames) chartData->xLabels << ((withMonthNames) ? monthsNames[num - 1] : QString::number(num)); - chartData->valuesPiv.append(piv); + chartData->valuesPiv.append(piv); + chartData->valuesMNRewards.append(mnrewards); int max = std::max(piv, mnrewards); if (max > chartData->maxValue) { @@ -690,7 +693,7 @@ void DashboardWidget::onChartRefreshed() // Total nDisplayUnit = walletModel->getOptionsModel()->getDisplayUnit(); - if (chartData->totalPiv > 0 || chartData->totalMNRewards) { + if (chartData->totalPiv > 0 || chartData->totalMNRewards > 0) { setCssProperty(ui->labelAmountPiv, "text-stake-piv"); setCssProperty(ui->labelAmountMNRewards, "text-stake-mnrewards"); } else { diff --git a/src/qt/pivx/forms/dashboardwidget.ui b/src/qt/pivx/forms/dashboardwidget.ui index 06c1473bd..c2bccdb74 100644 --- a/src/qt/pivx/forms/dashboardwidget.ui +++ b/src/qt/pivx/forms/dashboardwidget.ui @@ -560,31 +560,31 @@ - - - 0 - - - - - 0 UCR - - - Qt::AlignCenter - - - - - - - TextLabel - - - Qt::AlignCenter + + + 0 - - - + + + + 0 UCR + + + Qt::AlignCenter + + + + + + + TextLabel + + + Qt::AlignCenter + + + + diff --git a/src/qt/pivx/res/css/style_dark.css b/src/qt/pivx/res/css/style_dark.css index 9df320c10..6e36c6c4f 100644 --- a/src/qt/pivx/res/css/style_dark.css +++ b/src/qt/pivx/res/css/style_dark.css @@ -1746,10 +1746,10 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-stake-mnrewards"] { - color: #7be6ff; + color: rgb(74, 149, 103); font-size:16px; padding:10px; - border-bottom: 5px solid #7be6ff; + border-bottom: 5px solid rgb(74, 149, 103); } *[cssClass="text-stake-mnrewards-disable"] { @@ -1765,7 +1765,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-chart-mnrewards"] { - color: #7be6ff; + color: rgb(74, 149, 103); font-size:16px; padding-left:4px; } @@ -1777,7 +1777,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="square-chart-mnrewards"] { - background-color: #7be6ff; + background-color: rgb(74, 149, 103); border:none; } diff --git a/src/qt/pivx/res/css/style_light.css b/src/qt/pivx/res/css/style_light.css index 4a58e1334..9c79ca6cf 100644 --- a/src/qt/pivx/res/css/style_light.css +++ b/src/qt/pivx/res/css/style_light.css @@ -7,7 +7,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="container"] { - background-color: #ffffff; + background-color: #fafafa; } *[cssClass="container-border"] { @@ -1731,10 +1731,10 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-stake-mnrewards"] { - color: #7be6ff; + color: rgb(74, 149, 103); font-size:16px; padding:10px; - border-bottom: 5px solid #7be6ff; + border-bottom: 5px solid rgb(74, 149, 103); } *[cssClass="text-stake-mnrewards-disable"] { @@ -1750,7 +1750,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-chart-mnrewards"] { - color: #7be6ff; + color: rgb(74, 149, 103); font-size:16px; padding-left:4px; } @@ -1762,7 +1762,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="square-chart-mnrewards"] { - background-color: #7be6ff; + background-color: rgb(74, 149, 103); border:none; } diff --git a/src/qt/pivx/res/font/Montserrat-Black.ttf b/src/qt/pivx/res/font/Montserrat-Black.ttf new file mode 100644 index 000000000..437b1157c Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Black.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-BlackItalic.ttf b/src/qt/pivx/res/font/Montserrat-BlackItalic.ttf new file mode 100644 index 000000000..52348354c Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-BlackItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Bold.ttf b/src/qt/pivx/res/font/Montserrat-Bold.ttf new file mode 100644 index 000000000..221819bca Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Bold.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-BoldItalic.ttf b/src/qt/pivx/res/font/Montserrat-BoldItalic.ttf new file mode 100644 index 000000000..9ae2bd240 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-BoldItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-ExtraBold.ttf b/src/qt/pivx/res/font/Montserrat-ExtraBold.ttf new file mode 100644 index 000000000..80ea8061b Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-ExtraBold.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-ExtraBoldItalic.ttf b/src/qt/pivx/res/font/Montserrat-ExtraBoldItalic.ttf new file mode 100644 index 000000000..6c961e1cc Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-ExtraBoldItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-ExtraLight.ttf b/src/qt/pivx/res/font/Montserrat-ExtraLight.ttf new file mode 100644 index 000000000..ca0bbb656 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-ExtraLight.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-ExtraLightItalic.ttf b/src/qt/pivx/res/font/Montserrat-ExtraLightItalic.ttf new file mode 100644 index 000000000..f3c1559ec Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-ExtraLightItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Italic.ttf b/src/qt/pivx/res/font/Montserrat-Italic.ttf new file mode 100644 index 000000000..eb4232a0c Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Italic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Light.ttf b/src/qt/pivx/res/font/Montserrat-Light.ttf new file mode 100644 index 000000000..990857de8 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Light.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-LightItalic.ttf b/src/qt/pivx/res/font/Montserrat-LightItalic.ttf new file mode 100644 index 000000000..209604046 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-LightItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Medium.ttf b/src/qt/pivx/res/font/Montserrat-Medium.ttf new file mode 100644 index 000000000..6e079f698 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Medium.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-MediumItalic.ttf b/src/qt/pivx/res/font/Montserrat-MediumItalic.ttf new file mode 100644 index 000000000..0dc3ac9c2 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-MediumItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Regular.ttf b/src/qt/pivx/res/font/Montserrat-Regular.ttf new file mode 100644 index 000000000..8d443d5d5 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Regular.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-SemiBold.ttf b/src/qt/pivx/res/font/Montserrat-SemiBold.ttf new file mode 100644 index 000000000..f8a43f2b2 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-SemiBold.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-SemiBoldItalic.ttf b/src/qt/pivx/res/font/Montserrat-SemiBoldItalic.ttf new file mode 100644 index 000000000..336c56ec0 Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-SemiBoldItalic.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-Thin.ttf b/src/qt/pivx/res/font/Montserrat-Thin.ttf new file mode 100644 index 000000000..b9858757e Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-Thin.ttf differ diff --git a/src/qt/pivx/res/font/Montserrat-ThinItalic.ttf b/src/qt/pivx/res/font/Montserrat-ThinItalic.ttf new file mode 100644 index 000000000..e488998ec Binary files /dev/null and b/src/qt/pivx/res/font/Montserrat-ThinItalic.ttf differ diff --git a/src/qt/pivx/res/img/img-dashboard-banner.jpg b/src/qt/pivx/res/img/img-dashboard-banner.jpg index ceb75dfbb..bc9ea609f 100644 Binary files a/src/qt/pivx/res/img/img-dashboard-banner.jpg and b/src/qt/pivx/res/img/img-dashboard-banner.jpg differ diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp index f5cbd2b68..ab9db5a99 100644 --- a/src/qt/pivx/topbar.cpp +++ b/src/qt/pivx/topbar.cpp @@ -38,12 +38,7 @@ TopBar::TopBar(PIVXGUI* _mainWindow, QWidget *parent) : this->setStyleSheet(_mainWindow->styleSheet()); /* Containers */ ui->containerTop->setContentsMargins(10, 4, 10, 10); -#ifdef Q_OS_MAC - ui->containerTop->load("://bg-dashboard-banner"); - setCssProperty(ui->containerTop,"container-topbar-no-image"); -#else ui->containerTop->setProperty("cssClass", "container-top"); -#endif std::initializer_list lblTitles = {ui->labelTitle1, ui->labelTitle3, ui->labelTitle4}; setCssProperty(lblTitles, "text-title-topbar"); diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index 32fa7268d..309532573 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -163,7 +163,7 @@ bool TransactionFilterProxy::isZcTx(int type) const { } bool TransactionFilterProxy::isStakeTx(int type) const { - return type == TransactionRecord::StakeMint || type == TransactionRecord::Generated /*|| type == TransactionRecord::StakeZPIV*/ || type == TransactionRecord::StakeDelegated; + return type == TransactionRecord::StakeMint || type == TransactionRecord::Generated || type == TransactionRecord::StakeDelegated; } bool TransactionFilterProxy::isMasternodeRewardTx(int type) const { diff --git a/src/spork.cpp b/src/spork.cpp index 029d1bf0c..870d38a41 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -27,7 +27,7 @@ std::vector sporkDefs = { MAKE_SPORK_DEF(SPORK_11_NOOP, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_12_NOOP, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_13_ENABLE_SUPERBLOCKS, 4070908800ULL), // OFF - MAKE_SPORK_DEF(SPORK_14_MIN_PROTOCOL_ACCEPTED, 4070908800ULL), // OFF + MAKE_SPORK_DEF(SPORK_14_MIN_PROTOCOL_ACCEPTED, 70917ULL), // UCR 2.0 MAKE_SPORK_DEF(SPORK_15_NOOP, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_16_ZEROCOIN_MAINTENANCE_MODE, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_17_NOOP, 4070908800ULL), // OFF @@ -36,7 +36,7 @@ std::vector sporkDefs = { MAKE_SPORK_DEF(SPORK_101_SERVICES_ENFORCEMENT, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_102_FORCE_ENABLED_MASTERNODE , 4070908800ULL), // OFF - MAKE_SPORK_DEF(SPORK_103_PING_MESSAGE_SALT, 4070908800ULL), // OFF + MAKE_SPORK_DEF(SPORK_103_PING_MESSAGE_SALT, 0), // OFF MAKE_SPORK_DEF(SPORK_104_MAX_BLOCK_TIME, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_105_MAX_BLOCK_SIZE, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_106_STAKING_SKIP_MN_SYNC, 4070908800ULL), // OFF