cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

pr feedback and bugfixes

Browse Source
This commit is contained in:
realbigsean 2023-02-07 08:36:35 -05:00
parent e5896d9b71
commit 3533ed418e
No known key found for this signature in database
GPG Key ID: BE1B3DB104F6C788
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_node/execution_layer/src/lib.rs
View File

@ -1949,7 +1949,7 @@ pub enum BlobTxConversionError {
AccessListMissing, AccessListMissing,
/// Missing the `max_fee_per_data_gas` field. /// Missing the `max_fee_per_data_gas` field.
MaxFeePerDataGasMissing, MaxFeePerDataGasMissing,
/// Missing the `max_data_gas` field. /// Missing the `blob_versioned_hashes` field.
BlobVersionedHashesMissing, BlobVersionedHashesMissing,
/// There was an error converting the transaction to SSZ. /// There was an error converting the transaction to SSZ.
SszError(ssz_types::Error), SszError(ssz_types::Error),
@ -2019,7 +2019,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
)?; )?;
let max_fee_per_data_gas = transaction let max_fee_per_data_gas = transaction
.other .other
.get("max_fee_per_data_gas") .get("maxFeePerDataGas")
.ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)? .ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)?
.as_str() .as_str()
.ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)? .ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)?
@ -2028,7 +2028,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
let blob_versioned_hashes = serde_json::from_str( let blob_versioned_hashes = serde_json::from_str(
transaction transaction
.other .other
.get("blob_versioned_hashes") .get("blobVersionedHashes")
.ok_or(BlobTxConversionError::BlobVersionedHashesMissing)? .ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?
.as_str() .as_str()
.ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?, .ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?,
@ -2045,7 +2045,8 @@ fn ethers_tx_to_bytes<T: EthSpec>(
access_list, access_list,
max_fee_per_data_gas, max_fee_per_data_gas,
blob_versioned_hashes, blob_versioned_hashes,
}.as_ssz_bytes() }
.as_ssz_bytes()
} else { } else {
transaction.rlp().to_vec() transaction.rlp().to_vec()
}; };

7
consensus/types/src/transaction.rs
View File

@ -29,10 +29,3 @@ pub struct AccessTuple {
pub address: Address, pub address: Address,
pub storage_keys: VariableList<Hash256, MaxAccessListStorageKeys>, pub storage_keys: VariableList<Hash256, MaxAccessListStorageKeys>,
} }
#[derive(Debug, Clone, PartialEq, Encode, Decode)]
pub struct EcdsaSignature {
y_parity: bool,
r: Uint256,
s: Uint256,
}