Skip to content

Commit

Permalink
Move checkpoint from static/header definition to .c over extern
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonasschnelli
jonasschnelli committed Apr 29, 2017
1 parent 04e1253 commit 5a77b28
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 62 deletions.
1 change: 1 addition & 0 deletions Makefile.am
View file
Expand Up @@ -45,6 +45,7 @@ libbtc_la_SOURCES = \
src/bip32.c \
src/block.c \
src/buffer.c \
src/chainparams.c \
src/commontools.c \
src/cstr.c \
src/ctaes.c \
Expand Down
46 changes: 13 additions & 33 deletions include/btc/chainparams.h
View file
Expand Up @@ -53,39 +53,19 @@ typedef struct btc_chainparams_ {
btc_dns_seed dnsseeds[8];
} btc_chainparams;

static const btc_chainparams btc_chainparams_main = {
"main",
0x00,
0x05,
0x80,
0x0488ADE4,
0x0488B21E,
{0xf9, 0xbe, 0xb4, 0xd9},
{0x6f, 0xe2, 0x8c, 0x0a, 0xb6, 0xf1, 0xb3, 0x72, 0xc1, 0xa6, 0xa2, 0x46, 0xae, 0x63, 0xf7, 0x4f, 0x93, 0x1e, 0x83, 0x65, 0xe1, 0x5a, 0x08, 0x9c, 0x68, 0xd6, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00},
8333,
{{"seed.bitcoin.jonasschnelli.ch"}, 0}};
static const btc_chainparams btc_chainparams_test = {
"testnet3",
0x6f,
0xc4,
0xEF,
0x04358394,
0x043587CF,
{0x0b, 0x11, 0x09, 0x07},
{0x43, 0x49, 0x7f, 0xd7, 0xf8, 0x26, 0x95, 0x71, 0x08, 0xf4, 0xa3, 0x0f, 0xd9, 0xce, 0xc3, 0xae, 0xba, 0x79, 0x97, 0x20, 0x84, 0xe9, 0x0e, 0xad, 0x01, 0xea, 0x33, 0x09, 0x00, 0x00, 0x00, 0x00},
18333,
{{"testnet-seed.bitcoin.jonasschnelli.ch"}, 0}};
static const btc_chainparams btc_chainparams_regtest = {
"regtest",
0x6f,
0xc4,
0xEF,
0x04358394,
0x043587CF,
{0xfa, 0xbf, 0xb5, 0xda},
{0x06, 0x22, 0x6e, 0x46, 0x11, 0x1a, 0x0b, 0x59, 0xca, 0xaf, 0x12, 0x60, 0x43, 0xeb, 0x5b, 0xbf, 0x28, 0xc3, 0x4f, 0x3a, 0x5e, 0x33, 0x2a, 0x1f, 0xc7, 0xb2, 0xb7, 0x3c, 0xf1, 0x88, 0x91, 0x0f},
18444,
{0}};
typedef struct btc_checkpoint_ {
uint32_t height;
const char* hash;
uint32_t timestamp;
uint32_t target;
} btc_checkpoint;

extern const btc_chainparams btc_chainparams_main;
extern const btc_chainparams btc_chainparams_test;
extern const btc_chainparams btc_chainparams_regtest;

// the mainnet checkpoins, needs a fix size
extern const btc_checkpoint btc_mainnet_checkpoint_array[21];

#ifdef __cplusplus
}
Expand Down
28 changes: 0 additions & 28 deletions include/btc/checkpoints.h
View file
Expand Up @@ -31,34 +31,6 @@ OTHER DEALINGS IN THE SOFTWARE.
extern "C" {
#endif

static const struct {
uint32_t height;
const char* hash;
uint32_t timestamp;
uint32_t target;
} btc_mainnet_checkpoint_array[] = {
{0, "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f", 1231006505, 0x1d00ffff},
{20160, "000000000f1aef56190aee63d33a373e6487132d522ff4cd98ccfc96566d461e", 1248481816, 0x1d00ffff},
{40320, "0000000045861e169b5a961b7034f8de9e98022e7a39100dde3ae3ea240d7245", 1266191579, 0x1c654657},
{60480, "000000000632e22ce73ed38f46d5b408ff1cff2cc9e10daaf437dfd655153837", 1276298786, 0x1c0eba64},
{80640, "0000000000307c80b87edf9f6a0697e2f01db67e518c8a4d6065d1d859a3a659", 1284861847, 0x1b4766ed},
{100800, "000000000000e383d43cc471c64a9a4a46794026989ef4ff9611d5acb704e47a", 1294031411, 0x1b0404cb},
{120960, "0000000000002c920cf7e4406b969ae9c807b5c4f271f490ca3de1b0770836fc", 1304131980, 0x1b0098fa},
{141120, "00000000000002d214e1af085eda0a780a8446698ab5c0128b6392e189886114", 1313451894, 0x1a094a86},
{161280, "00000000000005911fe26209de7ff510a8306475b75ceffd434b68dc31943b99", 1326047176, 0x1a0d69d7},
{181440, "00000000000000e527fc19df0992d58c12b98ef5a17544696bbba67812ef0e64", 1337883029, 0x1a0a8b5f},
{201600, "00000000000003a5e28bef30ad31f1f9be706e91ae9dda54179a95c9f9cd9ad0", 1349226660, 0x1a057e08},
{221760, "00000000000000fc85dd77ea5ed6020f9e333589392560b40908d3264bd1f401", 1361148470, 0x1a04985c},
{241920, "00000000000000b79f259ad14635739aaf0cc48875874b6aeecc7308267b50fa", 1371418654, 0x1a00de15},
{262080, "000000000000000aa77be1c33deac6b8d3b7b0757d02ce72fffddc768235d0e2", 1381070552, 0x1916b0ca},
{282240, "0000000000000000ef9ee7529607286669763763e0c46acfdefd8a2306de5ca8", 1390570126, 0x1901f52c},
{302400, "0000000000000000472132c4daaf358acaf461ff1c3e96577a74e5ebf91bb170", 1400928750, 0x18692842},
{322560, "000000000000000002df2dd9d4fe0578392e519610e341dd09025469f101cfa1", 1411680080, 0x181fb893},
{342720, "00000000000000000f9cfece8494800d3dcbf9583232825da640c8703bcd27e7", 1423496415, 0x1818bb87},
{362880, "000000000000000014898b8e6538392702ffb9450f904c80ebf9d82b519a77d5", 1435475246, 0x1816418e},
{383040, "00000000000000000a974fa1a3f84055ad5ef0b2f96328bc96310ce83da801c9", 1447236692, 0x1810b289},
{403200, "000000000000000000c4272a5c68b4f55e5af734e88ceab09abf73e9ac3b6d01", 1458292068, 0x1806a4c3}};


#ifdef __cplusplus
}
Expand Down
13 changes: 13 additions & 0 deletions rpctest/spvtool.py
View file
Expand Up @@ -50,6 +50,19 @@ def run_test (self):
cmd = "./bitcoin-spv --regtest -f 0 -d -i 127.0.0.1:"+str(p2p_port(0))+" scan"
data = self.execute_and_get_response(cmd)
assert("parsing 1 tx(s) from block at height: 100" in data)

# do the same with a headers db
try:
os.remove("headers.db")
except OSError:
pass
cmd = "./bitcoin-spv --regtest -d -i 127.0.0.1:"+str(p2p_port(0))+" scan"
data = self.execute_and_get_response(cmd)
assert("parsing 1 tx(s) from block at height: 100" in data)
try:
os.remove("headers.db")
except OSError:
pass

if __name__ == '__main__':
SPVToolTest().main()
85 changes: 85 additions & 0 deletions src/chainparams.c
View file
@@ -0,0 +1,85 @@
/*
The MIT License (MIT)
Copyright (c) 2017 Jonas Schnelli
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/

#include <btc/chainparams.h>

const btc_chainparams btc_chainparams_main = {
"main",
0x00,
0x05,
0x80,
0x0488ADE4,
0x0488B21E,
{0xf9, 0xbe, 0xb4, 0xd9},
{0x6f, 0xe2, 0x8c, 0x0a, 0xb6, 0xf1, 0xb3, 0x72, 0xc1, 0xa6, 0xa2, 0x46, 0xae, 0x63, 0xf7, 0x4f, 0x93, 0x1e, 0x83, 0x65, 0xe1, 0x5a, 0x08, 0x9c, 0x68, 0xd6, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00},
8333,
{{"seed.bitcoin.jonasschnelli.ch"}, 0}};
const btc_chainparams btc_chainparams_test = {
"testnet3",
0x6f,
0xc4,
0xEF,
0x04358394,
0x043587CF,
{0x0b, 0x11, 0x09, 0x07},
{0x43, 0x49, 0x7f, 0xd7, 0xf8, 0x26, 0x95, 0x71, 0x08, 0xf4, 0xa3, 0x0f, 0xd9, 0xce, 0xc3, 0xae, 0xba, 0x79, 0x97, 0x20, 0x84, 0xe9, 0x0e, 0xad, 0x01, 0xea, 0x33, 0x09, 0x00, 0x00, 0x00, 0x00},
18333,
{{"testnet-seed.bitcoin.jonasschnelli.ch"}, 0}};
const btc_chainparams btc_chainparams_regtest = {
"regtest",
0x6f,
0xc4,
0xEF,
0x04358394,
0x043587CF,
{0xfa, 0xbf, 0xb5, 0xda},
{0x06, 0x22, 0x6e, 0x46, 0x11, 0x1a, 0x0b, 0x59, 0xca, 0xaf, 0x12, 0x60, 0x43, 0xeb, 0x5b, 0xbf, 0x28, 0xc3, 0x4f, 0x3a, 0x5e, 0x33, 0x2a, 0x1f, 0xc7, 0xb2, 0xb7, 0x3c, 0xf1, 0x88, 0x91, 0x0f},
18444,
{0}};


const btc_checkpoint btc_mainnet_checkpoint_array[] = {
{0, "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f", 1231006505, 0x1d00ffff},
{20160, "000000000f1aef56190aee63d33a373e6487132d522ff4cd98ccfc96566d461e", 1248481816, 0x1d00ffff},
{40320, "0000000045861e169b5a961b7034f8de9e98022e7a39100dde3ae3ea240d7245", 1266191579, 0x1c654657},
{60480, "000000000632e22ce73ed38f46d5b408ff1cff2cc9e10daaf437dfd655153837", 1276298786, 0x1c0eba64},
{80640, "0000000000307c80b87edf9f6a0697e2f01db67e518c8a4d6065d1d859a3a659", 1284861847, 0x1b4766ed},
{100800, "000000000000e383d43cc471c64a9a4a46794026989ef4ff9611d5acb704e47a", 1294031411, 0x1b0404cb},
{120960, "0000000000002c920cf7e4406b969ae9c807b5c4f271f490ca3de1b0770836fc", 1304131980, 0x1b0098fa},
{141120, "00000000000002d214e1af085eda0a780a8446698ab5c0128b6392e189886114", 1313451894, 0x1a094a86},
{161280, "00000000000005911fe26209de7ff510a8306475b75ceffd434b68dc31943b99", 1326047176, 0x1a0d69d7},
{181440, "00000000000000e527fc19df0992d58c12b98ef5a17544696bbba67812ef0e64", 1337883029, 0x1a0a8b5f},
{201600, "00000000000003a5e28bef30ad31f1f9be706e91ae9dda54179a95c9f9cd9ad0", 1349226660, 0x1a057e08},
{221760, "00000000000000fc85dd77ea5ed6020f9e333589392560b40908d3264bd1f401", 1361148470, 0x1a04985c},
{241920, "00000000000000b79f259ad14635739aaf0cc48875874b6aeecc7308267b50fa", 1371418654, 0x1a00de15},
{262080, "000000000000000aa77be1c33deac6b8d3b7b0757d02ce72fffddc768235d0e2", 1381070552, 0x1916b0ca},
{282240, "0000000000000000ef9ee7529607286669763763e0c46acfdefd8a2306de5ca8", 1390570126, 0x1901f52c},
{302400, "0000000000000000472132c4daaf358acaf461ff1c3e96577a74e5ebf91bb170", 1400928750, 0x18692842},
{322560, "000000000000000002df2dd9d4fe0578392e519610e341dd09025469f101cfa1", 1411680080, 0x181fb893},
{342720, "00000000000000000f9cfece8494800d3dcbf9583232825da640c8703bcd27e7", 1423496415, 0x1818bb87},
{362880, "000000000000000014898b8e6538392702ffb9450f904c80ebf9d82b519a77d5", 1435475246, 0x1816418e},
{383040, "00000000000000000a974fa1a3f84055ad5ef0b2f96328bc96310ce83da801c9", 1447236692, 0x1810b289},
{403200, "000000000000000000c4272a5c68b4f55e5af734e88ceab09abf73e9ac3b6d01", 1458292068, 0x1806a4c3}};
3 changes: 2 additions & 1 deletion src/netspv.c
View file
Expand Up @@ -21,7 +21,7 @@
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
*/

#include <btc/block.h>
Expand Down Expand Up @@ -226,6 +226,7 @@ void btc_net_spv_fill_block_locator(btc_spv_client *client, vector *blocklocator
int64_t min_timestamp = client->oldest_item_of_interest - BLOCK_GAP_TO_DEDUCT_TO_START_SCAN_FROM * BLOCKS_DELTA_IN_S; /* ensure we going back ~144 blocks */
for (int i = (sizeof(btc_mainnet_checkpoint_array) / sizeof(btc_mainnet_checkpoint_array[0]))-1; i >= 0 ; i--)
{
const btc_checkpoint *cp = &btc_mainnet_checkpoint_array[i];
if ( btc_mainnet_checkpoint_array[i].timestamp < min_timestamp)
{
uint256 *hash = btc_calloc(1, sizeof(uint256));
Expand Down

0 comments on commit 5a77b28

Please sign in to comment.