Skip to content

Commit 3b4bcea

Browse files
committed
Merge pull request #40 from syscoin/devstaging-aliasfix
Devstaging aliasfix, v1.5.1.1 updates.
2 parents 10c6073 + 9b4f6ec commit 3b4bcea

File tree

7 files changed

+231
-19
lines changed

7 files changed

+231
-19
lines changed

share/qt/Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<key>CFBundlePackageType</key>
88
<string>APPL</string>
99
<key>CFBundleGetInfoString</key>
10-
<string>0.1.5.1, Copyright © 2009-2015 The Bitcoin and Syscoin developers</string>
10+
<string>1.5.1.1, Copyright © 2009-2015 The Bitcoin and Syscoin developers</string>
1111
<key>CFBundleShortVersionString</key>
12-
<string>0.1.5.1</string>
12+
<string>1.5.1.1</string>
1313
<key>CFBundleVersion</key>
14-
<string>0.1.5.1</string>
14+
<string>1.5.1.1</string>
1515
<key>CFBundleSignature</key>
1616
<string>????</string>
1717
<key>CFBundleExecutable</key>

src/checkpoints.cpp

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,28 @@ namespace Checkpoints
100100
( 113151, uint256("0x5f0901cb9acb48d30426c359da9f9260b7c99ee5bca76a7e254283b73e2a734a"))
101101
( 116182, uint256("0x3b563424f766c83b7bd4f71cbfa55d36bd63e78e3203df316aa8955a208192e1"))
102102
( 119100, uint256("0xf1ae217c317865da6562ca62a469b3b64c089a04ca4d54925a96bf4b1cdf91b2"))
103-
;
103+
( 125360, uint256("0xcbce71a0702af2bb2607966ac19a03f28f7459383249166a05f55fa71b7e3c18"))
104+
( 140998, uint256("0xb7aee5d5dc68bc56835fc9a9fa17dd169cddbe61aae855d223b59d9c50abdd2b"))
105+
( 163221, uint256("0x316394844198d9bce5669a2d51ab08f206e40c158ce4eabad19adc0d7c930bf5"))
106+
( 185411, uint256("0x43f0395e7555bd56a3445154095e313ed4ed2aa931a4f40a8ebeaecda63b437b"))
107+
( 197200, uint256("0xe9a50ea75118573870c8d9c7908e3e0c589ce581dd98020f4a736b8ed17e1c51"))
108+
( 201990, uint256("0x27ef8fd089e999b0a88fe0829a23b73e178b91882e2541fd356a5ac25222f7b6"))
109+
( 218123, uint256("0xeb56da11c1ea2ad511813b2c114e20be7c7113181eeea5acc86451c23a451236"))
110+
( 240351, uint256("0xb123a60541f00310404c311d2f9168a46dce7c033314a2981557557d464d555a"))
111+
( 258999, uint256("0x5bf820f9b91b812a5976e5321d4928e79d83103b40a77e21fc6cfb77a01583a9"))
112+
( 286405, uint256("0x3d590a93302cff768268788d244e7326c042f9d14c2746fa3b52ba15d5c5a108"))
113+
( 291330, uint256("0x05e3cc54af99ce0c8a35adeb3a093138333a1ed7800a11d1c8a3aea9b39eeeee"))
114+
( 302005, uint256("0x1088aacdce9739c41cb57633637250759d67f70583e23ca9d9c9169b0f18c2eb"))
115+
( 325100, uint256("0x22b10a33fdf17d31e18fd6b491702505a6162f61e263de1b19ae5ac52be747dd"))
116+
( 341290, uint256("0x97dbfe0ce6028d7fef32a57c147a67f743899f59b499664550a19e96fbfd1e9e"))
117+
( 356001, uint256("0x50a48f51df7167afbcb3d6ddbaae0d42f383a85367eb6961ced22f9263c8c0f9"))
118+
( 362544, uint256("0x6bf678b95f1fe7ab8a9d48baefc990aab41b7444715e1e86c2ade2ce77739862"))
119+
;
120+
104121
static const CCheckpointData data = {
105122
&mapCheckpoints,
106-
1415484096, // * UNIX timestamp of last checkpoint block
107-
173927, // * total number of transactions between genesis and last checkpoint
123+
1430366011, // * UNIX timestamp of last checkpoint block
124+
468511, // * total number of transactions between genesis and last checkpoint
108125
// (the tx=... number in the SetBestChain debug.log lines)
109126
600.0 // * estimated number of transactions per day after checkpoint
110127
};
File renamed without changes.

src/makefile.port.osx

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
# -*- mode: Makefile; -*-
2+
# Copyright (c) 2011 Bitcoin Developers
3+
# Distributed under the MIT/X11 software license, see the accompanying
4+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5+
6+
# Mac OS X makefile for bitcoin
7+
# Originally by Laszlo Hanyecz ([email protected])
8+
9+
CXX=llvm-g++
10+
DEPSDIR=/opt/local
11+
12+
INCLUDEPATHS= \
13+
-I"$(CURDIR)" \
14+
-I"$(CURDIR)"/obj \
15+
-I"$(DEPSDIR)/include" \
16+
-I"$(DEPSDIR)/include/db48" \
17+
-I"$(DEPSDIR)/include/boost"
18+
19+
LIBPATHS= \
20+
-L"$(DEPSDIR)/lib" \
21+
-L"$(DEPSDIR)/lib/db48"
22+
23+
USE_UPNP:=1
24+
USE_IPV6:=1
25+
26+
LIBS= -dead_strip
27+
28+
TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
29+
30+
ifdef STATIC
31+
# Build STATIC if you are redistributing the bitcoind binary
32+
TESTLIBS += \
33+
$(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
34+
LIBS += \
35+
$(DEPSDIR)/lib/db48/libdb_cxx.a \
36+
$(DEPSDIR)/lib/libboost_system-mt.a \
37+
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
38+
$(DEPSDIR)/lib/libboost_program_options-mt.a \
39+
$(DEPSDIR)/lib/libboost_thread-mt.a \
40+
$(DEPSDIR)/lib/libboost_chrono-mt.a \
41+
$(DEPSDIR)/lib/libssl.a \
42+
$(DEPSDIR)/lib/libcrypto.a \
43+
-lz
44+
else
45+
TESTLIBS += \
46+
-lboost_unit_test_framework
47+
LIBS += \
48+
-ldb_cxx \
49+
-lboost_system-mt \
50+
-lboost_filesystem-mt \
51+
-lboost_program_options-mt \
52+
-lboost_thread-mt \
53+
-lboost_chrono-mt \
54+
-lssl \
55+
-lcrypto \
56+
-lz
57+
TESTDEFS += -DBOOST_TEST_DYN_LINK
58+
endif
59+
60+
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
61+
62+
ifdef RELEASE
63+
# Compile for maximum compatibility and smallest size.
64+
# This requires that dependencies are compiled
65+
# the same way.
66+
CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3
67+
else
68+
DEBUGFLAGS = -g
69+
endif
70+
71+
# osx 10.9 has changed the stdlib default to libc++. To prevent some link error, you may need to use libstdc++
72+
LFLAGS += -stdlib=libc++
73+
74+
CFLAGS += -stdlib=libc++
75+
76+
# ppc doesn't work because we don't support big-endian
77+
CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
78+
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
79+
80+
OBJS= \
81+
leveldb/libleveldb.a \
82+
obj/auxpow.o \
83+
obj/alert.o \
84+
obj/version.o \
85+
obj/checkpoints.o \
86+
obj/netbase.o \
87+
obj/addrman.o \
88+
obj/crypter.o \
89+
obj/key.o \
90+
obj/db.o \
91+
obj/init.o \
92+
obj/keystore.o \
93+
obj/main.o \
94+
obj/net.o \
95+
obj/protocol.o \
96+
obj/bitcoinrpc.o \
97+
obj/rpcdump.o \
98+
obj/rpcnet.o \
99+
obj/rpcmining.o \
100+
obj/rpcwallet.o \
101+
obj/rpcblockchain.o \
102+
obj/rpcrawtransaction.o \
103+
obj/script.o \
104+
obj/scrypt.o \
105+
obj/sync.o \
106+
obj/util.o \
107+
obj/wallet.o \
108+
obj/walletdb.o \
109+
obj/hash.o \
110+
obj/bloom.o \
111+
obj/noui.o \
112+
obj/leveldb.o \
113+
obj/txdb.o \
114+
obj/alias.o \
115+
obj/offer.o \
116+
obj/cert.o
117+
118+
ifdef USE_SSE2
119+
DEFS += -DUSE_SSE2
120+
OBJS_SSE2= obj/scrypt-sse2.o
121+
OBJS += $(OBJS_SSE2)
122+
endif
123+
124+
ifndef USE_UPNP
125+
override USE_UPNP = -
126+
endif
127+
ifneq (${USE_UPNP}, -)
128+
DEFS += -DUSE_UPNP=$(USE_UPNP)
129+
ifdef STATIC
130+
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
131+
else
132+
LIBS += -lminiupnpc
133+
endif
134+
endif
135+
136+
ifneq (${USE_IPV6}, -)
137+
DEFS += -DUSE_IPV6=$(USE_IPV6)
138+
endif
139+
140+
all: syscoind
141+
142+
test check: test_syscoin FORCE
143+
./test_syscoin
144+
145+
#
146+
# LevelDB support
147+
#
148+
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
149+
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
150+
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
151+
leveldb/libleveldb.a:
152+
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
153+
154+
# auto-generated dependencies:
155+
-include obj/*.P
156+
-include obj-test/*.P
157+
158+
obj/build.h: FORCE
159+
/bin/sh ../share/genbuild.sh obj/build.h
160+
version.cpp: obj/build.h
161+
DEFS += -DHAVE_BUILD_INFO
162+
163+
obj/%-sse2.o: %-sse2.cpp
164+
$(CXX) -c $(CFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
165+
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
166+
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
167+
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
168+
rm -f $(@:%.o=%.d)
169+
170+
obj/%.o: %.cpp
171+
$(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
172+
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
173+
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
174+
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
175+
rm -f $(@:%.o=%.d)
176+
177+
syscoind: $(OBJS:obj/%=obj/%)
178+
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
179+
180+
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
181+
182+
obj-test/%.o: test/%.cpp
183+
$(CXX) -c $(TESTDEFS) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
184+
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
185+
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
186+
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
187+
rm -f $(@:%.o=%.d)
188+
189+
test_syscoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
190+
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
191+
192+
clean:
193+
-rm -f syscoind test_syscoin
194+
-rm -f obj/*.o
195+
-rm -f obj-test/*.o
196+
-rm -f obj/*.P
197+
-rm -f obj-test/*.P
198+
-rm -f obj/build.h
199+
-cd leveldb && $(MAKE) clean || true
200+
201+
FORCE:

src/net.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,26 +1192,20 @@ void MapPort(bool)
11921192
// The first name is used as information source for addrman.
11931193
// The second name should resolve to a list of seed addresses.
11941194
static const char *strMainNetDNSSeed[][2] = {
1195+
{"syscoinseed.tk", "syscoinseed.tk"}, //sys team seeder [jon]
11951196
{"seed.syscoin.tk", "seed.syscoin.tk"}, //sys team seeder [jon]
1196-
{"seed.syscoinseed.tk", "syscoinseed.tk"}, //sys team seeder [jon]
1197-
{"107.170.159.167", "107.170.159.167"}, //sys team seeder [dan]
1198-
{"104.131.228.46", "104.131.228.46"}, //sys team seeder [dan]
1199-
{"stella.hopto.org", "stella.hopto.org"}, //sys team supernode [seb]
1200-
{"syscoin.selfip.com", "syscoin.selfip.com"}, //sys team supernode [dw]
1201-
{"dnsseed.syscoin.org", "dnsseed.syscoin.org"}, //sys team supernode DNS Seed [jon]
1197+
{"seed1.syscoinseed.tk", "seed1.syscoinseed.tk"}, //sys team seeder [dan]
1198+
{"seed2.syscoinseed.tk", "seed2.syscoinseed.tk"}, //sys team seeder [dan]
12021199
{NULL, NULL}
12031200
};
12041201

12051202
static const char *strTestNetDNSSeed[][2] = {
1206-
{"stella.hopto.org", "stella.hopto.org"}, //sys team supernode [seb]
1207-
{"syscoin.selfip.com", "syscoin.selfip.com"}, //sys team supernode [dw]
1208-
{"testnet-seed.syscoin.tk", "testnet-seed.syscoin.tk"}, //sys team supernode [seb]
1203+
{"testnet-syscoinseed.tk", "testnet-syscoinseed.tk"},
12091204
{NULL, NULL}
12101205
};
12111206

12121207
static const char *strCakeNetDNSSeed[][2] = {
1213-
{"stella.hopto.org", "stella.hopto.org"}, //sys team supernode [seb]
1214-
{"syscoin.selfip.com", "syscoin.selfip.com"}, //sys team supernode [dw]
1208+
{"cakenet-syscoinseed.tk", "cakenet-syscoinseed.tk"},
12151209
{NULL, NULL}
12161210
};
12171211

src/qt/forms/aboutdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<cursorShape>IBeamCursor</cursorShape>
3636
</property>
3737
<property name="text">
38-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Syscoin &lt;/span&gt;0.1.5.1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
38+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Syscoin &lt;/span&gt;1.5.1.1&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
3939
</property>
4040
<property name="textInteractionFlags">
4141
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>

src/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern const std::string CLIENT_DATE;
2828
//70002 = r0.1.1
2929
//70003 = r0.1.2
3030
//70004 = r0.1.3
31-
//70005 = r0.1.4
31+
//70005 = r0.1.4, r0.1.5.1, r1.5.1.1
3232
static const int PROTOCOL_VERSION = 70005;
3333

3434
// intial proto version, to be increased after version/verack negotiation

0 commit comments

Comments
 (0)