Skip to content

Commit

Permalink
deploy forwarder on roostock (#169)
Browse files Browse the repository at this point in the history
  • Loading branch information
0xSulpiride authored Mar 28, 2024
1 parent 60bb068 commit 9a69813
Show file tree
Hide file tree
Showing 16 changed files with 92 additions and 38 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "1.0.46-alpha",
"version": "1.0.47-alpha",
"stream": "true",
"command": {
"version": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "root",
"private": true,
"version": "1.0.46-alpha",
"version": "1.0.47-alpha",
"engines": {
"node": ">=18.0.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cli",
"version": "1.0.46-alpha",
"version": "1.0.47-alpha",
"description": "> TODO: description",
"author": "zincoshine <[email protected]>",
"homepage": "https://https://github.com/etherspot/skandha#readme",
Expand Down Expand Up @@ -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": {
Expand Down
9 changes: 7 additions & 2 deletions packages/contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
47 changes: 47 additions & 0 deletions packages/contracts/broadcast/Deploy.sol/30.json
Original file line number Diff line number Diff line change
@@ -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"
}
3 changes: 2 additions & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/db/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/executor/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/monitoring/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -32,6 +32,6 @@
},
"dependencies": {
"prom-client": "15.1.0",
"types": "^1.0.46-alpha"
"types": "^1.0.47-alpha"
}
}
16 changes: 8 additions & 8 deletions packages/node/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/params/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/params/src/eip1559.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export const chainsWithoutEIP1559: number[] = [
534353, // "scrollAlpha"
534351, // "scrollSepolia"
31, // rootstock testnet
30, // rootstock mainnet
];
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}
}

0 comments on commit 9a69813

Please sign in to comment.