Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################## update dependencies ####################
ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.1.2
ETHEREUM_TARGET_VERSION := morph-v2.1.2
ETHEREUM_SUBMODULE_COMMIT_OR_TAG := 81fb39343fd1106e6e87ea6aa91a458f7e458e08
ETHEREUM_TARGET_VERSION := v1.10.14-0.20260306065034-81fb39343fd1
TENDERMINT_TARGET_VERSION := v0.3.3


Expand Down Expand Up @@ -87,7 +87,8 @@ fmt-sol:
cd $(PWD)/contracts/ && yarn prettier --write --plugin=prettier-plugin-solidity './contracts/**/*.sol'
.PHONY: fmt-sol

# go get -u github.com/client9/misspell/cmd/misspell
# go install github.com/client9/misspell/cmd/misspell@latest
# go install golang.org/x/tools/cmd/goimports@latest
fmt-go:
go work sync
cd $(PWD)/bindings/ && go mod tidy
Expand Down
2 changes: 1 addition & 1 deletion bindings/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.3

require github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141
require github.com/morph-l2/go-ethereum v1.10.14-0.20260306065034-81fb39343fd1

require (
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions bindings/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ=
github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs=
github.com/morph-l2/go-ethereum v1.10.14-0.20260306065034-81fb39343fd1 h1:9EQk5JoYfGIb/EHiEhSEjzVXHysF93sfIzcjdVAg424=
github.com/morph-l2/go-ethereum v1.10.14-0.20260306065034-81fb39343fd1/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down
2 changes: 1 addition & 1 deletion contracts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ lint: lint-sol lint-go

# npm install --global --save-dev solhint
lint-sol:
find . -name '*.sol' | xargs solhint
find . -name '*.sol' | xargs npx solhint

lint-go:
GOBIN=$(PWD)/build/bin go run ../build/lint.go
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/l1/rollup/Rollup.sol
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ contract Rollup is IRollup, OwnableUpgradeable, PausableUpgradeable {
}
require(rollupDelay || l1MsgQueueDelayed, "invalid timing");

_commitBatchWithBatchData(batchDataInput, batchSignatureInput,0);
_commitBatchWithBatchData(batchDataInput, batchSignatureInput, 0);

// get batch data from batch header
(uint256 memPtr, bytes32 _batchHash) = _loadBatchHeader(_batchHeader);
Expand Down
3 changes: 1 addition & 2 deletions contracts/contracts/l2/system/IL2TokenRegistry.sol
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ interface IL2TokenRegistry {
* @dev priceRatio should follow: priceRatio = tokenScale * (tokenPrice / ethPrice) * 10^(ethDecimals - tokenDecimals)
*/
function updatePriceRatio(uint16 _tokenID, uint256 _newPrice) external;

/**
* @notice Batch update price ratios
* @param _tokenIDs Array of token IDs
Expand Down Expand Up @@ -258,4 +258,3 @@ interface IL2TokenRegistry {
*/
function getSupportedTokenCount() external view returns (uint256);
}

4 changes: 2 additions & 2 deletions contracts/contracts/l2/system/L2TokenRegistry.sol
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ contract L2TokenRegistry is IL2TokenRegistry, OwnableUpgradeable, ReentrancyGuar
} catch {
// If call fails, use default value 18
}

// Register token (isActive defaults to false)
// Note: balanceSlot is stored as actualSlot + 1 if needBalanceSlot is true, otherwise 0
tokenRegistry[_tokenID] = TokenInfo({
Expand Down Expand Up @@ -441,7 +441,7 @@ contract L2TokenRegistry is IL2TokenRegistry, OwnableUpgradeable, ReentrancyGuar
// Using formula: ceil(a/b) = (a + b - 1) / b
uint256 numerator = _ethAmount * uint256(info.scale);
tokenAmount = (numerator + ratio - 1) / ratio;

if (tokenAmount == 0) revert ZeroTokenAmount();

return tokenAmount;
Expand Down
4 changes: 2 additions & 2 deletions contracts/contracts/lido/L1LidoGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ contract L1LidoGateway is L1ERC20Gateway, LidoBridgeableTokens, LidoGatewayManag
/// @param _l1Token The address of the bridged token in the L1 chain
/// @param _l2Token The address of the token minted on the L2 chain when token bridged
constructor(address _l1Token, address _l2Token) LidoBridgeableTokens(_l1Token, _l2Token) {
if (_l1Token == address(0) || _l2Token ==address(0)){
revert ErrorZeroAddress();
if (_l1Token == address(0) || _l2Token == address(0)) {
revert ErrorZeroAddress();
}

_disableInitializers();
Expand Down
4 changes: 2 additions & 2 deletions contracts/contracts/lido/L2LidoGateway.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ contract L2LidoGateway is L2ERC20Gateway, LidoBridgeableTokens, LidoGatewayManag
/// @param _l1Token The address of the bridged token in the L1 chain
/// @param _l2Token The address of the token minted on the L2 chain when token bridged
constructor(address _l1Token, address _l2Token) LidoBridgeableTokens(_l1Token, _l2Token) {
if (_l1Token == address(0) || _l2Token ==address(0)){
revert ErrorZeroAddress();
if (_l1Token == address(0) || _l2Token == address(0)) {
revert ErrorZeroAddress();
}

_disableInitializers();
Expand Down
8 changes: 4 additions & 4 deletions contracts/contracts/lido/L2WstETHToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ contract L2WstETHToken is MorphStandardERC20 {
/**********
* Errors *
**********/

/// @dev Thrown when the deadline is expired.
error ErrorExpiredDeadline();

/// @dev Thrown when the given signature is invalid.
error ErrorInvalidSignature();

/*************
* Constants *
*************/
Expand Down Expand Up @@ -53,7 +53,7 @@ contract L2WstETHToken is MorphStandardERC20 {

bytes32 hash = _hashTypedDataV4(structHash);

if (!SignatureCheckerUpgradeable.isValidSignatureNow(owner, hash, abi.encodePacked(r, s, v))){
if (!SignatureCheckerUpgradeable.isValidSignatureNow(owner, hash, abi.encodePacked(r, s, v))) {
revert ErrorInvalidSignature();
}

Expand Down
Loading
Loading