add merge

starcoinorg · Nov 17, 2023 · 1cef501 · 1cef501
1 parent 4ecc3a5
commit 1cef501
Show file tree

Hide file tree

Showing 50 changed files with 825 additions and 789 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -503,7 +503,7 @@ starcoin-parallel-executor = { path = "vm/parallel-executor" }
 starcoin-transaction-benchmarks = { path = "vm/transaction-benchmarks" }
 starcoin-language-e2e-tests = { path = "vm/e2e-tests" }
 starcoin-proptest-helpers = { path = "vm/proptest-helpers" }
-flexidag = { path ="flexidag" }
+starcoin-flexidag = { path = "flexidag" }
 flexidag-service = { path ="flexidag/service" }
 syn = { version = "1.0.107", features = [
     "full",

diff --git a/block-relayer/src/block_relayer.rs b/block-relayer/src/block_relayer.rs
@@ -240,11 +240,7 @@ impl BlockRelayer {
                 )
                 .await?;
 
-                block_connector_service.notify(PeerNewBlock::new(
-                    peer_id,
-                    block,
-                    compact_block_msg.message.tips_hash,
-                ))?;
+                block_connector_service.notify(PeerNewBlock::new(peer_id, block))?;
             }
             Ok(())
         };

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -24,6 +24,7 @@ starcoin-vm-types = { workspace = true }
 starcoin-storage = { workspace = true }
 thiserror = { workspace = true }
 starcoin-network-rpc-api = { workspace = true }
+async-std = { workspace = true }
 
 [dev-dependencies]
 proptest = { workspace = true }

diff --git a/chain/api/Cargo.toml b/chain/api/Cargo.toml
@@ -18,7 +18,6 @@ thiserror = { workspace = true }
 starcoin-network-rpc-api = { workspace = true }
 starcoin-config = { workspace = true }
 
-
 [dev-dependencies]
 
 [features]

diff --git a/chain/api/src/chain.rs b/chain/api/src/chain.rs
@@ -103,8 +103,6 @@ pub trait ChainReader {
         access_path: Option<AccessPath>,
     ) -> Result<Option<TransactionInfoWithProof>>;
 
-    /// get the current tips hash value
-    fn current_tips_hash(&self) -> Option<HashValue>;
     fn net_id(&self) -> ChainNetworkID;
 }
 
@@ -117,18 +115,6 @@ pub trait ChainWriter {
     fn apply(&mut self, block: Block) -> Result<ExecutedBlock>;
 
     fn chain_state(&mut self) -> &ChainStateDB;
-
-    /// Get the dag accumulator info
-    fn get_current_dag_accumulator_info(&self) -> Result<AccumulatorInfo>;
-
-    /// Fork the accumulator
-    fn fork_dag_accumulator(&mut self, accumulator_info: AccumulatorInfo) -> Result<()>;
-
-    /// Append the dag accumulator leaf
-    fn append_dag_accumulator_leaf(
-        &mut self,
-        tips: Vec<HashValue>,
-    ) -> Result<(HashValue, AccumulatorInfo)>;
 }
 
 /// `Chain` is a trait that defines a single Chain.

diff --git a/chain/chain-notify/src/lib.rs b/chain/chain-notify/src/lib.rs
@@ -52,7 +52,7 @@ impl EventHandler<Self, NewHeadBlock> for ChainNotifyHandlerService {
         item: NewHeadBlock,
         ctx: &mut ServiceContext<ChainNotifyHandlerService>,
     ) {
-        let NewHeadBlock(block_detail, _tips_hash) = item;
+        let NewHeadBlock(block_detail) = item;
         let block = block_detail.block();
         // notify header.
         self.notify_new_block(block, ctx);

diff --git a/chain/service/Cargo.toml b/chain/service/Cargo.toml
@@ -1,5 +1,6 @@
 [dependencies]
 anyhow = { workspace = true }
+async-std = { workspace = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
 rand = { workspace = true }
@@ -21,6 +22,7 @@ tokio = { workspace = true }
 starcoin-network-rpc-api = { workspace = true }
 starcoin-consensus = { workspace = true }
 starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-flexidag = { workspace = true }
 
 [dev-dependencies]
 stest = { workspace = true }