Merge pull request #185 from tokamak-network/OR-1657-redeploy-thanos-…

…sepolia-thanos-sepolia-nighlty-to [OR-1657] redeploy thanos sepolia and thanos-spolia-nightly
tokamak-network · Jun 10, 2024 · 23fb082 · 23fb082
2 parents 1ebcae6 + 5d145e4
commit 23fb082
Show file tree

Hide file tree

Showing 52 changed files with 1,032 additions and 1,032 deletions.
diff --git a/packages/tokamak/contracts-bedrock/deploy-config/thanos-sepolia-nightly.json b/packages/tokamak/contracts-bedrock/deploy-config/thanos-sepolia-nightly.json
@@ -1,7 +1,7 @@
 {
   "finalSystemOwner": "0xEd5e79b6d1cEF3C578AE038c86100C87cE6bc843",
   "superchainConfigGuardian": "0xEd5e79b6d1cEF3C578AE038c86100C87cE6bc843",
-  "l1StartingBlockTag": "0xf0ea8438e717adb234c50b4069acdf26e705d72f9b6386f0e77e68bb54a6890b",
+  "l1StartingBlockTag": "0x05d0bf269ef093cf0eb99d88e41080a73b9c29ff85c29380e2b795e1fcf776c8",
   "l1ChainID": 11155111,
   "l2ChainID": 111551118282,
   "l2BlockTime": 12,
@@ -13,8 +13,8 @@
   "batchInboxAddress": "0xff00000000000000000000000000111551118282",
   "batchSenderAddress": "0xc891B50eF1ccF20D5DcCb3bc5c3EA20F95577483",
   "l2OutputOracleSubmissionInterval": 120,
-  "l2OutputOracleStartingTimestamp": 1717725792,
-  "l2OutputOracleStartingBlockNumber": 6055016,
+  "l2OutputOracleStartingTimestamp": -1,
+  "l2OutputOracleStartingBlockNumber": 0,
   "l2OutputOracleProposer": "0xbec09D89814Ed7267F7a03A879A00F1c2c5F3064",
   "l2OutputOracleChallenger": "0x6003eD8DC19613dc30e335E805826e4245ff2794",
   "finalizationPeriodSeconds": 12,

diff --git a/packages/tokamak/contracts-bedrock/deploy-config/thanos-sepolia.json b/packages/tokamak/contracts-bedrock/deploy-config/thanos-sepolia.json
@@ -1,7 +1,7 @@
 {
   "finalSystemOwner": "0x7cf8aD47c1B5E18cd827633F9e25538A08dB5448",
   "superchainConfigGuardian": "0x7cf8aD47c1B5E18cd827633F9e25538A08dB5448",
-  "l1StartingBlockTag": "0x15999cff83049c8aa6fa99630b2133a393258b94fd6a440632f5722f84f7e08e",
+  "l1StartingBlockTag": "0x05d0bf269ef093cf0eb99d88e41080a73b9c29ff85c29380e2b795e1fcf776c8",
   "l1ChainID": 11155111,
   "l2ChainID": 111551119090,
   "l2BlockTime": 12,
@@ -13,8 +13,8 @@
   "batchInboxAddress": "0xff00000000000000000000000000111551119090",
   "batchSenderAddress": "0x04b9d7812a68C163C5D94dD1a7D974D90eEC144c",
   "l2OutputOracleSubmissionInterval": 120,
-  "l2OutputOracleStartingTimestamp": 1717490460,
-  "l2OutputOracleStartingBlockNumber": 6036818,
+  "l2OutputOracleStartingTimestamp": -1,
+  "l2OutputOracleStartingBlockNumber": 0,
   "l2OutputOracleProposer": "0xf8873b3Fac779A00E54FF08424B14a9327e81cFa",
   "l2OutputOracleChallenger": "0x53f662840C05EdaB2415F0C90B014e56A9a62156",
   "finalizationPeriodSeconds": 12,

diff --git a/packages/tokamak/contracts-bedrock/deployments/thanos-sepolia-nightly/AddressManager.json b/packages/tokamak/contracts-bedrock/deployments/thanos-sepolia-nightly/AddressManager.json
@@ -115,7 +115,7 @@
       "anonymous": false
     }
   ],
-  "address": "0x3AbcE8e34bf00FFCc873FaeB39FedbE87bf75E3b",
+  "address": "0xAF4E9D3DF50F823c1F68CFb9dca7EA98728977A1",
   "args": [],
   "bytecode": "0x608060405234801561001057600080fd5b5061001a3361001f565b61006f565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6105ef8061007e6000396000f3fe608060405234801561001057600080fd5b50600436106100675760003560e01c80639b2ea4bd116100505780639b2ea4bd146100b9578063bf40fac1146100cc578063f2fde38b146100df57600080fd5b8063715018a61461006c5780638da5cb5b14610076575b600080fd5b6100746100f2565b005b60005473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b6100746100c73660046104fa565b610106565b6100906100da366004610548565b6101d9565b6100746100ed366004610585565b610215565b6100fa6102d1565b6101046000610352565b565b61010e6102d1565b6000610119836103c7565b60008181526001602052604090819020805473ffffffffffffffffffffffffffffffffffffffff8681167fffffffffffffffffffffffff00000000000000000000000000000000000000008316179092559151929350169061017c9085906105a7565b6040805191829003822073ffffffffffffffffffffffffffffffffffffffff808716845284166020840152917f9416a153a346f93d95f94b064ae3f148b6460473c6e82b3f9fc2521b873fcd6c910160405180910390a250505050565b6000600160006101e8846103c7565b815260208101919091526040016000205473ffffffffffffffffffffffffffffffffffffffff1692915050565b61021d6102d1565b73ffffffffffffffffffffffffffffffffffffffff81166102c5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6102ce81610352565b50565b60005473ffffffffffffffffffffffffffffffffffffffff163314610104576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102bc565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000816040516020016103da91906105a7565b604051602081830303815290604052805190602001209050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600082601f83011261043757600080fd5b813567ffffffffffffffff80821115610452576104526103f7565b604051601f83017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908282118183101715610498576104986103f7565b816040528381528660208588010111156104b157600080fd5b836020870160208301376000602085830101528094505050505092915050565b803573ffffffffffffffffffffffffffffffffffffffff811681146104f557600080fd5b919050565b6000806040838503121561050d57600080fd5b823567ffffffffffffffff81111561052457600080fd5b61053085828601610426565b92505061053f602084016104d1565b90509250929050565b60006020828403121561055a57600080fd5b813567ffffffffffffffff81111561057157600080fd5b61057d84828501610426565b949350505050565b60006020828403121561059757600080fd5b6105a0826104d1565b9392505050565b6000825160005b818110156105c857602081860181015185830152016105ae565b818111156105d7576000828501525b50919091019291505056fea164736f6c634300080f000a",
   "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100675760003560e01c80639b2ea4bd116100505780639b2ea4bd146100b9578063bf40fac1146100cc578063f2fde38b146100df57600080fd5b8063715018a61461006c5780638da5cb5b14610076575b600080fd5b6100746100f2565b005b60005473ffffffffffffffffffffffffffffffffffffffff165b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b6100746100c73660046104fa565b610106565b6100906100da366004610548565b6101d9565b6100746100ed366004610585565b610215565b6100fa6102d1565b6101046000610352565b565b61010e6102d1565b6000610119836103c7565b60008181526001602052604090819020805473ffffffffffffffffffffffffffffffffffffffff8681167fffffffffffffffffffffffff00000000000000000000000000000000000000008316179092559151929350169061017c9085906105a7565b6040805191829003822073ffffffffffffffffffffffffffffffffffffffff808716845284166020840152917f9416a153a346f93d95f94b064ae3f148b6460473c6e82b3f9fc2521b873fcd6c910160405180910390a250505050565b6000600160006101e8846103c7565b815260208101919091526040016000205473ffffffffffffffffffffffffffffffffffffffff1692915050565b61021d6102d1565b73ffffffffffffffffffffffffffffffffffffffff81166102c5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b6102ce81610352565b50565b60005473ffffffffffffffffffffffffffffffffffffffff163314610104576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016102bc565b6000805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000816040516020016103da91906105a7565b604051602081830303815290604052805190602001209050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600082601f83011261043757600080fd5b813567ffffffffffffffff80821115610452576104526103f7565b604051601f83017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908282118183101715610498576104986103f7565b816040528381528660208588010111156104b157600080fd5b836020870160208301376000602085830101528094505050505092915050565b803573ffffffffffffffffffffffffffffffffffffffff811681146104f557600080fd5b919050565b6000806040838503121561050d57600080fd5b823567ffffffffffffffff81111561052457600080fd5b61053085828601610426565b92505061053f602084016104d1565b90509250929050565b60006020828403121561055a57600080fd5b813567ffffffffffffffff81111561057157600080fd5b61057d84828501610426565b949350505050565b60006020828403121561059757600080fd5b6105a0826104d1565b9392505050565b6000825160005b818110156105c857602081860181015185830152016105ae565b818111156105d7576000828501525b50919091019291505056fea164736f6c634300080f000a",
@@ -158,38 +158,38 @@
     }
   },
   "metadata": "{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"name\",\"type\":\"string\",\"indexed\":true},{\"internalType\":\"address\",\"name\":\"newAddress\",\"type\":\"address\",\"indexed\":false},{\"internalType\":\"address\",\"name\":\"oldAddress\",\"type\":\"address\",\"indexed\":false}],\"type\":\"event\",\"name\":\"AddressSet\",\"anonymous\":false},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true},{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true}],\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"anonymous\":false},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_name\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\",\"name\":\"getAddress\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}]},{\"inputs\":[],\"stateMutability\":\"view\",\"type\":\"function\",\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}]},{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\",\"name\":\"renounceOwnership\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_name\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"_address\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\",\"name\":\"setAddress\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\",\"name\":\"transferOwnership\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{\"getAddress(string)\":{\"params\":{\"_name\":\"Name to retrieve an address for.\"},\"returns\":{\"_0\":\"Address associated with the given name.\"}},\"owner()\":{\"details\":\"Returns the address of the current owner.\"},\"renounceOwnership()\":{\"details\":\"Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.\"},\"setAddress(string,address)\":{\"params\":{\"_address\":\"Address to associate with the name.\",\"_name\":\"String name to associate an address with.\"}},\"transferOwnership(address)\":{\"details\":\"Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.\"}},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"getAddress(string)\":{\"notice\":\"Retrieves the address associated with a given name.\"},\"setAddress(string,address)\":{\"notice\":\"Changes the address associated with a particular name.\"}},\"version\":1}},\"settings\":{\"remappings\":[\"@cwia/=lib/clones-with-immutable-args/src/\",\"@lib-keccak/=lib/lib-keccak/contracts/lib/\",\"@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/\",\"@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/\",\"@openzeppelin/contracts_v3.1.0/=lib/openzeppelin-contracts_v3.1.0/contracts/\",\"@openzeppelin/contracts_v5.0.1/=lib/openzeppelin-contracts_v5.0.1/contracts/\",\"@rari-capital/solmate/=lib/solmate/\",\"@solady-test/=lib/lib-keccak/lib/solady/test/\",\"@solady/=lib/lib-keccak/lib/solady/src/\",\"clones-with-immutable-args/=lib/clones-with-immutable-args/src/\",\"ds-test/=lib/forge-std/lib/ds-test/src/\",\"erc4626-tests/=lib/openzeppelin-contracts_v5.0.1/lib/erc4626-tests/\",\"forge-std/=lib/forge-std/src/\",\"kontrol-cheatcodes/=lib/kontrol-cheatcodes/src/\",\"lib-keccak/=lib/lib-keccak/contracts/\",\"openzeppelin-contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/\",\"openzeppelin-contracts/=lib/openzeppelin-contracts/\",\"openzeppelin-contracts_v3.1.0/=lib/openzeppelin-contracts_v3.1.0/contracts/\",\"openzeppelin-contracts_v5.0.1/=lib/openzeppelin-contracts_v5.0.1/\",\"safe-contracts/=lib/safe-contracts/contracts/\",\"solady/=lib/solady/src/\",\"solmate/=lib/solmate/src/\"],\"optimizer\":{\"enabled\":true,\"runs\":999999},\"metadata\":{\"bytecodeHash\":\"none\"},\"compilationTarget\":{\"src/legacy/AddressManager.sol\":\"AddressManager\"},\"evmVersion\":\"london\",\"libraries\":{\"src/tokamak-contracts/USDC/L2/tokamak-USDC/v2/FiatTokenV2_2.sol:SignatureChecker\":\"0x4200000000000000000000000000000000000776\"}},\"sources\":{\"lib/openzeppelin-contracts/contracts/access/Ownable.sol\":{\"keccak256\":\"0xa94b34880e3c1b0b931662cb1c09e5dfa6662f31cba80e07c5ee71cd135c9673\",\"urls\":[\"bzz-raw://40fb1b5102468f783961d0af743f91b9980cf66b50d1d12009f6bb1869cea4d2\",\"dweb:/ipfs/QmYqEbJML4jB1GHbzD4cUZDtJg5wVwNm3vDJq1GbyDus8y\"],\"license\":\"MIT\"},\"lib/openzeppelin-contracts/contracts/utils/Context.sol\":{\"keccak256\":\"0xe2e337e6dde9ef6b680e07338c493ebea1b5fd09b43424112868e9cc1706bca7\",\"urls\":[\"bzz-raw://6df0ddf21ce9f58271bdfaa85cde98b200ef242a05a3f85c2bc10a8294800a92\",\"dweb:/ipfs/QmRK2Y5Yc6BK7tGKkgsgn3aJEQGi5aakeSPZvS65PV8Xp3\"],\"license\":\"MIT\"},\"src/legacy/AddressManager.sol\":{\"keccak256\":\"0x1fcb990df6473f7fa360d5924d62d39ce2ca97d45668e3901e5405cfbe598b19\",\"urls\":[\"bzz-raw://9d08358b60dea54dbc32e988a1bb7ea909488063eaae3c5ae28a322f125c9b34\",\"dweb:/ipfs/QmZPQwdjLh9gaamNAoTUmWwwbRKj3yHovBYfnTPnfuKvUt\"],\"license\":\"MIT\"}},\"version\":1}",
-  "numDeployments": 1,
+  "numDeployments": 3,
   "receipt": {
-    "transactionHash": "0xcbf5225b19dd0b28bea6f416daa44941bc6e9d48ff5e7453d391c3ddcd42074a",
-    "transactionIndex": "0x4",
-    "blockHash": "0xda47a69da58b97290bbebe616b3fdec7566c436655983bd026e0e10f8eeabfbd",
-    "blockNumber": "0x5c64f2",
-    "from": "0xEd5e79b6d1cEF3C578AE038c86100C87cE6bc843",
+    "transactionHash": "0xfc27e4c863685ec51807615e432a72e40501e965fda46a60b9c201318b80e596",
+    "transactionIndex": "0x0",
+    "blockHash": "0xf0506474c58e2f222d39450832c250a2beef8d9ad9e834803d474639270953ea",
+    "blockNumber": "0x5cb32c",
+    "from": "0xBd5C6a99b97Ef79F4beE97Bc1A6597683B397579",
     "to": null,
-    "cumulativeGasUsed": "0x85e41",
+    "cumulativeGasUsed": "0x62d28",
     "gasUsed": "0x62d28",
-    "contractAddress": "0x3AbcE8e34bf00FFCc873FaeB39FedbE87bf75E3b",
+    "contractAddress": "0xAF4E9D3DF50F823c1F68CFb9dca7EA98728977A1",
     "logs": [
       {
-        "address": "0x3AbcE8e34bf00FFCc873FaeB39FedbE87bf75E3b",
+        "address": "0xAF4E9D3DF50F823c1F68CFb9dca7EA98728977A1",
         "topics": [
           "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "0x000000000000000000000000ed5e79b6d1cef3c578ae038c86100c87ce6bc843"
+          "0x000000000000000000000000bd5c6a99b97ef79f4bee97bc1a6597683b397579"
         ],
         "data": "0x",
-        "blockHash": "0xda47a69da58b97290bbebe616b3fdec7566c436655983bd026e0e10f8eeabfbd",
-        "blockNumber": "0x5c64f2",
-        "transactionHash": "0xcbf5225b19dd0b28bea6f416daa44941bc6e9d48ff5e7453d391c3ddcd42074a",
-        "transactionIndex": "0x4",
-        "logIndex": "0x1",
+        "blockHash": "0xf0506474c58e2f222d39450832c250a2beef8d9ad9e834803d474639270953ea",
+        "blockNumber": "0x5cb32c",
+        "transactionHash": "0xfc27e4c863685ec51807615e432a72e40501e965fda46a60b9c201318b80e596",
+        "transactionIndex": "0x0",
+        "logIndex": "0x0",
         "removed": false
       }
     ],
     "status": "0x1",
-    "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000000000900000000000000000000000000000000400000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000000000000000000020000100000000000000000000000000000000000000000000000000000000000000",
+    "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000400100000000020000000000000000000800000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000010000000000000000000000000008020000000000000000000000000000000000000000000000000400000000000000000",
     "type": "0x2",
-    "effectiveGasPrice": "0xb2d89ddd"
+    "effectiveGasPrice": "0xb2d06b3e"
   },
   "solcInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "storageLayout": {
@@ -231,7 +231,7 @@
       }
     }
   },
-  "transactionHash": "0xcbf5225b19dd0b28bea6f416daa44941bc6e9d48ff5e7453d391c3ddcd42074a",
+  "transactionHash": "0xfc27e4c863685ec51807615e432a72e40501e965fda46a60b9c201318b80e596",
   "userdoc": {
     "version": 1,
     "kind": "user",

diff --git a/.../tokamak/contracts-bedrock/deployments/thanos-sepolia-nightly/L1CrossDomainMessenger.json b/.../tokamak/contracts-bedrock/deployments/thanos-sepolia-nightly/L1CrossDomainMessenger.json