From 8f6b4036e968e16823724232d4e78d88f933b9d4 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 1 Nov 2023 11:30:39 +0100 Subject: [PATCH 1/3] duplicated get_random_outputs in json-like api --- src/rpc/core_rpc_server.h | 1 + .../COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 utils/test_api_files/COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS.json diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index d95dd52b..181dab35 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -150,6 +150,7 @@ namespace currency MAP_JON_RPC ("get_pool_txs_brief_details", on_get_pool_txs_brief_details, COMMAND_RPC_GET_POOL_TXS_BRIEF_DETAILS) MAP_JON_RPC ("get_all_pool_tx_list", on_get_all_pool_tx_list, COMMAND_RPC_GET_ALL_POOL_TX_LIST) MAP_JON_RPC ("get_pool_info", on_get_pool_info, COMMAND_RPC_GET_POOL_INFO) + MAP_JON_RPC ("getrandom_outs", on_get_random_outs, COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS) MAP_JON_RPC_WE("get_main_block_details", on_get_main_block_details, COMMAND_RPC_GET_BLOCK_DETAILS) MAP_JON_RPC_WE("get_alt_block_details", on_get_alt_block_details, COMMAND_RPC_GET_BLOCK_DETAILS) diff --git a/utils/test_api_files/COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS.json b/utils/test_api_files/COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS.json new file mode 100644 index 00000000..1397a49d --- /dev/null +++ b/utils/test_api_files/COMMAND_RPC_GET_RANDOM_OUTPUTS_FOR_AMOUNTS.json @@ -0,0 +1 @@ +{"method": "getrandom_outs","params": {"amounts": [80000000000000000],"outs_count": 11, "use_forced_mix_outs": false }} \ No newline at end of file From 970d6891847dac3b4dd7a91127978de4f148a541 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 1 Nov 2023 13:08:51 +0100 Subject: [PATCH 2/3] migrated to notarytool for macos --- utils/build_script_mac_osx.sh | 40 +++++------------------------------ 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index c26b8da9..e9f554b4 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -185,41 +185,11 @@ rm -f Zano.zip /usr/bin/ditto -c -k --keepParent ./Zano.app ./Zano.zip tmpfile="tmptmptmp" -xcrun altool --notarize-app --primary-bundle-id "org.zano.desktop" -u "andrey@zano.org" -p "@keychain:Developer-altool" --file ./Zano.zip > $tmpfile 2>&1 -NOTARIZE_RES=$? -NOTARIZE_OUTPUT=$( cat $tmpfile ) -rm $tmpfile -echo "NOTARIZE_OUTPUT=$NOTARIZE_OUTPUT" -if [ $NOTARIZE_RES -ne 0 ]; then - echo "Notarization failed" - exit 1 -fi - -GUID=$(echo "$NOTARIZE_OUTPUT" | egrep -Ewo '[[:xdigit:]]{8}(-[[:xdigit:]]{4}){3}-[[:xdigit:]]{12}') -if [ ${#GUID} -ne 36 ]; then - echo "Couldn't get correct GUID from the response, got only \"$GUID\"" - exit 1 -fi - - -success=0 - -# check notarization status -for i in {1..10}; do - xcrun altool --notarization-info $GUID -u "andrey@zano.org" -p "@keychain:Developer-altool" > $tmpfile 2>&1 - NOTARIZE_OUTPUT=$( cat $tmpfile ) - rm $tmpfile - NOTARIZATION_LOG_URL=$(echo "$NOTARIZE_OUTPUT" | sed -n "s/.*LogFileURL\: \([[:graph:]]*\).*/\1/p") - if [ ${#NOTARIZATION_LOG_URL} -ge 30 ]; then - success=1 - curl -L $NOTARIZATION_LOG_URL - break - fi - sleep 60 -done - -if [ $success -ne 1 ]; then - echo "Build notarization failed" +#xcrun altool --notarize-app --primary-bundle-id "org.zano.desktop" -u "andrey@zano.org" -p "@keychain:Developer-altool" --file ./Zano.zip > $tmpfile 2>&1 +xcrun notarytool submit --wait --apple-id "andrey@zano.org" --team-id "562DC258Q6" --password "@keychain:Developer-altool" ./Zano.zip +RETURN=$? +if [ $RETURN -ne 0 ]; then + echo "Failed to submit for notarization or notarization failed, error code $RETURN" exit 1 fi From 301f0341b457f05983d671b6b2a13ff94a678b1b Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 1 Nov 2023 14:04:47 +0100 Subject: [PATCH 3/3] notarytool switched to keychain profile option --- utils/build_script_mac_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index e9f554b4..7153fff9 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -186,7 +186,7 @@ rm -f Zano.zip tmpfile="tmptmptmp" #xcrun altool --notarize-app --primary-bundle-id "org.zano.desktop" -u "andrey@zano.org" -p "@keychain:Developer-altool" --file ./Zano.zip > $tmpfile 2>&1 -xcrun notarytool submit --wait --apple-id "andrey@zano.org" --team-id "562DC258Q6" --password "@keychain:Developer-altool" ./Zano.zip +xcrun notarytool submit --wait --keychain-profile "notarytool-password" ./Zano.zip RETURN=$? if [ $RETURN -ne 0 ]; then echo "Failed to submit for notarization or notarization failed, error code $RETURN"