Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(config): optional block producer wallet for readonly node #768

Merged
merged 1 commit into from
Jul 20, 2022
Merged

fix(config): optional block producer wallet for readonly node #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion crates/block-producer/src/block_producer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,10 @@ impl BlockProducer {
contracts_dep_manager,
} = args;

let wallet = Wallet::from_config(&config.wallet_config).with_context(|| "init wallet")?;
let wallet = match config.wallet_config {
Some(ref c) => Wallet::from_config(c).with_context(|| "init wallet")?,
None => bail!("no wallet config for block producer"),
};

let block_producer = BlockProducer {
rollup_config_hash,
Expand Down
91 changes: 52 additions & 39 deletions crates/block-producer/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,14 +528,14 @@ impl BaseInitComponents {
pub async fn init_offchain_mock_context(
&self,
block_producer_config: &BlockProducerConfig,
) -> Result<OffChainMockContext> {
) -> Result<Option<OffChainMockContext>> {
let wallet = match block_producer_config.wallet_config {
Some(ref c) => Wallet::from_config(c).with_context(|| "offchain init wallet")?,
None => return Ok(None),
};
let ckb_genesis_info = gw_challenge::offchain::CKBGenesisInfo {
sighash_dep: self.ckb_genesis_info.sighash_dep(),
};
let wallet = {
let config = &block_producer_config.wallet_config;
Wallet::from_config(config).with_context(|| "init wallet")?
};
let contracts_dep_manager = self
.contracts_dep_manager
.clone()
Expand All @@ -551,7 +551,8 @@ impl BaseInitComponents {
contracts_dep_manager,
};

OffChainMockContext::build(build_args).await
let ctx = OffChainMockContext::build(build_args).await?;
Ok(Some(ctx))
}
}

Expand Down Expand Up @@ -588,9 +589,12 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
let base = BaseInitComponents::init(&config, skip_config_check).await?;
let (mem_pool, wallet, offchain_mock_context) = match config.block_producer.as_ref() {
Some(block_producer_config) => {
let wallet = Wallet::from_config(&block_producer_config.wallet_config)
.with_context(|| "init wallet")?;
let offchain_mock_context = base
let opt_wallet = block_producer_config
.wallet_config
.as_ref()
.map(|c| Wallet::from_config(c).with_context(|| "init block producer wallet"))
.transpose()?;
let opt_offchain_mock_context = base
.init_offchain_mock_context(block_producer_config)
.await?;
let mem_pool_provider = DefaultMemPoolProvider::new(
Expand Down Expand Up @@ -623,7 +627,7 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
.with_context(|| "create mem-pool")?,
))
};
(Some(mem_pool), Some(wallet), Some(offchain_mock_context))
(Some(mem_pool), opt_wallet, opt_offchain_mock_context)
}
None => (None, None, None),
};
Expand Down Expand Up @@ -708,17 +712,17 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
None
};

let unlocker_wallet = match block_producer_config
.withdrawal_unlocker_wallet_config
.as_ref()
{
Some(wallet_config) => {
Wallet::from_config(wallet_config).with_context(|| "init unlocker wallet")?
let unlocker_wallet = match block_producer_config.withdrawal_unlocker_wallet_config {
Some(ref wallet_config) => {
Wallet::from_config(wallet_config).with_context(|| "unlocker wallet")?
}
None => {
log::info!("[unlock withdrawal] reuse block producer wallet");
Wallet::from_config(&block_producer_config.wallet_config)
.with_context(|| "init unlocker wallet")?

match block_producer_config.wallet_config {
Some(ref c) => Wallet::from_config(c).with_context(|| "unlocker wallet")?,
None => bail!("no wallet config for withdrawal unlocker"),
}
}
};

Expand All @@ -736,14 +740,16 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
wallet,
));

let wallet = Wallet::from_config(&block_producer_config.wallet_config)
.with_context(|| "init wallet")?;
let challenger_wallet = match block_producer_config.wallet_config {
Some(ref c) => Wallet::from_config(c).with_context(|| "challenger wallet")?,
None => bail!("no wallet config for block producer"),
};

// Challenger
let args = ChallengerNewArgs {
rollup_context,
rpc_client: rpc_client.clone(),
wallet,
wallet: challenger_wallet,
config: block_producer_config.clone(),
debug_config: config.debug.clone(),
builtin_load_data,
Expand Down Expand Up @@ -827,13 +833,20 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {

// RPC registry
let polyjuice_sender_recover = {
log::info!("[tx from zero] use block producer wallet");
let opt_wallet = match config.block_producer.map(|c| c.wallet_config) {
Some(Some(c)) => {
log::info!("[tx from zero] use block producer wallet");

Some(Wallet::from_config(&c).with_context(|| "polyjuice sender creator wallet")?)
}
_ => {
log::info!("[tx from zero] no wallet config for polyjuice sender creator");

let block_producer_wallet = config
.block_producer
.map(|config| Wallet::from_config(&config.wallet_config).with_context(|| "init wallet"))
.transpose()?;
PolyjuiceSenderRecover::create(generator.rollup_context(), block_producer_wallet)?
None
}
};

PolyjuiceSenderRecover::create(generator.rollup_context(), opt_wallet)?
};
let args = RegistryArgs {
store,
Expand Down Expand Up @@ -1101,20 +1114,20 @@ fn check_locks(
}

// check wallet lock
if zeros == block_producer_config.wallet_config.lock.code_hash {
return Err(anyhow!(
"[block_producer.wallet.lock.code_hash] shouldn't be zero"
));
}
if block_producer_config.wallet_config.lock
== block_producer_config
let opt_wallet_config = block_producer_config.wallet_config.as_ref();
if let Some(block_producer_wallet_lock) = opt_wallet_config.map(|c| &c.lock) {
if zeros == block_producer_wallet_lock.code_hash {
bail!("[block_producer.wallet.lock.code_hash] shouldn't be zero");
}

let challenger_rewards_receiver_lock = &block_producer_config
.challenger_config
.rewards_receiver_lock
{
return Err(anyhow!(
"[block_producer.challenger.rewards_receiver_lock] and [block_producer.wallet.lock] have the same address, which is not recommended"
));
.rewards_receiver_lock;
if block_producer_wallet_lock == challenger_rewards_receiver_lock {
bail!("[block_producer.challenger.rewards_receiver_lock] and [block_producer.wallet.lock] have the same address, which is not recommended");
}
}

Ok(())
}

Expand Down
11 changes: 8 additions & 3 deletions crates/config/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,16 +167,21 @@ pub struct BlockProducerConfig {
pub block_producer: RegistryAddressConfig,
pub rollup_config_cell_dep: CellDep,
pub challenger_config: ChallengerConfig,
pub wallet_config: WalletConfig,
#[serde(default = "default_block_producer_wallet")]
pub wallet_config: Option<WalletConfig>,
#[serde(default = "default_withdrawal_unlocker_wallet")]
pub withdrawal_unlocker_wallet_config: Option<WalletConfig>,
}

fn default_check_mem_block_before_submit() -> bool {
const fn default_check_mem_block_before_submit() -> bool {
false
}

fn default_withdrawal_unlocker_wallet() -> Option<WalletConfig> {
const fn default_withdrawal_unlocker_wallet() -> Option<WalletConfig> {
None
}

const fn default_block_producer_wallet() -> Option<WalletConfig> {
None
}

Expand Down
8 changes: 6 additions & 2 deletions crates/godwoken-bin/src/subcommand/db_block_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ async fn build_validator(config: Config) -> Result<DBBlockCancelChallengeValidat
let base = BaseInitComponents::init(&config, true).await?;
let block_producer_config = config.block_producer.expect("block producer config");

let mut offchain_mock_context = base
let mut offchain_mock_context = match base
.init_offchain_mock_context(&block_producer_config)
.await?;
.await?
{
Some(ctx) => ctx,
None => bail!("no wallet config for block producer"),
};

let validator_config = config.db_block_validator.as_ref();
if let Some(Some(scripts)) = validator_config.map(|c| c.replace_scripts.as_ref()) {
Expand Down
2 changes: 1 addition & 1 deletion crates/tools/src/generate_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub async fn generate_node_config(args: GenerateNodeConfigArgs<'_>) -> Result<Co
// cell deps
rollup_config_cell_dep,
challenger_config,
wallet_config,
wallet_config: Some(wallet_config),
check_mem_block_before_submit: false,
withdrawal_unlocker_wallet_config: None,
});
Expand Down