diff --git a/lerna.json b/lerna.json index 6376955b..af9a94f7 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "1.0.48-alpha", + "version": "1.0.49-alpha", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index c46302a3..cb9d6186 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "1.0.48-alpha", + "version": "1.0.49-alpha", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index 8ce73f88..7b43a641 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha", + "executor": "^1.0.49-alpha", "fastify": "4.14.1", - "monitoring": "^1.0.48-alpha", + "monitoring": "^1.0.49-alpha", "pino": "8.11.0", "pino-pretty": "10.0.0", "reflect-metadata": "0.1.13", - "types": "^1.0.48-alpha" + "types": "^1.0.49-alpha" }, "devDependencies": { "@types/connect": "3.4.35" diff --git a/packages/cli/package.json b/packages/cli/package.json index 3b79283c..bb3f44fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha", - "db": "^1.0.48-alpha", - "executor": "^1.0.48-alpha", + "api": "^1.0.49-alpha", + "db": "^1.0.49-alpha", + "executor": "^1.0.49-alpha", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", - "monitoring": "^1.0.48-alpha", - "node": "^1.0.48-alpha", - "types": "^1.0.48-alpha", + "monitoring": "^1.0.49-alpha", + "node": "^1.0.49-alpha", + "types": "^1.0.49-alpha", "yargs": "17.6.2" }, "devDependencies": { diff --git a/packages/contracts/package.json b/packages/contracts/package.json index dd6102c0..2541d6d2 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,6 @@ { "name": "contracts", - "version": "1.0.48-alpha", + "version": "1.0.49-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 f033b32d..217be5e7 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "db", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha" + "types": "^1.0.49-alpha" }, "devDependencies": { "@types/rocksdb": "3.0.1", diff --git a/packages/executor/package.json b/packages/executor/package.json index d8a0f6fd..816e0893 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -1,6 +1,6 @@ { "name": "executor", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha", - "params": "^1.0.48-alpha", - "types": "^1.0.48-alpha" + "monitoring": "^1.0.49-alpha", + "params": "^1.0.49-alpha", + "types": "^1.0.49-alpha" } } diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts index 4dd4650e..153d873d 100644 --- a/packages/executor/src/modules/eth.ts +++ b/packages/executor/src/modules/eth.ts @@ -52,8 +52,8 @@ export class Eth { this.pvgEstimator = estimateArbitrumPVG(this.provider); } - // ["optimism", "optimismGoerli"] - if ([10, 420].includes(this.chainId)) { + // ["optimism", "optimismGoerli", "base"] + if ([10, 420, 8453].includes(this.chainId)) { this.pvgEstimator = estimateOptimismPVG(this.provider); } diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 5052e0e7..7ea30d95 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "monitoring", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha" + "types": "^1.0.49-alpha" } } diff --git a/packages/node/package.json b/packages/node/package.json index 13ea7761..ec5bc7f0 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -1,6 +1,6 @@ { "name": "node", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha", + "api": "^1.0.49-alpha", "datastore-core": "8.0.1", - "db": "^1.0.48-alpha", + "db": "^1.0.49-alpha", "ethers": "5.7.2", - "executor": "^1.0.48-alpha", + "executor": "^1.0.49-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.48-alpha", - "params": "^1.0.48-alpha", + "monitoring": "^1.0.49-alpha", + "params": "^1.0.49-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.48-alpha", - "utils": "^1.0.48-alpha", + "types": "^1.0.49-alpha", + "utils": "^1.0.49-alpha", "varint": "6.0.0", "xxhash-wasm": "1.0.2" }, diff --git a/packages/params/package.json b/packages/params/package.json index d29e8987..518e21d7 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -1,6 +1,6 @@ { "name": "params", - "version": "1.0.48-alpha", + "version": "1.0.49-alpha", "description": "Various bundler parameters", "author": "Etherspot", "homepage": "https://github.com/etherspot/skandha#readme", @@ -26,8 +26,8 @@ "@eth-optimism/sdk": "3.2.3", "@mantleio/sdk": "0.2.1", "ethers": "5.7.2", - "types": "^1.0.48-alpha", - "utils": "^1.0.48-alpha" + "types": "^1.0.49-alpha", + "utils": "^1.0.49-alpha" }, "scripts": { "clean": "rm -rf lib && rm -f *.tsbuildinfo", diff --git a/packages/params/src/gas-price-oracles/oracles/base.ts b/packages/params/src/gas-price-oracles/oracles/base.ts new file mode 100644 index 00000000..f51cac8f --- /dev/null +++ b/packages/params/src/gas-price-oracles/oracles/base.ts @@ -0,0 +1,7 @@ +import { IGetGasFeeResult, IOracle } from "./interfaces"; +import { getEtherscanGasFee } from "./utils"; + +export const getBaseGasFee: IOracle = ( + apiKey: string | undefined +): Promise => + getEtherscanGasFee("https://api.basescan.org/api", apiKey); diff --git a/packages/params/src/gas-price-oracles/oracles/index.ts b/packages/params/src/gas-price-oracles/oracles/index.ts index 2d76b123..17641f91 100644 --- a/packages/params/src/gas-price-oracles/oracles/index.ts +++ b/packages/params/src/gas-price-oracles/oracles/index.ts @@ -7,6 +7,7 @@ import { getMumbaiGasFee } from "./mumbai"; import { getOptimismGasFee } from "./optimism"; import { IOracle } from "./interfaces"; import { getMantleGasFee } from "./mantle"; +import { getBaseGasFee } from "./base"; export const oracles: { [chainId: number]: IOracle | undefined; @@ -17,4 +18,5 @@ export const oracles: { 42161: getArbitrumGasFee, 5000: getMantleGasFee, 5001: getMantleGasFee, + 8453: getBaseGasFee, }; diff --git a/packages/types/package.json b/packages/types/package.json index c8fbef91..2adf32ab 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "types", - "version": "1.0.48-alpha", + "version": "1.0.49-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 7f4fbc39..78e59c6d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "utils", - "version": "1.0.48-alpha", + "version": "1.0.49-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.48-alpha" + "types": "^1.0.49-alpha" } }