Index: head/net-p2p/qtum/files/patch-src_wallet_wallet.h =================================================================== --- head/net-p2p/qtum/files/patch-src_wallet_wallet.h (revision 479843) +++ head/net-p2p/qtum/files/patch-src_wallet_wallet.h (nonexistent) @@ -1,263 +0,0 @@ ---- src/wallet/wallet.h.orig 2018-05-25 13:32:42 UTC -+++ src/wallet/wallet.h -@@ -668,7 +668,130 @@ class CAccountingEntry (private) - std::vector _ssExtra; - }; - -+/** Contract book data */ -+class CContractBookData -+{ -+public: -+ std::string name; -+ std::string abi; - -+ CContractBookData() -+ {} -+}; -+ -+class CTokenTx -+{ -+public: -+ static const int CURRENT_VERSION=1; -+ int nVersion; -+ std::string strContractAddress; -+ std::string strSenderAddress; -+ std::string strReceiverAddress; -+ uint256 nValue; -+ uint256 transactionHash; -+ -+ // Wallet data for token transaction -+ int64_t nCreateTime; -+ uint256 blockHash; -+ int64_t blockNumber; -+ std::string strLabel; -+ -+ CTokenTx() -+ { -+ SetNull(); -+ } -+ -+ ADD_SERIALIZE_METHODS; -+ -+ template -+ inline void SerializationOp(Stream& s, Operation ser_action) { -+ if (!(s.GetType() & SER_GETHASH)) -+ { -+ READWRITE(nVersion); -+ READWRITE(nCreateTime); -+ READWRITE(blockHash); -+ READWRITE(blockNumber); -+ READWRITE(LIMITED_STRING(strLabel, 65536)); -+ } -+ READWRITE(strContractAddress); -+ READWRITE(strSenderAddress); -+ READWRITE(strReceiverAddress); -+ READWRITE(nValue); -+ READWRITE(transactionHash); -+ } -+ -+ void SetNull() -+ { -+ nVersion = CTokenTx::CURRENT_VERSION; -+ nCreateTime = 0; -+ strContractAddress = ""; -+ strSenderAddress = ""; -+ strReceiverAddress = ""; -+ nValue.SetNull(); -+ transactionHash.SetNull(); -+ blockHash.SetNull(); -+ blockNumber = -1; -+ strLabel = ""; -+ } -+ -+ uint256 GetHash() const; -+}; -+ -+class CTokenInfo -+{ -+public: -+ static const int CURRENT_VERSION=1; -+ int nVersion; -+ std::string strContractAddress; -+ std::string strTokenName; -+ std::string strTokenSymbol; -+ uint8_t nDecimals; -+ std::string strSenderAddress; -+ -+ // Wallet data for token transaction -+ int64_t nCreateTime; -+ uint256 blockHash; -+ int64_t blockNumber; -+ -+ CTokenInfo() -+ { -+ SetNull(); -+ } -+ -+ ADD_SERIALIZE_METHODS; -+ -+ template -+ inline void SerializationOp(Stream& s, Operation ser_action) { -+ if (!(s.GetType() & SER_GETHASH)) -+ { -+ READWRITE(nVersion); -+ READWRITE(nCreateTime); -+ READWRITE(strTokenName); -+ READWRITE(strTokenSymbol); -+ READWRITE(blockHash); -+ READWRITE(blockNumber); -+ } -+ READWRITE(nDecimals); -+ READWRITE(strContractAddress); -+ READWRITE(strSenderAddress); -+ } -+ -+ void SetNull() -+ { -+ nVersion = CTokenInfo::CURRENT_VERSION; -+ nCreateTime = 0; -+ strContractAddress = ""; -+ strTokenName = ""; -+ strTokenSymbol = ""; -+ nDecimals = 0; -+ strSenderAddress = ""; -+ blockHash.SetNull(); -+ blockNumber = -1; -+ } -+ -+ uint256 GetHash() const; -+}; -+ - /** - * A CWallet is an extension of a keystore, which also maintains a set of transactions and balances, - * and provides the ability to create new transactions. -@@ -1304,129 +1427,5 @@ bool CWallet::DummySignTx(CMutableTransaction &txNew, - } - return true; - } -- --class CTokenInfo --{ --public: -- static const int CURRENT_VERSION=1; -- int nVersion; -- std::string strContractAddress; -- std::string strTokenName; -- std::string strTokenSymbol; -- uint8_t nDecimals; -- std::string strSenderAddress; -- -- // Wallet data for token transaction -- int64_t nCreateTime; -- uint256 blockHash; -- int64_t blockNumber; -- -- CTokenInfo() -- { -- SetNull(); -- } -- -- ADD_SERIALIZE_METHODS; -- -- template -- inline void SerializationOp(Stream& s, Operation ser_action) { -- if (!(s.GetType() & SER_GETHASH)) -- { -- READWRITE(nVersion); -- READWRITE(nCreateTime); -- READWRITE(strTokenName); -- READWRITE(strTokenSymbol); -- READWRITE(blockHash); -- READWRITE(blockNumber); -- } -- READWRITE(nDecimals); -- READWRITE(strContractAddress); -- READWRITE(strSenderAddress); -- } -- -- void SetNull() -- { -- nVersion = CTokenInfo::CURRENT_VERSION; -- nCreateTime = 0; -- strContractAddress = ""; -- strTokenName = ""; -- strTokenSymbol = ""; -- nDecimals = 0; -- strSenderAddress = ""; -- blockHash.SetNull(); -- blockNumber = -1; -- } -- -- uint256 GetHash() const; --}; -- --class CTokenTx --{ --public: -- static const int CURRENT_VERSION=1; -- int nVersion; -- std::string strContractAddress; -- std::string strSenderAddress; -- std::string strReceiverAddress; -- uint256 nValue; -- uint256 transactionHash; -- -- // Wallet data for token transaction -- int64_t nCreateTime; -- uint256 blockHash; -- int64_t blockNumber; -- std::string strLabel; -- -- CTokenTx() -- { -- SetNull(); -- } -- -- ADD_SERIALIZE_METHODS; -- -- template -- inline void SerializationOp(Stream& s, Operation ser_action) { -- if (!(s.GetType() & SER_GETHASH)) -- { -- READWRITE(nVersion); -- READWRITE(nCreateTime); -- READWRITE(blockHash); -- READWRITE(blockNumber); -- READWRITE(LIMITED_STRING(strLabel, 65536)); -- } -- READWRITE(strContractAddress); -- READWRITE(strSenderAddress); -- READWRITE(strReceiverAddress); -- READWRITE(nValue); -- READWRITE(transactionHash); -- } -- -- void SetNull() -- { -- nVersion = CTokenTx::CURRENT_VERSION; -- nCreateTime = 0; -- strContractAddress = ""; -- strSenderAddress = ""; -- strReceiverAddress = ""; -- nValue.SetNull(); -- transactionHash.SetNull(); -- blockHash.SetNull(); -- blockNumber = -1; -- strLabel = ""; -- } -- -- uint256 GetHash() const; --}; -- --/** Contract book data */ --class CContractBookData --{ --public: -- std::string name; -- std::string abi; -- -- CContractBookData() -- {} --}; - - #endif // BITCOIN_WALLET_WALLET_H Property changes on: head/net-p2p/qtum/files/patch-src_wallet_wallet.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/qtum/Makefile =================================================================== --- head/net-p2p/qtum/Makefile (revision 479843) +++ head/net-p2p/qtum/Makefile (revision 479844) @@ -1,60 +1,59 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= qtum -PORTVERSION= 0.15.3 -PORTREVISION= 1 +PORTVERSION= 0.16.0 DISTVERSIONPREFIX= mainnet-ignition-v CATEGORIES= net-p2p finance MAINTAINER= vd@FreeBSD.org COMMENT= PoS cryptocurrency that can execute smart contract as part of an UTXO LICENSE= GPLv3 BROKEN_i386= does not compile: invalid operand for instruction ... ASJ(jnz, 0, b) ... "jnz" BUILD_DEPENDS= libzmq4>0:net/libzmq4 RUN_DEPENDS= libzmq4>0:net/libzmq4 LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ libevent.so:devel/libevent \ libminiupnpc.so:net/miniupnpc \ libprotobuf.so:devel/protobuf \ libqrencode.so:graphics/libqrencode GNU_CONFIGURE= yes CONFIGURE_ENV= BDB_CFLAGS="-I${BDB_INCLUDE_DIR}" \ BDB_LIBS="-L${BDB_LIB_DIR} -l${BDB_LIB_CXX_NAME}" # * Man pages have not been adjusted after cloning the Bitcoin code base. # They are the old Bitcoin man pages, so do not install them. # * --with-incompatible-bdb is required in order to use bdb-5. # * Do not install unneeded include/bitcoinconsensus.h and # lib/libbitcoinconsensus.* (--without-libs) CONFIGURE_ARGS= --disable-man \ --with-gui=qt5 \ --with-incompatible-bdb \ --with-miniupnpc=${LOCALBASE} \ --with-qrencode \ --without-libs USES= autoreconf bdb:5+ compiler:c++14-lang gmake libtool pkgconfig qt:5 ssl USE_QT= buildtools core dbus gui linguisttools network testlib widgets USE_GITHUB= yes GH_TUPLE= qtumproject:qtum:${DISTVERSIONPREFIX}${PORTVERSION} \ qtumproject:cpp-eth-qtum:d6081ecc98e3c5f4701363:cppeth/src/cpp-ethereum .include # The ./configure script tries to use pkg-config to derive the SSL CFLAGS and # libraries, but pkg-config requires libssl.pc which is only installed by the # ports' security/openssl and not present in the base system. So if we are to # use the base's SSL, then we trick ./configure to not use pkg-config by # setting some related environment variables. .if ${SSL_DEFAULT} == base CONFIGURE_ENV+= CRYPTO_CFLAGS="-I${OPENSSLINC}" \ CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \ SSL_CFLAGS="-I${OPENSSLINC}" \ SSL_LIBS="-L${OPENSSLLIB} -lssl" .endif .include Index: head/net-p2p/qtum/distinfo =================================================================== --- head/net-p2p/qtum/distinfo (revision 479843) +++ head/net-p2p/qtum/distinfo (revision 479844) @@ -1,5 +1,5 @@ -TIMESTAMP = 1533740100 -SHA256 (qtumproject-qtum-mainnet-ignition-v0.15.3_GH0.tar.gz) = 0ef0ea73e563048797b1ff08b689a5469fee16faf803a172d155018d8b0ef030 -SIZE (qtumproject-qtum-mainnet-ignition-v0.15.3_GH0.tar.gz) = 13182417 +TIMESTAMP = 1536992752 +SHA256 (qtumproject-qtum-mainnet-ignition-v0.16.0_GH0.tar.gz) = cd35b3aa8537a76d5fa188bd26011bea9084572c33e72a0e584ced75683808b5 +SIZE (qtumproject-qtum-mainnet-ignition-v0.16.0_GH0.tar.gz) = 12229638 SHA256 (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 62c858543510aaf656ce0a247e26fbce4a9b11d1fa424f40e9ff0fdc822b4b34 SIZE (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 1114149