Merge branch 'v0.12' into refactor/consensus

invoice/src/lib.rs

@@ -38,38 +38,11 @@ use core::fmt::{self, Display, Formatter};
 use core::str::FromStr;
 
 use baid64::Baid64ParseError;
-use hypersonic::{AuthToken, Consensus, ContractId};
-use sonic_callreq::CallRequest;
+use hypersonic::AuthToken;
+use rgbcore::{SealType, UnknownType};
+use sonic_callreq::{CallRequest, CallScope};
 
-pub type RgbInvoice = CallRequest<RgbScope, RgbBeneficiary>;
-
-#[derive(Clone, Eq, PartialEq, Debug, Display)]
-pub enum RgbScope {
-    #[display(inner)]
-    ContractId(ContractId),
-
-    #[display("contract:{0}")]
-    ContractQuery(ContractQuery),
-}
-
-impl FromStr for RgbScope {
-    type Err = ParseInvoiceError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if !s.starts_with("contract:") {
-            return Err(ParseInvoiceError::NoScheme);
-        }
-        match ContractId::from_str(s) {
-            Err(err1) => {
-                let s = s.trim_start_matches("contract:");
-                let query = ContractQuery::from_str(s)
-                    .map_err(|_| ParseInvoiceError::Unrecognizable(err1))?;
-                Ok(Self::ContractQuery(query))
-            }
-            Ok(id) => Ok(Self::ContractId(id)),
-        }
-    }
-}
+pub type RgbInvoice = CallRequest<CallScope, RgbBeneficiary>;
 
 #[derive(Clone, Eq, PartialEq, Debug, Display)]
 #[display(inner)]