update customGasToken

docker-compose.yml

@@ -9,7 +9,8 @@ networks:
 
 services:
   layer1-init:
-    image: tscel/eth:v1.10.26
+    #image: tscel/eth:v1.10.26
+    image: ethereum/client-go:v1.13.14
     container_name: initlayer1
     networks:
       - exchain
@@ -20,7 +21,8 @@ services:
     entrypoint: geth init --datadir /root/node/data /root/genesis.json
 
   layer1:
-    image: tscel/eth:v1.10.26
+    #image: tscel/eth:v1.10.26
+    image: ethereum/client-go:v1.13.14
     container_name: layer1
     logging:
       driver: "json-file"
@@ -32,7 +34,7 @@ services:
         ipv4_address: 172.80.1.2
     ports:
       - "8545:8545"
-    entrypoint: geth --datadir /root/node/data --http --nodiscover --miner.gaslimit=10000000000 --http --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=admin,engine,net,eth,web3,debug,txpool --authrpc.vhosts=* --authrpc.addr=0.0.0.0 --authrpc.port=8552 --rpc.allow-unprotected-txs --authrpc.jwtsecret=/root/node/data/jwtsecret --allow-insecure-unlock --unlock=0xfEe2882b7d75FadDcebD002E7e3bEf7B19Eed14E --password=/root/password.txt --mine --gcmode archive
+    entrypoint: geth --datadir /root/node/data --http --nodiscover --miner.gaslimit=10000000000 --http --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=admin,engine,net,eth,web3,debug,txpool --authrpc.vhosts=* --authrpc.addr=0.0.0.0 --authrpc.port=8552 --rpc.allow-unprotected-txs --authrpc.jwtsecret=/root/node/data/jwtsecret --allow-insecure-unlock --unlock=0xfEe2882b7d75FadDcebD002E7e3bEf7B19Eed14E --password=/root/password.txt --mine --miner.etherbase=0xfEe2882b7d75FadDcebD002E7e3bEf7B19Eed14E
     volumes:
       - "./data/layer1:/root/node/data"
       - "./layer1/keystore:/root/node/data/keystore"
@@ -99,6 +101,8 @@ services:
       - "./data/layer2:/root/node"
       - "./deployer:/root/deployments"
     entrypoint: /root/start.sh
+    ports:
+      - "7790:7790"
     depends_on:
       - layer1
 

layer1/forgeinit.sh

 #!/bin/sh
 cast publish --rpc-url http://172.80.1.2:8545 0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222
-cast publish --rpc-url http://172.80.1.2:8545 0xf90ff780843b9aca00830c0d358080b90fe560806040523480156200001157600080fd5b5060405162000f0538038062000f058339810160408190526200003491620002ba565b8151829082906200004d90600390602085019062000147565b5080516200006390600490602084019062000147565b5050506200007833846200008160201b60201c565b50505062000392565b6001600160a01b038216620000dc5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b8060026000828254620000f091906200032e565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001559062000355565b90600052602060002090601f016020900481019282620001795760008555620001c4565b82601f106200019457805160ff1916838001178555620001c4565b82800160010185558215620001c4579182015b82811115620001c4578251825591602001919060010190620001a7565b50620001d2929150620001d6565b5090565b5b80821115620001d25760008155600101620001d7565b634e487b7160e01b600052604160045260246000fd5b600082601f8301126200021557600080fd5b81516001600160401b0380821115620002325762000232620001ed565b604051601f8301601f19908116603f011681019082821181831017156200025d576200025d620001ed565b816040528381526020925086838588010111156200027a57600080fd5b600091505b838210156200029e57858201830151818301840152908201906200027f565b83821115620002b05760008385830101525b9695505050505050565b600080600060608486031215620002d057600080fd5b835160208501519093506001600160401b0380821115620002f057600080fd5b620002fe8783880162000203565b935060408601519150808211156200031557600080fd5b50620003248682870162000203565b9150509250925092565b600082198211156200035057634e487b7160e01b600052601160045260246000fd5b500190565b600181811c908216806200036a57607f821691505b602082108114156200038c57634e487b7160e01b600052602260045260246000fd5b50919050565b610b6380620003a26000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806340c10f191161007157806340c10f191461014157806370a082311461015657806395d89b411461017f578063a457c2d714610187578063a9059cbb1461019a578063dd62ed3e146101ad57600080fd5b806306fdde03146100b9578063095ea7b3146100d757806318160ddd146100fa57806323b872dd1461010c578063313ce5671461011f578063395093511461012e575b600080fd5b6100c16101c0565b6040516100ce9190610863565b60405180910390f35b6100ea6100e53660046108d4565b610252565b60405190151581526020016100ce565b6002545b6040519081526020016100ce565b6100ea61011a3660046108fe565b61026c565b604051601281526020016100ce565b6100ea61013c3660046108d4565b610290565b61015461014f3660046108d4565b6102b2565b005b6100fe61016436600461093a565b6001600160a01b031660009081526020819052604090205490565b6100c161039f565b6100ea6101953660046108d4565b6103ae565b6100ea6101a83660046108d4565b610429565b6100fe6101bb36600461095c565b610437565b6060600380546101cf9061098f565b80601f01602080910402602001604051908101604052809291908181526020018280546101fb9061098f565b80156102485780601f1061021d57610100808354040283529160200191610248565b820191906000526020600020905b81548152906001019060200180831161022b57829003601f168201915b5050505050905090565b600033610260818585610462565b60019150505b92915050565b60003361027a858285610586565b610285858585610600565b506001949350505050565b6000336102608185856102a38383610437565b6102ad91906109e0565b610462565b6005546001600160a01b0316331461031b5760405162461bcd60e51b815260206004820152602160248201527f6f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6044820152603760f91b60648201526084015b60405180910390fd5b61039b82306001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061038191906109f8565b61038c90600a610aff565b6103969084610b0e565b6107a4565b5050565b6060600480546101cf9061098f565b600033816103bc8286610437565b90508381101561041c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610312565b6102858286868403610462565b600033610260818585610600565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b0383166104c45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610312565b6001600160a01b0382166105255760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610312565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60006105928484610437565b905060001981146105fa57818110156105ed5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610312565b6105fa8484848403610462565b50505050565b6001600160a01b0383166106645760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610312565b6001600160a01b0382166106c65760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610312565b6001600160a01b0383166000908152602081905260409020548181101561073e5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610312565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105fa565b6001600160a01b0382166107fa5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610312565b806002600082825461080c91906109e0565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b8181101561089057858101830151858201604001528201610874565b818111156108a2576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b03811681146108cf57600080fd5b919050565b600080604083850312156108e757600080fd5b6108f0836108b8565b946020939093013593505050565b60008060006060848603121561091357600080fd5b61091c846108b8565b925061092a602085016108b8565b9150604084013590509250925092565b60006020828403121561094c57600080fd5b610955826108b8565b9392505050565b6000806040838503121561096f57600080fd5b610978836108b8565b9150610986602084016108b8565b90509250929050565b600181811c908216806109a357607f821691505b602082108114156109c457634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082198211156109f3576109f36109ca565b500190565b600060208284031215610a0a57600080fd5b815160ff8116811461095557600080fd5b600181815b80851115610a56578160001904821115610a3c57610a3c6109ca565b80851615610a4957918102915b93841c9390800290610a20565b509250929050565b600082610a6d57506001610266565b81610a7a57506000610266565b8160018114610a905760028114610a9a57610ab6565b6001915050610266565b60ff841115610aab57610aab6109ca565b50506001821b610266565b5060208310610133831016604e8410600b8410161715610ad9575081810a610266565b610ae38383610a1b565b8060001904821115610af757610af76109ca565b029392505050565b600061095560ff841683610a5e565b6000816000190483118215151615610b2857610b286109ca565b50029056fea26469706673582212207739fb501a2e3ca212f2933691e4518e49e53bdc1038bb289b2ea1937220dce964736f6c634300080a00330000000000000000000000000000000000000000033b2e3c9fd0803ce8000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000004555344580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045553445800000000000000000000000000000000000000000000000000000000808080
+cast publish --rpc-url http://172.80.1.2:8545 0xf9103980843b9aca00830c0d358080b90fe560806040523480156200001157600080fd5b5060405162000f0538038062000f058339810160408190526200003491620002ba565b8151829082906200004d90600390602085019062000147565b5080516200006390600490602084019062000147565b5050506200007833846200008160201b60201c565b50505062000392565b6001600160a01b038216620000dc5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f206164647265737300604482015260640160405180910390fd5b8060026000828254620000f091906200032e565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b828054620001559062000355565b90600052602060002090601f016020900481019282620001795760008555620001c4565b82601f106200019457805160ff1916838001178555620001c4565b82800160010185558215620001c4579182015b82811115620001c4578251825591602001919060010190620001a7565b50620001d2929150620001d6565b5090565b5b80821115620001d25760008155600101620001d7565b634e487b7160e01b600052604160045260246000fd5b600082601f8301126200021557600080fd5b81516001600160401b0380821115620002325762000232620001ed565b604051601f8301601f19908116603f011681019082821181831017156200025d576200025d620001ed565b816040528381526020925086838588010111156200027a57600080fd5b600091505b838210156200029e57858201830151818301840152908201906200027f565b83821115620002b05760008385830101525b9695505050505050565b600080600060608486031215620002d057600080fd5b835160208501519093506001600160401b0380821115620002f057600080fd5b620002fe8783880162000203565b935060408601519150808211156200031557600080fd5b50620003248682870162000203565b9150509250925092565b600082198211156200035057634e487b7160e01b600052601160045260246000fd5b500190565b600181811c908216806200036a57607f821691505b602082108114156200038c57634e487b7160e01b600052602260045260246000fd5b50919050565b610b6380620003a26000396000f3fe608060405234801561001057600080fd5b50600436106100b45760003560e01c806340c10f191161007157806340c10f191461014157806370a082311461015657806395d89b411461017f578063a457c2d714610187578063a9059cbb1461019a578063dd62ed3e146101ad57600080fd5b806306fdde03146100b9578063095ea7b3146100d757806318160ddd146100fa57806323b872dd1461010c578063313ce5671461011f578063395093511461012e575b600080fd5b6100c16101c0565b6040516100ce9190610863565b60405180910390f35b6100ea6100e53660046108d4565b610252565b60405190151581526020016100ce565b6002545b6040519081526020016100ce565b6100ea61011a3660046108fe565b61026c565b604051601281526020016100ce565b6100ea61013c3660046108d4565b610290565b61015461014f3660046108d4565b6102b2565b005b6100fe61016436600461093a565b6001600160a01b031660009081526020819052604090205490565b6100c161039f565b6100ea6101953660046108d4565b6103ae565b6100ea6101a83660046108d4565b610429565b6100fe6101bb36600461095c565b610437565b6060600380546101cf9061098f565b80601f01602080910402602001604051908101604052809291908181526020018280546101fb9061098f565b80156102485780601f1061021d57610100808354040283529160200191610248565b820191906000526020600020905b81548152906001019060200180831161022b57829003601f168201915b5050505050905090565b600033610260818585610462565b60019150505b92915050565b60003361027a858285610586565b610285858585610600565b506001949350505050565b6000336102608185856102a38383610437565b6102ad91906109e0565b610462565b6005546001600160a01b0316331461031b5760405162461bcd60e51b815260206004820152602160248201527f6f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6044820152603760f91b60648201526084015b60405180910390fd5b61039b82306001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061038191906109f8565b61038c90600a610aff565b6103969084610b0e565b6107a4565b5050565b6060600480546101cf9061098f565b600033816103bc8286610437565b90508381101561041c5760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610312565b6102858286868403610462565b600033610260818585610600565b6001600160a01b03918216600090815260016020908152604080832093909416825291909152205490565b6001600160a01b0383166104c45760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610312565b6001600160a01b0382166105255760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610312565b6001600160a01b0383811660008181526001602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b60006105928484610437565b905060001981146105fa57818110156105ed5760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e63650000006044820152606401610312565b6105fa8484848403610462565b50505050565b6001600160a01b0383166106645760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610312565b6001600160a01b0382166106c65760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610312565b6001600160a01b0383166000908152602081905260409020548181101561073e5760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610312565b6001600160a01b03848116600081815260208181526040808320878703905593871680835291849020805487019055925185815290927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a36105fa565b6001600160a01b0382166107fa5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610312565b806002600082825461080c91906109e0565b90915550506001600160a01b038216600081815260208181526040808320805486019055518481527fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef910160405180910390a35050565b600060208083528351808285015260005b8181101561089057858101830151858201604001528201610874565b818111156108a2576000604083870101525b50601f01601f1916929092016040019392505050565b80356001600160a01b03811681146108cf57600080fd5b919050565b600080604083850312156108e757600080fd5b6108f0836108b8565b946020939093013593505050565b60008060006060848603121561091357600080fd5b61091c846108b8565b925061092a602085016108b8565b9150604084013590509250925092565b60006020828403121561094c57600080fd5b610955826108b8565b9392505050565b6000806040838503121561096f57600080fd5b610978836108b8565b9150610986602084016108b8565b90509250929050565b600181811c908216806109a357607f821691505b602082108114156109c457634e487b7160e01b600052602260045260246000fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b600082198211156109f3576109f36109ca565b500190565b600060208284031215610a0a57600080fd5b815160ff8116811461095557600080fd5b600181815b80851115610a56578160001904821115610a3c57610a3c6109ca565b80851615610a4957918102915b93841c9390800290610a20565b509250929050565b600082610a6d57506001610266565b81610a7a57506000610266565b8160018114610a905760028114610a9a57610ab6565b6001915050610266565b60ff841115610aab57610aab6109ca565b50506001821b610266565b5060208310610133831016604e8410600b8410161715610ad9575081810a610266565b610ae38383610a1b565b8060001904821115610af757610af76109ca565b029392505050565b600061095560ff841683610a5e565b6000816000190483118215151615610b2857610b286109ca565b50029056fea26469706673582212207739fb501a2e3ca212f2933691e4518e49e53bdc1038bb289b2ea1937220dce964736f6c634300080a00330000000000000000000000000000000000000000033b2e3c9fd0803ce8000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000004555344580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045553445800000000000000000000000000000000000000000000000000000000824f0aa0ad2c9a83e114ed7b82fb98ba15bb5632db91ebcd288eeaa00a710e1484c2f3f3a06abcc4e6a708b971c6c67e9c4727738ff0fae8230ad46e7c33c3b61bf301bf0f
+

layer2/contracts-bedrock/scripts/getting-started/config.sh

@@ -153,8 +153,8 @@ cat << EOL >> tmp_config.json
   "daResolveWindow": 100,
   "daBondSize": 1000,
   "daResolverRefundPercentage": 50,
-  "useCustomGasToken": false,
-  "customGasTokenAddress": "0x88395111AB1586a4030dAC62a183542762929bbC"
+  "useCustomGasToken": true,
+  "customGasTokenAddress": "0x9c4bd341cf7134a53b1f34cfa9f3dea4fde61c9c"
 }
 EOL
 

layer2/proposer.sh

@@ -2,9 +2,11 @@
 source /root/.envrc
 
 op-proposer \
+  --data-dir=/root/node \
   --poll-interval=12s \
   --rpc.port=8560 \
   --rollup-rpc=http://layer2:9545 \
   --l2oo-address=$(cat /root/deployments/artifact.json  | grep "L2OutputOracleProxy" | grep -Eo "0x[a-fA-F0-9]+") \
+  --portal-address=$(cat /root/deployments/artifact.json  | grep -w "OptimismPortal" | grep -Eo "0x[a-fA-F0-9]+") \
   --private-key=$GS_PROPOSER_PRIVATE_KEY \
-  --l1-eth-rpc=$L1_RPC_URL
\ No newline at end of file
+  --l1-eth-rpc=$L1_RPC_URL