Merge pull request RGB-WG#4 from crisdut/exp/media

Fix compillation of MediaType

Cargo.toml

@@ -27,4 +27,9 @@ all=[]
 
 [patch.crates-io]
 # TODO: Remove after merge and release new version
-rgb-std = { git = "https://github.com/crisdut/rgb-wallet", branch = "feat/rgb21-state-data" }
+strict_types = { git = "https://github.com/strict-types/strict-types" }
+commit_verify = { git = "https://github.com/LNP-BP/client_side_validation" }
+bp-core = { git = "https://github.com/BP-WG/bp-core" }
+aluvm = { git = "https://github.com/AluVM/rust-aluvm" }
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core" }
+rgb-std = { git = "https://github.com/RGB-WG/rgb-wallet" }

examples/rgb21-token.rs

@@ -1,15 +1,16 @@
 use std::convert::Infallible;
 
+use amplify::confinement::SmallBlob;
 use amplify::hex::FromHex;
 use amplify::Wrapper;
 use bp::{Chain, Outpoint, Tx, Txid};
 use rgb_schemata::{uda_rgb21, uda_schema};
 use rgbstd::containers::BindleContent;
-use rgbstd::interface::rgb21::{Allocation, OwnedFraction, TokenData, TokenIndex};
+use rgbstd::interface::rgb21::{Allocation, EmbeddedMedia, OwnedFraction, TokenData, TokenIndex};
 use rgbstd::interface::{rgb21, ContractBuilder, FungibleAllocation};
 use rgbstd::persistence::{Inventory, Stock};
 use rgbstd::resolvers::ResolveHeight;
-use rgbstd::stl::{DivisibleAssetSpec, Precision, RicardianContract, Timestamp};
+use rgbstd::stl::{self, DivisibleAssetSpec, Precision, RicardianContract, Timestamp};
 use rgbstd::validation::{ResolveTx, TxResolverError};
 use strict_encoding::StrictDumb;
 
@@ -37,24 +38,29 @@ fn main() {
  let fraction = OwnedFraction::from_inner(1);
  let index = TokenIndex::from_inner(2);
 
- let token_data = TokenData { index, ..Default::default()};
+ let preview = EmbeddedMedia {
+ ty: stl::MediaType::with("text/*"), 
+ data: SmallBlob::try_from_iter(vec![0, 0]).expect("invalid data"), 
+ };
+
+ let token_data = TokenData { index, preview: Some(preview), ..Default::default() };
 
  let allocation = Allocation::with(index, fraction);
  let contract = ContractBuilder::with(
  rgb21(),
  uda_schema(),
  uda_rgb21()
- ).expect("schema fails to implement RGB20 interface")
+ ).expect("schema fails to implement RGB21 interface")
 
  .set_chain(Chain::Testnet3)
+ .add_global_state("tokens", token_data)
+ .expect("invalid token data")
+
  .add_global_state("spec", spec)
  .expect("invalid nominal")
 
  .add_global_state("created", created)
- .expect("invalid nominal")
-
- .add_global_state("tokens", token_data)
- .expect("invalid nominal")
+ .expect("invalid creation date")
 
  .add_global_state("terms", terms)
  .expect("invalid contract text")

interfaces/RGB20.rgba

@@ -1,33 +1,33 @@
 -----BEGIN RGB INTERFACE-----
-Id: Hi9HY8XN955imFe2DsJHeaoZQLM7rVSSSGtsP5JHsZx2
+Id: 7Rrqv5iVnTv3DquiK7FJmdVBy1nNYBuSbkXpXRunwZzy
 Name: RGB20
 
-AAVSR0IyMAYMYnVybmVkU3VwcGx5AYJ+OfqsC5wwo0fJrMCAaFfa8AJgCgdyhb3H
-kpdLRUYaAAEHY3JlYXRlZAHK0bud73JnqPaARSzjY0/ngU2l+kvpLKccXt8S5qHk
-MAEADGlzc3VlZFN1cHBseQGCfjn6rAucMKNHyazAgGhX2vACYAoHcoW9x5KXS0VG
-GgABDnJlcGxhY2VkU3VwcGx5AYJ+OfqsC5wwo0fJrMCAaFfa8AJgCgdyhb3HkpdL
-RUYaAAEEc3BlYwFxG/dbTJD45i4e05+I9KxrFvpf3zTcvqOzf7yeBJ9fqAEABXRl
-cm1zAbC/tv4Ak69rMjDl/Q09aarxS/CY3wdyjSULrjd5hhBwAQAFCmFzc2V0T3du
+AAVSR0IyMAYMYnVybmVkU3VwcGx5AYiMWGVjOvE7lbfNGo2K8trB3BQLl3JR2dTa
+88dRHI6EAAEHY3JlYXRlZAFZbno6DqNlnhAw8YtNZaO5E+5YUAf8914Lts3BacHA
+OwEADGlzc3VlZFN1cHBseQGIjFhlYzrxO5W3zRqNivLawdwUC5dyUdnU2vPHURyO
+hAABDnJlcGxhY2VkU3VwcGx5AYiMWGVjOvE7lbfNGo2K8trB3BQLl3JR2dTa88dR
+HI6EAAEEc3BlYwGZYk235CaSmVSTLt/I0melUpcCKTzVq8BWTm8iWzP68QEABXRl
+cm1zARjLlG8Sk88YDp143MZbxZtHL//+rfv1jbGYzIMo9ksBAQAFCmFzc2V0T3du
 ZXICAAABCWJ1cm5FcG9jaAEBAAAJYnVyblJpZ2h0AQEAARJpbmZsYXRpb25BbGxv
-d2FuY2UCAQABC3VwZGF0ZVJpZ2h0AQEAAAABBxg2NSHAwuMZFcgwSpM+j5w+adEf
-+ZqqoUmcYemDFbcEB2NyZWF0ZWQAAQABAAxpc3N1ZWRTdXBwbHkAAQABAARzcGVj
+d2FuY2UCAQABC3VwZGF0ZVJpZ2h0AQEAAAABRnusgTmx9RP9N7MedEWdhgqy9nAz
+2prUcubaPR/zinsEB2NyZWF0ZWQAAQABAAxpc3N1ZWRTdXBwbHkAAQABAARzcGVj
 AAEAAQAFdGVybXMAAQABAAQKYXNzZXRPd25lcgAAAP//CWJ1cm5FcG9jaAAAAAEA
 EmluZmxhdGlvbkFsbG93YW5jZQAAAP//C3VwZGF0ZVJpZ2h0AAAAAQAAAwEDBAYE
-QnVybgEB9L3LR6p9scqrVlb0guZ4jyLPRTT5PVBs2zUOE7nQ2esBDGJ1cm5lZFN1
+QnVybgEBMY7KoHKHC9lSMKlRWmqqFJgrrJ4/sV6iUo6wQFInp6EBDGJ1cm5lZFN1
 cHBseQABAAEAAQR1c2VkAQlidXJuUmlnaHQBAAEAAQZmdXR1cmUBCWJ1cm5SaWdo
-dAAAAQAAAwEDBQAFSXNzdWUBAQcYNjUhwMLjGRXIMEqTPo+cPmnRH/maqqFJnGHp
-gxW3AQxpc3N1ZWRTdXBwbHkAAQABAAEEdXNlZAESaW5mbGF0aW9uQWxsb3dhbmNl
+dAAAAQAAAwEDBQAFSXNzdWUBAUZ7rIE5sfUT/TezHnRFnYYKsvZwM9qa1HLm2j0f
+84p7AQxpc3N1ZWRTdXBwbHkAAQABAAEEdXNlZAESaW5mbGF0aW9uQWxsb3dhbmNl
 AQD//wILYmVuZWZpY2lhcnkBCmFzc2V0T3duZXIAAP//BmZ1dHVyZQESaW5mbGF0
 aW9uQWxsb3dhbmNlAAD//wAEAQMEBgELYmVuZWZpY2lhcnkJT3BlbkVwb2NoAQAA
 AQR1c2VkAQlidXJuRXBvY2gBAAEAAglidXJuUmlnaHQAAQABAARuZXh0AQlidXJu
 RXBvY2gAAAEAAAABCWJ1cm5SaWdodAZSZW5hbWUBAAEDbmV3AQRzcGVjAQABAAEE
 dXNlZAELdXBkYXRlUmlnaHQBAAEAAQZmdXR1cmUBC3VwZGF0ZVJpZ2h0AAABAAAA
-AQZmdXR1cmUHUmVwbGFjZQEB9L3LR6p9scqrVlb0guZ4jyLPRTT5PVBs2zUOE7nQ
-2esBDnJlcGxhY2VkU3VwcGx5AAEAAQABBHVzZWQBCWJ1cm5SaWdodAEAAQACC2Jl
+AQZmdXR1cmUHUmVwbGFjZQEBMY7KoHKHC9lSMKlRWmqqFJgrrJ4/sV6iUo6wQFIn
+p6EBDnJlcGxhY2VkU3VwcGx5AAEAAQABBHVzZWQBCWJ1cm5SaWdodAEAAQACC2Jl
 bmVmaWNpYXJ5AQphc3NldE93bmVyAAD//wZmdXR1cmUBCWJ1cm5SaWdodAAAAQAA
 BAECAwUBC2JlbmVmaWNpYXJ5CFRyYW5zZmVyAAAAAQhwcmV2aW91cwEKYXNzZXRP
 d25lcgEA//8BC2JlbmVmaWNpYXJ5AQphc3NldE93bmVyAQD//wABAgELYmVuZWZp
-Y2lhcnkAMeTisG/6wkxUVaZ3w4cIHeFpfruRunHvOIJfyTAbyAMBCFRyYW5zZmVy
+Y2lhcnkAoYeej1a91v2MoyO5TzngYGQ6ppo5IZGU1gxMinx7AcgBCFRyYW5zZmVy
 
 
 -----END RGB INTERFACE-----

interfaces/RGB21.rgba

@@ -1,29 +1,29 @@
 -----BEGIN RGB INTERFACE-----
-Id: FVK7vrToQx4qTKMqgseZiv3mJgHyp1YJvDKi27C37BDK
+Id: 35ebeVG1p8u7xrK3WDUZpgaDn9ZXwQ51qttLH9hJzFZS
 Name: RGB21
 
-AAVSR0IyMQYPYXR0YWNobWVudFR5cGVzAYadjHl/3bNf7942lcLfTuzlt245mXs+
-0naU/n6DU5n2AAEHY3JlYXRlZAHK0bud73JnqPaARSzjY0/ngU2l+kvpLKccXt8S
-5qHkMAEACmVuZ3JhdmluZ3MBjL+n4k7TCQ/qIg1r/LwKmosEpzQ2SgdY4EatbZWZ
-+UkAAQRzcGVjAXEb91tMkPjmLh7Tn4j0rGsW+l/fNNy+o7N/vJ4En1+oAQAFdGVy
-bXMBsL+2/gCTr2syMOX9DT1pqvFL8JjfB3KNJQuuN3mGEHABAAZ0b2tlbnMB3b9x
-Vo1gwNImZ5cuPvFGEnJM6r9v9aS7MxcVSYVQo7YAAQMKYXNzZXRPd25lcgVdUUcJ
-o7aA1QR1WDuuJnVdnxl3hBCMFIl3ctfMX0qoEAAAARJpbmZsYXRpb25BbGxvd2Fu
-Y2UFwfJS84llE4/Fy3MOSe2g9/eS7WuIsuF3OdZBDSUbFRQBAAELdXBkYXRlUmln
-aHQBAQAAAAEHGDY1IcDC4xkVyDBKkz6PnD5p0R/5mqqhSZxh6YMVtwUPYXR0YWNo
+AAVSR0IyMQYPYXR0YWNobWVudFR5cGVzAQhnVPQXicO5NRI0M9lZqkxUQRkLwpjh
+yNGn7ZK+jFaEAAEHY3JlYXRlZAFZbno6DqNlnhAw8YtNZaO5E+5YUAf8914Lts3B
+acHAOwEACmVuZ3JhdmluZ3MBNiKqTFMaQkPbAVdm9/VgF6uajwYISzZvVoiwSdVy
+qD4AAQRzcGVjAZliTbfkJpKZVJMu38jSZ6VSlwIpPNWrwFZObyJbM/rxAQAFdGVy
+bXMBGMuUbxKTzxgOnXjcxlvFm0cv//6t+/WNsZjMgyj2SwEBAAZ0b2tlbnMBa+fc
+OTq2xltI5JVCzR2KJ8oFhPUtmhLeFYkBl7rqi+AAAQMKYXNzZXRPd25lcgUYcO3L
+7GQHlLMENWzFXJCef/094VLYTHPyhV5Xg7vdWQAAARJpbmZsYXRpb25BbGxvd2Fu
+Y2UFFAyzHVP0vZ5ICRubVX2CAyYvIsJsp7FohlKCWz+KsjoBAAELdXBkYXRlUmln
+aHQBAQAAAAFGe6yBObH1E/03sx50RZ2GCrL2cDPamtRy5to9H/OKewUPYXR0YWNo
 bWVudFR5cGVzAAAA//8HY3JlYXRlZAABAAEABHNwZWMAAQABAAV0ZXJtcwABAAEA
 BnRva2VucwAAAP//Awphc3NldE93bmVyAAAA//8SaW5mbGF0aW9uQWxsb3dhbmNl
 AAAA//8LdXBkYXRlUmlnaHQAAAABAAAEAQMECQQHRW5ncmF2ZQEAAQplbmdyYXZp
 bmdzAAEAAQABCHByZXZpb3VzAQphc3NldE93bmVyAQD//wELYmVuZWZpY2lhcnkB
-CmFzc2V0T3duZXIBAP//AAQBAgcIAQtiZW5lZmljaWFyeQVJc3N1ZQEBBxg2NSHA
-wuMZFcgwSpM+j5w+adEf+ZqqoUmcYemDFbcCEm5ld0F0dGFjaG1lbnRUeXBlcwEP
+CmFzc2V0T3duZXIBAP//AAQBAgcIAQtiZW5lZmljaWFyeQVJc3N1ZQEBRnusgTmx
+9RP9N7MedEWdhgqy9nAz2prUcubaPR/zinsCEm5ld0F0dGFjaG1lbnRUeXBlcwEP
 YXR0YWNobWVudFR5cGVzAAD//wluZXdUb2tlbnMBBnRva2VucwAA//8BBHVzZWQB
 EmluZmxhdGlvbkFsbG93YW5jZQEA//8CC2JlbmVmaWNpYXJ5AQphc3NldE93bmVy
 AAD//wZmdXR1cmUBEmluZmxhdGlvbkFsbG93YW5jZQAA//8ABQEDBAYJAQtiZW5l
 ZmljaWFyeQZSZW5hbWUBAAEDbmV3AQRzcGVjAQABAAEEdXNlZAELdXBkYXRlUmln
 aHQBAAEAAQZmdXR1cmUBC3VwZGF0ZVJpZ2h0AAABAAAAAQZmdXR1cmUIVHJhbnNm
 ZXIAAAABCHByZXZpb3VzAQphc3NldE93bmVyAQD//wELYmVuZWZpY2lhcnkBCmFz
-c2V0T3duZXIBAP//AAMBAgcBC2JlbmVmaWNpYXJ5AJBIISytLtbgmj6FPJBPcYiS
-huF+wj0KO2Mm7O5yG3uZAQhUcmFuc2Zlcg==
+c2V0T3duZXIBAP//AAMBAgcBC2JlbmVmaWNpYXJ5AGuHzCBHak2qk1kLJWjbng7V
+SrjEPI6Ti7cvThrX8eneAQhUcmFuc2Zlcg==
 
 -----END RGB INTERFACE-----

schemata/NonInflatableAssets-RGB20.rgba

@@ -1,10 +1,10 @@
 -----BEGIN RGB INTERFACE IMPLEMENTATION-----
-Id: C3ta24JBWi4hrTRAsLTznJFS5cvbUSipKfy5AH8PQo5r
-IfaceId: Hi9HY8XN955imFe2DsJHeaoZQLM7rVSSSGtsP5JHsZx2
-SchemaId: 3Hgj55tGQxcH4bKZFuQwz1JmPfG124gjh3hmT5WWAcay
+Id: G6WW3639sopVPm3aYUpT1N7LHni1f4JDqTdeCxWvVz7F
+IfaceId: 7Rrqv5iVnTv3DquiK7FJmdVBy1nNYBuSbkXpXRunwZzy
+SchemaId: 7X8TPsZnwm8YV4HN6MnGk8iwnk2RKyWeiAy2nXZD3BYu
 
-ACH9lZsEnU5aM7UcW5N2hRJN3lkrd/E4n+MPe9Y6Nrr2+EUsCHVzBgAvBXBOggBZ
-ljh77zpPx76WARbpYp95IWcDAwAHY3JlYXRlZNAHBHNwZWPRBwV0ZXJtcwHQBwph
-c3NldE93bmVyAAHQBwhUcmFuc2ZlcgA=
+AGDd+a3w5kXDkpx/fvjP4QnKKgo90gS4RnWEmfPUQLCyX4RrRsmIbV8iTI+Ttxdn
+Y29CeTQOMSlRjxwPHXshHmIDAwAHY3JlYXRlZNAHBHNwZWPRBwV0ZXJtcwHQBwti
+ZW5lZmljaWFyeQAB0AcIVHJhbnNmZXIA
 
 -----END RGB INTERFACE IMPLEMENTATION-----