diff --git a/Cargo.lock b/Cargo.lock index e3c01c94..156ed17f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -950,8 +950,8 @@ dependencies = [ [[package]] name = "ethers" -version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +version = "0.5.4" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "ethers-contract", "ethers-core", @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "ethers-contract" version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "ethers-contract-abigen", "ethers-contract-derive", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "Inflector", "anyhow", @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "ethers-contract-derive" version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "ethers-contract-abigen", "ethers-core", @@ -1016,8 +1016,8 @@ dependencies = [ [[package]] name = "ethers-core" -version = "0.5.4" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +version = "0.5.5" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "arrayvec 0.7.2", "bytes", @@ -1045,7 +1045,7 @@ dependencies = [ [[package]] name = "ethers-middleware" version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "async-trait", "ethers-contract", @@ -1068,7 +1068,7 @@ dependencies = [ [[package]] name = "ethers-providers" version = "0.5.4" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "async-trait", "auto_impl", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "ethers-signers" version = "0.5.3" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "async-trait", "coins-bip32", @@ -1117,10 +1117,11 @@ dependencies = [ [[package]] name = "ethers-solc" version = "0.1.0" -source = "git+https://github.com/gakonst/ethers-rs#203b2e8ea303f36111968f8a143a03e50ecb98b2" +source = "git+https://github.com/gakonst/ethers-rs#1da62d65d2f8f4110a350cad9e23f02bf9f0ce78" dependencies = [ "colored", "ethers-core", + "glob", "hex", "home", "md-5", @@ -1194,7 +1195,7 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "fluidex-common" version = "0.1.0" -source = "git+https://github.com/fluidex/common-rs?branch=master#f277677d893feb5eecd30d399a8ccb96efaf1a23" +source = "git+https://github.com/fluidex/common-rs?branch=master#3d4b17f343fe198de3699971ef3ca35f8796c2e3" dependencies = [ "anyhow", "babyjubjub-rs", @@ -1424,6 +1425,12 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + [[package]] name = "group" version = "0.10.0" diff --git a/src/bin/main.rs b/src/bin/main.rs index 84c05066..5d812898 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -2,17 +2,11 @@ #![allow(dead_code)] use crossbeam_channel::RecvTimeoutError; +use fluidex_common::db::models::tablenames; +use fluidex_common::db::models::task::TaskStatus; +use fluidex_common::db::MIGRATOR; use fluidex_common::non_blocking_tracing; -use fluidex_common::{ - db::{ - models::{ - tablenames, - task::{CircuitType, TaskStatus}, - }, - MIGRATOR, - }, - types::FrExt, -}; +use fluidex_common::types::FrExt; use rollup_state_manager::config::Settings; use rollup_state_manager::grpc::run_grpc_server; use rollup_state_manager::msg::{msg_loader, msg_processor}; @@ -240,6 +234,7 @@ async fn save_block_to_db(pool: &PgPool, block: &L2Block) -> anyhow::Result<()> } async fn save_task_to_db(pool: &PgPool, block: L2Block) -> anyhow::Result<()> { + let tx_num = block.detail.encoded_txs.len(); let input = L2BlockSerde::from(block.detail); let task_id = unique_task_id(); @@ -248,7 +243,7 @@ async fn save_task_to_db(pool: &PgPool, block: L2Block) -> anyhow::Result<()> { tablenames::TASK )) .bind(task_id) - .bind(CircuitType::BLOCK) + .bind(format!("block_{}", tx_num)) .bind(block.block_id as i64) // TODO: will it overflow? .bind(sqlx::types::Json(input)) .bind(TaskStatus::Inited)