Merge branch 'master' into echo-integration

etherspot · Apr 1, 2024 · 20a83b8 · 20a83b8
2 parents 08cd174 + 9a69813
commit 20a83b8
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
@@ -2,7 +2,12 @@
 
 ### Deployments
 
-- Rootstock Testnet
+- Rootstock Testnet (31)
   - EntryPointForwarder
     - [Address](https://explorer.testnet.rootstock.io/address/0xD65d3D76DDe1311e07d881498D482E40095d8FE2)
-    - [Deployment tx](https://explorer.testnet.rootstock.io/tx/0xa1835557b4d90ecec09f1aa2b0b9b58ab16943064986681cc7252ce0fe13d596)
+    - [Deployment tx](https://explorer.testnet.rootstock.io/tx/0xa1835557b4d90ecec09f1aa2b0b9b58ab16943064986681cc7252ce0fe13d596)
+
+- Rootstock Mainnet (30)
+  - EntryPointForwarder
+    - [Address](https://explorer.rootstock.io/address/0x810FA4C915015b703db0878CF2B9344bEB254a40)
+    - [Deployment tx](https://explorer.rootstock.io/tx/0x596c1c4e61d593561ee1af526881e1937cbbe644acbba7ce289f5364eccc442c)
diff --git a/packages/contracts/broadcast/Deploy.sol/30.json b/packages/contracts/broadcast/Deploy.sol/30.json
@@ -0,0 +1,47 @@
+{
+  "transactions": [
+    {
+      "hash": "0x596c1c4e61d593561ee1af526881e1937cbbe644acbba7ce289f5364eccc442c",
+      "transactionType": "CREATE",
+      "contractName": "EntryPointForwarder",
+      "contractAddress": "0x810FA4C915015b703db0878CF2B9344bEB254a40",
+      "function": null,
+      "arguments": null,
+      "rpc": "https://public-node.rsk.co",
+      "transaction": {
+        "type": "0x00",
+        "from": "0x09fd4f6088f2025427ab1e89257a44747081ed59",
+        "gas": "0x2f5ab",
+        "value": "0x0",
+        "data": "0x608060405234801561001057600080fd5b506101be806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80636fadcf7214610030575b600080fd5b61004361003e36600461008d565b610045565b005b6000808251602084016000865af1503d6000803e3d6000f35b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080604083850312156100a057600080fd5b823573ffffffffffffffffffffffffffffffffffffffff811681146100c457600080fd5b9150602083013567ffffffffffffffff808211156100e157600080fd5b818501915085601f8301126100f557600080fd5b8135818111156101075761010761005e565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f0116810190838211818310171561014d5761014d61005e565b8160405282815288602084870101111561016657600080fd5b826020860160208301376000602084830101528095505050505050925092905056fea2646970667358221220883f7f5aa0166ab0e2f11201650237bf5da1dbf8ca3f278c44af3007a60de91c64736f6c63430008140033",
+        "nonce": "0x6"
+      },
+      "additionalContracts": []
+    }
+  ],
+  "receipts": [
+    {
+      "transactionHash": "0x596c1c4e61d593561ee1af526881e1937cbbe644acbba7ce289f5364eccc442c",
+      "transactionIndex": "0x0",
+      "blockHash": "0x3e47b254dd151029fce468f4f5f4982aa39dcb3569e9f09375e304a3d9900866",
+      "blockNumber": "0x5eafda",
+      "from": "0x09FD4F6088f2025427AB1e89257A44747081Ed59",
+      "to": null,
+      "cumulativeGasUsed": "0x29ab7",
+      "gasUsed": "0x29ab7",
+      "contractAddress": "0x810FA4C915015b703db0878CF2B9344bEB254a40",
+      "logs": [],
+      "status": "0x1",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "type": "0x0"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "path": "E:/etherspot/etherspot-bundler-p2p/packages/contracts/broadcast\\Deploy.sol\\30\\run-latest.json",
+  "returns": {},
+  "timestamp": 1711621842,
+  "chain": 30,
+  "multi": false,
+  "commit": "60bb068"
+}
diff --git a/...acts/broadcast/Deploy.sol/run-latest.json → ...es/contracts/broadcast/Deploy.sol/31.json b/...acts/broadcast/Deploy.sol/run-latest.json → ...es/contracts/broadcast/Deploy.sol/31.json
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -25,6 +25,7 @@
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
     "coverage": "forge coverage --match-contract Unit",
     "deploy:rootstockTestnet": "bash -c \"source .env && forge script Deploy --broadcast --legacy --rpc-url $ROOTSTOCK_TESTNET_RPC --private-key $ROOTSTOCK_TESTNET_DEPLOYER_PK\"",
+    "deploy:rootstock": "bash -c \"source .env && forge script Deploy --broadcast --legacy --rpc-url $ROOTSTOCK_RPC --private-key $ROOTSTOCK_DEPLOYER_PK\"",
     "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt --check",
     "lint:fix": "forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix",
     "lint:natspec": "npx @defi-wonderland/natspec-smells --config natspec-smells.config.js",

diff --git a/packages/params/src/eip1559.ts b/packages/params/src/eip1559.ts
@@ -9,4 +9,5 @@ export const chainsWithoutEIP1559: number[] = [
   534353, // "scrollAlpha"
   534351, // "scrollSepolia"
   31, // rootstock testnet
+  30, // rootstock mainnet
 ];