From 16e58625f9d8ae9d62e95c04c87211ecd7af646e Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Mon, 12 Sep 2022 13:32:38 +0200 Subject: [PATCH 1/5] Add parachain authorize upgrade proposal hash to output --- scripts/analyse.sh | 9 ++++++--- scripts/build | 9 ++++++--- templates/output.txt | 32 +++++++++++++++++--------------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/scripts/analyse.sh b/scripts/analyse.sh index d5e1970..54745a1 100755 --- a/scripts/analyse.sh +++ b/scripts/analyse.sh @@ -4,7 +4,8 @@ WASM=$1 WASM_FULLPATH=/build/$WASM SZ=`du -sb $WASM_FULLPATH | awk '{print $1}'` -PROP=`subwasm -j info $WASM_FULLPATH | jq -r .proposal_hash` +SET_CODE_PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` +AUTHORIZE_UPGRADE_PROP=`subwasm -j info $Z_WASM | jq -r .parachain_authorize_upgrade_hash` MULTIHASH=`subwasm -j info $WASM_FULLPATH | jq -r .ipfs_hash` SHA256=0x`shasum -a 256 $WASM_FULLPATH | awk '{print $1}'` TMSP=$(date --utc +%FT%TZ -d @$(stat -c "%Y" $WASM_FULLPATH)) @@ -14,7 +15,8 @@ SUBWASM=`subwasm -j info $WASM_FULLPATH` JSON=$( jq -n \ --arg tmsp "$TMSP" \ --arg size "$SZ" \ - --arg prop "$PROP" \ + --arg set_code_prop "$SET_CODE_PROP" \ + --arg authorize_upgrade_prop "$AUTHORIZE_UPGRADE_PROP" \ --arg blake2_256 "$BLAKE2_256" \ --arg ipfs "$MULTIHASH" \ --arg sha256 "$SHA256" \ @@ -23,7 +25,8 @@ JSON=$( jq -n \ '{ tmsp: $tmsp, size: $size, - prop: $prop, + set_code_prop: $set_code_prop, + authorize_upgrade_prop: $authorize_upgrade_prop, blake2_256: $blake2_256, ipfs: $ipfs, sha256: $sha256, diff --git a/scripts/build b/scripts/build index 03d9628..e631479 100755 --- a/scripts/build +++ b/scripts/build @@ -146,7 +146,8 @@ SZ=`du -sb $Z_WASM | awk '{print $1}'` KB=$(expr $SZ / 1024) TMSP=`date --utc +%FT%TZ` SHA256=0x`shasum -a 256 $Z_WASM | awk '{print $1}'` -PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` +SET_CODE_PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` +AUTHORIZE_UPGRADE_PROP=`subwasm -j info $Z_WASM | jq -r .parachain_authorize_upgrade_hash` MULTIHASH=`subwasm -j info $Z_WASM | jq -r .ipfs_hash` # If we work on a snapshot, we will NOT get a .git folder to work on @@ -178,7 +179,8 @@ JSON=$( jq -n \ --arg bytes "$SZ" \ --arg wasm "$WASM" \ --arg z_wasm "$Z_WASM" \ - --arg prop "$PROP" \ + --arg set_code_prop "$SET_CODE_PROP" \ + --arg authorize_upgrade_prop "$AUTHORIZE_UPGRADE_PROP" \ --arg sha256 "$SHA256" \ --arg tmsp "$TMSP" \ --arg git_tag "$GIT_TAG" \ @@ -201,7 +203,8 @@ JSON=$( jq -n \ pkg: $pkg, tmsp: $tmsp, size: $bytes, - prop: $prop, + set_code_prop: $set_code_prop, + authorize_upgrade_prop: $authorize_upgrade_prop, ipfs: $ipfs, sha256: $sha256, wasm: $z_wasm, diff --git a/templates/output.txt b/templates/output.txt index d7bdea8..ffeb3fc 100644 --- a/templates/output.txt +++ b/templates/output.txt @@ -11,25 +11,27 @@ Summary generated with {{ gen }} using the docker image {{ context.docker.image Time : {{ tmsp }} == Compact - Version : {{ runtimes.compact.subwasm.core_version }} - Metadata : V{{ runtimes.compact.subwasm.metadata_version }} - Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) - Proposal : {{ runtimes.compact.prop }} - IPFS : {{ runtimes.compact.ipfs }} - BLAKE2_256 : {{ runtimes.compact.blake2_256 }} - Wasm : {{ runtimes.compact.wasm }} + Version : {{ runtimes.compact.subwasm.core_version }} + Metadata : V{{ runtimes.compact.subwasm.metadata_version }} + Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) + system.setCode proposal : {{ runtimes.compact.set_code_prop }} + parachainSystem.authorizeUpgrade proposal : {{ runtimes.compact.authorize_upgrade_prop }} + IPFS : {{ runtimes.compact.ipfs }} + BLAKE2_256 : {{ runtimes.compact.blake2_256 }} + Wasm : {{ runtimes.compact.wasm }} == Compressed {%- if runtimes.compressed %} {%- set ratio = 100 - (( runtimes.compressed.subwasm.compression.size_compressed / runtimes.compressed.subwasm.compression.size_decompressed) ) * 100 %} - Version : {{ runtimes.compressed.subwasm.core_version }} - Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} - Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) - Compression : {{ ratio | round(method="ceil", precision=2) }}% - Proposal : {{ runtimes.compressed.prop }} - IPFS : {{ runtimes.compressed.ipfs }} - BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} - Wasm : {{ runtimes.compressed.wasm }} + Version : {{ runtimes.compressed.subwasm.core_version }} + Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} + Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) + Compression : {{ ratio | round(method="ceil", precision=2) }}% + system.setCode proposal : {{ runtimes.compressed.set_code_prop }} + parachainSystem.authorizeUpgrade proposal : {{ runtimes.compressed.authorize_upgrade_prop }} + IPFS : {{ runtimes.compressed.ipfs }} + BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} + Wasm : {{ runtimes.compressed.wasm }} {% else %} No compressed runtime found {% endif %} From 1bfd1e659994fedb07415d8c9768569fd52c04e5 Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Mon, 12 Sep 2022 15:46:56 +0200 Subject: [PATCH 2/5] Revert PROP renaming --- scripts/analyse.sh | 6 +++--- scripts/build | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/analyse.sh b/scripts/analyse.sh index 54745a1..705a10b 100755 --- a/scripts/analyse.sh +++ b/scripts/analyse.sh @@ -4,7 +4,7 @@ WASM=$1 WASM_FULLPATH=/build/$WASM SZ=`du -sb $WASM_FULLPATH | awk '{print $1}'` -SET_CODE_PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` +PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` AUTHORIZE_UPGRADE_PROP=`subwasm -j info $Z_WASM | jq -r .parachain_authorize_upgrade_hash` MULTIHASH=`subwasm -j info $WASM_FULLPATH | jq -r .ipfs_hash` SHA256=0x`shasum -a 256 $WASM_FULLPATH | awk '{print $1}'` @@ -15,7 +15,7 @@ SUBWASM=`subwasm -j info $WASM_FULLPATH` JSON=$( jq -n \ --arg tmsp "$TMSP" \ --arg size "$SZ" \ - --arg set_code_prop "$SET_CODE_PROP" \ + --arg prop "$PROP" \ --arg authorize_upgrade_prop "$AUTHORIZE_UPGRADE_PROP" \ --arg blake2_256 "$BLAKE2_256" \ --arg ipfs "$MULTIHASH" \ @@ -25,7 +25,7 @@ JSON=$( jq -n \ '{ tmsp: $tmsp, size: $size, - set_code_prop: $set_code_prop, + prop: $prop, authorize_upgrade_prop: $authorize_upgrade_prop, blake2_256: $blake2_256, ipfs: $ipfs, diff --git a/scripts/build b/scripts/build index e631479..4a0a735 100755 --- a/scripts/build +++ b/scripts/build @@ -146,7 +146,7 @@ SZ=`du -sb $Z_WASM | awk '{print $1}'` KB=$(expr $SZ / 1024) TMSP=`date --utc +%FT%TZ` SHA256=0x`shasum -a 256 $Z_WASM | awk '{print $1}'` -SET_CODE_PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` +PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` AUTHORIZE_UPGRADE_PROP=`subwasm -j info $Z_WASM | jq -r .parachain_authorize_upgrade_hash` MULTIHASH=`subwasm -j info $Z_WASM | jq -r .ipfs_hash` @@ -179,7 +179,7 @@ JSON=$( jq -n \ --arg bytes "$SZ" \ --arg wasm "$WASM" \ --arg z_wasm "$Z_WASM" \ - --arg set_code_prop "$SET_CODE_PROP" \ + --arg prop "$PROP" \ --arg authorize_upgrade_prop "$AUTHORIZE_UPGRADE_PROP" \ --arg sha256 "$SHA256" \ --arg tmsp "$TMSP" \ @@ -203,7 +203,7 @@ JSON=$( jq -n \ pkg: $pkg, tmsp: $tmsp, size: $bytes, - set_code_prop: $set_code_prop, + prop: $prop, authorize_upgrade_prop: $authorize_upgrade_prop, ipfs: $ipfs, sha256: $sha256, From d16e7a99545c1541a7b883e082c6c15b3320982f Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Mon, 12 Sep 2022 15:47:11 +0200 Subject: [PATCH 3/5] Reduce whitespaces in the template --- templates/output.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/output.txt b/templates/output.txt index ffeb3fc..483a129 100644 --- a/templates/output.txt +++ b/templates/output.txt @@ -11,27 +11,27 @@ Summary generated with {{ gen }} using the docker image {{ context.docker.image Time : {{ tmsp }} == Compact - Version : {{ runtimes.compact.subwasm.core_version }} - Metadata : V{{ runtimes.compact.subwasm.metadata_version }} - Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) - system.setCode proposal : {{ runtimes.compact.set_code_prop }} - parachainSystem.authorizeUpgrade proposal : {{ runtimes.compact.authorize_upgrade_prop }} - IPFS : {{ runtimes.compact.ipfs }} - BLAKE2_256 : {{ runtimes.compact.blake2_256 }} - Wasm : {{ runtimes.compact.wasm }} + Version : {{ runtimes.compact.subwasm.core_version }} + Metadata : V{{ runtimes.compact.subwasm.metadata_version }} + Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) + setCode proposal : {{ runtimes.compact.set_code_prop }} + authorizeUpgrade proposal : {{ runtimes.compact.authorize_upgrade_prop }} + IPFS : {{ runtimes.compact.ipfs }} + BLAKE2_256 : {{ runtimes.compact.blake2_256 }} + Wasm : {{ runtimes.compact.wasm }} == Compressed {%- if runtimes.compressed %} {%- set ratio = 100 - (( runtimes.compressed.subwasm.compression.size_compressed / runtimes.compressed.subwasm.compression.size_decompressed) ) * 100 %} - Version : {{ runtimes.compressed.subwasm.core_version }} - Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} - Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) - Compression : {{ ratio | round(method="ceil", precision=2) }}% - system.setCode proposal : {{ runtimes.compressed.set_code_prop }} - parachainSystem.authorizeUpgrade proposal : {{ runtimes.compressed.authorize_upgrade_prop }} - IPFS : {{ runtimes.compressed.ipfs }} - BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} - Wasm : {{ runtimes.compressed.wasm }} + Version : {{ runtimes.compressed.subwasm.core_version }} + Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} + Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) + Compression : {{ ratio | round(method="ceil", precision=2) }}% + setCode proposal : {{ runtimes.compressed.set_code_prop }} + authorizeUpgrade proposal : {{ runtimes.compressed.authorize_upgrade_prop }} + IPFS : {{ runtimes.compressed.ipfs }} + BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} + Wasm : {{ runtimes.compressed.wasm }} {% else %} No compressed runtime found {% endif %} From a2449cd43301a55bb21fba964230a19dc8132e6a Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Mon, 12 Sep 2022 15:50:05 +0200 Subject: [PATCH 4/5] Fix copy-paste issue --- scripts/analyse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyse.sh b/scripts/analyse.sh index 705a10b..3d8869c 100755 --- a/scripts/analyse.sh +++ b/scripts/analyse.sh @@ -4,8 +4,8 @@ WASM=$1 WASM_FULLPATH=/build/$WASM SZ=`du -sb $WASM_FULLPATH | awk '{print $1}'` -PROP=`subwasm -j info $Z_WASM | jq -r .proposal_hash` -AUTHORIZE_UPGRADE_PROP=`subwasm -j info $Z_WASM | jq -r .parachain_authorize_upgrade_hash` +PROP=`subwasm -j info $WASM_FULLPATH | jq -r .proposal_hash` +AUTHORIZE_UPGRADE_PROP=`subwasm -j info $WASM_FULLPATH | jq -r .parachain_authorize_upgrade_hash` MULTIHASH=`subwasm -j info $WASM_FULLPATH | jq -r .ipfs_hash` SHA256=0x`shasum -a 256 $WASM_FULLPATH | awk '{print $1}'` TMSP=$(date --utc +%FT%TZ -d @$(stat -c "%Y" $WASM_FULLPATH)) From bf1546fa99b0537d52c2ee6b4e6433ba4afeec6e Mon Sep 17 00:00:00 2001 From: Antonio Antonino Date: Tue, 13 Sep 2022 10:46:25 +0200 Subject: [PATCH 5/5] Remove 'proposal' from template --- templates/output.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/output.txt b/templates/output.txt index 483a129..c72da3b 100644 --- a/templates/output.txt +++ b/templates/output.txt @@ -11,27 +11,27 @@ Summary generated with {{ gen }} using the docker image {{ context.docker.image Time : {{ tmsp }} == Compact - Version : {{ runtimes.compact.subwasm.core_version }} - Metadata : V{{ runtimes.compact.subwasm.metadata_version }} - Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) - setCode proposal : {{ runtimes.compact.set_code_prop }} - authorizeUpgrade proposal : {{ runtimes.compact.authorize_upgrade_prop }} - IPFS : {{ runtimes.compact.ipfs }} - BLAKE2_256 : {{ runtimes.compact.blake2_256 }} - Wasm : {{ runtimes.compact.wasm }} + Version : {{ runtimes.compact.subwasm.core_version }} + Metadata : V{{ runtimes.compact.subwasm.metadata_version }} + Size : {{ runtimes.compact.size | int | filesizeformat }} ({{ runtimes.compact.size }} bytes) + setCode : {{ runtimes.compact.set_code_prop }} + authorizeUpgrade : {{ runtimes.compact.authorize_upgrade_prop }} + IPFS : {{ runtimes.compact.ipfs }} + BLAKE2_256 : {{ runtimes.compact.blake2_256 }} + Wasm : {{ runtimes.compact.wasm }} == Compressed {%- if runtimes.compressed %} {%- set ratio = 100 - (( runtimes.compressed.subwasm.compression.size_compressed / runtimes.compressed.subwasm.compression.size_decompressed) ) * 100 %} - Version : {{ runtimes.compressed.subwasm.core_version }} - Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} - Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) - Compression : {{ ratio | round(method="ceil", precision=2) }}% - setCode proposal : {{ runtimes.compressed.set_code_prop }} - authorizeUpgrade proposal : {{ runtimes.compressed.authorize_upgrade_prop }} - IPFS : {{ runtimes.compressed.ipfs }} - BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} - Wasm : {{ runtimes.compressed.wasm }} + Version : {{ runtimes.compressed.subwasm.core_version }} + Metadata : V{{ runtimes.compressed.subwasm.metadata_version }} + Size : {{ runtimes.compressed.size | int | filesizeformat }} ({{ runtimes.compressed.size }} bytes) + Compression : {{ ratio | round(method="ceil", precision=2) }}% + setCode : {{ runtimes.compressed.set_code_prop }} + authorizeUpgrade : {{ runtimes.compressed.authorize_upgrade_prop }} + IPFS : {{ runtimes.compressed.ipfs }} + BLAKE2_256 : {{ runtimes.compressed.blake2_256 }} + Wasm : {{ runtimes.compressed.wasm }} {% else %} No compressed runtime found {% endif %}