Skip to content

Commit

Permalink
Base gas fee fix (#171)
Browse files Browse the repository at this point in the history
  • Loading branch information
0xSulpiride authored Apr 8, 2024
1 parent 0082b2b commit 334cc51
Show file tree
Hide file tree
Showing 15 changed files with 47 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.48-alpha",
"version": "1.0.49-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.48-alpha",
"version": "1.0.49-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.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",
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.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"
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.48-alpha",
"version": "1.0.49-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.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": {
Expand Down
2 changes: 1 addition & 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.48-alpha",
"version": "1.0.49-alpha",
"description": "Smart contracts of Etherspot bundler client",
"author": "Etherspot",
"homepage": "https://https://github.com/etherspot/skandha#readme",
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.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",
Expand Down Expand Up @@ -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",
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.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",
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.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"
}
}
4 changes: 2 additions & 2 deletions packages/executor/src/modules/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
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.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",
Expand Down Expand Up @@ -32,6 +32,6 @@
},
"dependencies": {
"prom-client": "15.1.0",
"types": "^1.0.48-alpha"
"types": "^1.0.49-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.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",
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.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"
},
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.48-alpha",
"version": "1.0.49-alpha",
"description": "Various bundler parameters",
"author": "Etherspot",
"homepage": "https://github.com/etherspot/skandha#readme",
Expand All @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions packages/params/src/gas-price-oracles/oracles/base.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { IGetGasFeeResult, IOracle } from "./interfaces";
import { getEtherscanGasFee } from "./utils";

export const getBaseGasFee: IOracle = (
apiKey: string | undefined
): Promise<IGetGasFeeResult> =>
getEtherscanGasFee("https://api.basescan.org/api", apiKey);
2 changes: 2 additions & 0 deletions packages/params/src/gas-price-oracles/oracles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,4 +18,5 @@ export const oracles: {
42161: getArbitrumGasFee,
5000: getMantleGasFee,
5001: getMantleGasFee,
8453: getBaseGasFee,
};
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.48-alpha",
"version": "1.0.49-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.48-alpha",
"version": "1.0.49-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.48-alpha"
"types": "^1.0.49-alpha"
}
}

0 comments on commit 334cc51

Please sign in to comment.