Skip to content

Commit

Permalink
Merge pull request #40 from syscoin/devstaging-aliasfix
Browse files Browse the repository at this point in the history
Devstaging aliasfix, v1.5.1.1 updates.
  • Loading branch information
dwasyluk committed Apr 30, 2015
2 parents 10c6073 + 9b4f6ec commit 3b4bcea
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 19 deletions.
6 changes: 3 additions & 3 deletions share/qt/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>0.1.5.1, Copyright © 2009-2015 The Bitcoin and Syscoin developers</string>
<string>1.5.1.1, Copyright © 2009-2015 The Bitcoin and Syscoin developers</string>
<key>CFBundleShortVersionString</key>
<string>0.1.5.1</string>
<string>1.5.1.1</string>
<key>CFBundleVersion</key>
<string>0.1.5.1</string>
<string>1.5.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
Expand Down
23 changes: 20 additions & 3 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,28 @@ namespace Checkpoints
( 113151, uint256("0x5f0901cb9acb48d30426c359da9f9260b7c99ee5bca76a7e254283b73e2a734a"))
( 116182, uint256("0x3b563424f766c83b7bd4f71cbfa55d36bd63e78e3203df316aa8955a208192e1"))
( 119100, uint256("0xf1ae217c317865da6562ca62a469b3b64c089a04ca4d54925a96bf4b1cdf91b2"))
;
( 125360, uint256("0xcbce71a0702af2bb2607966ac19a03f28f7459383249166a05f55fa71b7e3c18"))
( 140998, uint256("0xb7aee5d5dc68bc56835fc9a9fa17dd169cddbe61aae855d223b59d9c50abdd2b"))
( 163221, uint256("0x316394844198d9bce5669a2d51ab08f206e40c158ce4eabad19adc0d7c930bf5"))
( 185411, uint256("0x43f0395e7555bd56a3445154095e313ed4ed2aa931a4f40a8ebeaecda63b437b"))
( 197200, uint256("0xe9a50ea75118573870c8d9c7908e3e0c589ce581dd98020f4a736b8ed17e1c51"))
( 201990, uint256("0x27ef8fd089e999b0a88fe0829a23b73e178b91882e2541fd356a5ac25222f7b6"))
( 218123, uint256("0xeb56da11c1ea2ad511813b2c114e20be7c7113181eeea5acc86451c23a451236"))
( 240351, uint256("0xb123a60541f00310404c311d2f9168a46dce7c033314a2981557557d464d555a"))
( 258999, uint256("0x5bf820f9b91b812a5976e5321d4928e79d83103b40a77e21fc6cfb77a01583a9"))
( 286405, uint256("0x3d590a93302cff768268788d244e7326c042f9d14c2746fa3b52ba15d5c5a108"))
( 291330, uint256("0x05e3cc54af99ce0c8a35adeb3a093138333a1ed7800a11d1c8a3aea9b39eeeee"))
( 302005, uint256("0x1088aacdce9739c41cb57633637250759d67f70583e23ca9d9c9169b0f18c2eb"))
( 325100, uint256("0x22b10a33fdf17d31e18fd6b491702505a6162f61e263de1b19ae5ac52be747dd"))
( 341290, uint256("0x97dbfe0ce6028d7fef32a57c147a67f743899f59b499664550a19e96fbfd1e9e"))
( 356001, uint256("0x50a48f51df7167afbcb3d6ddbaae0d42f383a85367eb6961ced22f9263c8c0f9"))
( 362544, uint256("0x6bf678b95f1fe7ab8a9d48baefc990aab41b7444715e1e86c2ade2ce77739862"))
;

static const CCheckpointData data = {
&mapCheckpoints,
1415484096, // * UNIX timestamp of last checkpoint block
173927, // * total number of transactions between genesis and last checkpoint
1430366011, // * UNIX timestamp of last checkpoint block
468511, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
600.0 // * estimated number of transactions per day after checkpoint
};
Expand Down
File renamed without changes.
201 changes: 201 additions & 0 deletions src/makefile.port.osx
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
# -*- mode: Makefile; -*-
# Copyright (c) 2011 Bitcoin Developers
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

# Mac OS X makefile for bitcoin
# Originally by Laszlo Hanyecz ([email protected])

CXX=llvm-g++
DEPSDIR=/opt/local

INCLUDEPATHS= \
-I"$(CURDIR)" \
-I"$(CURDIR)"/obj \
-I"$(DEPSDIR)/include" \
-I"$(DEPSDIR)/include/db48" \
-I"$(DEPSDIR)/include/boost"

LIBPATHS= \
-L"$(DEPSDIR)/lib" \
-L"$(DEPSDIR)/lib/db48"

USE_UPNP:=1
USE_IPV6:=1

LIBS= -dead_strip

TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)

ifdef STATIC
# Build STATIC if you are redistributing the bitcoind binary
TESTLIBS += \
$(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
LIBS += \
$(DEPSDIR)/lib/db48/libdb_cxx.a \
$(DEPSDIR)/lib/libboost_system-mt.a \
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
$(DEPSDIR)/lib/libboost_program_options-mt.a \
$(DEPSDIR)/lib/libboost_thread-mt.a \
$(DEPSDIR)/lib/libboost_chrono-mt.a \
$(DEPSDIR)/lib/libssl.a \
$(DEPSDIR)/lib/libcrypto.a \
-lz
else
TESTLIBS += \
-lboost_unit_test_framework
LIBS += \
-ldb_cxx \
-lboost_system-mt \
-lboost_filesystem-mt \
-lboost_program_options-mt \
-lboost_thread-mt \
-lboost_chrono-mt \
-lssl \
-lcrypto \
-lz
TESTDEFS += -DBOOST_TEST_DYN_LINK
endif

DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE

ifdef RELEASE
# Compile for maximum compatibility and smallest size.
# This requires that dependencies are compiled
# the same way.
CFLAGS = -mmacosx-version-min=10.5 -arch i386 -O3
else
DEBUGFLAGS = -g
endif

# osx 10.9 has changed the stdlib default to libc++. To prevent some link error, you may need to use libstdc++
LFLAGS += -stdlib=libc++

CFLAGS += -stdlib=libc++

# ppc doesn't work because we don't support big-endian
CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)

OBJS= \
leveldb/libleveldb.a \
obj/auxpow.o \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
obj/netbase.o \
obj/addrman.o \
obj/crypter.o \
obj/key.o \
obj/db.o \
obj/init.o \
obj/keystore.o \
obj/main.o \
obj/net.o \
obj/protocol.o \
obj/bitcoinrpc.o \
obj/rpcdump.o \
obj/rpcnet.o \
obj/rpcmining.o \
obj/rpcwallet.o \
obj/rpcblockchain.o \
obj/rpcrawtransaction.o \
obj/script.o \
obj/scrypt.o \
obj/sync.o \
obj/util.o \
obj/wallet.o \
obj/walletdb.o \
obj/hash.o \
obj/bloom.o \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o \
obj/alias.o \
obj/offer.o \
obj/cert.o

ifdef USE_SSE2
DEFS += -DUSE_SSE2
OBJS_SSE2= obj/scrypt-sse2.o
OBJS += $(OBJS_SSE2)
endif

ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
DEFS += -DUSE_UPNP=$(USE_UPNP)
ifdef STATIC
LIBS += $(DEPSDIR)/lib/libminiupnpc.a
else
LIBS += -lminiupnpc
endif
endif

ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif

all: syscoind

test check: test_syscoin FORCE
./test_syscoin

#
# LevelDB support
#
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..

# auto-generated dependencies:
-include obj/*.P
-include obj-test/*.P

obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO

obj/%-sse2.o: %-sse2.cpp
$(CXX) -c $(CFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)

obj/%.o: %.cpp
$(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)

syscoind: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)

TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))

obj-test/%.o: test/%.cpp
$(CXX) -c $(TESTDEFS) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)

test_syscoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)

clean:
-rm -f syscoind test_syscoin
-rm -f obj/*.o
-rm -f obj-test/*.o
-rm -f obj/*.P
-rm -f obj-test/*.P
-rm -f obj/build.h
-cd leveldb && $(MAKE) clean || true

FORCE:
16 changes: 5 additions & 11 deletions src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1192,26 +1192,20 @@ void MapPort(bool)
// The first name is used as information source for addrman.
// The second name should resolve to a list of seed addresses.
static const char *strMainNetDNSSeed[][2] = {
{"syscoinseed.tk", "syscoinseed.tk"}, //sys team seeder [jon]
{"seed.syscoin.tk", "seed.syscoin.tk"}, //sys team seeder [jon]
{"seed.syscoinseed.tk", "syscoinseed.tk"}, //sys team seeder [jon]
{"107.170.159.167", "107.170.159.167"}, //sys team seeder [dan]
{"104.131.228.46", "104.131.228.46"}, //sys team seeder [dan]
{"stella.hopto.org", "stella.hopto.org"}, //sys team supernode [seb]
{"syscoin.selfip.com", "syscoin.selfip.com"}, //sys team supernode [dw]
{"dnsseed.syscoin.org", "dnsseed.syscoin.org"}, //sys team supernode DNS Seed [jon]
{"seed1.syscoinseed.tk", "seed1.syscoinseed.tk"}, //sys team seeder [dan]
{"seed2.syscoinseed.tk", "seed2.syscoinseed.tk"}, //sys team seeder [dan]
{NULL, NULL}
};

static const char *strTestNetDNSSeed[][2] = {
{"stella.hopto.org", "stella.hopto.org"}, //sys team supernode [seb]
{"syscoin.selfip.com", "syscoin.selfip.com"}, //sys team supernode [dw]
{"testnet-seed.syscoin.tk", "testnet-seed.syscoin.tk"}, //sys team supernode [seb]
{"testnet-syscoinseed.tk", "testnet-syscoinseed.tk"},
{NULL, NULL}
};

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

Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/aboutdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<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>
<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>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern const std::string CLIENT_DATE;
//70002 = r0.1.1
//70003 = r0.1.2
//70004 = r0.1.3
//70005 = r0.1.4
//70005 = r0.1.4, r0.1.5.1, r1.5.1.1
static const int PROTOCOL_VERSION = 70005;

// intial proto version, to be increased after version/verack negotiation
Expand Down

0 comments on commit 3b4bcea

Please sign in to comment.