From 1d6e72911c72695cff82b33a8e7ea257b1490878 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 15 Aug 2024 10:16:20 -0300 Subject: [PATCH 1/9] chore: bump major --- app/Makefile.version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Makefile.version b/app/Makefile.version index 0d048e4..d835cad 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,6 +1,6 @@ # This is the `transaction_version` field of `Runtime` -APPVERSION_M=4 +APPVERSION_M=5 # This is the `spec_version` field of `Runtime` APPVERSION_N=63001 # This is the patch version of this release -APPVERSION_P=3 +APPVERSION_P=0 From 1971fb75c8a897940734c96a93425bb843715b5e Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 15 Aug 2024 11:05:40 -0300 Subject: [PATCH 2/9] feat. upload images if zemu tests fail --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1516c58..ef49535 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,6 +118,12 @@ jobs: - name: Build and run zemu tests run: | make test_all + - name: Upload Snapshots (only failure) + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: snapshots-tmp + path: tests_zemu/snapshots-tmp/ build_package_nanos: needs: [configure, build, build_ledger, test_zemu] From 8601af99099e9297ddffd146999443eaf3270c5f Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Thu, 15 Aug 2024 11:25:16 -0300 Subject: [PATCH 3/9] feat: update snapshots --- tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 9870 -> 9911 bytes tests_zemu/snapshots/s-mainmenu/00004.png | Bin 463 -> 450 bytes tests_zemu/snapshots/s-mainmenu/00010.png | Bin 463 -> 450 bytes tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 441 -> 422 bytes tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 441 -> 422 bytes tests_zemu/snapshots/st-mainmenu/00004.png | Bin 11551 -> 11598 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 441 -> 422 bytes tests_zemu/snapshots/x-mainmenu/00010.png | Bin 441 -> 422 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index b968f20b045691bd245f334efb1b48769e8e8800..2696da9aef5838bd93b117524aa71c5879b1f790 100644 GIT binary patch literal 9911 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 diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png index f01a0f531fd5dd10d66681cedad59f90064b4233..0a221742da3b8170f1fa2fe10c0d269dbd7e3423 100644 GIT binary patch delta 424 zcmV;Z0ayOd1HuE4B!7uXL_t(|ob8$04#FS|K+)*`fAAjW1E%R(D1`xSv?s=7fG~Tb zl$3%X2!em*v1y(2xGwu{j1&e;e4o{;D0psN&A}h`#>;qp@C>dSVx;hR9^Y?xBr{-d z%Za{o=VeY&Do`*Y)DRv=8|E+OdrSfNm}8FDowE-j&#TE^6##vHbnqL1 zJXyd%n{e?|DSsbRVVKYx0Hts}ngz)&qEtXLJJi&9#@bVTgV~$2n%06cwLnj*I(RVg z%UbxvUW$dIw1{ht{VhF5ClOGOyvU_^x^EPS8cQaboHl@{QGqw(V`A0mU>hBzrap2y!mJdz!7 zwADdAax2{m+Xx_F6_XrA#HW{6z5jC&tLaNY zqwg(w)~Ltf4D;j#@IE|fT=7dmTnmz3`YRS?4bML@a6N>pW3H_T@t)=G5Dq}!Jz!M| znjlQUzKPigXclwHIIT0FN1-*$>u;ZXzQg_1dXE_ZUvu1vdUB3I^m%pJs{vpxjt$-c z=#wQ3bO<+Zm4Es*6_zQp3D8Q{vsI8DBBKV-bA3;@XKq{)ZCJLt_JS&Ut|PsjN_`~J zDRqIA?vNz9x&Iza3_zMNqdl2TJ{aSWn>E0M2KBzCA_eMQGWD=X)l019S9E~@Dd-lx zx4g-bUzLI+a7>gaIl&k!17L50pvGrix#lGoV|d8z>n;U()%DHRW)aFnX|Xh}5V(7q fBuSDaN%9Upmk;O(!SN!f00000NkvXXu0mjf`lihH diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png index ef9b955754e6bc970b6b93f382bf6adbbddeb9df..613fce206428af2222c5f1743f383e4c24452748 100644 GIT binary patch delta 396 zcmdnVyo`B*N`0=Ui(^Q|oVPb~Cp9bZG$h`7>AUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0L~7;HUIzs delta 415 zcmV;Q0bu^71Gxi`B!7TOL_t(|obB0da)clZfMMI&n|S{tahLvZCQTDQ?5Ysh_xaJO ztOHAssM&1;00000000000001w`077oN=YB?`(8h@a>9+@=jl;OzK4vujhk>ZuhC!N zm+TC`Hs&Ig!<5qTR}M`Ndbb^ozNI<(qlWDOLx4%JzSKh+7OxLI1ttbcVSyknYECn*KthARmQNT+TnSRL=4FXCS)(qc)~a z(|1Kj`qT+WANF5{MtFmy#gaIQ`-yf9hMje*)%0W+GeKD`@ zuC*X3Aa8#o-i&^!&U|A`N4*<|s0B4;tH*Db=PE-io`SL@HJ{1R>*-yN)<0lLi+mcP zKHOQLpCk=g48LanmXKZ7W?I)bB-0@P000000000002lz6-4B(tBqIu1N2mY*002ov JPDHLkV1h|J$EN@Q diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png index ef9b955754e6bc970b6b93f382bf6adbbddeb9df..613fce206428af2222c5f1743f383e4c24452748 100644 GIT binary patch delta 396 zcmdnVyo`B*N`0=Ui(^Q|oVPb~Cp9bZG$h`7>AUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0L~7;HUIzs delta 415 zcmV;Q0bu^71Gxi`B!7TOL_t(|obB0da)clZfMMI&n|S{tahLvZCQTDQ?5Ysh_xaJO ztOHAssM&1;00000000000001w`077oN=YB?`(8h@a>9+@=jl;OzK4vujhk>ZuhC!N zm+TC`Hs&Ig!<5qTR}M`Ndbb^ozNI<(qlWDOLx4%JzSKh+7OxLI1ttbcVSyknYECn*KthARmQNT+TnSRL=4FXCS)(qc)~a z(|1Kj`qT+WANF5{MtFmy#gaIQ`-yf9hMje*)%0W+GeKD`@ zuC*X3Aa8#o-i&^!&U|A`N4*<|s0B4;tH*Db=PE-io`SL@HJ{1R>*-yN)<0lLi+mcP zKHOQLpCk=g48LanmXKZ7W?I)bB-0@P000000000002lz6-4B(tBqIu1N2mY*002ov JPDHLkV1h|J$EN@Q diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png index b0ece647ad12f9164998dd6cc524ca968b593ea2..3d44505af300c2b770df09886e61b6b8e92d5a85 100644 GIT binary patch literal 11598 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 diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index ef9b955754e6bc970b6b93f382bf6adbbddeb9df..613fce206428af2222c5f1743f383e4c24452748 100644 GIT binary patch delta 396 zcmdnVyo`B*N`0=Ui(^Q|oVPb~Cp9bZG$h`7>AUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0L~7;HUIzs delta 415 zcmV;Q0bu^71Gxi`B!7TOL_t(|obB0da)clZfMMI&n|S{tahLvZCQTDQ?5Ysh_xaJO ztOHAssM&1;00000000000001w`077oN=YB?`(8h@a>9+@=jl;OzK4vujhk>ZuhC!N zm+TC`Hs&Ig!<5qTR}M`Ndbb^ozNI<(qlWDOLx4%JzSKh+7OxLI1ttbcVSyknYECn*KthARmQNT+TnSRL=4FXCS)(qc)~a z(|1Kj`qT+WANF5{MtFmy#gaIQ`-yf9hMje*)%0W+GeKD`@ zuC*X3Aa8#o-i&^!&U|A`N4*<|s0B4;tH*Db=PE-io`SL@HJ{1R>*-yN)<0lLi+mcP zKHOQLpCk=g48LanmXKZ7W?I)bB-0@P000000000002lz6-4B(tBqIu1N2mY*002ov JPDHLkV1h|J$EN@Q diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png index ef9b955754e6bc970b6b93f382bf6adbbddeb9df..613fce206428af2222c5f1743f383e4c24452748 100644 GIT binary patch delta 396 zcmdnVyo`B*N`0=Ui(^Q|oVPb~Cp9bZG$h`7>AUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0L~7;HUIzs delta 415 zcmV;Q0bu^71Gxi`B!7TOL_t(|obB0da)clZfMMI&n|S{tahLvZCQTDQ?5Ysh_xaJO ztOHAssM&1;00000000000001w`077oN=YB?`(8h@a>9+@=jl;OzK4vujhk>ZuhC!N zm+TC`Hs&Ig!<5qTR}M`Ndbb^ozNI<(qlWDOLx4%JzSKh+7OxLI1ttbcVSyknYECn*KthARmQNT+TnSRL=4FXCS)(qc)~a z(|1Kj`qT+WANF5{MtFmy#gaIQ`-yf9hMje*)%0W+GeKD`@ zuC*X3Aa8#o-i&^!&U|A`N4*<|s0B4;tH*Db=PE-io`SL@HJ{1R>*-yN)<0lLi+mcP zKHOQLpCk=g48LanmXKZ7W?I)bB-0@P000000000002lz6-4B(tBqIu1N2mY*002ov JPDHLkV1h|J$EN@Q From 5319d9a1f13e04bc41f0582a663028e287a15c37 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 16 Aug 2024 13:45:55 -0300 Subject: [PATCH 4/9] feat: combine tx spec and zx app version in ledger major version --- app/Makefile.version | 2 +- app/src/substrate/substrate_coin.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Makefile.version b/app/Makefile.version index d835cad..54a8178 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,5 +1,5 @@ # This is the `transaction_version` field of `Runtime` -APPVERSION_M=5 +APPVERSION_M=1004 # This is the `spec_version` field of `Runtime` APPVERSION_N=63001 # This is the patch version of this release diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h index e2748bd..3fa3ed4 100644 --- a/app/src/substrate/substrate_coin.h +++ b/app/src/substrate/substrate_coin.h @@ -50,9 +50,10 @@ typedef enum { } key_kind_e; +#define ZX_MAJOR_VERSION_SHIFT 1000 // Coin Specific #define PK_ADDRESS_TYPE COIN_ADDR_TYPE -#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION +#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION - ZX_MAJOR_VERSION_SHIFT #define SUPPORTED_TX_VERSION_PREVIOUS (LEDGER_MAJOR_VERSION - 1) #define SUPPORTED_SPEC_VERSION (LEDGER_MINOR_VERSION + 0) #define SUPPORTED_MINIMUM_SPEC_VERSION 6003001 From 91a551c56637702055980dec13a77a76f33eab55 Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 16 Aug 2024 13:58:43 -0300 Subject: [PATCH 5/9] feat: update snapshots --- tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 9911 -> 9964 bytes tests_zemu/snapshots/s-mainmenu/00004.png | Bin 450 -> 467 bytes tests_zemu/snapshots/s-mainmenu/00010.png | Bin 450 -> 467 bytes tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 422 -> 445 bytes tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 422 -> 445 bytes tests_zemu/snapshots/st-mainmenu/00004.png | Bin 11598 -> 11667 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 422 -> 445 bytes tests_zemu/snapshots/x-mainmenu/00010.png | Bin 422 -> 445 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index 2696da9aef5838bd93b117524aa71c5879b1f790..8a684e172008d502d4a422a7d9f70361d464c4ec 100644 GIT binary patch literal 9964 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 P16i2cT&OsIC+2?v>=O(l literal 9911 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 jrMdJZNs=T;qp@C>dSVx;hR9^Y?xBr{-d z%Za{o=VeY&Do`*Y)DRv=8|E+OdrSfNm}8FDowE-j&#TE^6##vHbnqL1 zJXyd%n{e?|DSsbRVVKYx0Hts}ngz)&qEtXLJJi&9#@bVTgV~$2n%06cwLnj*I(RVg z%UbxvUW$dIw1{ht{VhF5ClOGOyvU_^x^*?1K$q02wa~xLZz|COSr3 zKtM`Kk|as~D_>4>&f_Zf_hzNC!02HBJK@hrIu~2y6O6 z(CE2ao;B)mIKr$P0Pn*uO(=08h-;yxm;Q=HS;OPc9)u?0>X^0_A>OmxCE*R|dk0vB zpb54q*dJo{28hL6GLDo3dK6l(dHs9NJwLl1}QdQ;H&eIZ(S8fHYxX=$2+43W*lypEbac>{egXq{z|hU=YeXaqEw8 zi}Oc^ARqMZbZEWz<^~|4>}4wR(;JFq jrMdJZNs=T;qp@C>dSVx;hR9^Y?xBr{-d z%Za{o=VeY&Do`*Y)DRv=8|E+OdrSfNm}8FDowE-j&#TE^6##vHbnqL1 zJXyd%n{e?|DSsbRVVKYx0Hts}ngz)&qEtXLJJi&9#@bVTgV~$2n%06cwLnj*I(RVg z%UbxvUW$dIw1{ht{VhF5ClOGOyvU_^x^J*h?Rrp_v4t9`5%49y-dQ zph42p7yYYMY6Q94&PLmEIeS;rc7P&7ta6lUw~LWJRe!NdJ+q-#o&Q}5lHsrs zw=Ex!A7jjpUq3|?(^AmWCr)OVnu+8%cGHZvL<+J|D8=ReHx{Rl%|8?A1(>xlWtwgk zoiwIQIP!G-GF*grk+fK{PU5anyoL4e?HvmcvY}r8#$FTs)0S)S8XIS!7ufsn@a}AQ z$5lh^H@`bA@_(aJ`+1=14NoWXr!IZ84OzyKE&hS*oZXtve!VlkI`F6HlpEUrC#){C z{_z=5Fqrssx32}IDsgBLyUP(uCFor;#uBxl8rj0~$CbPBmR^9Anw=cIyDsHu`If43 zoOHZG>3Aol*C2i$r`}L{funv!)jl6hbaM&-0000002}}S00026gAUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0MtIfIsgCw diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png index 613fce206428af2222c5f1743f383e4c24452748..b41845b12b66d669b920c3ec06c339fc53d2c836 100644 GIT binary patch delta 419 zcmV;U0bKs31HA)~B!7fSL_t(|obB0La)lrafMMF{PTc>J*h?Rrp_v4t9`5%49y-dQ zph42p7yYYMY6Q94&PLmEIeS;rc7P&7ta6lUw~LWJRe!NdJ+q-#o&Q}5lHsrs zw=Ex!A7jjpUq3|?(^AmWCr)OVnu+8%cGHZvL<+J|D8=ReHx{Rl%|8?A1(>xlWtwgk zoiwIQIP!G-GF*grk+fK{PU5anyoL4e?HvmcvY}r8#$FTs)0S)S8XIS!7ufsn@a}AQ z$5lh^H@`bA@_(aJ`+1=14NoWXr!IZ84OzyKE&hS*oZXtve!VlkI`F6HlpEUrC#){C z{_z=5Fqrssx32}IDsgBLyUP(uCFor;#uBxl8rj0~$CbPBmR^9Anw=cIyDsHu`If43 zoOHZG>3Aol*C2i$r`}L{funv!)jl6hbaM&-0000002}}S00026gAUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0MtIfIsgCw diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png index 3d44505af300c2b770df09886e61b6b8e92d5a85..d16500a5a789e012e7cd6006f15d543dbff28df4 100644 GIT binary patch literal 11667 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 diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png index 613fce206428af2222c5f1743f383e4c24452748..b41845b12b66d669b920c3ec06c339fc53d2c836 100644 GIT binary patch delta 419 zcmV;U0bKs31HA)~B!7fSL_t(|obB0La)lrafMMF{PTc>J*h?Rrp_v4t9`5%49y-dQ zph42p7yYYMY6Q94&PLmEIeS;rc7P&7ta6lUw~LWJRe!NdJ+q-#o&Q}5lHsrs zw=Ex!A7jjpUq3|?(^AmWCr)OVnu+8%cGHZvL<+J|D8=ReHx{Rl%|8?A1(>xlWtwgk zoiwIQIP!G-GF*grk+fK{PU5anyoL4e?HvmcvY}r8#$FTs)0S)S8XIS!7ufsn@a}AQ z$5lh^H@`bA@_(aJ`+1=14NoWXr!IZ84OzyKE&hS*oZXtve!VlkI`F6HlpEUrC#){C z{_z=5Fqrssx32}IDsgBLyUP(uCFor;#uBxl8rj0~$CbPBmR^9Anw=cIyDsHu`If43 zoOHZG>3Aol*C2i$r`}L{funv!)jl6hbaM&-0000002}}S00026gAUCu#G>i{3fh)&E?9eN`uoqx>8@;E z6H3h67?6P8#})QVJ6@bljXY(`E$jEkCj9)Q&pAff8QUM++Y?pa&|hKn=iZEVlen%E zzl`H%34Y0pmaaYh?9KG7GA16`q{)kYcHi%*xL$um@0(BCy^?*gT$dhx5d5xN->C2i_6Oxk0(*9EW>a_Ae|VL>wNpVUYw!l1ccs2N oH@}~p^YQRBYi2~CH7wlAxKu?~`b+0TX^^O=s~@Y&I;Vst0MtIfIsgCw From ec0b797c3b5967e0e8d9c7e2c73692e4e78161ea Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 16 Aug 2024 14:06:05 -0300 Subject: [PATCH 6/9] feat: adjust major again --- app/Makefile.version | 2 +- app/src/substrate/substrate_coin.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Makefile.version b/app/Makefile.version index 54a8178..415703d 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,5 +1,5 @@ # This is the `transaction_version` field of `Runtime` -APPVERSION_M=1004 +APPVERSION_M=104 # This is the `spec_version` field of `Runtime` APPVERSION_N=63001 # This is the patch version of this release diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h index 3fa3ed4..41b3f27 100644 --- a/app/src/substrate/substrate_coin.h +++ b/app/src/substrate/substrate_coin.h @@ -50,7 +50,10 @@ typedef enum { } key_kind_e; -#define ZX_MAJOR_VERSION_SHIFT 1000 +// Zondax major delta to fit chain tx version into the major value. +// Major - this delta -> results on the chain tx version +#define ZX_MAJOR_VERSION_DELTA 100 + // Coin Specific #define PK_ADDRESS_TYPE COIN_ADDR_TYPE #define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION - ZX_MAJOR_VERSION_SHIFT From 6370334f3261f68102695c8964131dd3bd7179cc Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 16 Aug 2024 14:13:45 -0300 Subject: [PATCH 7/9] fix: typo --- app/src/substrate/substrate_coin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h index 41b3f27..20a7b03 100644 --- a/app/src/substrate/substrate_coin.h +++ b/app/src/substrate/substrate_coin.h @@ -56,7 +56,7 @@ typedef enum { // Coin Specific #define PK_ADDRESS_TYPE COIN_ADDR_TYPE -#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION - ZX_MAJOR_VERSION_SHIFT +#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION - ZX_MAJOR_VERSION_DELTA #define SUPPORTED_TX_VERSION_PREVIOUS (LEDGER_MAJOR_VERSION - 1) #define SUPPORTED_SPEC_VERSION (LEDGER_MINOR_VERSION + 0) #define SUPPORTED_MINIMUM_SPEC_VERSION 6003001 From 8788e55872b767e250a6905781123da08861c7da Mon Sep 17 00:00:00 2001 From: emmanuelm41 Date: Fri, 16 Aug 2024 14:36:56 -0300 Subject: [PATCH 8/9] chore: update snapshots --- tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 9964 -> 9948 bytes tests_zemu/snapshots/s-mainmenu/00004.png | Bin 467 -> 473 bytes tests_zemu/snapshots/s-mainmenu/00010.png | Bin 467 -> 473 bytes tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 445 -> 445 bytes tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 445 -> 445 bytes tests_zemu/snapshots/st-mainmenu/00004.png | Bin 11667 -> 11649 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 445 -> 445 bytes tests_zemu/snapshots/x-mainmenu/00010.png | Bin 445 -> 445 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index 8a684e172008d502d4a422a7d9f70361d464c4ec..13c23e06fbeba2893d8b2b0efa7ff2763204531b 100644 GIT binary patch literal 9948 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 How)x6#_H=# literal 9964 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 P16i2cT&OsIC+2?v>=O(l diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index 22ea18690f1e30b91c2f0d05fcabd55016667d9a..a59ecc0cf9656eb468bfafdb7339ce9f48b6b423 100644 GIT binary patch delta 447 zcmV;w0YLuK1K9(RB!8euL_t(|ob8y~ZUi9+Ky9=A{|}yr*#|d-0b~?!be5B*iH;Qu za*>pRAP9nQTM>u>+4>YXGbcu77bpW8VKf z0DZE6fs(NJs(;j8URwbwpKy9i!>QP?D>@T(X&ELU&uDEi0-R#xAuY(Gp*9e z;X`pNk~Z>?>{gPZNH2-j4_v_#1CS;R42P$gNuh6MIb-)*SoMe@3{3p zwr3V&yF<`e^e(i^y6&GCfP^fUsE{L90WlS1VQlKyaA!{_5IP^it7LX002ovPDHLkV1jfr*?1K$q02wa~xLZz|COSr3 zKtM`Kk|as~D_>4>&f_Zf_hzNC!02HBJK@hrIu~2y6O6 z(CE2ao;B)mIKr$P0Pn*uO(=08h-;yxm;Q=HS;OPc9)u?0>X^0_A>OmxCE*R|dk0vB zpb54q*dJo{28hL6GLDo3dK6l(dHs9NJwLl1}QdQ;H&eIZ(S8fHYxX=$2+43W*lypEbac>{egXq{z|hU=YeXaqEw8 zi}Oc^ARqMZbZEWz<^~|4>}4wR(;JFq jrMdJZNs=TpRAP9nQTM>u>+4>YXGbcu77bpW8VKf z0DZE6fs(NJs(;j8URwbwpKy9i!>QP?D>@T(X&ELU&uDEi0-R#xAuY(Gp*9e z;X`pNk~Z>?>{gPZNH2-j4_v_#1CS;R42P$gNuh6MIb-)*SoMe@3{3p zwr3V&yF<`e^e(i^y6&GCfP^fUsE{L90WlS1VQlKyaA!{_5IP^it7LX002ovPDHLkV1jfr*?1K$q02wa~xLZz|COSr3 zKtM`Kk|as~D_>4>&f_Zf_hzNC!02HBJK@hrIu~2y6O6 z(CE2ao;B)mIKr$P0Pn*uO(=08h-;yxm;Q=HS;OPc9)u?0>X^0_A>OmxCE*R|dk0vB zpb54q*dJo{28hL6GLDo3dK6l(dHs9NJwLl1}QdQ;H&eIZ(S8fHYxX=$2+43W*lypEbac>{egXq{z|hU=YeXaqEw8 zi}Oc^ARqMZbZEWz<^~|4>}4wR(;JFq jrMdJZNs=TF$7(0e{Q#-U&fqa;cQ00000 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 diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index b41845b12b66d669b920c3ec06c339fc53d2c836..9a2e3241fb00996c16f223034a88645876f399b3 100644 GIT binary patch delta 408 zcmV;J0cZZb1HA)~FMq=z3_wxZ=}x@=C9#)&c!p{u9>F$7(0e{Q#-U&fqa;cQ00000 z000000001Bh_Cmjj4{gQaUAuYl@1SH&*)i7zNgF@=H0M2KeI33PudxFZPY`WnlZ-n zZ)&O$aoP{>9_WSVaYi$i}joBd0bXAd#$;-VIGLAIWJxnMVu#|22Kxss!|F}55nf3E8KuXOC8V!XD} z?;*`Twx>F_&E~Mpi>XWj00000000000002i@(cFBP7$NLmGpuD0000qj$c1T z6Vp=A(?ICj&Fw?qoEQ7Fab{x=q?dzF=d)=6`eGuOgQp%{4!jG zcagMMvQFZzQM`rq@9iB65VE0O|HfVu{nM6f@ERLup%>Wu@9^$yc*j*k?Ki(WE%KvM z`+1=14NoWXr++Sev<+FtkuCm#?3~@2&VIc!zB=%y=#(4U|0k?2wEpoKP%xPIbhobs zr7Ce~5xdI~N+sxBGR6|Mpc>i2^2e3C@s?hIl$xC!y}K^uX!(|^a-4L$Lg{!XrPm;S zAE(|>dV!;UMb$nZO>}b#000000000000026gF$7(0e{Q#-U&fqa;cQ00000 z000000001Bh_Cmjj4{gQaUAuYl@1SH&*)i7zNgF@=H0M2KeI33PudxFZPY`WnlZ-n zZ)&O$aoP{>9_WSVaYi$i}joBd0bXAd#$;-VIGLAIWJxnMVu#|22Kxss!|F}55nf3E8KuXOC8V!XD} z?;*`Twx>F_&E~Mpi>XWj00000000000002i@(cFBP7$NLmGpuD0000qj$c1T z6Vp=A(?ICj&Fw?qoEQ7Fab{x=q?dzF=d)=6`eGuOgQp%{4!jG zcagMMvQFZzQM`rq@9iB65VE0O|HfVu{nM6f@ERLup%>Wu@9^$yc*j*k?Ki(WE%KvM z`+1=14NoWXr++Sev<+FtkuCm#?3~@2&VIc!zB=%y=#(4U|0k?2wEpoKP%xPIbhobs zr7Ce~5xdI~N+sxBGR6|Mpc>i2^2e3C@s?hIl$xC!y}K^uX!(|^a-4L$Lg{!XrPm;S zAE(|>dV!;UMb$nZO>}b#000000000000026g Date: Fri, 16 Aug 2024 14:54:55 -0300 Subject: [PATCH 9/9] feat: improve tests --- tests_zemu/tests/standard.test.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts index 7bc81c7..ecb74fc 100644 --- a/tests_zemu/tests/standard.test.ts +++ b/tests_zemu/tests/standard.test.ts @@ -62,10 +62,16 @@ describe('Standard', function () { expect(resp.return_code).toEqual(0x9000) expect(resp.error_message).toEqual('No errors') + expect(resp).toHaveProperty('test_mode') + expect(resp).toHaveProperty('major') expect(resp).toHaveProperty('minor') expect(resp).toHaveProperty('patch') + + expect(resp.major).toEqual(104) + expect(resp.minor).toEqual(63001) + expect(resp.patch).toEqual(0) } finally { await sim.close() }