Skip to content

Commit f1d6add

Browse files
Netbox.Wallet v3.5.1
1 parent 321d832 commit f1d6add

26 files changed

+187
-100
lines changed

.dockerignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Dockerfile*
88
Makefile_docker
99
.dockerignore
1010
docker-compose.yml
11-
docker-compose-prod.yml
1211
/output
1312
.gitignore
1413
.gitattributes
@@ -155,7 +154,5 @@ depends/riscv64*
155154
/doc/doxygen/
156155
/nbproject/
157156

158-
.idea
159157
**/CMakeLists.txt
160158
**/cmake-build-debug
161-
.idea

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Copyright (c) 2009-2015 Bitcoin Developers
22
Copyright (c) 2014-2015 Dash Developers
33
Copyright (c) 2015-2019 PIVX Developers
4-
Copyright (c) 2018-2020 Netbox.Global
4+
Copyright (c) 2018-2021 Netbox.Global
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN apt-get update \
3131
&& apt-get update \
3232
&& apt-get install --no-install-recommends --yes \
3333
libboost-system1.65.1 libboost-filesystem1.65.1 libboost-program-options1.65.1 libboost-thread1.65.1 \
34-
libboost-chrono1.65.1 libdb4.8++ libevent-2.1 libevent-pthreads-2.1 libminiupnpc10 libssl1.0.0 \
34+
libboost-chrono1.65.1 libdb4.8++ libevent-2.1 libevent-pthreads-2.1 libminiupnpc10 libssl1.0.0 curl \
3535
&& rm -rf /var/lib/apt/lists/*
3636

3737
COPY --from=builder /netboxwallet/src/nbxd /netboxwallet/src/nbx-cli /netboxwallet/src/nbx-tx /usr/local/bin/

Dockerfile_qt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN apt-get update \
3333
&& apt-get install --no-install-recommends --yes \
3434
libboost-system1.65.1 libboost-filesystem1.65.1 libboost-program-options1.65.1 libboost-thread1.65.1 \
3535
libboost-chrono1.65.1 libdb4.8++ libevent-2.1 libevent-pthreads-2.1 \
36-
libqt5widgets5 libqrencode3 libprotobuf10 libminiupnpc10 libssl1.0.0 \
36+
libqt5widgets5 libqrencode3 libprotobuf10 libminiupnpc10 libssl1.0.0 curl \
3737
&& rm -rf /var/lib/apt/lists/*
3838

3939
COPY --from=builder /netboxwallet/src/qt/netboxwallet /usr/local/bin/

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 3)
44
define(_CLIENT_VERSION_MINOR, 5)
5+
define(_CLIENT_VERSION_REVISION, 1)
56
define(_CLIENT_VERSION_BUILD, 0)
6-
define(_CLIENT_VERSION_REVISION, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
8-
define(_COPYRIGHT_YEAR, 2020)
8+
define(_COPYRIGHT_YEAR, 2021)
99
AC_INIT([Netbox.Global],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[netbox.global],[nbx])
1010
AC_CONFIG_SRCDIR([src/main.cpp])
1111
AC_CONFIG_HEADERS([src/config/nbx-config.h])

depends/packages/qt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PACKAGE=qt
22
$(package)_version=5.9.7
3-
$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
3+
$(package)_download_path=https://download.qt.io/archive/qt/5.9/$($(package)_version)/submodules
44
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
66
$(package)_sha256_hash=36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00

doc/man/nbx-cli.1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
2-
.TH PIVX-CLI "1" "July 2018" "nbx-cli v3.1.99.0" "User Commands"
2+
.TH NBX-CLI "1" "December 2021" "nbx-cli v3.5.1" "User Commands"
33
.SH NAME
4-
nbx-cli \- manual page for nbx-cli v3.1.99.0
4+
nbx-cli \- manual page for nbx-cli v3.5.1
55
.SH DESCRIPTION
6-
PIVX Core RPC client version v3.1.99.0\-11f4a2bba4\-dirty
6+
Netbox.Wallet RPC client version v3.5.1
77
.SS "Usage:"
88
.TP
9-
pivx\-cli [options] <command> [params]
10-
Send command to PIVX Core
9+
nbx\-cli [options] <command> [params]
10+
Send command to Netbox.Wallet
1111
.TP
12-
pivx\-cli [options] help
12+
nbx\-cli [options] help
1313
List commands
1414
.TP
15-
pivx\-cli [options] help <command>
15+
nbx\-cli [options] help <command>
1616
Get help for a command
1717
.SH OPTIONS
1818
.HP
@@ -68,6 +68,8 @@ Copyright (C) 2014-2018 The Dash Core Developers
6868

6969
Copyright (C) 2015-2018 The PIVX Core Developers
7070

71+
Copyright (C) 2018-2021 Netbox.Global
72+
7173
This is experimental software.
7274

7375
Distributed under the MIT software license, see the accompanying file COPYING

doc/man/nbx-tx.1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
2-
.TH PIVX-TX "1" "July 2018" "nbx-tx v3.1.99.0" "User Commands"
2+
.TH NBX-TX "1" "December 2021" "nbx-tx v3.5.1" "User Commands"
33
.SH NAME
4-
nbx-tx \- manual page for nbx-tx v3.1.99.0
4+
nbx-tx \- manual page for nbx-tx v3.5.1
55
.SH DESCRIPTION
6-
Pivx Core pivx\-tx utility version v3.1.99.0\-11f4a2bba4\-dirty
6+
Netbox.Wallet nbx\-tx utility version v3.5.1
77
.SS "Usage:"
88
.TP
9-
pivx\-tx [options] <hex\-tx> [commands]
10-
Update hex\-encoded pivx transaction
9+
nbx\-tx [options] <hex\-tx> [commands]
10+
Update hex\-encoded nbx transaction
1111
.TP
12-
pivx\-tx [options] \fB\-create\fR [commands]
13-
Create hex\-encoded pivx transaction
12+
nbx\-tx [options] \fB\-create\fR [commands]
13+
Create hex\-encoded nbx transaction
1414
.SH OPTIONS
1515
.HP
1616
\-?
@@ -90,6 +90,8 @@ Copyright (C) 2014-2018 The Dash Core Developers
9090

9191
Copyright (C) 2015-2018 The PIVX Core Developers
9292

93+
Copyright (C) 2018-2021 Netbox.Global
94+
9395
This is experimental software.
9496

9597
Distributed under the MIT software license, see the accompanying file COPYING

doc/man/nbxd.1

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
2-
.TH NBXD "1" "July 2018" "nbxd v3.1.99.0" "User Commands"
2+
.TH NBXD "1" "December 2021" "nbxd v3.5.1" "User Commands"
33
.SH NAME
4-
nbxd \- manual page for nbxd v3.1.99.0
4+
nbxd \- manual page for nbxd v3.5.1
55
.SH DESCRIPTION
6-
Netbox.Wallet daemon version v3.1.99.0\-11f4a2bba4\-dirty
6+
Netbox.Wallet daemon version v3.5.1
77
.SS "Usage:"
88
.TP
99
nbxd [options]
@@ -69,6 +69,10 @@ Set the Maximum reorg depth (default: 100)
6969
.IP
7070
Keep at most <n> unconnectable transactions in memory (default: 100)
7171
.HP
72+
\fB\-mempoolnotify=\fR<cmd>
73+
.IP
74+
Execute command when transaction added to mempool (%s in cmd is replaced by transaction hash)
75+
.HP
7276
\fB\-par=\fR<n>
7377
.IP
7478
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
@@ -254,7 +258,7 @@ Set key pool size to <n> (default: 100)
254258
.HP
255259
\fB\-paytxfee=\fR<amt>
256260
.IP
257-
Fee (in PIV/kB) to add to transactions you send (default: 0.00)
261+
Fee (in NBX/kB) to add to transactions you send (default: 0.00)
258262
.HP
259263
\fB\-rescan\fR
260264
.IP
@@ -360,7 +364,7 @@ Prepend debug output with timestamp (default: 1)
360364
.HP
361365
\fB\-minrelaytxfee=\fR<amt>
362366
.IP
363-
Fees (in PIV/Kb) smaller than this are considered zero fee for relaying
367+
Fees (in NBX/Kb) smaller than this are considered zero fee for relaying
364368
(default: 0.0001)
365369
.HP
366370
\fB\-printtoconsole\fR
@@ -501,6 +505,8 @@ Copyright (C) 2014-2018 The Dash Core Developers
501505

502506
Copyright (C) 2015-2018 The PIVX Core Developers
503507

508+
Copyright (C) 2018-2021 Netbox.Global
509+
504510
This is experimental software.
505511

506512
Distributed under the MIT software license, see the accompanying file COPYING

doc/man/netboxwallet.1

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
2-
.TH Netbox.Wallet "1" "July 2018" "netboxwallet v3.1.99.0" "User Commands"
2+
.TH Netbox.Wallet "1" "December 2021" "netboxwallet v3.5.1" "User Commands"
33
.SH NAME
4-
netboxwallet \- manual page for netboxwallet v3.1.99.0
4+
netboxwallet \- manual page for netboxwallet v3.5.1
55
.SH DESCRIPTION
6-
Netbox.Wallet version v3.1.99.0\-11f4a2bba4\-dirty (64\-bit)
6+
Netbox.Wallet version v3.5.1 (64\-bit)
77
Usage:
88
.IP
99
netboxwallet [command\-line options]
@@ -64,6 +64,10 @@ Set the Maximum reorg depth (default: 100)
6464
.IP
6565
Keep at most <n> unconnectable transactions in memory (default: 100)
6666
.HP
67+
\fB\-mempoolnotify=\fR<cmd>
68+
.IP
69+
Execute command when transaction added to mempool (%s in cmd is replaced by transaction hash)
70+
.HP
6771
\fB\-par=\fR<n>
6872
.IP
6973
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
@@ -249,7 +253,7 @@ Set key pool size to <n> (default: 100)
249253
.HP
250254
\fB\-paytxfee=\fR<amt>
251255
.IP
252-
Fee (in PIV/kB) to add to transactions you send (default: 0.00)
256+
Fee (in NBX/kB) to add to transactions you send (default: 0.00)
253257
.HP
254258
\fB\-rescan\fR
255259
.IP
@@ -359,7 +363,7 @@ Prepend debug output with timestamp (default: 1)
359363
.HP
360364
\fB\-minrelaytxfee=\fR<amt>
361365
.IP
362-
Fees (in PIV/Kb) smaller than this are considered zero fee for relaying
366+
Fees (in NBX/Kb) smaller than this are considered zero fee for relaying
363367
(default: 0.0001)
364368
.HP
365369
\fB\-printtoconsole\fR
@@ -522,6 +526,8 @@ Copyright (C) 2014-2018 The Dash Core Developers
522526

523527
Copyright (C) 2015-2018 The PIVX Core Developers
524528

529+
Copyright (C) 2018-2021 Netbox.Global
530+
525531
This is experimental software.
526532

527533
Distributed under the MIT software license, see the accompanying file COPYING

0 commit comments

Comments
 (0)