Skip to content

Commit 0260e15

Browse files
authored
Merge pull request #49 from Gaon3/main
Fixed JumpTable encoding in exex-remote
2 parents 28ca319 + 4b2f8fc commit 0260e15

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

remote/proto/exex.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ message Bytecode {
236236
message LegacyAnalyzedBytecode {
237237
bytes bytecode = 1;
238238
uint64 original_len = 2;
239-
repeated uint32 jump_table = 3;
239+
bytes jump_table = 3;
240+
uint64 jump_table_len = 4;
240241
}
241242

242243
message Eip7702Bytecode {

remote/src/codec.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,13 +351,8 @@ impl TryFrom<&reth::revm::bytecode::Bytecode> for proto::Bytecode {
351351
proto::bytecode::Bytecode::LegacyAnalyzed(proto::LegacyAnalyzedBytecode {
352352
bytecode: legacy_analyzed.bytecode().to_vec(),
353353
original_len: legacy_analyzed.original_len() as u64,
354-
jump_table: legacy_analyzed
355-
.jump_table()
356-
.as_slice()
357-
.iter()
358-
.copied()
359-
.map(|x| x as u32)
360-
.collect(),
354+
jump_table: legacy_analyzed.jump_table().as_slice().iter().copied().collect(),
355+
jump_table_len: legacy_analyzed.jump_table().len() as u64,
361356
})
362357
}
363358
reth::revm::state::Bytecode::Eip7702(eip7702) => {
@@ -870,10 +865,10 @@ impl TryFrom<&proto::Bytecode> for reth::revm::state::Bytecode {
870865
legacy_analyzed
871866
.jump_table
872867
.iter()
873-
.map(|dest| *dest as u8)
868+
.copied()
874869
.collect::<Vec<_>>()
875870
.as_slice(),
876-
legacy_analyzed.jump_table.len(),
871+
legacy_analyzed.jump_table_len as usize,
877872
),
878873
),
879874
)

0 commit comments

Comments
 (0)