Qortal
/
qortal
mirror of https://github.com/qortal/qortal
3
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Update auto-update tools to work with testnet and on non-master branch (e.g. a testnet branch)

pull/67/head
catbref 4 years ago
parent
ca0deb2bf6
commit
8df3c68df9
2 changed files with 20 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      tools/approve-auto-update.sh
  2. 12
      tools/publish-auto-update.pl

19
tools/approve-auto-update.sh
Unescape View File

@ -1,8 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
port=12391
if [ $# -gt 0 -a "$1" = "-t" ]; then
port=62391
fi
printf "Searching for auto-update transactions to approve...\n"; printf "Searching for auto-update transactions to approve...\n";
tx=$( curl --silent --url "http://localhost:12391/arbitrary/search?txGroupId=1&service=1&confirmationStatus=CONFIRMED&limit=1&reverse=true" ); tx=$( curl --silent --url "http://localhost:${port}/arbitrary/search?txGroupId=1&service=1&confirmationStatus=CONFIRMED&limit=1&reverse=true" );
if fgrep --silent '"approvalStatus":"PENDING"' <<< "${tx}"; then if fgrep --silent '"approvalStatus":"PENDING"' <<< "${tx}"; then
true true
else else
@ -24,7 +29,7 @@ read -s privkey
printf "\n" printf "\n"
# Convert to public key # Convert to public key
pubkey=$( curl --silent --url "http://localhost:12391/utils/publickey" --data @- <<< "${privkey}" ); pubkey=$( curl --silent --url "http://localhost:${port}/utils/publickey" --data @- <<< "${privkey}" );
if egrep -v --silent '^\w{44,46}$' <<< "${pubkey}"; then if egrep -v --silent '^\w{44,46}$' <<< "${pubkey}"; then
printf "Invalid response from API - was your private key correct?\n%s\n" "${pubkey}" printf "Invalid response from API - was your private key correct?\n%s\n" "${pubkey}"
exit exit
@ -32,11 +37,11 @@ fi
printf "Your public key: %s\n" ${pubkey} printf "Your public key: %s\n" ${pubkey}
# Convert to address # Convert to address
address=$( curl --silent --url "http://localhost:12391/addresses/convert/${pubkey}" ); address=$( curl --silent --url "http://localhost:${port}/addresses/convert/${pubkey}" );
printf "Your address: %s\n" ${address} printf "Your address: %s\n" ${address}
# Grab last reference # Grab last reference
lastref=$( curl --silent --url "http://localhost:12391/addresses/lastreference/{$address}" ); lastref=$( curl --silent --url "http://localhost:${port}/addresses/lastreference/{$address}" );
printf "Your last reference: %s\n" ${lastref} printf "Your last reference: %s\n" ${lastref}
# Build GROUP_APPROVAL transaction # Build GROUP_APPROVAL transaction
@ -54,7 +59,7 @@ tx_json=$( cat <<TX_END
TX_END TX_END
) )
raw_tx=$( curl --silent --header "Content-Type: application/json" --url "http://localhost:12391/groups/approval" --data @- <<< "${tx_json}" ) raw_tx=$( curl --silent --header "Content-Type: application/json" --url "http://localhost:${port}/groups/approval" --data @- <<< "${tx_json}" )
if egrep -v --silent '^\w{100,}' <<< "${raw_tx}"; then if egrep -v --silent '^\w{100,}' <<< "${raw_tx}"; then
printf "Building GROUP_APPROVAL transaction failed:\n%s\n" "${raw_tx}" printf "Building GROUP_APPROVAL transaction failed:\n%s\n" "${raw_tx}"
exit exit
@ -69,7 +74,7 @@ sign_json=$( cat <<SIGN_END
} }
SIGN_END SIGN_END
) )
signed_tx=$( curl --silent --header "Content-Type: application/json" --url "http://localhost:12391/transactions/sign" --data @- <<< "${sign_json}" ) signed_tx=$( curl --silent --header "Content-Type: application/json" --url "http://localhost:${port}/transactions/sign" --data @- <<< "${sign_json}" )
printf "\nSigned tx:\n%s\n" ${signed_tx} printf "\nSigned tx:\n%s\n" ${signed_tx}
if egrep -v --silent '^\w{100,}' <<< "${signed_tx}"; then if egrep -v --silent '^\w{100,}' <<< "${signed_tx}"; then
printf "Signing GROUP_APPROVAL transaction failed:\n%s\n" "${signed_tx}" printf "Signing GROUP_APPROVAL transaction failed:\n%s\n" "${signed_tx}"
@ -88,5 +93,5 @@ for ((seconds = 5; seconds > 0; seconds--)); do
done done
printf "\rBroadcasting signed GROUP_APPROVAL transaction... \n" printf "\rBroadcasting signed GROUP_APPROVAL transaction... \n"
result=$( curl --silent --url "http://localhost:12391/transactions/process" --data @- <<< "${signed_tx}" ) result=$( curl --silent --url "http://localhost:${port}/transactions/process" --data @- <<< "${signed_tx}" )
printf "API response:\n%s\n" "${result}" printf "API response:\n%s\n" "${result}"

12
tools/publish-auto-update.pl
Unescape View File

@ -33,13 +33,17 @@ while (<POM>) {
} }
close(POM); close(POM);
# short-form commit hash on 'master' branch # determine git branch
my $branch_name = ` git symbolic-ref -q HEAD `
$branch_name =~ s|^refs/heads/||; # ${branch_name##refs/heads/}
# short-form commit hash on base branch (non-auto-update)
my $commit_hash = `git show --no-patch --format=%h`; my $commit_hash = `git show --no-patch --format=%h`;
die("Can't find commit hash\n") if ! defined $commit_hash; die("Can't find commit hash\n") if ! defined $commit_hash;
chomp $commit_hash; chomp $commit_hash;
printf "Commit hash on 'master' branch: %s\n", $commit_hash; printf "Commit hash on '%s' branch: %s\n", $branch_name, $commit_hash;
# build timestamp / commit timestamp on 'master' branch # build timestamp / commit timestamp on base branch
my $timestamp = `git show --no-patch --format=%ct`; my $timestamp = `git show --no-patch --format=%ct`;
die("Can't determine commit timestamp\n") if ! defined $timestamp; die("Can't determine commit timestamp\n") if ! defined $timestamp;
$timestamp *= 1000; # Convert to milliseconds $timestamp *= 1000; # Convert to milliseconds
@ -133,4 +137,4 @@ chomp $result;
die("Transaction wasn't accepted:\n$result\n") unless $result eq 'true'; die("Transaction wasn't accepted:\n$result\n") unless $result eq 'true';
my $decoded_tx = `curl --silent -H "Content-Type: application/json" --url http://localhost:${port}/transactions/decode --data ${signed_tx}`; my $decoded_tx = `curl --silent -H "Content-Type: application/json" --url http://localhost:${port}/transactions/decode --data ${signed_tx}`;
printf "\nTransaction accepted:\n$decoded_tx\n"; printf "\nTransaction accepted:\n$decoded_tx\n";

Write Preview
Loading…
Cancel
Save