Flexidag

Cargo.toml

@@ -111,6 +111,7 @@ members = [
     "cmd/miner_client/api",
     "cmd/db-exporter",
     "cmd/genesis-nft-miner",
+    "flexidag",
 ]
 
 default-members = [
@@ -217,6 +218,7 @@ default-members = [
     "stratum",
     "cmd/miner_client/api",
     "cmd/db-exporter",
+    "flexidag",
 ]
 
 [profile.dev]
@@ -246,7 +248,7 @@ api-limiter = { path = "commons/api-limiter" }
 arc-swap = "1.5.1"
 arrayref = "0.3"
 ascii = "1.0.0"
-async-std = "1.12"
+async-std = { version = "1.12", features = ["attributes", "tokio1"] }
 async-trait = "0.1.53"
 asynchronous-codec = "0.5"
 atomic-counter = "1.0.1"
@@ -257,6 +259,9 @@ bcs-ext = { path = "commons/bcs_ext" }
 bech32 = "0.9"
 bencher = "0.1.5"
 bitflags = "1.3.2"
+faster-hex = "0.6"
+indexmap = "1.9.1"
+bincode = { version = "1", default-features = false }
 bs58 = "0.3.1"
 byteorder = "1.3.4"
 bytes = "1"
@@ -438,7 +443,7 @@ starcoin-chain-service = { path = "chain/service" }
 starcoin-cmd = { path = "cmd/starcoin" }
 starcoin-config = { path = "config" }
 starcoin-consensus = { path = "consensus" }
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "a742ddc0674022800341182cbb4c3681807b2f00" }
+starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "8d41c280a227594ca0a2b6ecba580643518274ea" }
 starcoin-decrypt = { path = "commons/decrypt" }
 starcoin-dev = { path = "vm/dev" }
 starcoin-executor = { path = "executor" }
@@ -496,6 +501,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" }
+starcoin-flexidag = { path = "flexidag" }
 
 syn = { version = "1.0.107", features = [
     "full",

account/src/account_test.rs

@@ -224,7 +224,7 @@ pub fn test_wallet_account() -> Result<()> {
     );
     //println!("verify result is {:?}", sign.verify(&raw_txn, &public_key)?);
     println!("public key is {:?}", public_key.to_bytes().as_ref());
-    println!("hash value is {:?}", hash_value.as_ref());
+    println!("hash value is {:?}", hash_value);
     println!("key is {:?}", key.derived_address());
     println!("address is {:?},result is {:?}", address, result);
 

benchmarks/src/chain.rs

@@ -46,8 +46,14 @@ impl ChainBencher {
             Genesis::init_and_check_storage(&net, storage.clone(), temp_path.path())
                 .expect("init storage by genesis fail.");
 
-        let chain = BlockChain::new(net.time_service(), chain_info.head().id(), storage, None)
-            .expect("create block chain should success.");
+        let chain = BlockChain::new(
+            net.time_service(),
+            chain_info.head().id(),
+            storage,
+            net.id().clone(),
+            None,
+        )
+        .expect("create block chain should success.");
         let miner_account = AccountInfo::random();
 
         ChainBencher {

block-relayer/src/block_relayer.rs

@@ -78,14 +78,15 @@ impl BlockRelayer {
         &self,
         network: NetworkServiceRef,
         executed_block: Arc<ExecutedBlock>,
+        tips_hash: Option<Vec<HashValue>>,
     ) {
         if !self.is_nearly_synced() {
             debug!("[block-relay] Ignore NewHeadBlock event because the node has not been synchronized yet.");
             return;
         }
         let compact_block = executed_block.block().clone().into();
         let compact_block_msg =
-            CompactBlockMessage::new(compact_block, executed_block.block_info.clone());
+            CompactBlockMessage::new(compact_block, executed_block.block_info.clone(), tips_hash);
         network.broadcast(NotificationMessage::CompactBlock(Box::new(
             compact_block_msg,
         )));
@@ -203,7 +204,9 @@ impl BlockRelayer {
         ctx: &mut ServiceContext<BlockRelayer>,
     ) -> Result<()> {
         let network = ctx.get_shared::<NetworkServiceRef>()?;
-        let block_connector_service = ctx.service_ref::<BlockConnectorService>()?.clone();
+        let block_connector_service = ctx
+            .service_ref::<BlockConnectorService<TxPoolService>>()?
+            .clone();
         let txpool = self.txpool.clone();
         let metrics = self.metrics.clone();
         let fut = async move {
@@ -286,7 +289,7 @@ impl EventHandler<Self, NewHeadBlock> for BlockRelayer {
                 return;
             }
         };
-        self.broadcast_compact_block(network, event.0);
+        self.broadcast_compact_block(network, event.0, event.1);
     }
 }
 
@@ -303,7 +306,7 @@ impl EventHandler<Self, NewBranch> for BlockRelayer {
                 return;
             }
         };
-        self.broadcast_compact_block(network, event.0);
+        self.broadcast_compact_block(network, event.0, event.1);
     }
 }
 

chain/Cargo.toml

@@ -23,6 +23,8 @@ starcoin-types = { package = "starcoin-types", workspace = true }
 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 }
@@ -39,6 +41,7 @@ stdlib = { workspace = true }
 stest = { workspace = true }
 test-helper = { workspace = true }
 tokio = { features = ["full"], workspace = true }
+starcoin-network-rpc-api = { workspace = true }
 
 [features]
 default = []

chain/api/Cargo.toml

@@ -15,7 +15,8 @@ starcoin-time-service = { workspace = true }
 starcoin-types = { workspace = true }
 starcoin-vm-types = { workspace = true }
 thiserror = { workspace = true }
-
+starcoin-network-rpc-api = { workspace = true }
+starcoin-config = { workspace = true }
 
 [dev-dependencies]
 

chain/api/src/chain.rs

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2
 
 use anyhow::Result;
+use starcoin_accumulator::accumulator_info::AccumulatorInfo;
+use starcoin_config::ChainNetworkID;
 use starcoin_crypto::HashValue;
 use starcoin_state_api::ChainStateReader;
 use starcoin_statedb::ChainStateDB;
@@ -80,7 +82,11 @@ pub trait ChainReader {
     /// Verify block header and body, base current chain, but do not verify it execute state.
     fn verify(&self, block: Block) -> Result<VerifiedBlock>;
     /// Execute block and verify it execute state, and save result base current chain, but do not change current chain.
-    fn execute(&self, block: VerifiedBlock) -> Result<ExecutedBlock>;
+    fn execute(
+        &self,
+        block: VerifiedBlock,
+        transaction_parent: Option<HashValue>,
+    ) -> Result<ExecutedBlock>;
     /// Get chain transaction infos
     fn get_transaction_infos(
         &self,
@@ -100,6 +106,8 @@ pub trait ChainReader {
         event_index: Option<u64>,
         access_path: Option<AccessPath>,
     ) -> Result<Option<TransactionInfoWithProof>>;
+
+    fn net_id(&self) -> ChainNetworkID;
 }
 
 pub trait ChainWriter {