Skip to content

Commit 1032e2a

Browse files
committed
Fix
Signed-off-by: Danil <[email protected]>
1 parent 79f324f commit 1032e2a

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

core/lib/eth_client/src/contracts_loader.rs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,25 +186,21 @@ pub async fn get_zk_chain_on_chain_params(
186186
diamond_proxy_addr: Address,
187187
) -> Result<ZkChainOnChainConfig, ContractCallError> {
188188
let abi = getters_facet_contract();
189-
let l2_da_commitment_scheme: Token = CallFunctionArgs::new("getDAValidatorPair", ())
189+
let token: Token = CallFunctionArgs::new("getDAValidatorPair", ())
190190
.for_contract(diamond_proxy_addr, &abi)
191191
.call(eth_client)
192192
.await?;
193-
let l2_da_commitment_scheme =
194-
if let Token::Tuple(l2_da_commitment_scheme) = l2_da_commitment_scheme {
195-
if let [Token::Address(_), Token::Uint(l2_da_commitment_scheme)] =
196-
l2_da_commitment_scheme.as_slice()
197-
{
198-
Some(
199-
L2DACommitmentScheme::try_from(l2_da_commitment_scheme.as_u64() as u8)
200-
.expect("wrong l2_da_commitment_scheme"),
201-
)
202-
} else {
203-
None
204-
}
205-
} else {
206-
None
207-
};
193+
194+
let l2_da_commitment_scheme = match token {
195+
Token::Tuple(tuple) if tuple.len() == 2 => match tuple.as_slice() {
196+
[Token::Address(_), Token::Uint(value)] if *value <= U256::from(u8::MAX) => Some(
197+
L2DACommitmentScheme::try_from(value.as_u64() as u8)
198+
.expect("Wrong L2DACommitmentScheme"),
199+
),
200+
_ => None,
201+
},
202+
_ => None,
203+
};
208204

209205
Ok(ZkChainOnChainConfig {
210206
l2_da_commitment_scheme,

0 commit comments

Comments
 (0)