From 616c03f14035b1776f8890ca07fd3126a354a0e1 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Fri, 8 Sep 2023 16:09:03 +0500 Subject: [PATCH 1/3] add flare chains --- packages/params/src/whitelisted-entities/factories.ts | 5 ++++- packages/types/src/networks/networks.ts | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/params/src/whitelisted-entities/factories.ts b/packages/params/src/whitelisted-entities/factories.ts index 5581d443..63a058a8 100644 --- a/packages/params/src/whitelisted-entities/factories.ts +++ b/packages/params/src/whitelisted-entities/factories.ts @@ -2,7 +2,7 @@ import { getAddress } from "ethers/lib/utils"; import { IWhitelistedEntity } from "../types/IWhitelistedEntities"; export const WhitelistedFactories: IWhitelistedEntity = { - // Etehrspot Paymasters + // Etherspot Paymasters // ref: https://github.com/etherspot/etherspot-prime-contracts/blob/master/DEPLOYMENTS.md mainnet: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], arbitrum: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], @@ -28,4 +28,7 @@ export const WhitelistedFactories: IWhitelistedEntity = { lineaTestnet: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], scrollSepolia: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], mantleTestnet: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], + flare: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], + flareCoston: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], + flareCoston2: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], }; diff --git a/packages/types/src/networks/networks.ts b/packages/types/src/networks/networks.ts index 82102d79..1f8cdf66 100644 --- a/packages/types/src/networks/networks.ts +++ b/packages/types/src/networks/networks.ts @@ -37,7 +37,10 @@ export type NetworkName = | "lineaTestnet" | "scroll" | "scrollSepolia" - | "scrollAlpha"; + | "scrollAlpha" + | "flare" + | "flareCoston" + | "flareCoston2"; export const networkNames: NetworkName[] = [ "mainnet", @@ -79,6 +82,9 @@ export const networkNames: NetworkName[] = [ "scroll", "scrollSepolia", "scrollAlpha", + "flare", + "flareCoston", + "flareCoston2", ]; export const NETWORK_NAME_TO_CHAIN_ID: { @@ -123,4 +129,7 @@ export const NETWORK_NAME_TO_CHAIN_ID: { scroll: 534352, scrollSepolia: 534351, scrollAlpha: 534353, + flare: 14, + flareCoston: 16, + flareCoston2: 114, }; From 91138b92963c641e376cff41d94cfbc6f15e46f7 Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Fri, 8 Sep 2023 16:09:21 +0500 Subject: [PATCH 2/3] chore(release): v0.0.41 --- lerna.json | 2 +- package.json | 2 +- packages/api/package.json | 6 +++--- packages/cli/package.json | 10 +++++----- packages/db/package.json | 4 ++-- packages/executor/package.json | 6 +++--- packages/params/package.json | 4 ++-- packages/types/package.json | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lerna.json b/lerna.json index c1b46b8a..34841a43 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "0.0.40", + "version": "0.0.41", "stream": "true", "command": { "version": { diff --git a/package.json b/package.json index 0e4fc745..2a18af30 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "root", "private": true, - "version": "0.0.40", + "version": "0.0.41", "engines": { "node": ">=18.0.0" }, diff --git a/packages/api/package.json b/packages/api/package.json index 2291f037..f9159315 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "0.0.40", + "version": "0.0.41", "description": "The API module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -35,12 +35,12 @@ "class-transformer": "0.5.1", "class-validator": "0.14.0", "ethers": "5.7.2", - "executor": "^0.0.40", + "executor": "^0.0.41", "fastify": "4.14.1", "pino": "8.11.0", "pino-pretty": "10.0.0", "reflect-metadata": "0.1.13", - "types": "^0.0.40" + "types": "^0.0.41" }, "devDependencies": { "@types/connect": "3.4.35" diff --git a/packages/cli/package.json b/packages/cli/package.json index c900f1f3..f57af94d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "0.0.40", + "version": "0.0.41", "description": "> TODO: description", "author": "zincoshine ", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -31,13 +31,13 @@ "url": "https://https://github.com/etherspot/skandha/issues" }, "dependencies": { - "api": "^0.0.40", - "db": "^0.0.40", - "executor": "^0.0.40", + "api": "^0.0.41", + "db": "^0.0.41", + "executor": "^0.0.41", "find-up": "5.0.0", "got": "12.5.3", "js-yaml": "4.1.0", - "types": "^0.0.40", + "types": "^0.0.41", "yargs": "17.6.2" }, "devDependencies": { diff --git a/packages/db/package.json b/packages/db/package.json index 6776d034..05a23fb1 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -1,6 +1,6 @@ { "name": "db", - "version": "0.0.40", + "version": "0.0.41", "description": "The DB module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://github.com/etherspot/etherspot-bundler#readme", @@ -37,6 +37,6 @@ "devDependencies": { "@types/rocksdb": "3.0.1", "prettier": "^2.8.4", - "types": "^0.0.40" + "types": "^0.0.41" } } diff --git a/packages/executor/package.json b/packages/executor/package.json index 61242140..147a84da 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -1,6 +1,6 @@ { "name": "executor", - "version": "0.0.40", + "version": "0.0.41", "description": "The Relayer module of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", @@ -33,7 +33,7 @@ "dependencies": { "async-mutex": "0.4.0", "ethers": "5.7.2", - "params": "^0.0.40", - "types": "^0.0.40" + "params": "^0.0.41", + "types": "^0.0.41" } } diff --git a/packages/params/package.json b/packages/params/package.json index 108988ca..d70359b9 100644 --- a/packages/params/package.json +++ b/packages/params/package.json @@ -1,6 +1,6 @@ { "name": "params", - "version": "0.0.40", + "version": "0.0.41", "description": "Various bundler parameters", "author": "Etherspot", "homepage": "https://github.com/etherspot/skandha#readme", @@ -25,7 +25,7 @@ "@eth-optimism/sdk": "3.0.0", "@mantleio/sdk": "0.2.1", "ethers": "5.7.2", - "types": "^0.0.40" + "types": "^0.0.41" }, "scripts": { "clean": "rm -rf lib && rm -f *.tsbuildinfo", diff --git a/packages/types/package.json b/packages/types/package.json index f17460aa..b8dfae8d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "types", - "version": "0.0.40", + "version": "0.0.41", "description": "The types of Etherspot bundler client", "author": "Etherspot", "homepage": "https://https://github.com/etherspot/skandha#readme", From c2743dc780ac9791cff80d09be11c06c617e932d Mon Sep 17 00:00:00 2001 From: marie-fourier Date: Fri, 8 Sep 2023 16:25:54 +0500 Subject: [PATCH 3/3] add bifrost --- packages/params/src/whitelisted-entities/factories.ts | 2 ++ packages/types/src/networks/networks.ts | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/params/src/whitelisted-entities/factories.ts b/packages/params/src/whitelisted-entities/factories.ts index 63a058a8..4f238c82 100644 --- a/packages/params/src/whitelisted-entities/factories.ts +++ b/packages/params/src/whitelisted-entities/factories.ts @@ -31,4 +31,6 @@ export const WhitelistedFactories: IWhitelistedEntity = { flare: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], flareCoston: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], flareCoston2: [getAddress("0x7f6d8F107fE8551160BD5351d5F1514A6aD5d40E")], + bifrost: [getAddress("0x527bAb8bDC50A809d7c35D0129173BBed55C5EAE")], + bifrostTestnet: [getAddress("0x527bAb8bDC50A809d7c35D0129173BBed55C5EAE")], }; diff --git a/packages/types/src/networks/networks.ts b/packages/types/src/networks/networks.ts index 1f8cdf66..2d8c61ed 100644 --- a/packages/types/src/networks/networks.ts +++ b/packages/types/src/networks/networks.ts @@ -40,7 +40,9 @@ export type NetworkName = | "scrollAlpha" | "flare" | "flareCoston" - | "flareCoston2"; + | "flareCoston2" + | "bifrost" + | "bifrostTestnet"; export const networkNames: NetworkName[] = [ "mainnet", @@ -85,6 +87,8 @@ export const networkNames: NetworkName[] = [ "flare", "flareCoston", "flareCoston2", + "bifrost", + "bifrostTestnet", ]; export const NETWORK_NAME_TO_CHAIN_ID: { @@ -132,4 +136,6 @@ export const NETWORK_NAME_TO_CHAIN_ID: { flare: 14, flareCoston: 16, flareCoston2: 114, + bifrost: 3068, + bifrostTestnet: 49088, };