From d27eb42e1c98556a225311ab57e9f60e71f03377 Mon Sep 17 00:00:00 2001
From: minh-bq <97180373+minh-bq@users.noreply.github.com>
Date: Tue, 18 Jun 2024 13:23:12 +0700
Subject: [PATCH] genesis: add Berlin, London, Tripp, Aaron hardforks for
 mainnet (#473)

* genesis: add Berlin, London, Tripp, Aaron hardforks for mainnet

These hardforks are scheduled around 7:00 UTC July 3rd, 2024 at block 36052600
(https://app.roninchain.com/block/36052600).

* version: bump Ronin to v2.8.3
---
 genesis/mainnet.json | 10 ++++++++++
 params/config.go     |  8 +++++---
 params/version.go    |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/genesis/mainnet.json b/genesis/mainnet.json
index 8d7060a9e6..6e72073d17 100644
--- a/genesis/mainnet.json
+++ b/genesis/mainnet.json
@@ -32,10 +32,20 @@
     "shillinBlock": 28825400,
     "antennaBlock": 28825400,
     "mikoBlock": 32367400,
+    "berlinBlock": 36052600,
+    "londonBlock": 36052600,
+    "trippBlock": 36052600,
+    "trippPeriod": 19907,
+    "aaronBlock": 36052600,
     "whiteListDeployerContractV2Address": "0xc1876d5C4BFAF0eE325E4226B2bdf216D9896AE1",
     "roninTrustedOrgUpgrade": {
       "proxyAddress": "0x98D0230884448B3E2f09a177433D60fb1E19C090",
       "implementationAddress": "0x59646258Ec25CC329f5ce93223e0A50ccfA3e885"
+    },
+    "transparentProxyCodeUpgrade": {
+      "axieAddress": "0x32950db2a7164ae833121501c797d79e7b79d74c",
+      "landAddress": "0x8c811e3c958e190f5ec15fb376533a3398620500",
+      "code": "0x60806040523661001357610011610017565b005b6100115b61001f6102a1565b73ffffffffffffffffffffffffffffffffffffffff1633036102975760607fffffffff00000000000000000000000000000000000000000000000000000000600035167fc9a6301a000000000000000000000000000000000000000000000000000000008101610098576100916102e1565b915061028f565b7fb0e10d7a000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008216016100e957610091610338565b7f70d7c690000000000000000000000000000000000000000000000000000000007fffffffff0000000000000000000000000000000000000000000000000000000082160161013a5761009161037e565b7f07ae5bc0000000000000000000000000000000000000000000000000000000007fffffffff0000000000000000000000000000000000000000000000000000000082160161018b576100916103af565b7fa39f25e5000000000000000000000000000000000000000000000000000000007fffffffff000000000000000000000000000000000000000000000000000000008216016101dc576100916103fc565b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f7879207461726760648201527f6574000000000000000000000000000000000000000000000000000000000000608482015260a4015b60405180910390fd5b815160208301f35b61029f610410565b565b60007fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61035b5473ffffffffffffffffffffffffffffffffffffffff16919050565b60606102eb610420565b60006102fa36600481846108d7565b810190610307919061092a565b90506103248160405180602001604052806000815250600061042b565b505060408051602081019091526000815290565b606060008061034a36600481846108d7565b8101906103579190610974565b915091506103678282600161042b565b604051806020016040528060008152509250505090565b6060610388610420565b600061039736600481846108d7565b8101906103a4919061092a565b905061032481610457565b60606103b9610420565b60006103c36102a1565b6040805173ffffffffffffffffffffffffffffffffffffffff831660208201529192500160405160208183030381529060405291505090565b6060610406610420565b60006103c36104bb565b61029f61041b6104bb565b6104ca565b341561029f57600080fd5b610434836104ee565b6000825111806104415750805b1561045257610450838361053b565b505b505050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6104806102a1565b6040805173ffffffffffffffffffffffffffffffffffffffff928316815291841660208301520160405180910390a16104b881610567565b50565b60006104c5610673565b905090565b3660008037600080366000845af43d6000803e8080156104e9573d6000f35b3d6000fd5b6104f78161069b565b60405173ffffffffffffffffffffffffffffffffffffffff8216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606105608383604051806060016040528060278152602001610b0d60279139610766565b9392505050565b73ffffffffffffffffffffffffffffffffffffffff811661060a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610286565b807fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61035b80547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff9290921691909117905550565b60007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc6102c5565b73ffffffffffffffffffffffffffffffffffffffff81163b61073f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201527f6f74206120636f6e7472616374000000000000000000000000000000000000006064820152608401610286565b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc61062d565b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516107909190610a9f565b600060405180830381855af49150503d80600081146107cb576040519150601f19603f3d011682016040523d82523d6000602084013e6107d0565b606091505b50915091506107e1868383876107eb565b9695505050505050565b6060831561088157825160000361087a5773ffffffffffffffffffffffffffffffffffffffff85163b61087a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610286565b508161088b565b61088b8383610893565b949350505050565b8151156108a35781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102869190610abb565b600080858511156108e757600080fd5b838611156108f457600080fd5b5050820193919092039150565b803573ffffffffffffffffffffffffffffffffffffffff8116811461092557600080fd5b919050565b60006020828403121561093c57600080fd5b61056082610901565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000806040838503121561098757600080fd5b61099083610901565b9150602083013567ffffffffffffffff8111156109ac57600080fd5b8301601f810185136109bd57600080fd5b803567ffffffffffffffff8111156109d7576109d7610945565b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8501160116810181811067ffffffffffffffff82111715610a4357610a43610945565b604052818152828201602001871015610a5b57600080fd5b816020840160208301376000602083830101528093505050509250929050565b60005b83811015610a96578181015183820152602001610a7e565b50506000910152565b60008251610ab1818460208701610a7b565b9190910192915050565b6020815260008251806020840152610ada816040850160208701610a7b565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016919091016040019291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220301172db114fe6fe4ccca8436137dc0e221398901bf5ca28b3dc1915e56ed0b664736f6c634300081a0033"
     }
   },
   "alloc": {
diff --git a/params/config.go b/params/config.go
index 5a0b3e0d8c..7ff1a206f2 100644
--- a/params/config.go
+++ b/params/config.go
@@ -288,9 +288,11 @@ var (
 			ProxyAddress:          common.HexToAddress("0x98D0230884448B3E2f09a177433D60fb1E19C090"),
 			ImplementationAddress: common.HexToAddress("0x59646258Ec25CC329f5ce93223e0A50ccfA3e885"),
 		},
-		// TODO: fill this
-		TrippBlock: common.Big0,
-		AaronBlock: common.Big0,
+		LondonBlock: big.NewInt(36052600),
+		BerlinBlock: big.NewInt(36052600),
+		TrippBlock:  big.NewInt(36052600),
+		TrippPeriod: big.NewInt(19907),
+		AaronBlock:  big.NewInt(36052600),
 	}
 
 	RoninTestnetBlacklistContract                  = common.HexToAddress("0xF53EED5210c9cF308abFe66bA7CF14884c95A8aC")
diff --git a/params/version.go b/params/version.go
index 580cc7943e..d4de914ec9 100644
--- a/params/version.go
+++ b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 2  // Major version component of the current release
 	VersionMinor = 8  // Minor version component of the current release
-	VersionPatch = 2  // Patch version component of the current release
+	VersionPatch = 3  // Patch version component of the current release
 	VersionMeta  = "" // Version metadata to append to the version string
 )