From 09b32310e6438b01ec0dd97c995ede0af0813900 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Thu, 28 Mar 2024 15:38:37 +0500 Subject: [PATCH 1/2] deploy forwarder on roostock & disable eip1559 on roostock --- packages/contracts/README.md | 9 +++- .../contracts/broadcast/Deploy.sol/30.json | 47 +++++++++++++++++++ .../Deploy.sol/{run-latest.json => 31.json} | 0 packages/contracts/package.json | 1 + packages/params/src/eip1559.ts | 1 + 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 packages/contracts/broadcast/Deploy.sol/30.json rename packages/contracts/broadcast/Deploy.sol/{run-latest.json => 31.json} (100%) diff --git a/packages/contracts/README.md b/packages/contracts/README.md index af5ba9c9..c1c94b0b 100644 --- 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) \ No newline at end of file + - [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) \ No newline at end of file diff --git a/packages/contracts/broadcast/Deploy.sol/30.json b/packages/contracts/broadcast/Deploy.sol/30.json new file mode 100644 index 00000000..2dbd7f15 --- /dev/null +++ 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" +} \ No newline at end of file diff --git a/packages/contracts/broadcast/Deploy.sol/run-latest.json b/packages/contracts/broadcast/Deploy.sol/31.json similarity index 100% rename from packages/contracts/broadcast/Deploy.sol/run-latest.json rename to packages/contracts/broadcast/Deploy.sol/31.json diff --git a/packages/contracts/package.json b/packages/contracts/package.json index cfd224f0..6986dadb 100644 --- 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 index 207079e7..4621a7a3 100644 --- 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 ]; From 9f513083c272cdc11855f34210522099bcd28eb2 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Thu, 28 Mar 2024 15:39:22 +0500 Subject: [PATCH 2/2] chore: release 1.0.47-alpha --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 8 ++++---- packages/cli/package.json | 14 +++++++------- packages/contracts/package.json | 2 +- packages/db/package.json | 4 ++-- packages/executor/package.json | 8 ++++---- packages/monitoring/package.json | 4 ++-- packages/node/package.json | 16 ++++++++-------- packages/params/package.json | 6 +++--- packages/types/package.json | 2 +- packages/utils/package.json | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index d4fe4167..6d651eae 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index 79b4e003..c464debd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index a3d1fcb0..c13b137e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The API module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -35,13 +35,13 @@ "class-transformer": "0.5.1", "class-validator": "0.14.0", "ethers": "5.7.2", - "executor": "^1.0.46-alpha", + "executor": "^1.0.47-alpha", "fastify": "4.14.1", - "monitoring": "^1.0.46-alpha", + "monitoring": "^1.0.47-alpha", "pino": "8.11.0", "pino-pretty": "10.0.0", "reflect-metadata": "0.1.13", - "types": "^1.0.46-alpha" + "types": "^1.0.47-alpha" }, "devDependencies": { "@types/connect": "3.4.35" diff --git a/packages/cli/package.json b/packages/cli/package.json index ec01b1af..6cb7cee6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "> TODO: description", "author": "zincoshine ", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -38,15 +38,15 @@ "@libp2p/peer-id-factory": "2.0.1", "@libp2p/prometheus-metrics": "1.1.3", "@multiformats/multiaddr": "12.1.3", - "api": "^1.0.46-alpha", - "db": "^1.0.46-alpha", - "executor": "^1.0.46-alpha", + "api": "^1.0.47-alpha", + "db": "^1.0.47-alpha", + "executor": "^1.0.47-alpha", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", - "monitoring": "^1.0.46-alpha", - "node": "^1.0.46-alpha", - "types": "^1.0.46-alpha", + "monitoring": "^1.0.47-alpha", + "node": "^1.0.47-alpha", + "types": "^1.0.47-alpha", "yargs": "17.6.2" }, "devDependencies": { diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 6986dadb..3e0d2a81 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "contracts", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "Smart contracts of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", diff --git a/packages/db/package.json b/packages/db/package.json index 9290d969..66ff7e12 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "db", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The DB module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -33,7 +33,7 @@ "dependencies": { "@chainsafe/ssz": "0.10.1", "@farcaster/rocksdb": "5.5.0", - "types": "^1.0.46-alpha" + "types": "^1.0.47-alpha" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index d80435af..5c6d5643 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -1,6 +1,6 @@ { "name": "executor", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The Relayer module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -34,8 +34,8 @@ "@flashbots/ethers-provider-bundle": "0.6.2", "async-mutex": "0.4.0", "ethers": "5.7.2", - "monitoring": "^1.0.46-alpha", - "params": "^1.0.46-alpha", - "types": "^1.0.46-alpha" + "monitoring": "^1.0.47-alpha", + "params": "^1.0.47-alpha", + "types": "^1.0.47-alpha" } } diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index e88d8ee3..065ce057 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "monitoring", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The Monitoring module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -32,6 +32,6 @@ }, "dependencies": { "prom-client": "15.1.0", - "types": "^1.0.46-alpha" + "types": "^1.0.47-alpha" } } diff --git a/packages/node/package.json b/packages/node/package.json index b41518cb..98b50c58 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "node", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The bundler node module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -56,25 +56,25 @@ "@libp2p/tcp": "6.1.0", "@multiformats/multiaddr": "11.4.0", "abstract-leveldown": "7.2.0", - "api": "^1.0.46-alpha", + "api": "^1.0.47-alpha", "datastore-core": "8.0.1", - "db": "^1.0.46-alpha", + "db": "^1.0.47-alpha", "ethers": "5.7.2", - "executor": "^1.0.46-alpha", + "executor": "^1.0.47-alpha", "it-filter": "1.0.2", "it-map": "1.0.5", "it-sort": "1.0.0", "it-take": "1.0.1", "libp2p": "0.42.2", - "monitoring": "^1.0.46-alpha", - "params": "^1.0.46-alpha", + "monitoring": "^1.0.47-alpha", + "params": "^1.0.47-alpha", "prettier": "2.8.4", "snappy": "7.2.2", "snappyjs": "0.7.0", "stream-to-it": "0.2.4", "strict-event-emitter-types": "2.0.0", - "types": "^1.0.46-alpha", - "utils": "^1.0.46-alpha", + "types": "^1.0.47-alpha", + "utils": "^1.0.47-alpha", "varint": "6.0.0", "xxhash-wasm": "1.0.2" }, diff --git a/packages/params/package.json b/packages/params/package.json index d4908eca..3717c480 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -1,6 +1,6 @@ { "name": "params", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "Various bundler parameters", "author": "Etherspot", "homepage": "https://github.com/etherspot/skandha#readme", @@ -26,8 +26,8 @@ "@eth-optimism/sdk": "3.0.0", "@mantleio/sdk": "0.2.1", "ethers": "5.7.2", - "types": "^1.0.46-alpha", - "utils": "^1.0.46-alpha" + "types": "^1.0.47-alpha", + "utils": "^1.0.47-alpha" }, "scripts": { "clean": "rm -rf lib && rm -f *.tsbuildinfo", diff --git a/packages/types/package.json b/packages/types/package.json index 62e3524b..49488a3f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "types", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "The types of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", diff --git a/packages/utils/package.json b/packages/utils/package.json index e98e0d63..702bd26b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "utils", - "version": "1.0.46-alpha", + "version": "1.0.47-alpha", "description": "utils of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -37,6 +37,6 @@ "case": "^1.6.3", "pino": "8.11.0", "pino-pretty": "10.0.0", - "types": "^1.0.46-alpha" + "types": "^1.0.47-alpha" } }