From 2f9807f245c7de66bd320d264fd8f3958522ae9d Mon Sep 17 00:00:00 2001 From: Martin Habovstiak Date: Sat, 9 Oct 2021 18:23:39 +0200 Subject: [PATCH] Experimental: updated electrs to 0.9 This updates electrs to 0.9 dropping dynamic linking for the time being. Dynamic linking will be re-enabled in Bullseye. This also removes generating blocks from electrs test because that was done on bitcoind test so it's not needed and it actually causesd tests to fail. Part of #175 --- build_rules/electrs.yaml | 4 ++-- pkg_specs/electrs-@variant.sps | 13 +++++++++++++ pkg_specs/electrs.changelog | 6 ++++++ tests/per-package/electrs-regtest/after_install.sh | 14 -------------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/build_rules/electrs.yaml b/build_rules/electrs.yaml index 1e2d2c0..721f24e 100644 --- a/build_rules/electrs.yaml +++ b/build_rules/electrs.yaml @@ -7,5 +7,5 @@ git_tag: v$(ELECTRS_VERSION) fingerprint: 15C8C3574AE4F1E25F3F35C587CAE5FA46917CBB verify_tag: true build_system: cargo -cargo_env: ROCKSDB_INCLUDE_DIR=/usr/include ROCKSDB_LIB_DIR=/usr/lib SNAPPY_LIB_DIR=/usr/lib LZ4_LIB_DIR=/usr/lib ZSTD_LIB_DIR=/usr/lib Z_LIB_DIR=/usr/lib BZ2_LIB_DIR=/usr/lib -cargo_args: --no-default-features +#cargo_env: ROCKSDB_INCLUDE_DIR=/usr/include ROCKSDB_LIB_DIR=/usr/lib SNAPPY_LIB_DIR=/usr/lib LZ4_LIB_DIR=/usr/lib ZSTD_LIB_DIR=/usr/lib Z_LIB_DIR=/usr/lib BZ2_LIB_DIR=/usr/lib +#cargo_args: --no-default-features diff --git a/pkg_specs/electrs-@variant.sps b/pkg_specs/electrs-@variant.sps index c1da8cc..b8787d7 100644 --- a/pkg_specs/electrs-@variant.sps +++ b/pkg_specs/electrs-@variant.sps @@ -54,6 +54,12 @@ default = "/var/lib/electrs-{variant}" priority = "low" summary = "Database directory of electrs ({variant})" +[config."conf.d/behavior.toml".ivars.verbose] +type = "uint" +default = "2" +priority = "medium" +summary = "Logging verbosity of electrs ({variant})" + [config."conf.d/credentials.conf"] format = "toml" @@ -74,3 +80,10 @@ constant = "public:public" [config."conf.d/credentials.conf".hvars.daemon_rpc_addr] type = "string" template = "127.0.0.1:{bitcoin-rpc-proxy-@variant/bind_port}" + +[config."conf.d/credentials.conf".evars."bitcoin-@variant".p2p_bind_port] +store = false + +[config."conf.d/credentials.conf".hvars."daemon_p2p_addr"] +type = "string" +template = "127.0.0.1:{bitcoin-@variant/p2p_bind_port}" diff --git a/pkg_specs/electrs.changelog b/pkg_specs/electrs.changelog index 3454612..f52ef04 100644 --- a/pkg_specs/electrs.changelog +++ b/pkg_specs/electrs.changelog @@ -1,3 +1,9 @@ +electrs (0.9.0-1) buster; urgency=medium + + * Experimental only: Updated upstream version + + -- Martin Habovstiak Thu, 30 Sep 2021 10:18:42 +0100 + electrs (0.8.8-2) buster; urgency=medium * Improved sandboxing of service diff --git a/tests/per-package/electrs-regtest/after_install.sh b/tests/per-package/electrs-regtest/after_install.sh index af2d728..1dae4a4 100755 --- a/tests/per-package/electrs-regtest/after_install.sh +++ b/tests/per-package/electrs-regtest/after_install.sh @@ -9,20 +9,6 @@ done bitcoin_network="`echo -n $0 | sed 's/^.*-\([^-\/]*\)\/after_install\.sh$/\1/'`" -bitcoind_port=`sudo grep '^rpcport=' "/etc/bitcoin-$bitcoin_network/bitcoin.conf"` -bitcoind_port=`echo "$bitcoind_port" | sed 's/^rpcport=//'` - -if sudo test -e "/var/lib/bitcoin-regtest/regtest/wallets/test_wallet"; -then - wget -O - --header "Authorization: Basic `sudo base64 -w 0 "/var/run/bitcoin-$bitcoin_network/cookie"`" --post-data='{"jsonrpc": "1.0", "id":"curltest", "method": "loadwallet", "params": ["test_wallet"] }' "http://127.0.0.1:$bitcoind_port/" -else - wget -O - --header "Authorization: Basic `sudo base64 -w 0 "/var/run/bitcoin-$bitcoin_network/cookie"`" --post-data='{"jsonrpc": "1.0", "id":"curltest", "method": "createwallet", "params": ["test_wallet"] }' "http://127.0.0.1:$bitcoind_port/" -fi - -mining_addr="$(wget -O - --header "Authorization: Basic `sudo base64 -w 0 "/var/run/bitcoin-$bitcoin_network/cookie"`" --post-data='{"jsonrpc": "1.0", "id":"curltest", "method": "getnewaddress", "params": [] }' "http://127.0.0.1:$bitcoind_port/" | grep '"result"' | sed 's/^.*"result" *: *"\([^"]*\)".*$/\1/')" - -wget -O - --header "Authorization: Basic `sudo base64 -w 0 "/var/run/bitcoin-$bitcoin_network/cookie"`" --post-data='{"jsonrpc": "1.0", "id":"curltest", "method": "generatetoaddress", "params": [100, "'"$mining_addr"'"] }' "http://127.0.0.1:$bitcoind_port/" | grep '"result"' | sed 's/^.*"result" *: *"\([^"]*\)".*$/\1/' - sleep 10 electrs_port="`grep '^ *electrum_rpc_addr *= *' "/etc/electrs-$bitcoin_network/conf.d/interface.toml"`"