Merge remote-tracking branch 'origin/thanos'

tokamak-network · Dec 5, 2024 · 1616c43 · 1616c43
2 parents 0bfa5da + 902f416
commit 1616c43
Show file tree

Hide file tree

Showing 7 changed files with 390 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -39,9 +39,6 @@ anvil :; anvil -m 'test test test test test test test test test test test junk'
 
 NETWORK_ARGS := --rpc-url http://localhost:8545 --private-key $(DEFAULT_ANVIL_KEY) --broadcast --legacy --gas-limit 9999999999999999999
 
-ifeq ($(findstring --network thanossepolia,$(ARGS)), --network thanossepolia)
-	NETWORK_ARGS := --rpc-url $(THANOS_SEPOLIA_URL) --private-key $(PRIVATE_KEY) --broadcast --verify --verifier blockscout --verifier-url https://explorer.thanos-sepolia.tokamak.network/api --etherscan-api-key 11 -vv
-endif
 ifeq ($(findstring --network sepolia,$(ARGS)), --network sepolia)
 	NETWORK_ARGS := --rpc-url $(SEPOLIA_RPC_URL) --private-key $(PRIVATE_KEY) --broadcast --verify --etherscan-api-key $(ETHERSCAN_API_KEY) -vv
 endif
@@ -51,6 +48,9 @@ endif
 ifeq ($(findstring --network titansepolia,$(ARGS)), --network titansepolia)
 	NETWORK_ARGS := --rpc-url $(TITAN_SEPOLIA_URL) --private-key $(PRIVATE_KEY) --broadcast --verify --verifier blockscout --verifier-url $(TITAN_SEPOLIA_EXPLORER) -vv --legacy
 endif
+ifeq ($(findstring --network thanossepolia,$(ARGS)), --network thanossepolia)
+	NETWORK_ARGS := --rpc-url $(THANOS_SEPOLIA_URL) --private-key $(PRIVATE_KEY) --broadcast --verify --verifier blockscout --verifier-url $(THANOS_SEPOLIA_EXPLORER) -vv
+endif
 # ifeq ($(findstring --network titan,$(ARGS)), --network titan)
 # 	NETWORK_ARGS := --rpc-url $(TITAN_RPC_URL) --private-key $(PRIVATE_KEY) --broadcast --verify --verifier blockscout --verifier-url $(TITAN_EXPLORER) -vv --legacy
 # endif

diff --git a/broadcast/DeployCommitReveal2.s.sol/111551119090/run-1733114962.json b/broadcast/DeployCommitReveal2.s.sol/111551119090/run-1733114962.json
diff --git a/broadcast/DeployCommitReveal2.s.sol/111551119090/run-latest.json b/broadcast/DeployCommitReveal2.s.sol/111551119090/run-latest.json
diff --git a/broadcast/DeployConsumerExample.s.sol/111551119090/run-1733115023.json b/broadcast/DeployConsumerExample.s.sol/111551119090/run-1733115023.json
@@ -0,0 +1,54 @@
+{
+  "transactions": [
+    {
+      "hash": "0x0a67cb407ffe558a2cfcd07f04bf73ea51a1b8ec4117d2a469b0295365300fb5",
+      "transactionType": "CREATE",
+      "contractName": "ConsumerExample",
+      "contractAddress": "0x07877fa4e98d4e38585c5f0955f1c1785276228a",
+      "function": null,
+      "arguments": [
+        "0x31BCECA13c5be57b3677Ec116FB38fEde7Fe1217"
+      ],
+      "transaction": {
+        "from": "0xb68aa9e398c054da7ebaaa446292f611ca0cd52b",
+        "gas": "0x8a6fb",
+        "value": "0x0",
+        "input": "0x60a034607657601f61077d38819003918201601f19168301916001600160401b03831184841017607a57808492602094604052833981010312607657516001600160a01b038116908190036076576080526040516106ee908161008f8239608051818181610378015281816104f3015261059b0152f35b5f80fd5b634e487b7160e01b5f52604160045260245ffdfe6080604052600436101561001a575b3615610018575f80fd5b005b5f3560e01c8062fc98b81461055257806333d608f11461051757806359687a6a146104a95780638678a7b2146103025780638796ba8c146102ac5780638aea61dc14610271578063a168fa89146101ff578063d8a4676f146101355763fc2a88c30361000e5734610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157600154806100c3575060205f5b604051908152f35b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8101908111610104576100f8602091610673565b90549060031b1c6100bb565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f80fd5b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576004355f525f60205260405f206040516060810181811067ffffffffffffffff8211176101d2576040908152825460ff808216151580855260089290921c161515602080850182905260019095015493830184905282519182529381019390935282015280606081015b0390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576004355f525f60205260405f2060018154910154906101ce604051928260ff80869560081c16911684604091949392606082019515158252151560208201520152565b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576020600154604051908152f35b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157600435600154811015610131576102f3602091610673565b90549060031b1c604051908152f35b5f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576040517fb5f3abb00000000000000000000000000000000000000000000000000000000081526201444360048201526020816024813473ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000165af190811561049e575f91610438575b50805f525f60205260405f2060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00825416179055600154680100000000000000008110156101d2578060016104019201600155610673565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff829392549160031b92831b921b19161790555f80f35b905060203d602011610497575b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f820116820182811067ffffffffffffffff8211176101d2576020918391604052810103126101315751816103a8565b503d610445565b6040513d5f823e3d90fd5b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157602060405173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576020604051620144438152f35b346101315760407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101315760043573ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168033036106445750805f525f60205260ff60405f20541615610619575f90815260208190526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16610100178155602435600190910155005b7fa7d8e883000000000000000000000000000000000000000000000000000000005f5260045260245ffd5b7f1cf993f4000000000000000000000000000000000000000000000000000000005f523360045260245260445ffd5b60015481101561068b5760015f5260205f2001905f90565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffdfea2646970667358221220d929523336bde240243bf70493a161a530118e344d47c08e27134713128a1dbc64736f6c634300081c003300000000000000000000000031bceca13c5be57b3677ec116fb38fede7fe1217",
+        "nonce": "0x2",
+        "chainId": "0x19f8f6fef2"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "status": "0x1",
+      "cumulativeGasUsed": "0x773e7",
+      "logs": [],
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "type": "0x2",
+      "transactionHash": "0x0a67cb407ffe558a2cfcd07f04bf73ea51a1b8ec4117d2a469b0295365300fb5",
+      "transactionIndex": "0x1",
+      "blockHash": "0xa7f86a51c1db357496c76056ba40580feb19df313b2d4a5429dfb000a5c763a7",
+      "blockNumber": "0xb0c5",
+      "gasUsed": "0x6a7d5",
+      "effectiveGasPrice": "0xfd",
+      "from": "0xb68aa9e398c054da7ebaaa446292f611ca0cd52b",
+      "to": null,
+      "contractAddress": "0x07877fa4e98d4e38585c5f0955f1c1785276228a",
+      "l1BaseFeeScalar": "0x558",
+      "l1BlobBaseFee": "0x1",
+      "l1BlobBaseFeeScalar": "0xc5fc5",
+      "l1Fee": "0x11d999ab11",
+      "l1GasPrice": "0xeb6e4417",
+      "l1GasUsed": "0x376c"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "returns": {},
+  "timestamp": 1733115023,
+  "chain": 111551119090,
+  "commit": "084c38c"
+}
diff --git a/broadcast/DeployConsumerExample.s.sol/111551119090/run-latest.json b/broadcast/DeployConsumerExample.s.sol/111551119090/run-latest.json
@@ -0,0 +1,54 @@
+{
+  "transactions": [
+    {
+      "hash": "0x0a67cb407ffe558a2cfcd07f04bf73ea51a1b8ec4117d2a469b0295365300fb5",
+      "transactionType": "CREATE",
+      "contractName": "ConsumerExample",
+      "contractAddress": "0x07877fa4e98d4e38585c5f0955f1c1785276228a",
+      "function": null,
+      "arguments": [
+        "0x31BCECA13c5be57b3677Ec116FB38fEde7Fe1217"
+      ],
+      "transaction": {
+        "from": "0xb68aa9e398c054da7ebaaa446292f611ca0cd52b",
+        "gas": "0x8a6fb",
+        "value": "0x0",
+        "input": "0x60a034607657601f61077d38819003918201601f19168301916001600160401b03831184841017607a57808492602094604052833981010312607657516001600160a01b038116908190036076576080526040516106ee908161008f8239608051818181610378015281816104f3015261059b0152f35b5f80fd5b634e487b7160e01b5f52604160045260245ffdfe6080604052600436101561001a575b3615610018575f80fd5b005b5f3560e01c8062fc98b81461055257806333d608f11461051757806359687a6a146104a95780638678a7b2146103025780638796ba8c146102ac5780638aea61dc14610271578063a168fa89146101ff578063d8a4676f146101355763fc2a88c30361000e5734610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157600154806100c3575060205f5b604051908152f35b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8101908111610104576100f8602091610673565b90549060031b1c6100bb565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b5f80fd5b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576004355f525f60205260405f206040516060810181811067ffffffffffffffff8211176101d2576040908152825460ff808216151580855260089290921c161515602080850182905260019095015493830184905282519182529381019390935282015280606081015b0390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576004355f525f60205260405f2060018154910154906101ce604051928260ff80869560081c16911684604091949392606082019515158252151560208201520152565b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576020600154604051908152f35b346101315760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157600435600154811015610131576102f3602091610673565b90549060031b1c604051908152f35b5f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576040517fb5f3abb00000000000000000000000000000000000000000000000000000000081526201444360048201526020816024813473ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000165af190811561049e575f91610438575b50805f525f60205260405f2060017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00825416179055600154680100000000000000008110156101d2578060016104019201600155610673565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff829392549160031b92831b921b19161790555f80f35b905060203d602011610497575b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f820116820182811067ffffffffffffffff8211176101d2576020918391604052810103126101315751816103a8565b503d610445565b6040513d5f823e3d90fd5b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261013157602060405173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152f35b34610131575f7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610131576020604051620144438152f35b346101315760407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101315760043573ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000168033036106445750805f525f60205260ff60405f20541615610619575f90815260208190526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff16610100178155602435600190910155005b7fa7d8e883000000000000000000000000000000000000000000000000000000005f5260045260245ffd5b7f1cf993f4000000000000000000000000000000000000000000000000000000005f523360045260245260445ffd5b60015481101561068b5760015f5260205f2001905f90565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffdfea2646970667358221220d929523336bde240243bf70493a161a530118e344d47c08e27134713128a1dbc64736f6c634300081c003300000000000000000000000031bceca13c5be57b3677ec116fb38fede7fe1217",
+        "nonce": "0x2",
+        "chainId": "0x19f8f6fef2"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "status": "0x1",
+      "cumulativeGasUsed": "0x773e7",
+      "logs": [],
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "type": "0x2",
+      "transactionHash": "0x0a67cb407ffe558a2cfcd07f04bf73ea51a1b8ec4117d2a469b0295365300fb5",
+      "transactionIndex": "0x1",
+      "blockHash": "0xa7f86a51c1db357496c76056ba40580feb19df313b2d4a5429dfb000a5c763a7",
+      "blockNumber": "0xb0c5",
+      "gasUsed": "0x6a7d5",
+      "effectiveGasPrice": "0xfd",
+      "from": "0xb68aa9e398c054da7ebaaa446292f611ca0cd52b",
+      "to": null,
+      "contractAddress": "0x07877fa4e98d4e38585c5f0955f1c1785276228a",
+      "l1BaseFeeScalar": "0x558",
+      "l1BlobBaseFee": "0x1",
+      "l1BlobBaseFeeScalar": "0xc5fc5",
+      "l1Fee": "0x11d999ab11",
+      "l1GasPrice": "0xeb6e4417",
+      "l1GasUsed": "0x376c"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "returns": {},
+  "timestamp": 1733115023,
+  "chain": 111551119090,
+  "commit": "084c38c"
+}
diff --git a/src/OptimismL1Fees.sol b/src/OptimismL1Fees.sol
@@ -27,7 +27,7 @@ abstract contract OptimismL1Fees is Ownable {
     uint8 internal constant L1_GAS_FEES_LEGACY_MODE = 2;
     uint8 internal constant NOT_L2 = 3;
 
-    uint8 internal s_l1FeeCalculationMode = 2;
+    uint8 internal s_l1FeeCalculationMode = 0;
 
     /// @dev L1 fee coefficient can be applied to options 2 or 3 to reduce possibly inflated gas price
     uint8 internal s_l1FeeCoefficient = 100;

diff --git a/test/CommitReveal2.t.sol b/test/CommitReveal2.t.sol
@@ -316,10 +316,10 @@ contract CommitReveal2Test is BaseTest {
     }
 
     function test_L1GasFeegenerateRandomNumber() public {
-        string memory key = "OP_MAINNET_RPC_URL";
-        string memory OP_MAINNET_RPC_URL = vm.envString(key);
-        uint256 optimismFork = vm.createFork(OP_MAINNET_RPC_URL);
-        vm.selectFork(optimismFork);
+        string memory key = "THANOS_SEPOLIA_URL";
+        string memory THANOS_SEPOLIA_URL = vm.envString(key);
+        uint256 thanosFork = vm.createFork(THANOS_SEPOLIA_URL);
+        vm.selectFork(thanosFork);
 
         L1Block l1Block = L1Block(
             address(0x4200000000000000000000000000000000000015)