stockpile: forward implementation

Author: dr-orlovsky

Cargo.lock

@@ -108,10 +108,11 @@ wasm-bindgen-test = "0.3"
 features = ["all"]
 
 [patch.crates-io]
+aora = { git = "https://github.com/rust-amplify/aora", branch = "master" }
 aluvm = { git = "https://github.com/AluVM/aluvm", branch = "master" }
 zk-aluvm = { git = "https://github.com/AluVM/zk-aluvm", branch = "master" }
 ultrasonic = { git = "https://github.com/AluVM/ultrasonic", branch = "master" }
-sonic-api = { git = "https://github.com/AluVM/sonic", branch = "master" }
-sonic-callreq = { git = "https://github.com/AluVM/sonic", branch = "master" }
-hypersonic = { git = "https://github.com/AluVM/sonic", branch = "master" }
+sonic-api = { git = "https://github.com/AluVM/sonic", branch = "rollback" }
+sonic-callreq = { git = "https://github.com/AluVM/sonic", branch = "rollback" }
+hypersonic = { git = "https://github.com/AluVM/sonic", branch = "rollback" }
 rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "v0.12" }

Cargo.toml

@@ -67,18 +67,14 @@ pub struct WitnessStatus {
     pub mining_id: Bytes32,
 }
 
-pub trait Pile {
+pub trait Pile
+where <Self::Seal as RgbSeal>::WitnessId: From<[u8; 32]> + Into<[u8; 32]>
+{
     type Seal: RgbSeal;
 
-    type Hoard: Aora<
-        Id = <Self::Seal as RgbSeal>::WitnessId,
-        Item = <Self::Seal as RgbSeal>::Client,
-    >;
-    type Cache: Aora<
-        Id = <Self::Seal as RgbSeal>::WitnessId,
-        Item = <Self::Seal as RgbSeal>::Published,
-    >;
-    type Keep: Aora<Id = Opid, Item = SmallOrdMap<u16, <Self::Seal as RgbSeal>::Definiton>>;
+    type Hoard: Aora<<Self::Seal as RgbSeal>::WitnessId, <Self::Seal as RgbSeal>::Client>;
+    type Cache: Aora<<Self::Seal as RgbSeal>::WitnessId, <Self::Seal as RgbSeal>::Published>;
+    type Keep: Aora<Opid, SmallOrdMap<u16, <Self::Seal as RgbSeal>::Definiton>>;
     type Index: Index<Opid, <Self::Seal as RgbSeal>::WitnessId>;
     type Stand: Index<<Self::Seal as RgbSeal>::WitnessId, Opid>;
     type Mine: Cru<<Self::Seal as RgbSeal>::WitnessId, Option<WitnessStatus>>;
@@ -109,7 +105,7 @@ pub trait Pile {
         self.index_mut().add(opid, pubid);
         self.stand_mut().add(pubid, opid);
         if self.hoard_mut().has(&pubid) {
-            let mut prev_anchor = self.hoard_mut().read(pubid);
+            let mut prev_anchor = self.hoard_mut().read(&pubid);
             if prev_anchor != anchor {
                 prev_anchor.merge(anchor).expect(
                     "existing anchor is not compatible with new one; this indicates either bug in \
@@ -384,8 +380,8 @@ pub mod fs {
 
         fn retrieve(&mut self, opid: Opid) -> impl ExactSizeIterator<Item = SealWitness<Seal>> {
             self.index.get(opid).map(|pubid| {
-                let client = self.hoard.read(pubid);
-                let published = self.cache.read(pubid);
+                let client = self.hoard.read(&pubid);
+                let published = self.cache.read(&pubid);
                 SealWitness::new(published, client)
             })
         }

src/pile.rs

@@ -662,7 +662,7 @@ impl<W: WalletProvider, S: Supply, P: Pile<Seal = TxoSeal>, X: Excavate<S, P>> B
                 .iter()
                 .flat_map(|(name, map)| map.iter().map(move |(addr, val)| (name, *addr, val)))
                 .filter_map(|(name, addr, val)| {
-                    let seals = stockpile.pile_mut().keep_mut().read(addr.opid);
+                    let seals = stockpile.pile_mut().keep_mut().read(&addr.opid);
                     let seal = seals.get(&addr.pos)?;
                     let outpoint = if let WOutpoint::Extern(outpoint) = seal.primary {
                         if !outpoints.contains(&outpoint) {

src/popls/bp.rs

@@ -35,9 +35,9 @@ use chrono::{DateTime, Utc};
 use commit_verify::ReservedBytes;
 use hypersonic::sigs::ContentSigs;
 use hypersonic::{
-    Articles, AuthToken, CellAddr, Codex, CodexId, Consensus, Contract, ContractId, CoreParams,
-    DataCell, IssueParams, LibRepo, Memory, MergeError, MethodName, NamedState, Operation, Opid,
-    Schema, StateAtom, StateName, Stock, Supply,
+    AcceptError, Articles, AuthToken, CellAddr, Codex, CodexId, Consensus, Contract, ContractId,
+    CoreParams, DataCell, IssueParams, LibRepo, Memory, MergeError, MethodName, NamedState,
+    Operation, Opid, Schema, StateAtom, StateName, Stock, Supply,
 };
 use rgb::{
     ContractApi, ContractVerify, OperationSeals, ReadOperation, ReadWitness, RgbSeal, RgbSealDef,
@@ -290,7 +290,7 @@ impl<S: Supply, P: Pile> Stockpile<S, P> {
                 let since = *cache
                     .entry(addr.opid)
                     .or_insert_with(|| self.pile().since(addr.opid));
-                let seals = self.pile_mut().keep_mut().read(addr.opid);
+                let seals = self.pile_mut().keep_mut().read(&addr.opid);
                 let Some(seal) = seals.get(&addr.pos) else {
                     continue;
                 };
@@ -344,7 +344,7 @@ impl<S: Supply, P: Pile> Stockpile<S, P> {
         self.stock
             .export_aux(terminals, writer, |opid, mut writer| {
                 // Write seal definitions
-                let seals = self.pile.keep_mut().read(opid);
+                let seals = self.pile.keep_mut().read(&opid);
                 writer = seals.strict_encode(writer)?;
 
                 // Write witnesses
@@ -438,14 +438,15 @@ impl<S: Supply, P: Pile> Stockpile<S, P> {
         &mut self,
         pubid: <P::Seal as RgbSeal>::WitnessId,
         status: Option<WitnessStatus>,
-    ) {
+    ) -> Result<(), AcceptError> {
         let opids = self.pile.stand().get(pubid);
         if status.is_none() {
             self.stock.rollback(opids);
         } else {
-            self.stock.forward(opids);
+            self.stock.forward(opids)?;
         }
         self.pile_mut().mine_mut().update(pubid, status);
+        Ok(())
     }
 }