Skip to content

Commit

Permalink
Merge pull request Raptor3um#290 from Raptor3um/develop
Browse files Browse the repository at this point in the history
1.3.17.04 upgrade
  • Loading branch information
npq7721 authored May 12, 2023
2 parents e5a4c05 + 0fc8ba6 commit 87a504a
Show file tree
Hide file tree
Showing 51 changed files with 3,731 additions and 3,617 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Development Process
-------------------

The `master` branch is meant to be stable. Development is done in separate branches.
[Tags](https://github.com/raptoreum/raptoreum/tags) are created to indicate new official,
[Tags](https://github.com/raptor3um/raptoreum/tags) are created to indicate new official,
stable release versions of Raptoreum Core.

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
Expand Down
6 changes: 3 additions & 3 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
snapshot-version=1.3.17.03-SNAPSHOT
release-version=1.3.17.03
candidate-version=1.3.17.03-candidate
snapshot-version=1.3.17.04-SNAPSHOT
release-version=1.3.17.04
candidate-version=1.3.17.04-candidate
2 changes: 1 addition & 1 deletion ci/Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN pip3 install jinja2
RUN pip3 install flake8

# raptoreum_hash
RUN git clone https://github.com/raptoreum/raptoreum_hash
RUN git clone https://github.com/raptor3um/raptoreum_hash
RUN cd raptoreum_hash && python3 setup.py install

ARG USER_ID=1000
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 3)
define(_CLIENT_VERSION_REVISION, 17)
define(_CLIENT_VERSION_BUILD, 03)
define(_CLIENT_VERSION_BUILD, 04)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2022)
define(_COPYRIGHT_HOLDERS,[The %s developers])
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Build-Depends: debhelper,
libzmq3-dev
Standards-Version: 3.9.2
Homepage: https://www.raptoreum.org/
Vcs-Git: git://github.com/raptoreum/raptoreum.git
Vcs-Browser: https://github.com/raptoreum/raptoreum
Vcs-Git: git://github.com/raptor3um/raptoreum.git
Vcs-Browser: https://github.com/raptor3um/raptoreum

Package: raptoreumd
Architecture: any
Expand Down
8 changes: 4 additions & 4 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ def setup():
exit(1)
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
if not os.path.isdir('gitian.sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/raptoreum/gitian.sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/raptor3um/gitian.sigs.git'])
if not os.path.isdir('raptoreum-detached-sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/raptoreum/raptoreum-detached-sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/raptor3um/raptoreum-detached-sigs.git'])
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('raptoreum'):
subprocess.check_call(['git', 'clone', 'https://github.com/raptoreum/raptoreum.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/raptor3um/raptoreum.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
Expand Down Expand Up @@ -138,7 +138,7 @@ def main():
parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/raptoreum/raptoreum', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/raptor3um/raptoreum', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Sanity checks:

Once you've got the right hardware and software:

git clone git://github.com/raptoreum/raptoreum.git
git clone git://github.com/raptor3um/raptoreum.git
git clone git://github.com/devrandom/gitian-builder.git
mkdir gitian-builder/inputs
cd gitian-builder/inputs
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ packages:
- "libxkbcommon0"
- "ccache"
remotes:
- "url": "https://github.com/raptoreum/raptoreum.git"
- "url": "https://github.com/raptor3um/raptoreum.git"
"dir": "raptoreum"
files: []
script: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ architectures:
packages:
- "faketime"
remotes:
- "url": "https://github.com/raptoreum/raptoreum-detached-sigs.git"
- "url": "https://github.com/raptor3um/raptoreum-detached-sigs.git"
"dir": "signature"
files:
- "raptoreumcore-osx-unsigned.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ packages:
- "fonts-tuffy"
- "ccache"
remotes:
- "url": "https://github.com/raptoreum/raptoreum.git"
- "url": "https://github.com/raptor3um/raptoreum.git"
"dir": "raptoreum"
files:
- "MacOSX10.11.sdk.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win-signer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ packages:
- "libtool"
- "pkg-config"
remotes:
- "url": "https://github.com/raptoreum/raptoreum-detached-sigs.git"
- "url": "https://github.com/raptor3um/raptoreum-detached-sigs.git"
"dir": "signature"
files:
- "osslsigncode-2.0.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ packages:
- "rename"
- "ccache"
remotes:
- "url": "https://github.com/raptoreum/raptoreum.git"
- "url": "https://github.com/raptor3um/raptoreum.git"
"dir": "raptoreum"
files: []
script: |
Expand Down
2 changes: 1 addition & 1 deletion contrib/linearize/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ run using Python 3 but are compatible with Python 2.

## Step 0: Install raptoreum_hash

https://github.com/raptoreum/raptoreum_hash
https://github.com/raptor3um/raptoreum_hash

## Step 1: Download hash list

Expand Down
10 changes: 5 additions & 5 deletions doc/gitian-building.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ Clone the git repositories for Raptoreum Core and Gitian.

```bash
git clone https://github.com/devrandom/gitian-builder.git
git clone https://github.com/raptoreum/raptoreum
git clone https://github.com/raptoreum/gitian.sigs.git
git clone https://github.com/raptor3um/raptoreum
git clone https://github.com/raptor3um/gitian.sigs.git
```

Setting up the Gitian image
Expand Down Expand Up @@ -381,7 +381,7 @@ Output from `gbuild` will look something like
remote: Total 57959 (delta 0), reused 0 (delta 0), pack-reused 57958
Receiving objects: 100% (57959/57959), 53.76 MiB | 484.00 KiB/s, done.
Resolving deltas: 100% (41590/41590), done.
From https://github.com/raptoreum/raptoreum
From https://github.com/raptor3um/raptoreum
... (new tags, new branch etc)
--- Building for bionic amd64 ---
Stopping target if it is up
Expand Down Expand Up @@ -457,7 +457,7 @@ Then when building, override the remote URLs that gbuild would otherwise pull fr
```bash
cd /some/root/path/
git clone https://github.com/raptoreum/raptoreum-detached-sigs.git
git clone https://github.com/raptor3um/raptoreum-detached-sigs.git
BTCPATH=/some/root/path/raptoreum
SIGPATH=/some/root/path/raptoreum-detached-sigs
Expand Down Expand Up @@ -489,6 +489,6 @@ Uploading signatures (not yet implemented)
---------------------
In the future it will be possible to push your signatures (both the `.assert` and `.assert.sig` files) to the
[raptoreum/gitian.sigs](https://github.com/raptoreum/gitian.sigs/) repository, or if that's not possible to create a pull
[raptoreum/gitian.sigs](https://github.com/raptor3um/gitian.sigs/) repository, or if that's not possible to create a pull
request.
There will be an official announcement when this repository is online.
4 changes: 2 additions & 2 deletions doc/instantsend.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ When a "Transaction Lock" occurs the hash of the related transaction is broadcas
* `zmqpubhashtxlock`: publishes the transaction hash when locked via InstantSend

This mechanism has been integrated into Bitcore-Node-Raptoreum which allows for notification to be broadcast through Insight API in one of two ways:
* WebSocket: [https://github.com/raptoreum/insight-api-raptoreum#web-socket-api](https://github.com/raptoreum/insight-api-raptoreum#web-socket-api)
* API: [https://github.com/raptoreum/insight-api-raptoreum#instantsend-transactions](https://github.com/raptoreum/insight-api-raptoreum#instantsend-transactions)
* WebSocket: [https://github.com/raptor3um/insight-api-raptoreum#web-socket-api](https://github.com/raptor3um/insight-api-raptoreum#web-socket-api)
* API: [https://github.com/raptor3um/insight-api-raptoreum#instantsend-transactions](https://github.com/raptor3um/insight-api-raptoreum#instantsend-transactions)

#### Command line option

Expand Down
2 changes: 1 addition & 1 deletion doc/man/raptoreum-cli.1
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Raptoreum Core useful. Visit <https://raptoreum.org> for
further information about the software.
The source code is available from <https://github.com/raptoreum/raptoreum>.
The source code is available from <https://github.com/raptor3um/raptoreum>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
2 changes: 1 addition & 1 deletion doc/man/raptoreum-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Raptoreum Core useful. Visit <https://raptoreum.org> for
further information about the software.
The source code is available from <https://github.com/raptoreum/raptoreum>.
The source code is available from <https://github.com/raptor3um/raptoreum>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
2 changes: 1 addition & 1 deletion doc/man/raptoreum-tx.1
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Raptoreum Core useful. Visit <https://raptoreum.org> for
further information about the software.
The source code is available from <https://github.com/raptoreum/raptoreum>.
The source code is available from <https://github.com/raptor3um/raptoreum>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
2 changes: 1 addition & 1 deletion doc/man/raptoreumd.1
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ Copyright (C) 2009-2021 The Bitcoin Core developers

Please contribute if you find Raptoreum Core useful. Visit <https://raptoreum.org> for
further information about the software.
The source code is available from <https://github.com/raptoreum/raptoreum>.
The source code is available from <https://github.com/raptor3um/raptoreum>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/dash/release-notes-0.12.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Raptoreum Core version 0.12.0 is now available from:

Please report bugs using the issue tracker at github:

https://github.com/raptoreum/raptoreum/issues
https://github.com/raptor3um/raptoreum/issues


How to Upgrade
Expand Down
Loading

0 comments on commit 87a504a

Please sign in to comment.