Feature/trezor common #1838
Feature/trezor common #1838
Conversation
OBorce
requested review from
erubboli,
azarovh and
ImplOfAnImpl
as code owners
OBorce
force-pushed
the
feature/trezor-common
branch
from
6469899 to
c2c31bb
Compare
OBorce
force-pushed
the
feature/trezor-common
branch
from
c2c31bb to
a99237c
Compare
OBorce
force-pushed
the
feature/trezor-common
branch
from
a99237c to
00f5576
Compare
OBorce
force-pushed
the
feature/trezor-common
branch
from
00f5576 to
44b17f9
Compare
| fn make_random_destination(rng: &mut (impl Rng + CryptoRng)) -> chain::Destination { | ||
| match rng.gen_range(0..=4) { | ||
| 0 => chain::Destination::AnyoneCanSpend, | ||
| 1 => chain::Destination::PublicKey( | ||
| crypto::key::PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr).1, | ||
| ), | ||
| 2 => chain::Destination::ScriptHash(primitives::H256(rng.gen()).into()), | ||
| 3 => chain::Destination::ClassicMultisig( | ||
| (&crypto::key::PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr).1).into(), | ||
| ), | ||
| _ => chain::Destination::PublicKeyHash( | ||
| (&crypto::key::PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr).1).into(), | ||
| ), | ||
| } | ||
| } |
There was a problem hiding this comment.
I suggest deriving strum::EnumDiscriminants for the existing enum types, like I did in 1832 for Destination:
#[derive(..., EnumDiscriminants)]
#[strum_discriminants(name(DestinationTag), derive(EnumIter))]
pub enum Destination {
...
This will define an additional enum called DestinationTag, which will be like Destination but without the data. And this DestinationTag will implement EnumIter, so it'll be possible to iterate over its values.
Then you'd be able to write:
let dest_tag = DestinationTag::iter().choose(rng).unwrap();
match dest_tag {
DestinationTag::PublicKey => {
chain::Destination::PublicKey(
crypto::key::PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr).1,
)
},
...
}
So, if/when a new variant is added to the enum, we'll get a compilation failure here.
| impl From<chain::OutPointSourceId> for crate::OutPointSourceId { | ||
| fn from(value: chain::OutPointSourceId) -> Self { | ||
| match value { | ||
| chain::OutPointSourceId::Transaction(tx) => Self::Transaction(tx.to_hash().into()), | ||
| chain::OutPointSourceId::BlockReward(tx) => Self::BlockReward(tx.to_hash().into()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl From<chain::UtxoOutPoint> for crate::UtxoOutPoint { | ||
| fn from(value: chain::UtxoOutPoint) -> Self { |
There was a problem hiding this comment.
Though I don't insist on this, I'd suggest to make the make_random... functions return a pair of values that are supposed to be encoded to the same bytes, and remove these From implementations (which look somewhat fragile to me).
| let mut rng = make_seedable_rng(seed); | ||
|
|
||
| let inp = make_random_input(&mut rng); | ||
|
|
||
| let simple_inp: crate::TxInput = inp.clone().into(); | ||
|
|
||
| assert_eq!(inp.encode(), simple_inp.encode()); | ||
|
|
||
| let decoded_simple_inp = | ||
| chain::TxInput::decode_all(&mut simple_inp.encode().as_slice()).unwrap(); | ||
| assert_eq!(decoded_simple_inp, inp); |
There was a problem hiding this comment.
It's better to perform the checks multiple times (e.g. 100 or 1000) in a loop, to increase the chance of failure if things get broken.
Same for the other test.
| #[derive(FromPrimitive)] | ||
| pub enum AccountCommandIndex { | ||
| MintTokens = 0, | ||
| UnmintTokens = 1, | ||
| LockTokenSupply = 2, | ||
| FreezeToken = 3, | ||
| UnfreezeToken = 4, | ||
| ChangeTokenAuthority = 5, | ||
| ConcludeOrder = 6, | ||
| FillOrder = 7, | ||
| ChangeTokenMetadataUri = 8, | ||
| } |
There was a problem hiding this comment.
Is this enum needed here? As I can see, it's only used in the trezor firmware repo in encode_token_account_command_input but only on the rust side. And its values are not tied to anything, they just have to be the same in rust and python. So probably it should go to messages-mintlayer.proto in the trezor repo, so that named constants can be used on the python side too.
| #[derive(FromPrimitive)] | ||
| pub enum OutPointSourceIdIndex { | ||
| Transaction = 0, | ||
| BlockReward = 1, | ||
| } |
There was a problem hiding this comment.
As I can see, this is similar to AccountCommandIndex, but the difference is that there is already MintlayerUtxoType in the protobuf config which this enum should be consistent with. Remove it and use MintlayerUtxoType instead.
Move the simplified no-std types used by Trezor firmware to keep it in sync with the core types.
Add randomized tests to check the encodings match between the types.