LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove 0x bytecode object prefix for CompilerOutput (#1424) 

* fix: remove 0x bytecode object prefix for CompilerOutput

* chore: rustfmt

* chore(clippy): make clippy happy
This commit is contained in:
Matthias Seitz 2022-06-29 00:17:50 +02:00 committed by GitHub
parent 7c6462be02
commit f6eaa7e551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ethers-solc/src/artifacts/bytecode.rs
View File

@ -6,7 +6,7 @@ use crate::{
utils, utils,
}; };
use ethers_core::{abi::Address, types::Bytes}; use ethers_core::{abi::Address, types::Bytes};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize, Serializer};
use std::collections::BTreeMap; use std::collections::BTreeMap;
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
@ -16,6 +16,7 @@ pub struct Bytecode {
#[serde(default, skip_serializing_if = "::std::collections::BTreeMap::is_empty")] #[serde(default, skip_serializing_if = "::std::collections::BTreeMap::is_empty")]
pub function_debug_data: BTreeMap<String, FunctionDebugData>, pub function_debug_data: BTreeMap<String, FunctionDebugData>,
/// The bytecode as a hex string. /// The bytecode as a hex string.
#[serde(serialize_with = "serialize_bytecode_without_prefix")]
pub object: BytecodeObject, pub object: BytecodeObject,
/// Opcodes list (string) /// Opcodes list (string)
#[serde(default, skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
@ -367,6 +368,25 @@ impl AsRef<[u8]> for BytecodeObject {
} }
} }
/// This will serialize the bytecode data without a `0x` prefix, which the `ethers::types::Bytes`
/// adds by default.
///
/// This ensures that we serialize bytecode data in the same way as solc does, See also <https://github.com/gakonst/ethers-rs/issues/1422>
pub fn serialize_bytecode_without_prefix<S>(
bytecode: &BytecodeObject,
s: S,
) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match bytecode {
BytecodeObject::Bytecode(code) => s.serialize_str(&hex::encode(code)),
BytecodeObject::Unlinked(code) => {
s.serialize_str(code.strip_prefix("0x").unwrap_or(code.as_str()))
}
}
}
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
pub struct DeployedBytecode { pub struct DeployedBytecode {
#[serde(flatten)] #[serde(flatten)]