From a57d6fd0424c582b0e741445ac3227ba1ae6e9bc Mon Sep 17 00:00:00 2001 From: seolaoh Date: Thu, 12 Dec 2024 17:30:43 +0900 Subject: [PATCH] feat: adjust PR reviews --- kroma-bindings/bindings/gaspriceoracle.go | 66 +++++++------- .../bindings/gaspriceoracle_more.go | 3 +- .../derive/kromampt_upgrade_transactions.go | 3 +- packages/contracts/.gas-snapshot | 12 +-- .../contracts/contracts/L2/GasPriceOracle.sol | 18 ++-- .../contracts/contracts/test/Encoding.t.sol | 8 +- packages/contracts/src/constants.ts | 6 +- packages/contracts/tasks/check-l2.ts | 86 +++++++++++++++++-- 8 files changed, 136 insertions(+), 66 deletions(-) diff --git a/kroma-bindings/bindings/gaspriceoracle.go b/kroma-bindings/bindings/gaspriceoracle.go index bedf4c579f..7d567610b8 100644 --- a/kroma-bindings/bindings/gaspriceoracle.go +++ b/kroma-bindings/bindings/gaspriceoracle.go @@ -31,8 +31,8 @@ var ( // GasPriceOracleMetaData contains all meta data concerning the GasPriceOracle contract. var GasPriceOracleMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"function\",\"name\":\"DECIMALS\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"baseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"baseFeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobBaseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobBaseFeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"decimals\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"gasPrice\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getKromaMPT\",\"inputs\":[],\"outputs\":[{\"name\":\"isKromaMPT\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getL1Fee\",\"inputs\":[{\"name\":\"_data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getL1GasUsed\",\"inputs\":[{\"name\":\"_data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"isEcotone\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1BaseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setEcotone\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setKromaMPT\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"}]", - Bin: "0x608060405234801561001057600080fd5b5061146e806100206000396000f3fe608060405234801561001057600080fd5b506004361061011b5760003560e01c806354fd4d50116100b2578063c598591811610081578063f45e65d811610066578063f45e65d81461023e578063f820614014610246578063fe173b971461021557600080fd5b8063c598591814610223578063de26c4a11461022b57600080fd5b806354fd4d50146101af57806368d5dca6146101f85780636ef25c3a146102155780638cca67621461021b57600080fd5b80634621e226116100ee5780634621e2261461015457806349948e0e146101875780634ef6e2241461019a578063519b4bd3146101a757600080fd5b80630c18c1621461012057806322b90ab31461013b5780632e0f262514610145578063313ce5671461014d575b600080fd5b61012861024e565b6040519081526020015b60405180910390f35b61014361036f565b005b610128600681565b6006610128565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c545b6040519015158152602001610132565b61012861019536600461102c565b610592565b6000546101779060ff1681565b6101286105b6565b6101eb6040518060400160405280600581526020017f312e312e3000000000000000000000000000000000000000000000000000000081525081565b60405161013291906110fb565b6102006106a3565b60405163ffffffff9091168152602001610132565b48610128565b6101436107b4565b6102006109ec565b61012861023936600461102c565b610ad9565b610128610b8d565b610128610c80565b6000805460ff16156102e7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a206f76657268656164282920697320646560448201527f707265636174656400000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a919061116e565b905090565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f29190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104d2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e2073657420697345636f746f6e6520666c6160648201527f6700000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b60005460ff1615610565576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a2045636f746f6e6520616c72656164792060448201527f616374697665000000000000000000000000000000000000000000000000000060648201526084016102de565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000805460ff16156105ad576105a782610d6d565b92915050565b6105a782610e11565b60006105e07f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156106445773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b60006106cd7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156107555773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a91906111bd565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa158015610813573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108379190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610917576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e207365742069734b726f6d614d505420666c60648201527f6167000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54156109c6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a204b726f6d61204d505420616c7265616460448201527f792061637469766500000000000000000000000000000000000000000000000060648201526084016102de565b60017f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c55565b6000610a167f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610a7a5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b600080610ae583610f6d565b60005490915060ff1615610af95792915050565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b7c919061116e565b610b869082611212565b9392505050565b6000805460ff1615610c21576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a207363616c61722829206973206465707260448201527f656361746564000000000000000000000000000000000000000000000000000060648201526084016102de565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b6000610caa7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610d0e5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b600080610d7983610f6d565b90506000610d856105b6565b610d8d6109ec565b610d9890601061122a565b63ffffffff16610da89190611256565b90506000610db4610c80565b610dbc6106a3565b63ffffffff16610dcc9190611256565b90506000610dda8284611212565b610de49085611256565b9050610df26006600a6113b3565b610dfd906010611256565b610e0790826113bf565b9695505050505050565b600080610e1d83610f6d565b9050600073420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e80573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea4919061116e565b610eac6105b6565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f2f919061116e565b610f399085611212565b610f439190611256565b610f4d9190611256565b9050610f5b6006600a6113b3565b610f6590826113bf565b949350505050565b80516000908190815b81811015610ff057848181518110610f9057610f906113fa565b01602001517fff0000000000000000000000000000000000000000000000000000000000000016600003610fd057610fc9600484611212565b9250610fde565b610fdb601084611212565b92505b80610fe881611429565b915050610f76565b50610f6582610440611212565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60006020828403121561103e57600080fd5b813567ffffffffffffffff8082111561105657600080fd5b818401915084601f83011261106a57600080fd5b81358181111561107c5761107c610ffd565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156110c2576110c2610ffd565b816040528281528760208487010111156110db57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156111285785810183015185820160400152820161110c565b8181111561113a576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561118057600080fd5b5051919050565b60006020828403121561119957600080fd5b815173ffffffffffffffffffffffffffffffffffffffff81168114610b8657600080fd5b6000602082840312156111cf57600080fd5b815163ffffffff81168114610b8657600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115611225576112256111e3565b500190565b600063ffffffff8083168185168183048111821515161561124d5761124d6111e3565b02949350505050565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048311821515161561128e5761128e6111e3565b500290565b600181815b808511156112ec57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156112d2576112d26111e3565b808516156112df57918102915b93841c9390800290611298565b509250929050565b600082611303575060016105a7565b81611310575060006105a7565b816001811461132657600281146113305761134c565b60019150506105a7565b60ff841115611341576113416111e3565b50506001821b6105a7565b5060208310610133831016604e8410600b841016171561136f575081810a6105a7565b6113798383611293565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156113ab576113ab6111e3565b029392505050565b6000610b8683836112f4565b6000826113f5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361145a5761145a6111e3565b506001019056fea164736f6c634300080f000a", + ABI: "[{\"type\":\"function\",\"name\":\"DECIMALS\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"baseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"baseFeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobBaseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobBaseFeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"decimals\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"gasPrice\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getL1Fee\",\"inputs\":[{\"name\":\"_data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getL1GasUsed\",\"inputs\":[{\"name\":\"_data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"isEcotone\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"isKromaMPT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1BaseFee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setEcotone\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setKromaMPT\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"}]", + Bin: "0x608060405234801561001057600080fd5b50611472806100206000396000f3fe608060405234801561001057600080fd5b506004361061011b5760003560e01c806368d5dca6116100b2578063c598591811610081578063f45e65d811610066578063f45e65d814610242578063f82061401461024a578063fe173b97146101f257600080fd5b8063c598591814610227578063de26c4a11461022f57600080fd5b806368d5dca6146101d55780636ef25c3a146101f25780638cca6762146101f8578063a566e1a51461020057600080fd5b806349948e0e116100ee57806349948e0e146101545780634ef6e22414610167578063519b4bd31461018457806354fd4d501461018c57600080fd5b80630c18c1621461012057806322b90ab31461013b5780632e0f262514610145578063313ce5671461014d575b600080fd5b610128610252565b6040519081526020015b60405180910390f35b610143610373565b005b610128600681565b6006610128565b610128610162366004611030565b610596565b6000546101749060ff1681565b6040519015158152602001610132565b6101286105ba565b6101c86040518060400160405280600581526020017f312e312e3000000000000000000000000000000000000000000000000000000081525081565b60405161013291906110ff565b6101dd6106a7565b60405163ffffffff9091168152602001610132565b48610128565b6101436107b8565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54610174565b6101dd6109f0565b61012861023d366004611030565b610add565b610128610b91565b610128610c84565b6000805460ff16156102eb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a206f76657268656164282920697320646560448201527f707265636174656400000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036e9190611172565b905090565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f6919061118b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104d6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e2073657420697345636f746f6e6520666c6160648201527f6700000000000000000000000000000000000000000000000000000000000000608482015260a4016102e2565b60005460ff1615610569576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a2045636f746f6e6520616c72656164792060448201527f616374697665000000000000000000000000000000000000000000000000000060648201526084016102e2565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000805460ff16156105b1576105ab82610d71565b92915050565b6105ab82610e15565b60006105e47f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156106485773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b60006106d17f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156107595773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036e91906111c1565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa158015610817573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061083b919061118b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461091b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e207365742069734b726f6d614d505420666c60648201527f6167000000000000000000000000000000000000000000000000000000000000608482015260a4016102e2565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54156109ca576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a204b726f6d61204d505420616c7265616460448201527f792061637469766500000000000000000000000000000000000000000000000060648201526084016102e2565b60017f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c55565b6000610a1a7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610a7e5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b600080610ae983610f71565b60005490915060ff1615610afd5792915050565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b809190611172565b610b8a9082611216565b9392505050565b6000805460ff1615610c25576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a207363616c61722829206973206465707260448201527f656361746564000000000000000000000000000000000000000000000000000060648201526084016102e2565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b6000610cae7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610d125773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b600080610d7d83610f71565b90506000610d896105ba565b610d916109f0565b610d9c90601061122e565b63ffffffff16610dac919061125a565b90506000610db8610c84565b610dc06106a7565b63ffffffff16610dd0919061125a565b90506000610dde8284611216565b610de8908561125a565b9050610df66006600a6113b7565b610e0190601061125a565b610e0b90826113c3565b9695505050505050565b600080610e2183610f71565b9050600073420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea89190611172565b610eb06105ba565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f339190611172565b610f3d9085611216565b610f47919061125a565b610f51919061125a565b9050610f5f6006600a6113b7565b610f6990826113c3565b949350505050565b80516000908190815b81811015610ff457848181518110610f9457610f946113fe565b01602001517fff0000000000000000000000000000000000000000000000000000000000000016600003610fd457610fcd600484611216565b9250610fe2565b610fdf601084611216565b92505b80610fec8161142d565b915050610f7a565b50610f6982610440611216565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60006020828403121561104257600080fd5b813567ffffffffffffffff8082111561105a57600080fd5b818401915084601f83011261106e57600080fd5b81358181111561108057611080611001565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156110c6576110c6611001565b816040528281528760208487010111156110df57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b8181101561112c57858101830151858201604001528201611110565b8181111561113e576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561118457600080fd5b5051919050565b60006020828403121561119d57600080fd5b815173ffffffffffffffffffffffffffffffffffffffff81168114610b8a57600080fd5b6000602082840312156111d357600080fd5b815163ffffffff81168114610b8a57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115611229576112296111e7565b500190565b600063ffffffff80831681851681830481118215151615611251576112516111e7565b02949350505050565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615611292576112926111e7565b500290565b600181815b808511156112f057817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156112d6576112d66111e7565b808516156112e357918102915b93841c939080029061129c565b509250929050565b600082611307575060016105ab565b81611314575060006105ab565b816001811461132a576002811461133457611350565b60019150506105ab565b60ff841115611345576113456111e7565b50506001821b6105ab565b5060208310610133831016604e8410600b8410161715611373575081810a6105ab565b61137d8383611297565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156113af576113af6111e7565b029392505050565b6000610b8a83836112f8565b6000826113f9577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361145e5761145e6111e7565b506001019056fea164736f6c634300080f000a", } // GasPriceOracleABI is the input ABI used to generate the binding from. @@ -419,37 +419,6 @@ func (_GasPriceOracle *GasPriceOracleCallerSession) GasPrice() (*big.Int, error) return _GasPriceOracle.Contract.GasPrice(&_GasPriceOracle.CallOpts) } -// GetKromaMPT is a free data retrieval call binding the contract method 0x4621e226. -// -// Solidity: function getKromaMPT() view returns(bool isKromaMPT) -func (_GasPriceOracle *GasPriceOracleCaller) GetKromaMPT(opts *bind.CallOpts) (bool, error) { - var out []interface{} - err := _GasPriceOracle.contract.Call(opts, &out, "getKromaMPT") - - if err != nil { - return *new(bool), err - } - - out0 := *abi.ConvertType(out[0], new(bool)).(*bool) - - return out0, err - -} - -// GetKromaMPT is a free data retrieval call binding the contract method 0x4621e226. -// -// Solidity: function getKromaMPT() view returns(bool isKromaMPT) -func (_GasPriceOracle *GasPriceOracleSession) GetKromaMPT() (bool, error) { - return _GasPriceOracle.Contract.GetKromaMPT(&_GasPriceOracle.CallOpts) -} - -// GetKromaMPT is a free data retrieval call binding the contract method 0x4621e226. -// -// Solidity: function getKromaMPT() view returns(bool isKromaMPT) -func (_GasPriceOracle *GasPriceOracleCallerSession) GetKromaMPT() (bool, error) { - return _GasPriceOracle.Contract.GetKromaMPT(&_GasPriceOracle.CallOpts) -} - // GetL1Fee is a free data retrieval call binding the contract method 0x49948e0e. // // Solidity: function getL1Fee(bytes _data) view returns(uint256) @@ -543,6 +512,37 @@ func (_GasPriceOracle *GasPriceOracleCallerSession) IsEcotone() (bool, error) { return _GasPriceOracle.Contract.IsEcotone(&_GasPriceOracle.CallOpts) } +// IsKromaMPT is a free data retrieval call binding the contract method 0xa566e1a5. +// +// Solidity: function isKromaMPT() view returns(bool) +func (_GasPriceOracle *GasPriceOracleCaller) IsKromaMPT(opts *bind.CallOpts) (bool, error) { + var out []interface{} + err := _GasPriceOracle.contract.Call(opts, &out, "isKromaMPT") + + if err != nil { + return *new(bool), err + } + + out0 := *abi.ConvertType(out[0], new(bool)).(*bool) + + return out0, err + +} + +// IsKromaMPT is a free data retrieval call binding the contract method 0xa566e1a5. +// +// Solidity: function isKromaMPT() view returns(bool) +func (_GasPriceOracle *GasPriceOracleSession) IsKromaMPT() (bool, error) { + return _GasPriceOracle.Contract.IsKromaMPT(&_GasPriceOracle.CallOpts) +} + +// IsKromaMPT is a free data retrieval call binding the contract method 0xa566e1a5. +// +// Solidity: function isKromaMPT() view returns(bool) +func (_GasPriceOracle *GasPriceOracleCallerSession) IsKromaMPT() (bool, error) { + return _GasPriceOracle.Contract.IsKromaMPT(&_GasPriceOracle.CallOpts) +} + // L1BaseFee is a free data retrieval call binding the contract method 0x519b4bd3. // // Solidity: function l1BaseFee() view returns(uint256) diff --git a/kroma-bindings/bindings/gaspriceoracle_more.go b/kroma-bindings/bindings/gaspriceoracle_more.go index 43a8ae44e3..c93dc485ec 100644 --- a/kroma-bindings/bindings/gaspriceoracle_more.go +++ b/kroma-bindings/bindings/gaspriceoracle_more.go @@ -13,7 +13,8 @@ const GasPriceOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contrac var GasPriceOracleStorageLayout = new(solc.StorageLayout) -var GasPriceOracleDeployedBin = "0x608060405234801561001057600080fd5b506004361061011b5760003560e01c806354fd4d50116100b2578063c598591811610081578063f45e65d811610066578063f45e65d81461023e578063f820614014610246578063fe173b971461021557600080fd5b8063c598591814610223578063de26c4a11461022b57600080fd5b806354fd4d50146101af57806368d5dca6146101f85780636ef25c3a146102155780638cca67621461021b57600080fd5b80634621e226116100ee5780634621e2261461015457806349948e0e146101875780634ef6e2241461019a578063519b4bd3146101a757600080fd5b80630c18c1621461012057806322b90ab31461013b5780632e0f262514610145578063313ce5671461014d575b600080fd5b61012861024e565b6040519081526020015b60405180910390f35b61014361036f565b005b610128600681565b6006610128565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c545b6040519015158152602001610132565b61012861019536600461102c565b610592565b6000546101779060ff1681565b6101286105b6565b6101eb6040518060400160405280600581526020017f312e312e3000000000000000000000000000000000000000000000000000000081525081565b60405161013291906110fb565b6102006106a3565b60405163ffffffff9091168152602001610132565b48610128565b6101436107b4565b6102006109ec565b61012861023936600461102c565b610ad9565b610128610b8d565b610128610c80565b6000805460ff16156102e7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a206f76657268656164282920697320646560448201527f707265636174656400000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a919061116e565b905090565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f29190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104d2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e2073657420697345636f746f6e6520666c6160648201527f6700000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b60005460ff1615610565576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a2045636f746f6e6520616c72656164792060448201527f616374697665000000000000000000000000000000000000000000000000000060648201526084016102de565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000805460ff16156105ad576105a782610d6d565b92915050565b6105a782610e11565b60006105e07f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156106445773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b60006106cd7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156107555773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a91906111bd565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa158015610813573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108379190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610917576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e207365742069734b726f6d614d505420666c60648201527f6167000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54156109c6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a204b726f6d61204d505420616c7265616460448201527f792061637469766500000000000000000000000000000000000000000000000060648201526084016102de565b60017f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c55565b6000610a167f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610a7a5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b600080610ae583610f6d565b60005490915060ff1615610af95792915050565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b7c919061116e565b610b869082611212565b9392505050565b6000805460ff1615610c21576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a207363616c61722829206973206465707260448201527f656361746564000000000000000000000000000000000000000000000000000060648201526084016102de565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b6000610caa7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610d0e5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b600080610d7983610f6d565b90506000610d856105b6565b610d8d6109ec565b610d9890601061122a565b63ffffffff16610da89190611256565b90506000610db4610c80565b610dbc6106a3565b63ffffffff16610dcc9190611256565b90506000610dda8284611212565b610de49085611256565b9050610df26006600a6113b3565b610dfd906010611256565b610e0790826113bf565b9695505050505050565b600080610e1d83610f6d565b9050600073420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e80573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea4919061116e565b610eac6105b6565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f2f919061116e565b610f399085611212565b610f439190611256565b610f4d9190611256565b9050610f5b6006600a6113b3565b610f6590826113bf565b949350505050565b80516000908190815b81811015610ff057848181518110610f9057610f906113fa565b01602001517fff0000000000000000000000000000000000000000000000000000000000000016600003610fd057610fc9600484611212565b9250610fde565b610fdb601084611212565b92505b80610fe881611429565b915050610f76565b50610f6582610440611212565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60006020828403121561103e57600080fd5b813567ffffffffffffffff8082111561105657600080fd5b818401915084601f83011261106a57600080fd5b81358181111561107c5761107c610ffd565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156110c2576110c2610ffd565b816040528281528760208487010111156110db57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156111285785810183015185820160400152820161110c565b8181111561113a576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561118057600080fd5b5051919050565b60006020828403121561119957600080fd5b815173ffffffffffffffffffffffffffffffffffffffff81168114610b8657600080fd5b6000602082840312156111cf57600080fd5b815163ffffffff81168114610b8657600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115611225576112256111e3565b500190565b600063ffffffff8083168185168183048111821515161561124d5761124d6111e3565b02949350505050565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048311821515161561128e5761128e6111e3565b500290565b600181815b808511156112ec57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156112d2576112d26111e3565b808516156112df57918102915b93841c9390800290611298565b509250929050565b600082611303575060016105a7565b81611310575060006105a7565b816001811461132657600281146113305761134c565b60019150506105a7565b60ff841115611341576113416111e3565b50506001821b6105a7565b5060208310610133831016604e8410600b841016171561136f575081810a6105a7565b6113798383611293565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156113ab576113ab6111e3565b029392505050565b6000610b8683836112f4565b6000826113f5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361145a5761145a6111e3565b506001019056fea164736f6c634300080f000a" +var GasPriceOracleDeployedBin = "0x608060405234801561001057600080fd5b506004361061011b5760003560e01c806368d5dca6116100b2578063c598591811610081578063f45e65d811610066578063f45e65d814610242578063f82061401461024a578063fe173b97146101f257600080fd5b8063c598591814610227578063de26c4a11461022f57600080fd5b806368d5dca6146101d55780636ef25c3a146101f25780638cca6762146101f8578063a566e1a51461020057600080fd5b806349948e0e116100ee57806349948e0e146101545780634ef6e22414610167578063519b4bd31461018457806354fd4d501461018c57600080fd5b80630c18c1621461012057806322b90ab31461013b5780632e0f262514610145578063313ce5671461014d575b600080fd5b610128610252565b6040519081526020015b60405180910390f35b610143610373565b005b610128600681565b6006610128565b610128610162366004611030565b610596565b6000546101749060ff1681565b6040519015158152602001610132565b6101286105ba565b6101c86040518060400160405280600581526020017f312e312e3000000000000000000000000000000000000000000000000000000081525081565b60405161013291906110ff565b6101dd6106a7565b60405163ffffffff9091168152602001610132565b48610128565b6101436107b8565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54610174565b6101dd6109f0565b61012861023d366004611030565b610add565b610128610b91565b610128610c84565b6000805460ff16156102eb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a206f76657268656164282920697320646560448201527f707265636174656400000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036e9190611172565b905090565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103d2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f6919061118b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104d6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e2073657420697345636f746f6e6520666c6160648201527f6700000000000000000000000000000000000000000000000000000000000000608482015260a4016102e2565b60005460ff1615610569576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a2045636f746f6e6520616c72656164792060448201527f616374697665000000000000000000000000000000000000000000000000000060648201526084016102e2565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000805460ff16156105b1576105ab82610d71565b92915050565b6105ab82610e15565b60006105e47f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156106485773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b60006106d17f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156107595773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036e91906111c1565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa158015610817573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061083b919061118b565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461091b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e207365742069734b726f6d614d505420666c60648201527f6167000000000000000000000000000000000000000000000000000000000000608482015260a4016102e2565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54156109ca576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a204b726f6d61204d505420616c7265616460448201527f792061637469766500000000000000000000000000000000000000000000000060648201526084016102e2565b60017f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c55565b6000610a1a7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610a7e5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610735573d6000803e3d6000fd5b600080610ae983610f71565b60005490915060ff1615610afd5792915050565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b809190611172565b610b8a9082611216565b9392505050565b6000805460ff1615610c25576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a207363616c61722829206973206465707260448201527f656361746564000000000000000000000000000000000000000000000000000060648201526084016102e2565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b6000610cae7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610d125773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa15801561034a573d6000803e3d6000fd5b600080610d7d83610f71565b90506000610d896105ba565b610d916109f0565b610d9c90601061122e565b63ffffffff16610dac919061125a565b90506000610db8610c84565b610dc06106a7565b63ffffffff16610dd0919061125a565b90506000610dde8284611216565b610de8908561125a565b9050610df66006600a6113b7565b610e0190601061125a565b610e0b90826113c3565b9695505050505050565b600080610e2183610f71565b9050600073420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea89190611172565b610eb06105ba565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f339190611172565b610f3d9085611216565b610f47919061125a565b610f51919061125a565b9050610f5f6006600a6113b7565b610f6990826113c3565b949350505050565b80516000908190815b81811015610ff457848181518110610f9457610f946113fe565b01602001517fff0000000000000000000000000000000000000000000000000000000000000016600003610fd457610fcd600484611216565b9250610fe2565b610fdf601084611216565b92505b80610fec8161142d565b915050610f7a565b50610f6982610440611216565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60006020828403121561104257600080fd5b813567ffffffffffffffff8082111561105a57600080fd5b818401915084601f83011261106e57600080fd5b81358181111561108057611080611001565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156110c6576110c6611001565b816040528281528760208487010111156110df57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b8181101561112c57858101830151858201604001528201611110565b8181111561113e576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561118457600080fd5b5051919050565b60006020828403121561119d57600080fd5b815173ffffffffffffffffffffffffffffffffffffffff81168114610b8a57600080fd5b6000602082840312156111d357600080fd5b815163ffffffff81168114610b8a57600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115611229576112296111e7565b500190565b600063ffffffff80831681851681830481118215151615611251576112516111e7565b02949350505050565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615611292576112926111e7565b500290565b600181815b808511156112f057817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156112d6576112d66111e7565b808516156112e357918102915b93841c939080029061129c565b509250929050565b600082611307575060016105ab565b81611314575060006105ab565b816001811461132a576002811461133457611350565b60019150506105ab565b60ff841115611345576113456111e7565b50506001821b6105ab565b5060208310610133831016604e8410600b8410161715611373575081810a6105ab565b61137d8383611297565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156113af576113af6111e7565b029392505050565b6000610b8a83836112f8565b6000826113f9577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361145e5761145e6111e7565b506001019056fea164736f6c634300080f000a" + func init() { if err := json.Unmarshal([]byte(GasPriceOracleStorageLayoutJSON), GasPriceOracleStorageLayout); err != nil { diff --git a/op-node/rollup/derive/kromampt_upgrade_transactions.go b/op-node/rollup/derive/kromampt_upgrade_transactions.go index a6582b488b..8a4ecca9e3 100644 --- a/op-node/rollup/derive/kromampt_upgrade_transactions.go +++ b/op-node/rollup/derive/kromampt_upgrade_transactions.go @@ -9,7 +9,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/kroma-network/kroma/kroma-bindings/bindings" "github.com/kroma-network/kroma/kroma-bindings/predeploys" ) @@ -46,7 +45,7 @@ var ( sequencerFeeVaultDeploymentBytecode = common.FromHex("0x60c060405234801561001057600080fd5b5060405161081638038061081683398101604081905261002f91610045565b60006080526001600160a01b031660a052610075565b60006020828403121561005757600080fd5b81516001600160a01b038116811461006e57600080fd5b9392505050565b60805160a0516107536100c3600039600081816087015281816101c5015281816102db015281816103550152818161041501526105b401526000818161018b01526104bc01526107536000f3fe6080604052600436106100695760003560e01c80636ed39f62116100435780636ed39f621461014057806384411d6514610155578063d3e5792b1461017957600080fd5b80630d9019e1146100755780633ccfd60b146100d357806354fd4d50146100ea57600080fd5b3661007057005b600080fd5b34801561008157600080fd5b506100a97f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b3480156100df57600080fd5b506100e86101ad565b005b3480156100f657600080fd5b506101336040518060400160405280600581526020017f312e302e3100000000000000000000000000000000000000000000000000000081525081565b6040516100ca91906106a9565b34801561014c57600080fd5b506100e861033d565b34801561016157600080fd5b5061016b60005481565b6040519081526020016100ca565b34801561018557600080fd5b5061016b7f000000000000000000000000000000000000000000000000000000000000000081565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610277576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c00000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b60006102816104b8565b604080516020810182526000815290517fe11013dd0000000000000000000000000000000000000000000000000000000081529192507342000000000000000000000000000000000000099163e11013dd918491610308917f0000000000000000000000000000000000000000000000000000000000000000916188b891906004016106c3565b6000604051808303818588803b15801561032157600080fd5b505af1158015610335573d6000803e3d6000fd5b505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610402576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c000000000000000000000000000000000000000000000000000000606482015260840161026e565b600061040c6104b8565b9050600061044b7f00000000000000000000000000000000000000000000000000000000000000005a8460405180602001604052806000815250610624565b9050806104b4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f4665655661756c743a20455448207472616e73666572206661696c6564000000604482015260640161026e565b5050565b60007f0000000000000000000000000000000000000000000000000000000000000000471015610590576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e7400000000000000000000000000000000000000000000608482015260a40161026e565b6000479050806000808282546105a69190610707565b9091555050604080518281527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166020820152338183015290517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1919050565b600080600080845160208601878a8af19695505050505050565b6000815180845260005b8181101561066457602081850181015186830182015201610648565b81811115610676576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006106bc602083018461063e565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff8416815263ffffffff831660208201526060604082015260006106fe606083018461063e565b95945050505050565b60008219821115610741577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b50019056fea164736f6c634300080f000a") baseFeeVaultDeploymentBytecode = common.FromHex("0x60c060405234801561001057600080fd5b5060405161081638038061081683398101604081905261002f91610045565b60006080526001600160a01b031660a052610075565b60006020828403121561005757600080fd5b81516001600160a01b038116811461006e57600080fd5b9392505050565b60805160a0516107536100c3600039600081816087015281816101c5015281816102db015281816103550152818161041501526105b401526000818161018b01526104bc01526107536000f3fe6080604052600436106100695760003560e01c80636ed39f62116100435780636ed39f621461014057806384411d6514610155578063d3e5792b1461017957600080fd5b80630d9019e1146100755780633ccfd60b146100d357806354fd4d50146100ea57600080fd5b3661007057005b600080fd5b34801561008157600080fd5b506100a97f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b3480156100df57600080fd5b506100e86101ad565b005b3480156100f657600080fd5b506101336040518060400160405280600581526020017f312e302e3100000000000000000000000000000000000000000000000000000081525081565b6040516100ca91906106a9565b34801561014c57600080fd5b506100e861033d565b34801561016157600080fd5b5061016b60005481565b6040519081526020016100ca565b34801561018557600080fd5b5061016b7f000000000000000000000000000000000000000000000000000000000000000081565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610277576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c00000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b60006102816104b8565b604080516020810182526000815290517fe11013dd0000000000000000000000000000000000000000000000000000000081529192507342000000000000000000000000000000000000099163e11013dd918491610308917f0000000000000000000000000000000000000000000000000000000000000000916188b891906004016106c3565b6000604051808303818588803b15801561032157600080fd5b505af1158015610335573d6000803e3d6000fd5b505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610402576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c000000000000000000000000000000000000000000000000000000606482015260840161026e565b600061040c6104b8565b9050600061044b7f00000000000000000000000000000000000000000000000000000000000000005a8460405180602001604052806000815250610624565b9050806104b4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f4665655661756c743a20455448207472616e73666572206661696c6564000000604482015260640161026e565b5050565b60007f0000000000000000000000000000000000000000000000000000000000000000471015610590576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e7400000000000000000000000000000000000000000000608482015260a40161026e565b6000479050806000808282546105a69190610707565b9091555050604080518281527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166020820152338183015290517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1919050565b600080600080845160208601878a8af19695505050505050565b6000815180845260005b8181101561066457602081850181015186830182015201610648565b81811115610676576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006106bc602083018461063e565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff8416815263ffffffff831660208201526060604082015260006106fe606083018461063e565b95945050505050565b60008219821115610741577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b50019056fea164736f6c634300080f000a") l1FeeVaultDeploymentBytecode = common.FromHex("0x60c060405234801561001057600080fd5b5060405161081638038061081683398101604081905261002f91610045565b60006080526001600160a01b031660a052610075565b60006020828403121561005757600080fd5b81516001600160a01b038116811461006e57600080fd5b9392505050565b60805160a0516107536100c3600039600081816087015281816101c5015281816102db015281816103550152818161041501526105b401526000818161018b01526104bc01526107536000f3fe6080604052600436106100695760003560e01c80636ed39f62116100435780636ed39f621461014057806384411d6514610155578063d3e5792b1461017957600080fd5b80630d9019e1146100755780633ccfd60b146100d357806354fd4d50146100ea57600080fd5b3661007057005b600080fd5b34801561008157600080fd5b506100a97f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b3480156100df57600080fd5b506100e86101ad565b005b3480156100f657600080fd5b506101336040518060400160405280600581526020017f312e302e3200000000000000000000000000000000000000000000000000000081525081565b6040516100ca91906106a9565b34801561014c57600080fd5b506100e861033d565b34801561016157600080fd5b5061016b60005481565b6040519081526020016100ca565b34801561018557600080fd5b5061016b7f000000000000000000000000000000000000000000000000000000000000000081565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610277576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c00000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b60006102816104b8565b604080516020810182526000815290517fe11013dd0000000000000000000000000000000000000000000000000000000081529192507342000000000000000000000000000000000000099163e11013dd918491610308917f0000000000000000000000000000000000000000000000000000000000000000916188b891906004016106c3565b6000604051808303818588803b15801561032157600080fd5b505af1158015610335573d6000803e3d6000fd5b505050505050565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614610402576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f4665655661756c743a20746865206f6e6c7920726563697069656e742063616e60448201527f2063616c6c000000000000000000000000000000000000000000000000000000606482015260840161026e565b600061040c6104b8565b9050600061044b7f00000000000000000000000000000000000000000000000000000000000000005a8460405180602001604052806000815250610624565b9050806104b4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f4665655661756c743a20455448207472616e73666572206661696c6564000000604482015260640161026e565b5050565b60007f0000000000000000000000000000000000000000000000000000000000000000471015610590576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604a60248201527f4665655661756c743a207769746864726177616c20616d6f756e74206d75737460448201527f2062652067726561746572207468616e206d696e696d756d207769746864726160648201527f77616c20616d6f756e7400000000000000000000000000000000000000000000608482015260a40161026e565b6000479050806000808282546105a69190610707565b9091555050604080518281527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff166020820152338183015290517fc8a211cc64b6ed1b50595a9fcb1932b6d1e5a6e8ef15b60e5b1f988ea9086bba9181900360600190a1919050565b600080600080845160208601878a8af19695505050505050565b6000815180845260005b8181101561066457602081850181015186830182015201610648565b81811115610676576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006106bc602083018461063e565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff8416815263ffffffff831660208201526060604082015260006106fe606083018461063e565b95945050505050565b60008219821115610741577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b50019056fea164736f6c634300080f000a") - gasPriceOracleMPTDeploymentBytecode = common.FromHex(bindings.GasPriceOracleMetaData.Bin) + gasPriceOracleMPTDeploymentBytecode = common.FromHex("0x608060405234801561001057600080fd5b5061146e806100206000396000f3fe608060405234801561001057600080fd5b506004361061011b5760003560e01c806354fd4d50116100b2578063c598591811610081578063f45e65d811610066578063f45e65d81461023e578063f820614014610246578063fe173b971461021557600080fd5b8063c598591814610223578063de26c4a11461022b57600080fd5b806354fd4d50146101af57806368d5dca6146101f85780636ef25c3a146102155780638cca67621461021b57600080fd5b80634621e226116100ee5780634621e2261461015457806349948e0e146101875780634ef6e2241461019a578063519b4bd3146101a757600080fd5b80630c18c1621461012057806322b90ab31461013b5780632e0f262514610145578063313ce5671461014d575b600080fd5b61012861024e565b6040519081526020015b60405180910390f35b61014361036f565b005b610128600681565b6006610128565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c545b6040519015158152602001610132565b61012861019536600461102c565b610592565b6000546101779060ff1681565b6101286105b6565b6101eb6040518060400160405280600581526020017f312e312e3000000000000000000000000000000000000000000000000000000081525081565b60405161013291906110fb565b6102006106a3565b60405163ffffffff9091168152602001610132565b48610128565b6101436107b4565b6102006109ec565b61012861023936600461102c565b610ad9565b610128610b8d565b610128610c80565b6000805460ff16156102e7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a206f76657268656164282920697320646560448201527f707265636174656400000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a919061116e565b905090565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f29190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146104d2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604160248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e2073657420697345636f746f6e6520666c6160648201527f6700000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b60005460ff1615610565576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a2045636f746f6e6520616c72656164792060448201527f616374697665000000000000000000000000000000000000000000000000000060648201526084016102de565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000805460ff16156105ad576105a782610d6d565b92915050565b6105a782610e11565b60006105e07f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156106445773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16635cf249696040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b60006106cd7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b156107555773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061036a91906111bd565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff166368d5dca66040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663e591b2826040518163ffffffff1660e01b8152600401602060405180830381865afa158015610813573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108379190611187565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610917576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f47617350726963654f7261636c653a206f6e6c7920746865206465706f73697460448201527f6f72206163636f756e742063616e207365742069734b726f6d614d505420666c60648201527f6167000000000000000000000000000000000000000000000000000000000000608482015260a4016102de565b7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c54156109c6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602860248201527f47617350726963654f7261636c653a204b726f6d61204d505420616c7265616460448201527f792061637469766500000000000000000000000000000000000000000000000060648201526084016102de565b60017f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c55565b6000610a167f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610a7a5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663c59859186040518163ffffffff1660e01b8152600401602060405180830381865afa158015610731573d6000803e3d6000fd5b600080610ae583610f6d565b60005490915060ff1615610af95792915050565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b7c919061116e565b610b869082611212565b9392505050565b6000805460ff1615610c21576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f47617350726963654f7261636c653a207363616c61722829206973206465707260448201527f656361746564000000000000000000000000000000000000000000000000000060648201526084016102de565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b6000610caa7f8f72cb8c9ce0db6b33874dcafb4caaa75b2406f18992b3856856f86d8949de5c5490565b15610d0e5773420000000000000000000000000000000000001573ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff1663f82061406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610346573d6000803e3d6000fd5b600080610d7983610f6d565b90506000610d856105b6565b610d8d6109ec565b610d9890601061122a565b63ffffffff16610da89190611256565b90506000610db4610c80565b610dbc6106a3565b63ffffffff16610dcc9190611256565b90506000610dda8284611212565b610de49085611256565b9050610df26006600a6113b3565b610dfd906010611256565b610e0790826113bf565b9695505050505050565b600080610e1d83610f6d565b9050600073420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16639e8c49666040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e80573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ea4919061116e565b610eac6105b6565b73420000000000000000000000000000000000000273ffffffffffffffffffffffffffffffffffffffff16638b239f736040518163ffffffff1660e01b8152600401602060405180830381865afa158015610f0b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f2f919061116e565b610f399085611212565b610f439190611256565b610f4d9190611256565b9050610f5b6006600a6113b3565b610f6590826113bf565b949350505050565b80516000908190815b81811015610ff057848181518110610f9057610f906113fa565b01602001517fff0000000000000000000000000000000000000000000000000000000000000016600003610fd057610fc9600484611212565b9250610fde565b610fdb601084611212565b92505b80610fe881611429565b915050610f76565b50610f6582610440611212565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b60006020828403121561103e57600080fd5b813567ffffffffffffffff8082111561105657600080fd5b818401915084601f83011261106a57600080fd5b81358181111561107c5761107c610ffd565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156110c2576110c2610ffd565b816040528281528760208487010111156110db57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156111285785810183015185820160400152820161110c565b8181111561113a576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561118057600080fd5b5051919050565b60006020828403121561119957600080fd5b815173ffffffffffffffffffffffffffffffffffffffff81168114610b8657600080fd5b6000602082840312156111cf57600080fd5b815163ffffffff81168114610b8657600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115611225576112256111e3565b500190565b600063ffffffff8083168185168183048111821515161561124d5761124d6111e3565b02949350505050565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048311821515161561128e5761128e6111e3565b500290565b600181815b808511156112ec57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156112d2576112d26111e3565b808516156112df57918102915b93841c9390800290611298565b509250929050565b600082611303575060016105a7565b81611310575060006105a7565b816001811461132657600281146113305761134c565b60019150506105a7565b60ff841115611341576113416111e3565b50506001821b6105a7565b5060208310610133831016604e8410600b841016171561136f575081810a6105a7565b6113798383611293565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156113ab576113ab6111e3565b029392505050565b6000610b8683836112f4565b6000826113f5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b500490565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361145a5761145a6111e3565b506001019056fea164736f6c634300080f000a") ) func KromaMPTNetworkUpgradeTransactions() ([]hexutil.Bytes, error) { diff --git a/packages/contracts/.gas-snapshot b/packages/contracts/.gas-snapshot index 09b600e733..6027a5830a 100644 --- a/packages/contracts/.gas-snapshot +++ b/packages/contracts/.gas-snapshot @@ -161,20 +161,20 @@ GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 421695 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3467594) GasBenchMark_L1StandardBridge_Finalize:test_finalizeBridgeETH_benchmark() (gas: 32252) GasBenchMark_L2OutputOracle:test_submitL2Output_benchmark() (gas: 157518) -GasPriceOracleBedrock_Test:test_baseFee_succeeds() (gas: 8347) +GasPriceOracleBedrock_Test:test_baseFee_succeeds() (gas: 8325) GasPriceOracleBedrock_Test:test_decimals_succeeds() (gas: 6256) GasPriceOracleBedrock_Test:test_gasPrice_succeeds() (gas: 8316) -GasPriceOracleBedrock_Test:test_l1BaseFee_succeeds() (gas: 12858) +GasPriceOracleBedrock_Test:test_l1BaseFee_succeeds() (gas: 12836) GasPriceOracleBedrock_Test:test_overhead_succeeds() (gas: 12806) GasPriceOracleBedrock_Test:test_scalar_succeeds() (gas: 12759) GasPriceOracleEcotone_Test:test_baseFeeScalar_succeeds() (gas: 12903) -GasPriceOracleEcotone_Test:test_baseFee_succeeds() (gas: 8347) -GasPriceOracleEcotone_Test:test_blobBaseFeeScalar_succeeds() (gas: 12903) +GasPriceOracleEcotone_Test:test_baseFee_succeeds() (gas: 8325) +GasPriceOracleEcotone_Test:test_blobBaseFeeScalar_succeeds() (gas: 12881) GasPriceOracleEcotone_Test:test_blobBaseFee_succeeds() (gas: 12811) GasPriceOracleEcotone_Test:test_decimals_succeeds() (gas: 6234) GasPriceOracleEcotone_Test:test_gasPrice_succeeds() (gas: 8339) -GasPriceOracleEcotone_Test:test_getL1Fee_succeeds() (gas: 28049) -GasPriceOracleEcotone_Test:test_l1BaseFee_succeeds() (gas: 12880) +GasPriceOracleEcotone_Test:test_getL1Fee_succeeds() (gas: 28027) +GasPriceOracleEcotone_Test:test_l1BaseFee_succeeds() (gas: 12858) GasPriceOracleEcotone_Test:test_overhead_legacyFunction_reverts() (gas: 10507) GasPriceOracleEcotone_Test:test_scalar_legacyFunction_reverts() (gas: 10517) GasPriceOracleEcotone_Test:test_setEcotone_wrongCaller_reverts() (gas: 11616) diff --git a/packages/contracts/contracts/L2/GasPriceOracle.sol b/packages/contracts/contracts/L2/GasPriceOracle.sol index 8aaacbfc16..dbdb0e4dbb 100644 --- a/packages/contracts/contracts/L2/GasPriceOracle.sol +++ b/packages/contracts/contracts/L2/GasPriceOracle.sol @@ -60,7 +60,7 @@ contract GasPriceOracle is ISemver { msg.sender == L1Block(Predeploys.KROMA_L1_BLOCK_ATTRIBUTES).DEPOSITOR_ACCOUNT(), "GasPriceOracle: only the depositor account can set isKromaMPT flag" ); - require(getKromaMPT() == false, "GasPriceOracle: Kroma MPT already active"); + require(isKromaMPT() == false, "GasPriceOracle: Kroma MPT already active"); bytes32 slot = IS_KROMA_MPT_KEY; assembly { @@ -69,12 +69,14 @@ contract GasPriceOracle is ISemver { } /// @notice Retrieves the boolean indicates whether the network has gone through the Kroma MPT upgrade. - /// @return isKromaMPT The boolean indicates whether the network has gone through the Kroma MPT upgrade. - function getKromaMPT() public view returns (bool isKromaMPT) { + /// @return The boolean indicates whether the network has gone through the Kroma MPT upgrade. + function isKromaMPT() public view returns (bool) { bytes32 slot = IS_KROMA_MPT_KEY; + bool kromaMPT; assembly { - isKromaMPT := sload(slot) + kromaMPT := sload(slot) } + return kromaMPT; } /// @notice Retrieves the current gas price (base fee). @@ -108,7 +110,7 @@ contract GasPriceOracle is ISemver { /// @notice Retrieves the latest known L1 base fee. /// @return Latest known L1 base fee. function l1BaseFee() public view returns (uint256) { - if (getKromaMPT()) { + if (isKromaMPT()) { return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).basefee(); } else { return L1Block(Predeploys.KROMA_L1_BLOCK_ATTRIBUTES).basefee(); @@ -118,7 +120,7 @@ contract GasPriceOracle is ISemver { /// @notice Retrieves the current blob base fee. /// @return Current blob base fee. function blobBaseFee() public view returns (uint256) { - if (getKromaMPT()) { + if (isKromaMPT()) { return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).blobBaseFee(); } else { return L1Block(Predeploys.KROMA_L1_BLOCK_ATTRIBUTES).blobBaseFee(); @@ -128,7 +130,7 @@ contract GasPriceOracle is ISemver { /// @notice Retrieves the current base fee scalar. /// @return Current base fee scalar. function baseFeeScalar() public view returns (uint32) { - if (getKromaMPT()) { + if (isKromaMPT()) { return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).baseFeeScalar(); } else { return L1Block(Predeploys.KROMA_L1_BLOCK_ATTRIBUTES).baseFeeScalar(); @@ -138,7 +140,7 @@ contract GasPriceOracle is ISemver { /// @notice Retrieves the current blob base fee scalar. /// @return Current blob base fee scalar. function blobBaseFeeScalar() public view returns (uint32) { - if (getKromaMPT()) { + if (isKromaMPT()) { return L1Block(Predeploys.L1_BLOCK_ATTRIBUTES).blobBaseFeeScalar(); } else { return L1Block(Predeploys.KROMA_L1_BLOCK_ATTRIBUTES).blobBaseFeeScalar(); diff --git a/packages/contracts/contracts/test/Encoding.t.sol b/packages/contracts/contracts/test/Encoding.t.sol index 408f73c715..0dbe28f054 100644 --- a/packages/contracts/contracts/test/Encoding.t.sol +++ b/packages/contracts/contracts/test/Encoding.t.sol @@ -86,12 +86,10 @@ contract Encoding_Test is CommonTest { assertEq(txn, _txn, "failed to assert deposit tx"); // assert KromaDepositTx - { - txn = Encoding.encodeDepositTransaction(t, true); - _txn = ffi.encodeDepositTransaction(t, true); + txn = Encoding.encodeDepositTransaction(t, true); + _txn = ffi.encodeDepositTransaction(t, true); - assertEq(txn, _txn, "failed to assert kroma deposit tx"); - } + assertEq(txn, _txn, "failed to assert kroma deposit tx"); } // [Kroma: END] } diff --git a/packages/contracts/src/constants.ts b/packages/contracts/src/constants.ts index a59e82ef58..8a7fcc2537 100644 --- a/packages/contracts/src/constants.ts +++ b/packages/contracts/src/constants.ts @@ -14,13 +14,13 @@ export const predeploys = { ProtocolVault: '0x4200000000000000000000000000000000000006', KromaL1FeeVault: '0x4200000000000000000000000000000000000007', ValidatorRewardVault: '0x4200000000000000000000000000000000000008', - SequencerFeeVault: '0x4200000000000000000000000000000000000011', - BaseFeeVault: '0x4200000000000000000000000000000000000019', - L1FeeVault: '0x420000000000000000000000000000000000001A', L2StandardBridge: '0x4200000000000000000000000000000000000009', L2ERC721Bridge: '0x420000000000000000000000000000000000000A', KromaMintableERC20Factory: '0x420000000000000000000000000000000000000B', KromaMintableERC721Factory: '0x420000000000000000000000000000000000000C', + SequencerFeeVault: '0x4200000000000000000000000000000000000011', + BaseFeeVault: '0x4200000000000000000000000000000000000019', + L1FeeVault: '0x420000000000000000000000000000000000001A', Create2Deployer: '0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2', } diff --git a/packages/contracts/tasks/check-l2.ts b/packages/contracts/tasks/check-l2.ts index 0e4aa56ce2..03392231c6 100644 --- a/packages/contracts/tasks/check-l2.ts +++ b/packages/contracts/tasks/check-l2.ts @@ -413,28 +413,28 @@ const check = { await checkProxy(hre, 'ProtocolVault', signer.provider) await assertProxy(hre, 'ProtocolVault', signer.provider) }, - // L1FeeVault + // KromaL1FeeVault // - check version // - check MIN_WITHDRAWAL_AMOUNT // - check RECIPIENT - L1FeeVault: async (hre: HardhatRuntimeEnvironment, signer: Signer) => { - const L1FeeVault = await hre.ethers.getContractAt( + KromaL1FeeVault: async (hre: HardhatRuntimeEnvironment, signer: Signer) => { + const KromaL1FeeVault = await hre.ethers.getContractAt( 'L1FeeVault', predeploys.KromaL1FeeVault, signer ) - await assertSemver(L1FeeVault, 'L1FeeVault') + await assertSemver(KromaL1FeeVault, 'KromaL1FeeVault') - const MIN_WITHDRAWAL_AMOUNT = await L1FeeVault.MIN_WITHDRAWAL_AMOUNT() + const MIN_WITHDRAWAL_AMOUNT = await KromaL1FeeVault.MIN_WITHDRAWAL_AMOUNT() console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) - const RECIPIENT = await L1FeeVault.RECIPIENT() + const RECIPIENT = await KromaL1FeeVault.RECIPIENT() assert(RECIPIENT !== hre.ethers.constants.AddressZero) yell(` - RECIPIENT: ${RECIPIENT}`) - await checkProxy(hre, 'L1FeeVault', signer.provider) - await assertProxy(hre, 'L1FeeVault', signer.provider) + await checkProxy(hre, 'KromaL1FeeVault', signer.provider) + await assertProxy(hre, 'KromaL1FeeVault', signer.provider) }, // L2ToL1MessagePasser // - check version @@ -459,6 +459,76 @@ const check = { await checkProxy(hre, 'L2ToL1MessagePasser', signer.provider) await assertProxy(hre, 'L2ToL1MessagePasser', signer.provider) }, + // SequencerFeeVault + // - check version + // - check MIN_WITHDRAWAL_AMOUNT + // - check RECIPIENT + SequencerFeeVault: async (hre: HardhatRuntimeEnvironment, signer: Signer) => { + const SequencerFeeVault = await hre.ethers.getContractAt( + 'ProtocolVault', + predeploys.SequencerFeeVault, + signer + ) + + await assertSemver(SequencerFeeVault, 'SequencerFeeVault') + + const MIN_WITHDRAWAL_AMOUNT = + await SequencerFeeVault.MIN_WITHDRAWAL_AMOUNT() + console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) + + const RECIPIENT = await SequencerFeeVault.RECIPIENT() + assert(RECIPIENT !== hre.ethers.constants.AddressZero) + yell(` - RECIPIENT: ${RECIPIENT}`) + + await checkProxy(hre, 'SequencerFeeVault', signer.provider) + await assertProxy(hre, 'SequencerFeeVault', signer.provider) + }, + // BaseFeeVault + // - check version + // - check MIN_WITHDRAWAL_AMOUNT + // - check RECIPIENT + BaseFeeVault: async (hre: HardhatRuntimeEnvironment, signer: Signer) => { + const BaseFeeVault = await hre.ethers.getContractAt( + 'ProtocolVault', + predeploys.BaseFeeVault, + signer + ) + + await assertSemver(BaseFeeVault, 'BaseFeeVault') + + const MIN_WITHDRAWAL_AMOUNT = await BaseFeeVault.MIN_WITHDRAWAL_AMOUNT() + console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) + + const RECIPIENT = await BaseFeeVault.RECIPIENT() + assert(RECIPIENT !== hre.ethers.constants.AddressZero) + yell(` - RECIPIENT: ${RECIPIENT}`) + + await checkProxy(hre, 'BaseFeeVault', signer.provider) + await assertProxy(hre, 'BaseFeeVault', signer.provider) + }, + // L1FeeVault + // - check version + // - check MIN_WITHDRAWAL_AMOUNT + // - check RECIPIENT + L1FeeVault: async (hre: HardhatRuntimeEnvironment, signer: Signer) => { + const L1FeeVault = await hre.ethers.getContractAt( + 'L1FeeVault', + predeploys.L1FeeVault, + signer + ) + + await assertSemver(L1FeeVault, 'L1FeeVault') + + const MIN_WITHDRAWAL_AMOUNT = await L1FeeVault.MIN_WITHDRAWAL_AMOUNT() + console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) + + const RECIPIENT = await L1FeeVault.RECIPIENT() + assert(RECIPIENT !== hre.ethers.constants.AddressZero) + yell(` - RECIPIENT: ${RECIPIENT}`) + + await checkProxy(hre, 'L1FeeVault', signer.provider) + await assertProxy(hre, 'L1FeeVault', signer.provider) + }, } task('check-l2', 'Checks a freshly migrated L2 system for correct migration')