Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add seignorage receiver in SystemConfig #318

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
lint fix
  • Loading branch information
theo-learner committed Jan 21, 2025
commit fdd549d3cc8c02a632718706e9f4606224216fbf
1 change: 0 additions & 1 deletion packages/tokamak/contracts-bedrock/scripts/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,6 @@ contract Deploy is Deployer {
address seigniorageReceiver = cfg.seigniorageReceiver();
console.log(" [Check ]seigniorageReceiver", seigniorageReceiver);


_upgradeAndCallViaSafe({
_proxy: payable(systemConfigProxy),
_implementation: systemConfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,7 @@ contract OptimismPortal2 is Initializable, ResourceMetering, OnApprove, ISemver
require(_data.length <= 120_000, "OptimismPortal: data too large");

// Transform the from-address to its alias if the caller is a contract.
address from =
((_sender != tx.origin)) ? AddressAliasHelper.applyL1ToL2Alias(_sender) : _sender;
address from = ((_sender != tx.origin)) ? AddressAliasHelper.applyL1ToL2Alias(_sender) : _sender;

// Compute the opaque data that will be emitted as part of the TransactionDeposited event.
// We use opaque data so that we can update the TransactionDeposited event in the future
Expand Down
3 changes: 2 additions & 1 deletion packages/tokamak/contracts-bedrock/src/L1/SystemConfig.sol
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
bytes32(uint256(keccak256("systemconfig.nativetokenaddress")) - 1);

// @notice Storage slot that the seigniorage receiver address is stored at.
bytes32 public constant SEIGNIORAGE_RECEIVER_SLOT = bytes32(uint256(keccak256("systemconfig.seignioragereceiver")) - 1);
bytes32 public constant SEIGNIORAGE_RECEIVER_SLOT =
bytes32(uint256(keccak256("systemconfig.seignioragereceiver")) - 1);

/// @notice Storage slot for the DisputeGameFactory address.
bytes32 public constant DISPUTE_GAME_FACTORY_SLOT =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
/// L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
/// level message passing contracts.
contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {

/// @custom:semver 2.1.0
string public constant version = "2.1.0";

Expand Down
Loading