Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ipfs upload and display, set mainnet chainparams #390

Merged
merged 9 commits into from
Aug 16, 2024
Merged

Add ipfs upload and display, set mainnet chainparams #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2226bb4
add upload on create/update asset and view ipfs image file on view as…
npq7721 Aug 6, 2024
a8fcfdb
use boost instead of libcurl to make http requests
npq7721 Aug 9, 2024
5849750
update action test-macos
npq7721 Aug 9, 2024
b6689f2
attempt to fix mac build
npq7721 Aug 9, 2024
0274f0d
resolve conflict
npq7721 Aug 14, 2024
16af804
remove recent tx for asset tab, make reference image bigger, link und…
npq7721 Aug 15, 2024
fc7d02f
add mainnet Round Voting chainparams
npq7721 Aug 15, 2024
cd56153
increase to 2.0.3.99 version
npq7721 Aug 15, 2024
0a88c2a
remove unuse variable and file
npq7721 Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Install Required Packages
run: |
sudo apt-get update -y
sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y
sudo apt-get install curl libcurl4-openssl-dev build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y
- name: Build Depends
run: |
echo "building with $(nproc) threads"
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- name: Install Required Packages
run: |
sudo apt-get update -y
sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y
sudo apt-get install curl libcurl4-openssl-dev build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y

- name: Build Depends
run: |
Expand Down Expand Up @@ -333,9 +333,9 @@ jobs:
report_paths: "unit_test_results.xml"

build-macos:
name: macOS 11 Build
name: macOS 12 Build
needs: get-version
runs-on: macos-11
runs-on: macos-12

steps:
- name: Checkout
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
test-macos:
name: macOS Tests
needs: [get-version, build-macos]
runs-on: macos-11
runs-on: macos-12

steps:
- name: Download Artifacts
Expand Down Expand Up @@ -601,7 +601,7 @@ jobs:
- name: Install Required Packages
run: |
sudo apt-get update -y
sudo apt-get install curl build-essential libtool g++-aarch64-linux-gnu autotools-dev automake pkg-config python3 bsdmainutils cmake -y
sudo apt-get install curl libcurl4-openssl-dev build-essential libtool g++-aarch64-linux-gnu autotools-dev automake pkg-config python3 bsdmainutils cmake -y

- name: Build Depends
run: |
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:
- name: Install Required Packages
run: |
sudo apt-get update -y
sudo apt-get install curl build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y
sudo apt-get install curl libcurl4-openssl-dev build-essential libtool autotools-dev automake pkg-config python3 bsdmainutils cmake -y
sudo apt-get install -y g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 nsis
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ build-aux/compile
build-aux/test-driver
config.log
config.status
config.status.old
configure
libtool
src/config/raptoreum-config.h
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Raptoreum Core Latest v1.4.18.99
Raptoreum Core Latest v2.0.3
===========================

|CI|master|develop|
Expand Down
6 changes: 3 additions & 3 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
snapshot-version=2.0.2.99-SNAPSHOT
release-version=2.0.2.00
candidate-version=2.0.2.00-candidate
snapshot-version=2.0.3.99-SNAPSHOT
release-version=2.0.3.00
candidate-version=2.0.3.00-candidate
5 changes: 4 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 02)
define(_CLIENT_VERSION_REVISION, 03)
define(_CLIENT_VERSION_BUILD, 99)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2024)
Expand Down Expand Up @@ -1378,6 +1378,9 @@ if test "$use_reduce_exports" = "yes"; then
AX_CHECK_LINK_FLAG([-Wl,--exclude-libs,ALL], [RELDFLAGS="-Wl,--exclude-libs,ALL"], [], [$LDFLAG_WERROR])
fi

AX_CHECK_LINK_FLAG([-lssl], [LDFLAGS="$LDFLAGS -lssl"])
AX_CHECK_LINK_FLAG([-lcrypto], [LDFLAGS="$LDFLAGS -lcrypto"])

if test "$use_tests" = "yes"; then
if test "$HEXDUMP" = ""; then
AC_MSG_ERROR([hexdump is required for tests])
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/openssl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=openssl
$(package)_version=1.1.1n
$(package)_version=1.1.1w
$(package)_download_path=https://www.openssl.org/source
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
$(package)_sha256_hash=cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8

define $(package)_set_vars
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
Expand Down Expand Up @@ -86,7 +86,7 @@ define $(package)_config_cmds
endef

define $(package)_build_cmds
$(MAKE) -j1 build_crypto libcrypto.pc libssl.pc openssl.pc
$(MAKE) -j4
endef

define $(package)_stage_cmds
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/packages.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:=boost libevent gmp backtrace cmake immer zeromq
packages:=boost libevent gmp backtrace cmake immer zeromq openssl

qrencode_linux_packages = qrencode
qrencode_android_packages = qrencode
Expand Down
2 changes: 2 additions & 0 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ BITCOIN_QT_H = \
qt/sendassetsdialog.h \
qt/sendassetsentry.h \
qt/createassetsdialog.h \
qt/uploaddownload.h \
qt/updateassetsdialog.h \
qt/signverifymessagedialog.h \
qt/smartnodelist.h \
Expand Down Expand Up @@ -287,6 +288,7 @@ BITCOIN_QT_WALLET_CPP = \
qt/sendcoinsentry.cpp \
qt/sendassetsdialog.cpp \
qt/createassetsdialog.cpp \
qt/uploaddownload.cpp \
qt/updateassetsdialog.cpp \
qt/assetsdialog.cpp \
qt/sendassetsentry.cpp \
Expand Down
16 changes: 12 additions & 4 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,18 @@ class CMainParams : public CChainParams {
Update(EUpdate::DEPLOYMENT_V17, std::string("v17"), 0, 4032, 419328, 1, 3, 1, false,
VoteThreshold(80, 60, 5), VoteThreshold(0, 0, 1), false, 427392)
);
// updateManager.Add
// (
// Update(EUpdate::ROUND_VOTING, std::string("Round Voting"), 7, 100, 100000, 5, 10, 5, false, VoteThreshold(85, 85, 1), VoteThreshold(95, 95, 1))
// );
updateManager.Add(
Update(EUpdate::ROUND_VOTING, std::string("Round Voting"),
1, // bit
720, // roundSize
905760, // startHeight
7, // votingPeriod
365, // votingMaxRounds
7, // gracePeriod
false, // forceUpdate
VoteThreshold(85, 85, 1), // minerThreshold
VoteThreshold(0, 0, 1)) // nodeThreshold
);

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S(
Expand Down
Loading
Loading