Commit 31e244c3 authored by Roberto Bayardo's avatar Roberto Bayardo Committed by GitHub

- fix lint issue in Encoding.sol (#12215)

- clarify that 'just update-foundry' needs to be run from the root of the repo in check-foundry
  script. Usually the user will be in contracts-bedrock/src when seeing this message, and the
  justfile there doesn't handle it.
parent 75b0e66d
...@@ -41,5 +41,5 @@ if [ "$INSTALLED_VERSION" = "$EXPECTED_VERSION" ]; then ...@@ -41,5 +41,5 @@ if [ "$INSTALLED_VERSION" = "$EXPECTED_VERSION" ]; then
else else
echo "Mismatch between installed Foundry version ($INSTALLED_VERSION) and expected version ($EXPECTED_VERSION)." echo "Mismatch between installed Foundry version ($INSTALLED_VERSION) and expected version ($EXPECTED_VERSION)."
echo "Your version of Foundry may either not be up to date, or it could be a later version." echo "Your version of Foundry may either not be up to date, or it could be a later version."
echo "Running just update-foundry will install the expected version." echo "Running 'just update-foundry' from the repository root will install the expected version."
fi fi
...@@ -215,29 +215,29 @@ library Encoding { ...@@ -215,29 +215,29 @@ library Encoding {
} }
/// @notice Returns an appropriately encoded call to L1Block.setL1BlockValuesHolocene /// @notice Returns an appropriately encoded call to L1Block.setL1BlockValuesHolocene
/// @param baseFeeScalar L1 base fee Scalar /// @param _baseFeeScalar L1 base fee Scalar
/// @param blobBaseFeeScalar L1 blob base fee Scalar /// @param _blobBaseFeeScalar L1 blob base fee Scalar
/// @param sequenceNumber Number of L2 blocks since epoch start. /// @param _sequenceNumber Number of L2 blocks since epoch start.
/// @param timestamp L1 timestamp. /// @param _timestamp L1 timestamp.
/// @param number L1 blocknumber. /// @param _number L1 blocknumber.
/// @param baseFee L1 base fee. /// @param _baseFee L1 base fee.
/// @param blobBaseFee L1 blob base fee. /// @param _blobBaseFee L1 blob base fee.
/// @param hash L1 blockhash. /// @param _hash L1 blockhash.
/// @param batcherHash Versioned hash to authenticate batcher by. /// @param _batcherHash Versioned hash to authenticate batcher by.
/// @param eip1559Elasticity EIP-1559 elasticity parameter /// @param _eip1559Elasticity EIP-1559 elasticity parameter
/// @param eip1559Denominator EIP-1559 denominator parameter /// @param _eip1559Denominator EIP-1559 denominator parameter
function encodeSetL1BlockValuesHolocene( function encodeSetL1BlockValuesHolocene(
uint32 baseFeeScalar, uint32 _baseFeeScalar,
uint32 blobBaseFeeScalar, uint32 _blobBaseFeeScalar,
uint64 sequenceNumber, uint64 _sequenceNumber,
uint64 timestamp, uint64 _timestamp,
uint64 number, uint64 _number,
uint256 baseFee, uint256 _baseFee,
uint256 blobBaseFee, uint256 _blobBaseFee,
bytes32 hash, bytes32 _hash,
bytes32 batcherHash, bytes32 _batcherHash,
uint64 eip1559Elasticity, uint64 _eip1559Elasticity,
uint64 eip1559Denominator uint64 _eip1559Denominator
) )
internal internal
pure pure
...@@ -246,17 +246,17 @@ library Encoding { ...@@ -246,17 +246,17 @@ library Encoding {
bytes4 functionSignature = bytes4(keccak256("setL1BlockValuesHolocene()")); bytes4 functionSignature = bytes4(keccak256("setL1BlockValuesHolocene()"));
return abi.encodePacked( return abi.encodePacked(
functionSignature, functionSignature,
baseFeeScalar, _baseFeeScalar,
blobBaseFeeScalar, _blobBaseFeeScalar,
sequenceNumber, _sequenceNumber,
timestamp, _timestamp,
number, _number,
baseFee, _baseFee,
blobBaseFee, _blobBaseFee,
hash, _hash,
batcherHash, _batcherHash,
eip1559Elasticity, _eip1559Elasticity,
eip1559Denominator _eip1559Denominator
); );
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment