Skip to content

Commit

Permalink
feat: rebase all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
epociask committed Sep 29, 2024
1 parent 56ac723 commit 05b936e
Show file tree
Hide file tree
Showing 13 changed files with 571 additions and 70 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "go-ethereum"]
path = go-ethereum
url = [email protected]:Layr-Labs/nitro-go-ethereum-private.git
branch = eigenda-v3.1.2
branch = eigenda-v3.1.3
[submodule "fastcache"]
path = fastcache
url = https://github.com/OffchainLabs/fastcache.git
Expand All @@ -17,11 +17,11 @@
[submodule "contracts"]
path = contracts
url = https://github.com/Layr-Labs/nitro-contracts.git
branch = eigenda-v3.1.2
branch = eigenda-v3.1.3
[submodule "nitro-testnode"]
path = nitro-testnode
url = https://github.com/Layr-Labs/nitro-testnode.git
branch = eigenda-v3.1.2
branch = eigenda-v3.1.3
[submodule "arbitrator/rust-kzg-bn254"]
path = arbitrator/rust-kzg-bn254
url = https://github.com/Layr-Labs/rust-kzg-bn254.git
Expand Down
4 changes: 2 additions & 2 deletions arbitrator/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 22 additions & 15 deletions arbitrator/jit/src/wavmio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,27 @@ pub fn resolve_preimage_impl(
)
};

// Check if preimage rehashes to the provided hash. Exclude blob preimages
let calculated_hash: [u8; 32] = match preimage_type {
PreimageType::Keccak256 => Keccak256::digest(preimage).into(),
PreimageType::Sha2_256 => Sha256::digest(preimage).into(),
PreimageType::EthVersionedHash => *hash,
PreimageType::EigenDAHash => *hash,
};
if calculated_hash != *hash {
error!(
"Calculated hash {} of preimage {} does not match provided hash {}",
hex::encode(calculated_hash),
hex::encode(preimage),
hex::encode(*hash)
);

#[cfg(debug_assertions)]
{
use sha2::Sha256;
use sha3::{Digest, Keccak256};

// Check if preimage rehashes to the provided hash. Exclude blob preimages
let calculated_hash: [u8; 32] = match preimage_type {
PreimageType::Keccak256 => Keccak256::digest(preimage).into(),
PreimageType::Sha2_256 => Sha256::digest(preimage).into(),
PreimageType::EthVersionedHash => *hash,
PreimageType::EigenDAHash => *hash,
};
if calculated_hash != *hash {
error!(
"Calculated hash {} of preimage {} does not match provided hash {}",
hex::encode(calculated_hash),
hex::encode(preimage),
hex::encode(*hash)
);
}
}

if offset % 32 != 0 {
Expand Down Expand Up @@ -302,4 +309,4 @@ fn ready_hostio(env: &mut WasmEnv) -> MaybeEscape {
env.process.socket = Some((writer, reader));
env.process.forks = false;
Ok(())
}
}
1 change: 1 addition & 0 deletions arbitrator/rust-kzg-bn254
Submodule rust-kzg-bn254 added at 199155
Loading

0 comments on commit 05b936e

Please sign in to comment.