Skip to content

Commit

Permalink
zk fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
ilitteri committed Dec 15, 2023
1 parent ea3b9a9 commit 8ea17e1
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 16 deletions.
3 changes: 1 addition & 2 deletions core/lib/zksync_core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)]

use std::env;
use std::{net::Ipv4Addr, str::FromStr, sync::Arc, time::Instant};
use std::{env, net::Ipv4Addr, str::FromStr, sync::Arc, time::Instant};

use anyhow::Context as _;
use futures::channel::oneshot;
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/zk/src/hyperchain_wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async function initHyperchain() {
deploy: deployTestTokens,
args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!]
},
validium: false,
validium: false
};

await init(initArgs);
Expand Down Expand Up @@ -801,7 +801,7 @@ async function configDemoHyperchain(cmd: Command) {
deploy: deployTestTokens,
args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!]
},
validium: cmd.validium,
validium: cmd.validium
};

if (!cmd.skipEnvSetup) {
Expand Down
12 changes: 9 additions & 3 deletions infrastructure/zk/src/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ const success = chalk.green;
const timestamp = chalk.grey;

export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
const { skipSubmodulesCheckout, skipEnvSetup, testTokens, governorPrivateKeyArgs, deployerL2ContractInput, validium } =
initArgs;
const {
skipSubmodulesCheckout,
skipEnvSetup,
testTokens,
governorPrivateKeyArgs,
deployerL2ContractInput,
validium
} = initArgs;

if (!process.env.CI && !skipEnvSetup) {
await announced('Pulling images', docker.pull());
Expand Down Expand Up @@ -176,7 +182,7 @@ export const initCommand = new Command('init')
governorPrivateKeyArgs: [],
deployerL2ContractInput: { args: [], includePaymaster: true, includeL2WETH: true },
testTokens: { deploy: true, args: [] },
validium: cmd.validium,
validium: cmd.validium
};
await init(initArgs);
});
Expand Down
18 changes: 9 additions & 9 deletions zksync_full_stack/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use ethers::abi::Abi;
use ethers::providers::Http;
use ethers::utils::parse_units;
use std::str::FromStr;
use zksync_web3_rs::providers::{Middleware, Provider};
use zksync_web3_rs::signers::{LocalWallet, Signer};
use zksync_web3_rs::zks_provider::ZKSProvider;
use zksync_web3_rs::zks_wallet::CallRequest;
use zksync_web3_rs::zks_wallet::{DeployRequest, DepositRequest};
use zksync_web3_rs::ZKSWallet;

use ethers::{abi::Abi, providers::Http, utils::parse_units};
use zksync_web3_rs::{
providers::{Middleware, Provider},
signers::{LocalWallet, Signer},
zks_provider::ZKSProvider,
zks_wallet::{CallRequest, DeployRequest, DepositRequest},
ZKSWallet,
};

static ERA_PROVIDER_URL: &str = "http://127.0.0.1:3050";
static PRIVATE_KEY: &str = "7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110";
Expand Down

0 comments on commit 8ea17e1

Please sign in to comment.