Merge pull request #151 from RGB-WG/v0.10.0-release

V0.10.0 release

Cargo.toml

@@ -18,15 +18,15 @@ name = "rgb"
 crate-type = ["cdylib", "rlib"] # We need this for WASM
 
 [dependencies]
-amplify = "~4.0.0-beta.20"
+amplify = "~4.0.0-beta.22"
 strict_encoding = "~2.0.1"
 strict_types = "~1.0.0-rc.1"
 aluvm = { version = "~0.10.0-rc.1", features = ["std"] }
 commit_verify = { version = "~0.10.0-rc.3", features = ["rand"] }
 single_use_seals = "~0.10.0-rc.2"
 bp-core = { version = "~0.10.0-rc.2" }
 secp256k1-zkp = { version = "~0.7.0", features = ["use-rand", "rand-std", "global-context"] }
-baid58 = "~0.2.0"
+baid58 = "~0.3.0"
 mime = "~0.3.16"
 serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
 

src/contract/assignments.rs

@@ -561,8 +561,9 @@ impl TypedAssigns<GenesisSeal> {
     }
 }
 
-#[derive(Wrapper, Clone, PartialEq, Eq, Hash, Debug, From)]
+#[derive(Wrapper, WrapperMut, Clone, PartialEq, Eq, Hash, Debug, From)]
 #[wrapper(Deref)]
+#[wrapper_mut(DerefMut)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_RGB)]
 #[cfg_attr(

src/contract/contract.rs

@@ -385,26 +385,26 @@ impl ContractHistory {
         }
 
         // Remove invalidated state
-        for output in op.prev_outs() {
-            if let Some(o) = self.rights.iter().find(|r| r.opout == output) {
+        for input in op.inputs() {
+            if let Some(o) = self.rights.iter().find(|r| r.opout == input.prev_out) {
                 let o = o.clone(); // need this b/c of borrow checker
                 self.rights
                     .remove(&o)
                     .expect("collection allows zero elements");
             }
-            if let Some(o) = self.fungibles.iter().find(|r| r.opout == output) {
+            if let Some(o) = self.fungibles.iter().find(|r| r.opout == input.prev_out) {
                 let o = o.clone();
                 self.fungibles
                     .remove(&o)
                     .expect("collection allows zero elements");
             }
-            if let Some(o) = self.data.iter().find(|r| r.opout == output) {
+            if let Some(o) = self.data.iter().find(|r| r.opout == input.prev_out) {
                 let o = o.clone();
                 self.data
                     .remove(&o)
                     .expect("collection allows zero elements");
             }
-            if let Some(o) = self.attach.iter().find(|r| r.opout == output) {
+            if let Some(o) = self.attach.iter().find(|r| r.opout == input.prev_out) {
                 let o = o.clone();
                 self.attach
                     .remove(&o)

src/contract/data.rs

@@ -20,10 +20,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use core::fmt::Debug;
+use core::fmt::{self, Debug, Display, Formatter};
 
 use amplify::confinement::SmallVec;
-use amplify::Bytes32;
+use amplify::hex::ToHex;
+use amplify::{Bytes32, Wrapper};
 use commit_verify::{CommitStrategy, CommitVerify, Conceal, StrictEncodedProtocol};
 use strict_encoding::{StrictSerialize, StrictType};
 
@@ -57,7 +58,7 @@ impl CommitStrategy for VoidState {
     type Strategy = commit_verify::strategies::Strict;
 }
 
-#[derive(Wrapper, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, From)]
+#[derive(Wrapper, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, From)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_RGB)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate = "serde_crate"))]
@@ -79,6 +80,21 @@ impl CommitStrategy for RevealedData {
 
 impl StrictSerialize for RevealedData {}
 
+impl Debug for RevealedData {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let val = match String::from_utf8(self.0.to_inner()) {
+            Ok(s) => s,
+            Err(_) => self.0.to_hex(),
+        };
+
+        f.debug_tuple("RevealedData").field(&val).finish()
+    }
+}
+
+impl Display for RevealedData {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { f.write_str(&self.as_ref().to_hex()) }
+}
+
 /// Confidential version of an structured state data.
 ///
 /// See also revealed version [`RevealedData`].

src/contract/mod.rs

@@ -48,7 +48,7 @@ pub use fungible::{
 };
 pub use global::{GlobalState, GlobalValues};
 pub use operations::{
-    ContractId, Extension, Genesis, OpId, OpRef, Operation, PrevOuts, Redeemed, Transition,
+    ContractId, Extension, Genesis, Input, Inputs, OpId, OpRef, Operation, Redeemed, Transition,
     Valencies,
 };
 pub use seal::{ExposedSeal, GenesisSeal, GraphSeal, SealWitness, SecretSeal, TxoSeal};