From 9e22f09ac349c944e30d826a80d7bce8607706b4 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Fri, 26 Nov 2021 13:56:01 +0800
Subject: [PATCH 1/2] only pub_data

---
 src/block_submitter/task_fetcher.rs | 5 +++++
 src/block_submitter/types.rs        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/block_submitter/task_fetcher.rs b/src/block_submitter/task_fetcher.rs
index 5698ee2..6b5e5f7 100644
--- a/src/block_submitter/task_fetcher.rs
+++ b/src/block_submitter/task_fetcher.rs
@@ -40,6 +40,7 @@ impl TaskFetcher {
             block_id: i64,
             public_input: Vec<u8>,
             proof: Vec<u8>,
+            public_data: Vec<u8>,
         }
 
         let query: &'static str = const_format::formatcp!(
@@ -47,6 +48,7 @@ impl TaskFetcher {
             select t.block_id     as block_id,
                    t.public_input as public_input,
                    t.proof        as proof
+                   l2b.raw_public_data as public_data
             from {} t
                      inner join {} l2b
                                 on t.block_id = l2b.block_id
@@ -72,10 +74,13 @@ impl TaskFetcher {
         if let Some(task) = task {
             let public_inputs: Vec<U256> = serde_json::de::from_slice(&task.public_input)?;
             let serialized_proof: Vec<U256> = serde_json::de::from_slice(&task.proof)?;
+            // TODO: maybe https://github.com/fluidex/rollup-state-manager/issues/246?
+            // let public_data: Vec<u8> = serde_json::de::from_slice(&task.public_data)?;
             tx.try_send(ContractCall::SubmitBlock(SubmitBlockArgs {
                 block_id: task.block_id.into(),
                 public_inputs,
                 serialized_proof,
+                public_data: task.public_data
             }))?;
             self.last_block_id = Some(task.block_id);
         }
diff --git a/src/block_submitter/types.rs b/src/block_submitter/types.rs
index b3f153a..fd89d9b 100644
--- a/src/block_submitter/types.rs
+++ b/src/block_submitter/types.rs
@@ -10,4 +10,5 @@ pub struct SubmitBlockArgs {
     pub block_id: U256,
     pub public_inputs: Vec<U256>,
     pub serialized_proof: Vec<U256>,
+    pub public_data: Vec<u8>,
 }

From 21d164380c7d343b99553c5365e50f1ef2c0805a Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Mon, 29 Nov 2021 10:18:31 +0800
Subject: [PATCH 2/2] cargo fmt

---
 src/block_submitter/task_fetcher.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/block_submitter/task_fetcher.rs b/src/block_submitter/task_fetcher.rs
index 6b5e5f7..d6c4cff 100644
--- a/src/block_submitter/task_fetcher.rs
+++ b/src/block_submitter/task_fetcher.rs
@@ -80,7 +80,7 @@ impl TaskFetcher {
                 block_id: task.block_id.into(),
                 public_inputs,
                 serialized_proof,
-                public_data: task.public_data
+                public_data: task.public_data,
             }))?;
             self.last_block_id = Some(task.block_id);
         }