remove interfaces

Author: zoedberg

Cargo.lock

@@ -1,12 +1,12 @@
 -----BEGIN RGB CONSIGNMENT-----
-Id: rgb:csg:NMRVC2V8-NS3mHk0-a2pWAhM-OSv789X-gshAO4R-3DTR9gY#visual-scorpio-kansas
+Id: rgb:csg:E2gglPSZ-ol15s0v-7Bsn7g0-palSQ8e-BEHjsAS-dDLeiNA#cheese-virtual-andy
 Version: 2
 Type: contract
 Contract: rgb:C9vGwULI-zVhMBCR-jRacB$r-Bf7qloC-ixe$Lcq-xu9AnJ4
 Schema: rgb:sch:DZTJx1!$gw9X2Y3uC2aeeV!fR8qNUwUqsCbICKwwRqY#yellow-doctor-number
-Check-SHA256: d31e237c99dd9906a316b904af7df3cf0bbed220bd9d1b672377d2e2683be433
+Check-SHA256: f196c6351598246c77e4c830d8f42844af209a0da57783d0f65232fb6498a78d
 
 0ssI2000000000000000000000000000000000000000000000000000000D0CRI`I$>^aZh38Qb#np$
-0000000000000C|VQpmq000000000D0CRI`I$>^aZh38Qb#nj!00000000000000000000000000000
+0000000000000C|VQpmq000000000D0CRI`I$>^aZh38Qb#nj!0000000000000000000000000000
 
 -----END RGB CONSIGNMENT-----

asset/armored_contract.default

@@ -1,9 +1,9 @@
 -----BEGIN RGB KIT-----
-Id: rgb:kit:5PcH5BM9-JI91Fhx-R0TUG4o-ZqLwv6r-UHlivQn-x1q6XqA
+Id: rgb:kit:ij7UAXOl-MCrXzKt-L8fC6Vu-e$xPh5k-GEurStO-4RNfzsI
 Version: 2
 Type-System: sts:8Vb$sM1F-5MsQc20-HEixf55-gJR37FM-0zRKfpY-SwIp35w#design-farmer-camel
-Check-SHA256: 337a32712f14c5df0b57a64bd6c321a043081688ecd4f33fd8319470da2256b1
+Check-SHA256: d86e8112f3c4c4442126f8e9f44f16867da487f29052bf91b810457db34209a4
 
-0ssI200000000
+0ssI200000
 
 -----END RGB KIT-----

asset/armored_kit.default

@@ -1,12 +1,12 @@
 -----BEGIN RGB CONSIGNMENT-----
-Id: rgb:csg:nYQ0UGV2-dWzSP1M-PV$XFFx-T2wgOuw-IYecFIO-2XATOAI#monkey-zebra-minute
+Id: rgb:csg:g4ZDNtpl-RgfaP7f-bxGts!Y-vjw!IS5-5oGn70b-uS9Pmjg#twin-pardon-member
 Version: 2
 Type: transfer
 Contract: rgb:C9vGwULI-zVhMBCR-jRacB$r-Bf7qloC-ixe$Lcq-xu9AnJ4
 Schema: rgb:sch:DZTJx1!$gw9X2Y3uC2aeeV!fR8qNUwUqsCbICKwwRqY#yellow-doctor-number
-Check-SHA256: 42db055d91cb9eec55930f7912b92fe029ab186cad2ab94fc81ee86872a8ada3
+Check-SHA256: c31f56b8ef659a7b7294baeca1812604756e0c12443fce0dc81ae0bf19640e81
 
 0s#O3000000000000000000000000000000000000000000000000000000D0CRI`I$>^aZh38Qb#np$
-0000000000000C|VQpmq000000000D0CRI`I$>^aZh38Qb#nj!00000000000000000000000000000
+0000000000000C|VQpmq000000000D0CRI`I$>^aZh38Qb#nj!0000000000000000000000000000
 
 -----END RGB CONSIGNMENT-----

asset/armored_transfer.default

@@ -21,8 +21,8 @@
 
 use std::str::FromStr;
 
-use rgb::ContractId;
-use strict_encoding::{FieldName, TypeName};
+use rgb::{ContractId, SchemaId};
+use strict_types::FieldName;
 
 use crate::invoice::{Beneficiary, InvoiceState, RgbInvoice, RgbTransport, XChainNet};
 use crate::{Allocation, Amount, CoinAmount, NonFungible, Precision, TransportParseError};
@@ -36,11 +36,10 @@ impl RgbInvoiceBuilder {
         Self(RgbInvoice {
             transports: vec![RgbTransport::UnspecifiedMeans],
             contract: None,
-            iface: None,
-            operation: None,
-            assignment: None,
+            schema: None,
+            assignment_name: None,
+            assignment_state: InvoiceState::Void,
             beneficiary: beneficiary.into(),
-            owned_state: InvoiceState::Void,
             expiry: None,
             unknown_query: none!(),
         })
@@ -50,36 +49,23 @@ impl RgbInvoiceBuilder {
         Self::new(beneficiary).set_contract(contract_id)
     }
 
-    pub fn rgb20(contract_id: ContractId, beneficiary: impl Into<XChainNet<Beneficiary>>) -> Self {
-        Self::with(contract_id, beneficiary).set_interface("RGB20")
-    }
-
-    pub fn rgb20_anything(beneficiary: impl Into<XChainNet<Beneficiary>>) -> Self {
-        Self::new(beneficiary).set_interface("RGB20")
-    }
-
     pub fn set_contract(mut self, contract_id: ContractId) -> Self {
         self.0.contract = Some(contract_id);
         self
     }
 
-    pub fn set_interface(mut self, name: impl Into<TypeName>) -> Self {
-        self.0.iface = Some(name.into());
-        self
-    }
-
-    pub fn set_operation(mut self, name: impl Into<FieldName>) -> Self {
-        self.0.operation = Some(name.into());
+    pub fn set_schema(mut self, schema_id: SchemaId) -> Self {
+        self.0.schema = Some(schema_id);
         self
     }
 
-    pub fn set_assignment(mut self, name: impl Into<FieldName>) -> Self {
-        self.0.assignment = Some(name.into());
+    pub fn set_assignment_name(mut self, assignment_name: FieldName) -> Self {
+        self.0.assignment_name = Some(assignment_name);
         self
     }
 
     pub fn set_amount_raw(mut self, amount: impl Into<Amount>) -> Self {
-        self.0.owned_state = InvoiceState::Amount(amount.into());
+        self.0.assignment_state = InvoiceState::Amount(amount.into());
         self
     }
 
@@ -94,12 +80,13 @@ impl RgbInvoiceBuilder {
             Err(_) => return Err(self),
         }
         .to_amount_unchecked();
-        self.0.owned_state = InvoiceState::Amount(amount);
+        self.0.assignment_state = InvoiceState::Amount(amount);
         Ok(self)
     }
 
     pub fn set_allocation_raw(mut self, allocation: impl Into<Allocation>) -> Self {
-        self.0.owned_state = InvoiceState::Data(NonFungible::RGB21(allocation.into()));
+        self.0.assignment_state =
+            InvoiceState::Data(NonFungible::FractionedToken(allocation.into()));
         self
     }
 

asset/transfer.default

@@ -37,14 +37,14 @@ use crate::LIB_NAME_RGB_CONTRACT;
 )]
 pub enum NonFungible {
     #[display(inner)]
-    RGB21(Allocation),
+    FractionedToken(Allocation),
 }
 
 impl FromStr for NonFungible {
     type Err = AllocationParseError;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let allocation = Allocation::from_str(s)?;
-        Ok(NonFungible::RGB21(allocation))
+        Ok(NonFungible::FractionedToken(allocation))
     }
 }
 

invoice/src/builder.rs

@@ -26,8 +26,8 @@ use amplify::{ByteArray, Bytes32};
 use bp::{InvalidPubkey, OutputPk, PubkeyHash, ScriptHash, WPubkeyHash, WScriptHash};
 use indexmap::IndexMap;
 use invoice::{AddressNetwork, AddressPayload, Network};
-use rgb::{AttachId, ChainNet, ContractId, Layer1, SecretSeal};
-use strict_encoding::{FieldName, TypeName};
+use rgb::{AttachId, ChainNet, ContractId, Layer1, SchemaId, SecretSeal, StateType};
+use strict_types::FieldName;
 
 use crate::{Amount, NonFungible};
 
@@ -78,6 +78,17 @@ impl FromStr for InvoiceState {
     }
 }
 
+impl From<InvoiceState> for StateType {
+    fn from(val: InvoiceState) -> Self {
+        match val {
+            InvoiceState::Void => StateType::Void,
+            InvoiceState::Amount(_) => StateType::Fungible,
+            InvoiceState::Data(_) => StateType::Structured,
+            InvoiceState::Attach(_) => StateType::Attachment,
+        }
+    }
+}
+
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
 #[non_exhaustive]
 pub enum XChainNet<T> {
@@ -214,11 +225,10 @@ pub enum Beneficiary {
 pub struct RgbInvoice {
     pub transports: Vec<RgbTransport>,
     pub contract: Option<ContractId>,
-    pub iface: Option<TypeName>,
-    pub operation: Option<FieldName>,
-    pub assignment: Option<FieldName>,
+    pub schema: Option<SchemaId>,
+    pub assignment_name: Option<FieldName>,
+    pub assignment_state: InvoiceState,
     pub beneficiary: XChainNet<Beneficiary>,
-    pub owned_state: InvoiceState,
     /// UTC unix timestamp
     pub expiry: Option<i64>,
     pub unknown_query: IndexMap<String, String>,