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

Jump to bottom

Update 23 #72

Merged
merged 9 commits into from
Jun 15, 2022
Merged

Update 23 #72

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3bb4ac4
update migration for lt_22
kn0wmad Jun 2, 2022
55d489f
Migrations
kn0wmad Jun 7, 2022
1239d1b
Ready for beta testing
kn0wmad Jun 10, 2022
2b23af1
Fix migration filenames, organization
kn0wmad Jun 13, 2022
ad9b250
Fix migration filenames, organization
kn0wmad Jun 13, 2022
60cd243
Add warning when using Bloom Filters, minor migrations bugfixes
kn0wmad Jun 13, 2022
e66ba37
More migrations bugfixes
kn0wmad Jun 13, 2022
59c81c5
More more migrations bugfixes
kn0wmad Jun 13, 2022
5a22f8a
More more more migrations bugfixes
kn0wmad Jun 14, 2022
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
2 changes: 1 addition & 1 deletion assets/compat/config_spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ rpc:
type: number
nullable: false
default: 4
range: "[1,4]"
range: "[1,64]"
integral: true
units: ~
workqueue:
Expand Down
25 changes: 23 additions & 2 deletions manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ title: "Bitcoin Core"
version: 23.0.0
release-notes: |
* Latest release from Core - see full release notes at https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-23.0.md
* Embassy change - Add support for Bloom Filters, as required for Bisq integration
* It is HIGHLY RECOMMENDED TO NOT USE THIS for anything except Bisq integration
* Embassy changes
* Add support for Bloom Filters, as required for Bisq integration
* It is HIGHLY RECOMMENDED TO NOT USE THIS for anything except Bisq integration
license: mit
wrapper-repo: https://github.com/Start9Labs/bitcoind-wrapper
upstream-repo: https://github.com/bitcoin/bitcoin
Expand Down Expand Up @@ -200,6 +201,16 @@ migrations:
mounts:
main: /root/.bitcoin
inject: false
"=22.0.1":
type: docker
image: main
system: false
entrypoint: /usr/local/bin/migrations/eq_22_0_0.sh
args: ["from"]
io-format: json
mounts:
main: /root/.bitcoin
inject: false
to:
"<22.0.0":
type: docker
Expand All @@ -221,3 +232,13 @@ migrations:
mounts:
main: /root/.bitcoin
inject: false
"=22.0.1":
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
type: docker
image: main
system: false
entrypoint: /usr/local/bin/migrations/eq_22_0_0.sh
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
args: ["to"]
io-format: json
mounts:
main: /root/.bitcoin
inject: false
12 changes: 12 additions & 0 deletions migrations/eq_22_0_0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,24 @@ set -ea

if [ $1 = "from" ]; then
yq -i '.advanced.peers.addnode |= map(select(.hostname != ~))' /root/.bitcoin/start9/config.yaml
yq -i '.advanced.bloomfilters.peerbloomfilters = false' /root/.bitcoin/start9/config.yaml
echo '{"configured": true }'
exit 0
elif [ $1 = "to" ]; then
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
yq -i 'del(.advanced.bloomfilters)' /root/.bitcoin/start9/config.yaml
yq -i '.rpc.advanced.threads |= 4' /root/.bitcoin/start9/config.yaml
yq -i '.rpc.advanced.workqueue |= 32' /root/.bitcoin/start9/config.yaml
echo '{"configured": true }'
exit 0
else
echo "FATAL: Invalid argument: {from, to}. Migration failed." >&2
exit 1
fi



# if threads > 4
# set to 4

# if workqueue > 32
# set to 32
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion migrations/lt_22_0_0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -ea
if [ $1 = "from" ]; then
yq -i '.advanced.peers.addnode |= map(select(.hostname != ~ or . == "*"))' /root/.bitcoin/start9/config.yaml
yq -i '.advanced.peers.addnode.[] |= {"hostname":., "port":~}' /root/.bitcoin/start9/config.yaml
yq -i '(.advanced.blockfilters.blockfilterindex, .advanced.blockfilters.peerblockfilters) = false' /root/.bitcoin/start9/config.yaml
yq -i '(.advanced.blockfilters.blockfilterindex, .advanced.blockfilters.peerblockfilters, .advanced.bloomfilters.peerbloomfilters) = false' /root/.bitcoin/start9/config.yaml
kn0wmad marked this conversation as resolved.
Show resolved Hide resolved
echo '{"configured": true }'
exit 0
elif [ $1 = "to" ]; then
Expand Down