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.

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

v10.4.2 #2294

Merged
merged 37 commits into from
Oct 3, 2024
Merged

v10.4.2 #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4c8780a
fix test compose
Ouziel Sep 25, 2024
9c868d3
re-enable testnet
Ouziel Sep 25, 2024
759e815
Fix json serialization of bytes with API v1
Ouziel Sep 25, 2024
fd49474
release notes for 10.4.2
Ouziel Sep 25, 2024
82e9601
Test reparse and rollback on regtest
Ouziel Sep 25, 2024
6f84608
fix server version
Ouziel Sep 26, 2024
6f143e9
Tweak Mempool API
Ouziel Sep 26, 2024
ba654b5
Fix RSFetcher starting
Ouziel Sep 26, 2024
a3e39d7
release notes
Ouziel Sep 26, 2024
a01a596
tweaks
Ouziel Sep 26, 2024
42dc86d
fix the fix
Ouziel Sep 26, 2024
e4d60e7
Merge pull request #2271 from CounterpartyXCP/fixstartfetcher
ouziel-slama Sep 26, 2024
8310170
Merge branch 'develop' into testcompose
Ouziel Sep 30, 2024
0772d04
temporary disable test compose
Ouziel Sep 30, 2024
491d402
fix api v1 regression
Ouziel Sep 30, 2024
420c97b
update release notes
Ouziel Sep 30, 2024
0adac32
Merge pull request #2264 from CounterpartyXCP/testcompose
ouziel-slama Sep 30, 2024
3eb888b
test p2sh encoding with regtest
Ouziel Oct 1, 2024
4bfcf76
Restart RSFetcher when it stops
Ouziel Oct 1, 2024
a70ed5e
update release notes
Ouziel Oct 1, 2024
1622ad2
Tweak Warning
adamkrellenstein Oct 1, 2024
23a35de
fix p2sh signature
Ouziel Oct 2, 2024
4c979e6
ruff format
Ouziel Oct 2, 2024
9841638
Merge pull request #2285 from CounterpartyXCP/restartfetcher
ouziel-slama Oct 2, 2024
2b47612
disable p2sh
Ouziel Oct 2, 2024
0578634
Fix tests
Ouziel Oct 2, 2024
ea9fb36
test with broadcast instead send
Ouziel Oct 2, 2024
df0d65a
Merge pull request #2283 from CounterpartyXCP/p2sh
ouziel-slama Oct 2, 2024
ffba8c1
Merge branch 'develop' into disablep2sh
Ouziel Oct 2, 2024
17c662d
tweak
Ouziel Oct 2, 2024
b5b3c29
Bump version
Ouziel Oct 2, 2024
650f24e
Merge pull request #2290 from CounterpartyXCP/disablep2sh
adamkrellenstein Oct 2, 2024
054f6d2
Merge pull request #2291 from CounterpartyXCP/bumpversion
adamkrellenstein Oct 2, 2024
0c0e8ca
v10.4.2 ChangeLog
adamkrellenstein Oct 2, 2024
15755f2
set timeout duration to max
warrenpuffett Oct 2, 2024
c58d48b
Merge pull request #2293 from CounterpartyXCP/wp/rs-fetcher-no-retry-…
warrenpuffett Oct 2, 2024
cc9c41e
Merge pull request #2295 from CounterpartyXCP/master
ouziel-slama Oct 2, 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
57 changes: 30 additions & 27 deletions .github/workflows/test_compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
set -x

exit 0
#exit 0

export PATH="/snap/bin:$PATH"

Expand All @@ -27,10 +27,9 @@ sed -i 's/#- "--verbose"/- "-vv"/g' docker-compose.yml

# stop the running containers
docker compose --profile mainnet stop counterparty-core
#docker compose --profile testnet stop counterparty-core-testnet
docker compose --profile testnet stop counterparty-core-testnet

# remove counterparty-core container
#docker rm counterparty-core-counterparty-core-1
docker container prune -f

# remove counterparty-core image
Expand All @@ -43,18 +42,18 @@ cat build.txt

# re-start containers
docker compose --profile mainnet up -d
#docker compose --profile testnet up -d
docker compose --profile testnet up -d

# wait for counterparty-core to be ready
while [ "$(docker compose logs counterparty-core 2>&1 | grep 'Watching for new blocks')" = "" ]; do
echo "Waiting for counterparty-core mainnet to be ready"
sleep 1
done

#while [ "$(docker compose logs counterparty-core-testnet 2>&1 | grep 'Watching for new blocks')" = "" ]; do
# echo "Waiting for counterparty-core testnet to be ready"
# sleep 1
#done
while [ "$(docker compose logs counterparty-core-testnet 2>&1 | grep 'Watching for new blocks')" = "" ]; do
echo "Waiting for counterparty-core testnet to be ready"
sleep 1
done


# check running info with API v1 mainnet
Expand All @@ -71,17 +70,17 @@ if [ "$response_v1_mainnet" -ne 200 ]; then
fi

# check running info with API v1 testnet
#response_v1_testnet=$(curl -X POST http://127.0.0.1:14100/v1/ \
# --user rpc:rpc \
# -H 'Content-Type: application/json; charset=UTF-8'\
# -H 'Accept: application/json, text/javascript' \
# --data-binary '{ "jsonrpc": "2.0", "id": 0, "method": "get_running_info" }' \
# --write-out '%{http_code}' --silent --output /dev/null)

#if [ "$response_v1_testnet" -ne 200 ]; then
# echo "Failed to get_running_info testnet"
# exit 1
#fi
response_v1_testnet=$(curl -X POST http://127.0.0.1:14100/v1/ \
--user rpc:rpc \
-H 'Content-Type: application/json; charset=UTF-8'\
-H 'Accept: application/json, text/javascript' \
--data-binary '{ "jsonrpc": "2.0", "id": 0, "method": "get_running_info" }' \
--write-out '%{http_code}' --silent --output /dev/null)

if [ "$response_v1_testnet" -ne 200 ]; then
echo "Failed to get_running_info testnet"
exit 1
fi

# check running info with API v2 mainnet
response_v2_mainnet=$(curl http://localhost:4000/v2/ \
Expand All @@ -93,28 +92,32 @@ if [ "$response_v2_mainnet" -ne 200 ]; then
fi

# check running info with API v2 testnet
#response_v2_testnet=$(curl http://localhost:14000/v2/ \
# --write-out '%{http_code}' --silent --output /dev/null)
response_v2_testnet=$(curl http://localhost:14000/v2/ \
--write-out '%{http_code}' --silent --output /dev/null)

#if [ "$response_v2_testnet" -ne 200 ]; then
# echo "Failed to get API v2 root testnet"
# exit 1
#fi
if [ "$response_v2_testnet" -ne 200 ]; then
echo "Failed to get API v2 root testnet"
exit 1
fi

# Let's reparse 50 blocks before Dredd and compare hashes tests
CURRENT_HEIGHT=$(curl http://localhost:4000/v2/ --silent | jq '.result.counterparty_height')
REPARSE_FROM=$(($CURRENT_HEIGHT-50))

# Stop, reparse and start counterparty-core mainnet
echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
LOG_PATH=$(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
sudo rm -f $LOG_PATH
sudo touch $LOG_PATH

docker compose --profile mainnet stop counterparty-core
docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
--backend-connect=bitcoind \
--indexd-connect=addrindexrs \
--rpc-host=0.0.0.0 \
--api-host=0.0.0.0

echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
sudo rm -f $LOG_PATH
sudo touch $LOG_PATH

docker compose --profile mainnet up -d counterparty-core

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Docker Compose

on:
push:
branches: ['develop', 'master', 'preprelease']
branches: ['develop', 'master']

jobs:
build:
Expand Down
Loading
Loading