From c787a6a8aa103804a84ca0c0af6d81ef51518e72 Mon Sep 17 00:00:00 2001 From: stringhandler Date: Tue, 10 Sep 2024 08:37:40 +0200 Subject: [PATCH 1/3] chore: reduce size of proxy logs (#6546) Proxy config would generate 200mb files that are impossible to read in an editor --- applications/minotari_merge_mining_proxy/log4rs_sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/minotari_merge_mining_proxy/log4rs_sample.yml b/applications/minotari_merge_mining_proxy/log4rs_sample.yml index 7cbebfcec3..e4ce789a82 100644 --- a/applications/minotari_merge_mining_proxy/log4rs_sample.yml +++ b/applications/minotari_merge_mining_proxy/log4rs_sample.yml @@ -26,7 +26,7 @@ appenders: kind: compound trigger: kind: size - limit: 200mb + limit: 10mb roller: kind: fixed_window base: 1 From f696fd3687c22064c1e84b95cf86d7abb96a46b8 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 10 Sep 2024 08:48:47 +0200 Subject: [PATCH 2/3] chore: update nextnet change logs (#6536) Description --- updates the nextnet change log --- changelog-nextnet.md | 164 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/changelog-nextnet.md b/changelog-nextnet.md index ab11e34341..245c680d8f 100644 --- a/changelog-nextnet.md +++ b/changelog-nextnet.md @@ -1,6 +1,170 @@ # Changelog All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +# Changelog + +All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.4.1-rc.0](https://github.com/tari-project/tari/compare/v1.4.0-rc.0...v1.0.0-rc.8) (2024-09-06) + + +### ⚠ BREAKING CHANGES + +* add genesis blocks (#6499) +* don't use the ledger unless both keys are for ledger (#6492) +* add source address to encrypted data (#6472) +* ledger metadata signature with receiver adress confirmation (#6462) +* fix key manager use of keys (#6407) +* faucet and new esme gen block (#6384) +* add accessor functions for tari address in FFI (#6385) +* make stealth one-sided tx's look the same as all other tx's (#6376) +* change tar address to use base58 and not hex (#6372) +* export unblinded outputs (#6361) +* add payment id (#6340) +* new tari address scheme (#6353) +* change position calculation in MTparams for mergemining (#6339) +* monero merkle tree params (#6336) +* update key manager hasher labels (#6329) +* remove user agent config option (#6320) +* update emojis to match yat emojis (#6288) +* avoid `Encryptable` domain collisions (#6275) +* change grpc deny to allow (#6218) + +### Features + +* add console wallet detail ([#6531](https://github.com/tari-project/tari/issues/6531)) ([594e984](https://github.com/tari-project/tari/commit/594e98477e2f68ff9c4a92334f198b2be5f97c84)) +* clear handshake error when connections go stale ([#6528](https://github.com/tari-project/tari/issues/6528)) ([b5f5e03](https://github.com/tari-project/tari/commit/b5f5e03817e5d43f1d2f3168307d7e9bc6cd77d6)) +* improve universe comms ([#6533](https://github.com/tari-project/tari/issues/6533)) ([3b2c88e](https://github.com/tari-project/tari/commit/3b2c88ec0b6a89d3864e39f0fccff5f59ad5c33f)) +* propagate handshake error ([#6530](https://github.com/tari-project/tari/issues/6530)) ([e29c909](https://github.com/tari-project/tari/commit/e29c9096d0b1b2d4cc6c3686f414e5d954d7c8ad)) +* add grpc specific log file ([#6524](https://github.com/tari-project/tari/issues/6524)) ([be9e32e](https://github.com/tari-project/tari/commit/be9e32edce774e31d79907450ed531e560befbd4)) +* add network wire byte ([#6518](https://github.com/tari-project/tari/issues/6518)) ([78a4803](https://github.com/tari-project/tari/commit/78a4803ca9364d472525fd94a5f36b33379268a5)) +* **p2pool-randomx-support:** added pow algo to GetNewBlockRequest in p2pool proto ([#6509](https://github.com/tari-project/tari/issues/6509)) ([125b49c](https://github.com/tari-project/tari/commit/125b49ca7792db2a200ef2fdc5b323564a1667ab)) +* **p2pool-randomx-support:** merge mining proxy update ([#6521](https://github.com/tari-project/tari/issues/6521)) ([3f4a3e8](https://github.com/tari-project/tari/commit/3f4a3e853d9404925fd941479b0adddc6209cb13)) +* paper wallet cli ([#6522](https://github.com/tari-project/tari/issues/6522)) ([31a953c](https://github.com/tari-project/tari/commit/31a953c66bac3810d0369fb675af3622657c6b16)) +* add merge mining proxy support for p2pool ([#6474](https://github.com/tari-project/tari/issues/6474)) ([bed32d5](https://github.com/tari-project/tari/commit/bed32d5628538843f978cc2e5db25dff4814547b)) +* add more verbose comms errors ([#6507](https://github.com/tari-project/tari/issues/6507)) ([169572a](https://github.com/tari-project/tari/commit/169572aa3e76e2dee649451c461245e5f6c9cb70)) +* improve header validation speed ([#6510](https://github.com/tari-project/tari/issues/6510)) ([da5b443](https://github.com/tari-project/tari/commit/da5b44382c35a9b5a98405f2b0a30b1a92253746)) +* ledger reconnect ([#6503](https://github.com/tari-project/tari/issues/6503)) ([444b5a3](https://github.com/tari-project/tari/commit/444b5a359e0e9efdafccfab8f49d4d9a8f48f3c1)) +* limit open-ended vectors for covenants ([#6497](https://github.com/tari-project/tari/issues/6497)) ([7a1150d](https://github.com/tari-project/tari/commit/7a1150d2edc2b3663f58246d654534c4140df2a7)) +* limit open-ended vectors for tari script ([#6501](https://github.com/tari-project/tari/issues/6501)) ([f91cffa](https://github.com/tari-project/tari/commit/f91cffa018935e3f3a683e13853a6c798c4fcb21)) +* add genesis blocks ([#6499](https://github.com/tari-project/tari/issues/6499)) ([da8ae63](https://github.com/tari-project/tari/commit/da8ae635a45eb33d3c535bab6417f695b73c1668)) +* ffi accessor function for payment id ([#6487](https://github.com/tari-project/tari/issues/6487)) ([4d45286](https://github.com/tari-project/tari/commit/4d452862fb74b8348f9bd6287b3bc64344cd4ef1)) +* limit open-ended vectors ([#6473](https://github.com/tari-project/tari/issues/6473)) ([6e387a8](https://github.com/tari-project/tari/commit/6e387a880524466f9496e6a3c5d021934bf9f217)) +* various safety improvements to ledger wallet code ([#6494](https://github.com/tari-project/tari/issues/6494)) ([34eaaec](https://github.com/tari-project/tari/commit/34eaaec931b1e3c24cbedd75a7b4c7662a5ec82c)) +* add ability to specify log location ([#6459](https://github.com/tari-project/tari/issues/6459)) ([124bfd4](https://github.com/tari-project/tari/commit/124bfd4f145951b2ba22d9e6d26596c90130b6ef)) +* add esmeralda pre-mine ([#6454](https://github.com/tari-project/tari/issues/6454)) ([c38a948](https://github.com/tari-project/tari/commit/c38a9488fa5300c40ee68dd898da85e7366708eb)) +* add new esmeralda pre-mine for test ([#6460](https://github.com/tari-project/tari/issues/6460)) ([310a470](https://github.com/tari-project/tari/commit/310a470f34875250ca91a703f324760762c8461c)) +* add new genesis blocks ([#6471](https://github.com/tari-project/tari/issues/6471)) ([3828796](https://github.com/tari-project/tari/commit/3828796634b3affe35224392a57cf212037e1b98)) +* add pre-mine fail-safe height ([#6456](https://github.com/tari-project/tari/issues/6456)) ([45f67fa](https://github.com/tari-project/tari/commit/45f67fa3110d735c9355740a6a1ce2f9630763c1)) +* add source address to encrypted data ([#6472](https://github.com/tari-project/tari/issues/6472)) ([e97afc5](https://github.com/tari-project/tari/commit/e97afc5b35abe152536449fa69045f85f2a114b2)) +* check encumbrance later ([#6457](https://github.com/tari-project/tari/issues/6457)) ([c8f0896](https://github.com/tari-project/tari/commit/c8f089673892008a8a16754eac275ac0e6f7e22e)) +* check wallet type on send + ui fixes ([#6461](https://github.com/tari-project/tari/issues/6461)) ([574fa1e](https://github.com/tari-project/tari/commit/574fa1ef1a9939bf99411e0ac8ab6b7de2fae76d)) +* console wallet recovery improvements for ledger ([#6455](https://github.com/tari-project/tari/issues/6455)) ([e726e5d](https://github.com/tari-project/tari/commit/e726e5d81e741c99d6f5a586690bf1a12be2b803)) +* don't permit trying to send interactive transfers from hardware devices ([#6458](https://github.com/tari-project/tari/issues/6458)) ([540be2c](https://github.com/tari-project/tari/commit/540be2c60cee87d787caad59d1bb0914ed8cc289)) +* ledger metadata signature with receiver adress confirmation ([#6462](https://github.com/tari-project/tari/issues/6462)) ([84e7c0a](https://github.com/tari-project/tari/commit/84e7c0aff996fffdc71f1ee325a71c172bb448d8)) +* limit open ended vectors in chat ([#6467](https://github.com/tari-project/tari/issues/6467)) ([777869d](https://github.com/tari-project/tari/commit/777869d9c12588034cdbf2f03537d28b37a6505a)) +* prepare MM backend stuff ([#6448](https://github.com/tari-project/tari/issues/6448)) ([47ddf85](https://github.com/tari-project/tari/commit/47ddf859d69c10b228874816e53e5a07a82acba0)) +* remove pre-mine create commands from the console wallet ([#6451](https://github.com/tari-project/tari/issues/6451)) ([486cd63](https://github.com/tari-project/tari/commit/486cd63561b69e1f43262c8744485458cc8dfc74)) +* update sender offset key ([#6465](https://github.com/tari-project/tari/issues/6465)) ([4601530](https://github.com/tari-project/tari/commit/4601530c7e6442338ebe864eeb57265461e104c2)) +* add identify to allowed grpc mining methods ([#6445](https://github.com/tari-project/tari/issues/6445)) ([07de6f2](https://github.com/tari-project/tari/commit/07de6f21a0302bd5947df53d33194c55a99df6fd)) +* add ledger function to generate one sided metadata signature ([#6410](https://github.com/tari-project/tari/issues/6410)) ([a1129b6](https://github.com/tari-project/tari/commit/a1129b6b6e51eda49c7a92d12cf64a4624bef53c)) +* add ledger methods for faucet spending ([#6409](https://github.com/tari-project/tari/issues/6409)) ([80acbd2](https://github.com/tari-project/tari/commit/80acbd2b71be7a0aabe108820309de44653cddcd)) +* add memory db key manager util function ([#6444](https://github.com/tari-project/tari/issues/6444)) ([900a107](https://github.com/tari-project/tari/commit/900a107677f3cabced0005d64ba6153cb0f7d14c)) +* add pre-mine create commands ([#6432](https://github.com/tari-project/tari/issues/6432)) ([817729f](https://github.com/tari-project/tari/commit/817729f5e14342b5192feedca11c0ca74d98e689)) +* add pre-mine spend ([#6442](https://github.com/tari-project/tari/issues/6442)) ([0018126](https://github.com/tari-project/tari/commit/001812615f02ab643223931f5659d5da60e91740)) +* add private view key function ([#6447](https://github.com/tari-project/tari/issues/6447)) ([016ccf6](https://github.com/tari-project/tari/commit/016ccf69b8779d27edda3d052c5b3fcdd365cd7c)) +* add scanned height ([#6440](https://github.com/tari-project/tari/issues/6440)) ([ad14053](https://github.com/tari-project/tari/commit/ad140530d4627f7d669cefd377852e6d75518171)) +* add timestamp to grpc ([#6449](https://github.com/tari-project/tari/issues/6449)) ([2902c8d](https://github.com/tari-project/tari/commit/2902c8d96105ef4243ac4bc4cdea64a4224dcfe2)) +* add zeroize to memory_key_manager ([#6446](https://github.com/tari-project/tari/issues/6446)) ([caa7097](https://github.com/tari-project/tari/commit/caa70978e48888839da2c277e0bbd5a434607679)) +* backup spend for pre-mine ([#6431](https://github.com/tari-project/tari/issues/6431)) ([1224b6a](https://github.com/tari-project/tari/commit/1224b6aaed0f312773eac5681f885f9c5625ca8d)) +* check address features on send ([#6433](https://github.com/tari-project/tari/issues/6433)) ([2f491fa](https://github.com/tari-project/tari/commit/2f491fa98722394b69d0a6b608207fcca2b75e35)) +* sync cli ([#6435](https://github.com/tari-project/tari/issues/6435)) ([f7ffe1d](https://github.com/tari-project/tari/commit/f7ffe1db4b2b6fb154fc45034636a3d6483926c1)) +* update Ledger readme ([#6443](https://github.com/tari-project/tari/issues/6443)) ([6f7318b](https://github.com/tari-project/tari/commit/6f7318bb573f25055703d7ba0a762be4c30daa18)) +* **wallet:** add view key commands ([#6426](https://github.com/tari-project/tari/issues/6426)) ([77e5ca9](https://github.com/tari-project/tari/commit/77e5ca92596f8309033913e9f1a372dbbee9d4c4)) +* encode max allowable encrypted bytes into struct ([#6425](https://github.com/tari-project/tari/issues/6425)) ([65567d5](https://github.com/tari-project/tari/commit/65567d5a99aec4d6b1ff650ea7ff2eeba77468f0)) +* add file-based input and output to faucet commands ([#6405](https://github.com/tari-project/tari/issues/6405)) ([8c6ea82](https://github.com/tari-project/tari/commit/8c6ea82837320865f59e5c9a8b23755e282a17cf)) +* change grpc address conversions to use from_str ([#6422](https://github.com/tari-project/tari/issues/6422)) ([33374a6](https://github.com/tari-project/tari/commit/33374a6917e16c2756ba94aaf818234ba0daba62)) +* count unique keys ([#6401](https://github.com/tari-project/tari/issues/6401)) ([5997ff3](https://github.com/tari-project/tari/commit/5997ff390b0f7d57f1018fa28088e92ec6172068)) +* fix key manager use of keys ([#6407](https://github.com/tari-project/tari/issues/6407)) ([35db898](https://github.com/tari-project/tari/commit/35db8980e82acc4f29fdc7b8d8fbf1f84a8f04de)) +* update ledger instructions ([#6406](https://github.com/tari-project/tari/issues/6406)) ([cc74845](https://github.com/tari-project/tari/commit/cc7484501e7f79c7b437a52b3a88d3073c978ebc)) +* add ffi features ([#6390](https://github.com/tari-project/tari/issues/6390)) ([c0c27a5](https://github.com/tari-project/tari/commit/c0c27a53f4b176db9991c097ab03589e9b1f430b)) +* **miner:** add SHA P2Pool mining related configuration and changes ([#6370](https://github.com/tari-project/tari/issues/6370)) ([cb1eb63](https://github.com/tari-project/tari/commit/cb1eb6383a0887c95f869146b94c0da00f3faffd)) +* simplify leader sig generation ([#6399](https://github.com/tari-project/tari/issues/6399)) ([22c8e33](https://github.com/tari-project/tari/commit/22c8e332d169723ced70811b08ac8cce5a4d0575)) +* add accessor functions for tari address in FFI ([#6385](https://github.com/tari-project/tari/issues/6385)) ([df5b057](https://github.com/tari-project/tari/commit/df5b05765df984e94be7097b60ab828c76cfd1d8)) +* change tari address to use base58 and not hex ([#6372](https://github.com/tari-project/tari/issues/6372)) ([f42a838](https://github.com/tari-project/tari/commit/f42a83882c8a824bf72c800c1018b4167c1a7d8c)) +* enlarge console wallet display ([#6382](https://github.com/tari-project/tari/issues/6382)) ([d62ab99](https://github.com/tari-project/tari/commit/d62ab999cda834af7c38d594cf06da24988bba5f)) +* export unblinded outputs ([#6361](https://github.com/tari-project/tari/issues/6361)) ([c444b4c](https://github.com/tari-project/tari/commit/c444b4c2cc326b6fe3ca37b10bf2d3728cdd9aca)) +* faucet and new esme gen block ([#6384](https://github.com/tari-project/tari/issues/6384)) ([075b1d4](https://github.com/tari-project/tari/commit/075b1d4ca5917cca6232ffde14d7dc51b797be1a)) +* ledger recovery ([#6383](https://github.com/tari-project/tari/issues/6383)) ([fb2de35](https://github.com/tari-project/tari/commit/fb2de353907402eb9fb8e56fc046f1a837fd8497)) +* m of n scripting poc ([#6377](https://github.com/tari-project/tari/issues/6377)) ([fc744d0](https://github.com/tari-project/tari/commit/fc744d0806e8fe15b657450c2a99ae9a488f14f6)) +* make console wallet ledger default ([#6362](https://github.com/tari-project/tari/issues/6362)) ([4ace36c](https://github.com/tari-project/tari/commit/4ace36c91d0955429f4350f9d4b9371de319984e)) +* make stealth one-sided tx's look the same as all other tx's ([#6376](https://github.com/tari-project/tari/issues/6376)) ([2bd58c2](https://github.com/tari-project/tari/commit/2bd58c235e6d89f5d836c66cc3e2e056fc40543d)) +* remove ablity to send 1-sided tx ([#6367](https://github.com/tari-project/tari/issues/6367)) ([b773173](https://github.com/tari-project/tari/commit/b773173decf6065de0f52dfa5b377c973fd97498)) +* add default message tag ([#6355](https://github.com/tari-project/tari/issues/6355)) ([ef387d7](https://github.com/tari-project/tari/commit/ef387d720ae1b092d0ebe4459fafc27a241368f8)) +* add payment id ([#6340](https://github.com/tari-project/tari/issues/6340)) ([ec4e5e9](https://github.com/tari-project/tari/commit/ec4e5e953b86aa3e99e65f428997682674707d4a)) +* adjust block sync timeouts ([#6342](https://github.com/tari-project/tari/issues/6342)) ([16ca4b5](https://github.com/tari-project/tari/commit/16ca4b5dc8b5e02629dd02d6839edad189d23956)) +* chat ffi find by message ([#6354](https://github.com/tari-project/tari/issues/6354)) ([28c7659](https://github.com/tari-project/tari/commit/28c76596920be88eb7b2077e6bd0645e4c5ae4a3)) +* fix base node console display ([#6341](https://github.com/tari-project/tari/issues/6341)) ([df0d801](https://github.com/tari-project/tari/commit/df0d8011d9f55f087478b0795ed0c1657b3552af)) +* generate script challenge on the ledger ([#6344](https://github.com/tari-project/tari/issues/6344)) ([34db82d](https://github.com/tari-project/tari/commit/34db82dcccc2c4bb3c9a999518cd2f5381314b07)) +* improve initial connection times ([#6343](https://github.com/tari-project/tari/issues/6343)) ([64e650b](https://github.com/tari-project/tari/commit/64e650bd61762df2b014b1dbcd7e689cd72e0c62)) +* ledger blind sign ([#6264](https://github.com/tari-project/tari/issues/6264)) ([301ea00](https://github.com/tari-project/tari/commit/301ea00fcc0664f00428828ce710bebc9491350a)) +* limit script max size ([#6364](https://github.com/tari-project/tari/issues/6364)) ([0fd2efe](https://github.com/tari-project/tari/commit/0fd2efe69298e981eec7839df5d7d0e5135d7386)) +* limit wallet base node peer outbound connections ([#6307](https://github.com/tari-project/tari/issues/6307)) ([79fcd03](https://github.com/tari-project/tari/commit/79fcd03a36f1bd81f252b1db52acc5ecc9152e61)) +* new tari address scheme ([#6353](https://github.com/tari-project/tari/issues/6353)) ([4c0ce46](https://github.com/tari-project/tari/commit/4c0ce46a3988d7d1de84f9b449a4e2c8a364ce45)) +* remove chunking from rpc ([#6345](https://github.com/tari-project/tari/issues/6345)) ([82f0d6a](https://github.com/tari-project/tari/commit/82f0d6af77841fae088f07fc1b89005377571ed8)) +* remove wallet type from config ([#6357](https://github.com/tari-project/tari/issues/6357)) ([f927d69](https://github.com/tari-project/tari/commit/f927d69ac475c5b4a66f107bcdb7a57b7c8db75c)) +* split message to have dedicated to and from fields ([#6358](https://github.com/tari-project/tari/issues/6358)) ([c24cc15](https://github.com/tari-project/tari/commit/c24cc1515d3e8980cf67564b11a78a5fabc30b08)) +* update key manager hasher labels ([#6329](https://github.com/tari-project/tari/issues/6329)) ([ae63bab](https://github.com/tari-project/tari/commit/ae63babfde7f4e4528ed63b1ffec96425da79593)) +* add check to verify mempool state ([#6316](https://github.com/tari-project/tari/issues/6316)) ([925d29a](https://github.com/tari-project/tari/commit/925d29a20cf3e9e1dc7d32b512e2113c70b110fb)) +* add sent at timestamp to chat messages ([#6314](https://github.com/tari-project/tari/issues/6314)) ([4adcb26](https://github.com/tari-project/tari/commit/4adcb26544e897ade7c02b5d9d1e432b1ae69df5)) +* esmeralda testnet reset ([#6311](https://github.com/tari-project/tari/issues/6311)) ([b7b0ea3](https://github.com/tari-project/tari/commit/b7b0ea3b0c25638fc3e0addb0d2f7f0979545ed2)) +* remove user agent config option ([#6320](https://github.com/tari-project/tari/issues/6320)) ([6b21e05](https://github.com/tari-project/tari/commit/6b21e0592412c632db774e0f1292f302f91cd3c9)) +* update emojis to match yat emojis ([#6288](https://github.com/tari-project/tari/issues/6288)) ([cf579f5](https://github.com/tari-project/tari/commit/cf579f527c31912c0a1105fa3b51aa2b63c29407)) +* updates the emoji ID API to be more idiomatic ([#6287](https://github.com/tari-project/tari/issues/6287)) ([f538714](https://github.com/tari-project/tari/commit/f538714801f6ab61f20a297c8714385a27e1aca2)) + + +### Bug Fixes + +* remove sub repo +* **comms:** always send disconnect notification to conn manager ([#6511](https://github.com/tari-project/tari/issues/6511)) ([26e85a8](https://github.com/tari-project/tari/commit/26e85a8c49b45825ea744a16b8518d83c6d9490c)) +* correct the expected return errors in ledger demo ([#6506](https://github.com/tari-project/tari/issues/6506)) ([8d5da30](https://github.com/tari-project/tari/commit/8d5da30f05f18937e7196e72145d6cc07d4b661e)) +* **minotari node:** add get_sync_progress to allow list if mining is enabled ([#6498](https://github.com/tari-project/tari/issues/6498)) ([e9c420d](https://github.com/tari-project/tari/commit/e9c420d4509d05738144d2602dec6b70d7d39948)) +* avoid an underflow in Ledger BIP32 path parsing ([#6482](https://github.com/tari-project/tari/issues/6482)) ([fed0bdf](https://github.com/tari-project/tari/commit/fed0bdf82e25f8bcef0d0e944f942e7f3721ca66)) +* backup spend ([#6495](https://github.com/tari-project/tari/issues/6495)) ([13b34d1](https://github.com/tari-project/tari/commit/13b34d1627528c164bd009f029bae68646c431b9)) +* contact service tari address support ([#6478](https://github.com/tari-project/tari/issues/6478)) ([7909a75](https://github.com/tari-project/tari/commit/7909a7514e34208c6c8dd3929cfb693387ac68ac)) +* default ledger wallet ([#6479](https://github.com/tari-project/tari/issues/6479)) ([b50838f](https://github.com/tari-project/tari/commit/b50838f695b4d7115fa6d54f05ebaa908c13bc9c)) +* don't use the ledger unless both keys are for ledger ([#6492](https://github.com/tari-project/tari/issues/6492)) ([cfb0b58](https://github.com/tari-project/tari/commit/cfb0b5873f057124c8efe808278e114d257db84c)) +* fix mainnet consensus constants ([#6480](https://github.com/tari-project/tari/issues/6480)) ([8b8ab93](https://github.com/tari-project/tari/commit/8b8ab93e430d0199df565da8ea3957d18fb24836)) +* ledger 1-sided spend ([#6481](https://github.com/tari-project/tari/issues/6481)) ([1914a51](https://github.com/tari-project/tari/commit/1914a515f7ba9e09638d9f0f7b0f670f840fc3e3)) +* backup spend ([#6466](https://github.com/tari-project/tari/issues/6466)) ([0fa0ca4](https://github.com/tari-project/tari/commit/0fa0ca492536be95cd61112aec091bf04a9a9122)) +* comms key managedment ([#6452](https://github.com/tari-project/tari/issues/6452)) ([260b4ce](https://github.com/tari-project/tari/commit/260b4ce36d39313785e3f50302ca917d42630502)) +* stop reuse of nonce keys ([#6464](https://github.com/tari-project/tari/issues/6464)) ([131225c](https://github.com/tari-project/tari/commit/131225cb33cb28f63af5032558ca737e2c65f8ed)) +* wallet validation ([#6468](https://github.com/tari-project/tari/issues/6468)) ([62531bb](https://github.com/tari-project/tari/commit/62531bba5b6862a91bd1cf7b54f7b95bdcd79fb5)) +* lagging code ([#6441](https://github.com/tari-project/tari/issues/6441)) ([af1f451](https://github.com/tari-project/tari/commit/af1f45190ff01bf6cc4da4e1b1e2dce6c8fd2928)) +* wallet address deserialize ([#6428](https://github.com/tari-project/tari/issues/6428)) ([1ffce47](https://github.com/tari-project/tari/commit/1ffce47f2e921e8066057f353e3fb48783145849)) +* branch keys ([#6413](https://github.com/tari-project/tari/issues/6413)) ([47e3761](https://github.com/tari-project/tari/commit/47e37614d6a3efa1fff3914b7ea0acfc4fa484cc)) +* panic in from_base58 fn ([#6414](https://github.com/tari-project/tari/issues/6414)) ([237fbfd](https://github.com/tari-project/tari/commit/237fbfd45641bd138d8d3ee50d8f0b3fff4c1eeb)) +* claim n of m faucet ([#6389](https://github.com/tari-project/tari/issues/6389)) ([2700a46](https://github.com/tari-project/tari/commit/2700a467e3444df60fb7df71efdd54d50769a7ce)) +* script dependance on party order ([#6398](https://github.com/tari-project/tari/issues/6398)) ([2b22c1a](https://github.com/tari-project/tari/commit/2b22c1ad8c70350e838db979d008f1369552fbc4)) +* improve key scanning ([#6374](https://github.com/tari-project/tari/issues/6374)) ([43b2317](https://github.com/tari-project/tari/commit/43b2317e8fea146d9446e150b97b09cfe41bea4d)) +* keep alpha key constant ([#6375](https://github.com/tari-project/tari/issues/6375)) ([f5e88e9](https://github.com/tari-project/tari/commit/f5e88e9e65d5253305691dcc1e9306185c2c3c1b)) +* make tx id random ([#6380](https://github.com/tari-project/tari/issues/6380)) ([59a3440](https://github.com/tari-project/tari/commit/59a344004e198eda77c9883d82dbc137741cebf4)) +* update curve library ([#6381](https://github.com/tari-project/tari/issues/6381)) ([498816d](https://github.com/tari-project/tari/commit/498816d8a8748af10e84122d39012b3a4d6b4a63)) +* monero merkle tree params ([#6336](https://github.com/tari-project/tari/issues/6336)) ([9920916](https://github.com/tari-project/tari/commit/9920916f891fbd26759f7cb4912701189b7579a1)) +* atomic swap ([#6360](https://github.com/tari-project/tari/issues/6360)) ([01f93ab](https://github.com/tari-project/tari/commit/01f93ab62aa468869d51ed1afa17e103cf948a8f)) +* change position calculation in MTparams for mergemining ([#6339](https://github.com/tari-project/tari/issues/6339)) ([1d6e0d8](https://github.com/tari-project/tari/commit/1d6e0d84c9553fbb3479e2605e6122d9dd1791db)) +* new monero release for mr support in monero ([#6335](https://github.com/tari-project/tari/issues/6335)) ([3c58600](https://github.com/tari-project/tari/commit/3c58600fcf43030d7a75343a51f6aa945e8b04d1)) +* change mmproxy to select new monerod on error ([#6321](https://github.com/tari-project/tari/issues/6321)) ([2a9250b](https://github.com/tari-project/tari/commit/2a9250b91a1134df675203ea5c7c43deb2abdc61)) +* **comms/core:** upgrade to yamux 0.13 ([#6317](https://github.com/tari-project/tari/issues/6317)) ([1b5e217](https://github.com/tari-project/tari/commit/1b5e21757cfc99e8876c3a4c6dc20c85e886bb72)) +* potential overflow of coinbase calc ([#6306](https://github.com/tari-project/tari/issues/6306)) ([030d389](https://github.com/tari-project/tari/commit/030d389768f6e79a1e2319eb13d44ccb4392be55)) +* reload old wallets ([#6308](https://github.com/tari-project/tari/issues/6308)) ([4cc082d](https://github.com/tari-project/tari/commit/4cc082debdfc0e284a92b57f318165a04d61ce07)) +* avoid `Encryptable` domain collisions ([#6275](https://github.com/tari-project/tari/issues/6275)) ([39a3fba](https://github.com/tari-project/tari/commit/39a3fbacf28142c8fd2615d4e07bdd2d489b1da4)) +* change grpc deny to allow ([#6218](https://github.com/tari-project/tari/issues/6218)) ([7665067](https://github.com/tari-project/tari/commit/7665067ef99893fc0d33996f5acbaa8fa164e844)) + +## [1.0.0-rc.8](https://github.com/tari-project/tari/compare/v1.0.0-rc.7...v1.0.0-rc.8) (2024-04-23) + +### Bug Fixes + +* Hot fix to remove breaking change of wallet type saved in db. ## [1.0.0-rc.7](https://github.com/tari-project/tari/compare/v1.0.0-rc.6a...v1.0.0-rc.7) (2024-04-22) From 611f22692024d260fd05a7453fd39d9e5e47bf29 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 10 Sep 2024 08:48:56 +0200 Subject: [PATCH 3/3] feat: ledger version check (#6541) Description --- Changed the ledger app version check from an explicit check to a min version check Uses semver for checking Closes: #6439 --- Cargo.lock | 1 + .../minotari_ledger_wallet/comms/Cargo.toml | 2 +- .../comms/src/accessor_methods.rs | 25 +++++++++++-------- .../minotari_ledger_wallet/comms/src/error.rs | 4 +-- .../comms/src/ledger_wallet.rs | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fb6295aa2..d9f64cf519 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3373,6 +3373,7 @@ dependencies = [ "minotari_ledger_wallet_common", "once_cell", "rand", + "semver", "serde", "tari_common", "tari_common_types", diff --git a/applications/minotari_ledger_wallet/comms/Cargo.toml b/applications/minotari_ledger_wallet/comms/Cargo.toml index 26b04d176a..b19eb454ec 100644 --- a/applications/minotari_ledger_wallet/comms/Cargo.toml +++ b/applications/minotari_ledger_wallet/comms/Cargo.toml @@ -13,7 +13,7 @@ tari_common_types = { path = "../../../base_layer/common_types" } tari_script = { path = "../../../infrastructure/tari_script" } minotari_ledger_wallet_common = { path = "../common" } - +semver = "1.0" borsh = "1.2" dialoguer = { version = "0.11" } ledger-transport = { git = "https://github.com/Zondax/ledger-rs", rev = "20e2a20" } diff --git a/applications/minotari_ledger_wallet/comms/src/accessor_methods.rs b/applications/minotari_ledger_wallet/comms/src/accessor_methods.rs index 8f87ffa37c..1d719dd922 100644 --- a/applications/minotari_ledger_wallet/comms/src/accessor_methods.rs +++ b/applications/minotari_ledger_wallet/comms/src/accessor_methods.rs @@ -26,6 +26,7 @@ use log::debug; use minotari_ledger_wallet_common::common_types::{AppSW, Instruction}; use once_cell::sync::Lazy; use rand::{rngs::OsRng, RngCore}; +use semver::Version; use tari_common::configuration::Network; use tari_common_types::{ key_branches::TransactionKeyManagerBranch, @@ -38,7 +39,7 @@ use tari_utilities::{hex::Hex, ByteArray}; use crate::{ error::LedgerDeviceError, - ledger_wallet::{Command, EXPECTED_NAME, EXPECTED_VERSION}, + ledger_wallet::{Command, EXPECTED_NAME, MIN_LEDGER_APP_VERSION}, }; const LOG_TARGET: &str = "ledger_wallet::accessor_methods"; @@ -91,16 +92,20 @@ fn verify() -> Result<(), LedgerDeviceError> { match ledger_get_version() { Ok(version) => { - if version != EXPECTED_VERSION { + let req = Version::parse(MIN_LEDGER_APP_VERSION) + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?; + let ledger_version = + Version::parse(&version).map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?; + if ledger_version < req { return Err(LedgerDeviceError::Processing(format!( - "'Minotari Wallet' application version mismatch: expected '{}', running '{}'.", - EXPECTED_VERSION, version + "'Minotari Wallet' application version check failed: min version '{}', running '{}'.", + MIN_LEDGER_APP_VERSION, version ))); } }, Err(e) => { return Err(LedgerDeviceError::Processing(format!( - "'Minotari Wallet' application version mismatch ({})", + "'Minotari Wallet' application version check ({})", e ))) }, @@ -601,15 +606,15 @@ pub fn ledger_get_one_sided_metadata_signature( let data = result.data(); Ok(ComAndPubSignature::new( Commitment::from_canonical_bytes(&data[1..33]) - .map_err(|e| LedgerDeviceError::ByteArrayError(e.to_string()))?, + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?, PublicKey::from_canonical_bytes(&data[33..65]) - .map_err(|e| LedgerDeviceError::ByteArrayError(e.to_string()))?, + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?, PrivateKey::from_canonical_bytes(&data[65..97]) - .map_err(|e| LedgerDeviceError::ByteArrayError(e.to_string()))?, + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?, PrivateKey::from_canonical_bytes(&data[97..129]) - .map_err(|e| LedgerDeviceError::ByteArrayError(e.to_string()))?, + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?, PrivateKey::from_canonical_bytes(&data[129..161]) - .map_err(|e| LedgerDeviceError::ByteArrayError(e.to_string()))?, + .map_err(|e| LedgerDeviceError::ConversionError(e.to_string()))?, )) }, Err(e) => Err(LedgerDeviceError::Instruction(format!( diff --git a/applications/minotari_ledger_wallet/comms/src/error.rs b/applications/minotari_ledger_wallet/comms/src/error.rs index 4a042f992f..5755356902 100644 --- a/applications/minotari_ledger_wallet/comms/src/error.rs +++ b/applications/minotari_ledger_wallet/comms/src/error.rs @@ -50,7 +50,7 @@ pub enum LedgerDeviceError { Processing(String), /// Conversion error to or from ledger #[error("Conversion failed: {0}")] - ByteArrayError(String), + ConversionError(String), /// Not yet supported #[error("Ledger is not fully supported")] NotSupported, @@ -60,7 +60,7 @@ pub enum LedgerDeviceError { impl From for LedgerDeviceError { fn from(e: ByteArrayError) -> Self { - LedgerDeviceError::ByteArrayError(e.to_string()) + LedgerDeviceError::ConversionError(e.to_string()) } } diff --git a/applications/minotari_ledger_wallet/comms/src/ledger_wallet.rs b/applications/minotari_ledger_wallet/comms/src/ledger_wallet.rs index 20c2e80806..300d1a22d2 100644 --- a/applications/minotari_ledger_wallet/comms/src/ledger_wallet.rs +++ b/applications/minotari_ledger_wallet/comms/src/ledger_wallet.rs @@ -31,7 +31,7 @@ use tari_utilities::ByteArray; use crate::error::LedgerDeviceError; pub const EXPECTED_NAME: &str = "minotari_ledger_wallet"; -pub const EXPECTED_VERSION: &str = env!("CARGO_PKG_VERSION"); +pub const MIN_LEDGER_APP_VERSION: &str = "1.4.0"; const WALLET_CLA: u8 = 0x80; struct HidManager {