From 0a62f1f9f561beb558707697912115367f8ccf9d Mon Sep 17 00:00:00 2001
From: Nikola Divic <divicnikola@gmail.com>
Date: Thu, 11 Jul 2024 13:04:02 +0200
Subject: [PATCH 1/3] feat(integrations): :sparkles: Taiko Hekla Testnet
 integration

Currently fails with aa14: The initCode returned a different smart account address than expected because of a wrong factory contract deployment
---
 config/default.json           | 48 ++++++++++++++++++++++-------------
 src/common/constants/index.ts |  1 +
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/config/default.json b/config/default.json
index b88aa6c5..e9e8450b 100644
--- a/config/default.json
+++ b/config/default.json
@@ -4,17 +4,17 @@
     5000, 204, 5611, 88888, 592, 88882, 81, 1115, 1116, 169, 3441005, 91715,
     9980, 421614, 11155111, 84532, 168587773, 80085, 81457, 534351, 534352,
     56400, 7000, 11155420, 80002, 27827, 4653, 8101902, 666666666, 2442, 7001,
-    5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799
+    5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
   ],
   "EIP1559SupportedNetworks": [
     1, 137, 42161, 10, 43114, 43113, 8453, 59140, 59144, 204, 5611, 421614,
     11155111, 84532, 168587773, 80085, 81457, 42170, 169, 56400, 11155420,
-    80002, 27827, 4653, 100, 10200, 997, 713715, 3799
+    80002, 27827, 4653, 100, 10200, 997, 713715, 3799, 167009
   ],
   "testnetNetworks": [
     97, 43113, 59140, 5611, 81, 88882, 59144, 421614, 11155111, 1115, 3441005,
     84532, 168587773, 80085, 534351, 56400, 11155420, 80002, 7001, 2442, 5003,
-    10200, 195, 2810, 997, 713715, 3799
+    10200, 195, 2810, 997, 713715, 3799, 167009
   ],
   "supportedTransactionType": {
     "1": ["BUNDLER"],
@@ -72,7 +72,8 @@
     "2810": ["BUNDLER"],
     "997": ["BUNDLER"],
     "713715": ["BUNDLER"],
-    "3799": ["BUNDLER"]
+    "3799": ["BUNDLER"],
+    "167009": ["BUNDLER"]
   },
   "chains": {
     "providers": {
@@ -169,7 +170,8 @@
       "2810": "ETH",
       "997": "5ire",
       "713715": "SEI",
-      "3799": "tTNT"
+      "3799": "tTNT",
+      "167009": "ETH"
     },
     "decimal": {
       "137": 18,
@@ -227,7 +229,8 @@
       "2810": 18,
       "997": 18,
       "713715": 18,
-      "3799": 18
+      "3799": 18,
+      "167009": 18
     },
     "retryTransactionInterval": {
       "137": 30000,
@@ -285,7 +288,8 @@
       "2810": 30000,
       "997": 30000,
       "713715": 30000,
-      "3799": 30000
+      "3799": 30000,
+      "167009": 30000
     },
     "updateFrequencyInSeconds": {
       "137": 10,
@@ -343,7 +347,8 @@
       "2810": 60,
       "997": 60,
       "713715": 60,
-      "3799": 60
+      "3799": 60,
+      "167009": 60
     }
   },
   "maxPriorityFeePerGasThresholdPercentage": 0.5,
@@ -414,7 +419,8 @@
         "2810": 2,
         "997": 2,
         "713715": 2,
-        "3799": 2
+        "3799": 2,
+        "167009": 2
       },
       "maxRelayerCount": {
         "137": 400,
@@ -472,7 +478,8 @@
         "2810": 5,
         "997": 5,
         "713715": 5,
-        "3799": 5
+        "3799": 5,
+        "167009": 5
       },
       "inactiveRelayerCountThreshold": {
         "137": 250,
@@ -530,7 +537,8 @@
         "2810": 3,
         "997": 3,
         "713715": 3,
-        "3799": 3
+        "3799": 3,
+        "167009": 3
       },
       "pendingTransactionCountThreshold": {
         "137": 15,
@@ -588,7 +596,8 @@
         "2810": 15,
         "997": 15,
         "713715": 15,
-        "3799": 15
+        "3799": 15,
+        "167009": 15
       },
       "fundingRelayerAmount": {
         "137": 5,
@@ -646,7 +655,8 @@
         "2810": 0.01,
         "997": 0.01,
         "713715": 0.1,
-        "3799": 0.1
+        "3799": 0.1,
+        "167009": 0.01
       },
       "fundingBalanceThreshold": {
         "137": 3,
@@ -704,7 +714,8 @@
         "2810": 0.005,
         "997": 0.005,
         "713715": 0.05,
-        "3799": 0.05
+        "3799": 0.05,
+        "167009": 0.005
       },
       "newRelayerInstanceCount": {
         "137": 10,
@@ -762,7 +773,8 @@
         "2810": 2,
         "997": 2,
         "713715": 2,
-        "3799": 2
+        "3799": 2,
+        "167009": 2
       }
     }
   ],
@@ -819,7 +831,7 @@
         204, 5611, 5000, 169, 3441005, 1115, 1116, 91715, 9980, 421614,
         11155111, 84532, 168587773, 43113, 80085, 81457, 42170, 534351, 534352,
         56400, 7000, 11155420, 80002, 27827, 7001, 2442, 4653, 5003, 8101902,
-        666666666, 100, 10200, 195, 196, 2810, 997, 713715, 3799
+        666666666, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
       ]
     },
     "0x00000061fefce24a79343c27127435286bb7a4e1": {
@@ -841,12 +853,12 @@
   "scrollNetworks": [534351, 534352],
   "networksNotSupportingEthCallStateOverrides": [
     1101, 81, 592, 169, 3441005, 91715, 7116, 9980, 88882, 88888, 81457,
-    666666666, 2442, 8101902, 7001, 196, 195
+    666666666, 2442, 8101902, 7001, 196, 195, 167009
   ],
   "trustWalletSupportedNetworks": [137, 56, 204, 42161, 10, 8453],
   "networksNotSupportingEthCallBytecodeStateOverrides": [
     1, 59140, 59144, 84532, 421614, 168587773, 43113, 11155111, 1101, 88882,
-    88888, 81457
+    88888, 81457, 167009
   ],
   "pvgMarkUp": {
     "1": 0.1,
diff --git a/src/common/constants/index.ts b/src/common/constants/index.ts
index 5e2ce17b..e2466d7c 100644
--- a/src/common/constants/index.ts
+++ b/src/common/constants/index.ts
@@ -51,4 +51,5 @@ export enum BLOCKCHAINS {
   FIRECHAIN_TESTNET = 997,
   SEI_TESTNET = 713715,
   TANGLE_TESTNET = 3799,
+  TAIKO_HEKLA_TESTNET = 167009,
 }

From 4cdd01b88687c94ed4ccd0ff132aeed70eeb32eb Mon Sep 17 00:00:00 2001
From: Nikola Divic <divicnikola@gmail.com>
Date: Thu, 11 Jul 2024 14:13:23 +0200
Subject: [PATCH 2/3] fix(integrations): :bookmark: update Combo Testnet chain
 ID to 1715

It used to be 91715
---
 config/default.json           | 38 +++++++++++++++++------------------
 src/common/constants/index.ts |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/config/default.json b/config/default.json
index e9e8450b..aa1e5c74 100644
--- a/config/default.json
+++ b/config/default.json
@@ -1,7 +1,7 @@
 {
   "supportedNetworks": [
     1, 137, 97, 56, 1101, 42161, 42170, 10, 43113, 43114, 8453, 59140, 59144,
-    5000, 204, 5611, 88888, 592, 88882, 81, 1115, 1116, 169, 3441005, 91715,
+    5000, 204, 5611, 88888, 592, 88882, 81, 1115, 1116, 169, 3441005, 1715,
     9980, 421614, 11155111, 84532, 168587773, 80085, 81457, 534351, 534352,
     56400, 7000, 11155420, 80002, 27827, 4653, 8101902, 666666666, 2442, 7001,
     5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
@@ -43,7 +43,7 @@
     "1116": ["BUNDLER"],
     "169": ["BUNDLER"],
     "3441005": ["BUNDLER"],
-    "91715": ["BUNDLER"],
+    "1715": ["BUNDLER"],
     "9980": ["BUNDLER"],
     "7116": ["BUNDLER"],
     "421614": ["BUNDLER"],
@@ -141,7 +141,7 @@
       "1116": "CORE",
       "169": "ETH",
       "3441005": "ETH",
-      "91715": "tcBNB",
+      "1715": "tcBNB",
       "9980": "BNB",
       "7116": "ETH",
       "421614": "ETH",
@@ -200,7 +200,7 @@
       "1116": 18,
       "169": 18,
       "3441005": 18,
-      "91715": 18,
+      "1715": 18,
       "9980": 18,
       "7116": 18,
       "421614": 18,
@@ -259,7 +259,7 @@
       "1116": 30000,
       "169": 30000,
       "3441005": 30000,
-      "91715": 30000,
+      "1715": 30000,
       "9980": 30000,
       "7116": 30000,
       "421614": 30000,
@@ -318,7 +318,7 @@
       "1116": 60,
       "169": 60,
       "3441005": 60,
-      "91715": 60,
+      "1715": 60,
       "9980": 60,
       "7116": 60,
       "421614": 60,
@@ -390,7 +390,7 @@
         "1116": 15,
         "169": 1,
         "3441005": 1,
-        "91715": 1,
+        "1715": 1,
         "9980": 1,
         "7116": 40,
         "421614": 5,
@@ -449,7 +449,7 @@
         "1116": 20,
         "169": 5,
         "3441005": 5,
-        "91715": 5,
+        "1715": 5,
         "9980": 5,
         "7116": 100,
         "421614": 20,
@@ -508,7 +508,7 @@
         "1116": 5,
         "169": 5,
         "3441005": 5,
-        "91715": 5,
+        "1715": 5,
         "9980": 5,
         "7116": 60,
         "421614": 15,
@@ -567,7 +567,7 @@
         "1116": 15,
         "169": 15,
         "3441005": 15,
-        "91715": 15,
+        "1715": 15,
         "9980": 15,
         "7116": 15,
         "421614": 15,
@@ -626,7 +626,7 @@
         "1116": 0.2,
         "169": 0.002,
         "3441005": 0.002,
-        "91715": 0.05,
+        "1715": 0.05,
         "9980": 0.05,
         "7116": 0.01,
         "421614": 0.01,
@@ -685,7 +685,7 @@
         "1116": 6,
         "169": 0.001,
         "3441005": 0.001,
-        "91715": 0.02,
+        "1715": 0.02,
         "9980": 0.02,
         "7116": 0.005,
         "421614": 0.005,
@@ -744,7 +744,7 @@
         "1116": 2,
         "169": 2,
         "3441005": 2,
-        "91715": 2,
+        "1715": 2,
         "9980": 2,
         "7116": 2,
         "421614": 2,
@@ -828,9 +828,9 @@
     "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789": {
       "supportedChainIds": [
         1, 137, 97, 56, 1101, 42161, 10, 43114, 8453, 59140, 59144, 592, 81,
-        204, 5611, 5000, 169, 3441005, 1115, 1116, 91715, 9980, 421614,
-        11155111, 84532, 168587773, 43113, 80085, 81457, 42170, 534351, 534352,
-        56400, 7000, 11155420, 80002, 27827, 7001, 2442, 4653, 5003, 8101902,
+        204, 5611, 5000, 169, 3441005, 1115, 1116, 1715, 9980, 421614, 11155111,
+        84532, 168587773, 43113, 80085, 81457, 42170, 534351, 534352, 56400,
+        7000, 11155420, 80002, 27827, 7001, 2442, 4653, 5003, 8101902,
         666666666, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
       ]
     },
@@ -842,7 +842,7 @@
   "l2Networks": [42161, 42170],
   "polygonZKEvmNetworks": [1101, 2442, 195, 196],
   "optimismNetworks": [
-    10, 8453, 204, 5611, 9980, 91715, 84532, 168587773, 11155420, 4653
+    10, 8453, 204, 5611, 9980, 1715, 84532, 168587773, 11155420, 4653
   ],
   "morphNetworks": [2810],
   "lineaNetworks": [59140, 59144],
@@ -852,7 +852,7 @@
   "blastPvgValue": 700000000,
   "scrollNetworks": [534351, 534352],
   "networksNotSupportingEthCallStateOverrides": [
-    1101, 81, 592, 169, 3441005, 91715, 7116, 9980, 88882, 88888, 81457,
+    1101, 81, 592, 169, 3441005, 1715, 7116, 9980, 88882, 88888, 81457,
     666666666, 2442, 8101902, 7001, 196, 195, 167009
   ],
   "trustWalletSupportedNetworks": [137, 56, 204, 42161, 10, 8453],
@@ -885,7 +885,7 @@
     "1116": 0.1,
     "169": 0.1,
     "3441005": 0.1,
-    "91715": 0.15,
+    "1715": 0.15,
     "9980": 0.15,
     "7116": 0.1,
     "421614": 0.1,
diff --git a/src/common/constants/index.ts b/src/common/constants/index.ts
index e2466d7c..4df429a8 100644
--- a/src/common/constants/index.ts
+++ b/src/common/constants/index.ts
@@ -23,7 +23,7 @@ export enum BLOCKCHAINS {
   CORE_TESTNET = 1115,
   MANTA_TESTNET = 3441005,
   MANTA_MAINNET = 169,
-  COMBO_TESTNET = 91715,
+  COMBO_TESTNET = 1715,
   COMBO_MAINNET = 9980,
   ARBITRUM_SEPOLIA_TESTNET = 421614,
   SEPOLIA_TESTNET = 11155111,

From d3a5fb24fbd6bfcd88a27f86819ebd33b8256690 Mon Sep 17 00:00:00 2001
From: Nikola Divic <divicnikola@gmail.com>
Date: Thu, 11 Jul 2024 15:20:36 +0200
Subject: [PATCH 3/3] feat(integrations): :sparkles: Berachain Bartion
 integration + change combo testnet chain id

Bartio works like a charm, new Combo testnet fails with aa13: EntryPoint failed to create the smart account with the initCode provided
---
 config/default.json           | 48 ++++++++++++++++++++++-------------
 package.json                  |  2 +-
 src/common/constants/index.ts |  1 +
 yarn.lock                     |  8 +++---
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/config/default.json b/config/default.json
index aa1e5c74..d41de2cd 100644
--- a/config/default.json
+++ b/config/default.json
@@ -4,17 +4,17 @@
     5000, 204, 5611, 88888, 592, 88882, 81, 1115, 1116, 169, 3441005, 1715,
     9980, 421614, 11155111, 84532, 168587773, 80085, 81457, 534351, 534352,
     56400, 7000, 11155420, 80002, 27827, 4653, 8101902, 666666666, 2442, 7001,
-    5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
+    5003, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009, 80084
   ],
   "EIP1559SupportedNetworks": [
     1, 137, 42161, 10, 43114, 43113, 8453, 59140, 59144, 204, 5611, 421614,
     11155111, 84532, 168587773, 80085, 81457, 42170, 169, 56400, 11155420,
-    80002, 27827, 4653, 100, 10200, 997, 713715, 3799, 167009
+    80002, 27827, 4653, 100, 10200, 997, 713715, 3799, 167009, 80084
   ],
   "testnetNetworks": [
     97, 43113, 59140, 5611, 81, 88882, 59144, 421614, 11155111, 1115, 3441005,
     84532, 168587773, 80085, 534351, 56400, 11155420, 80002, 7001, 2442, 5003,
-    10200, 195, 2810, 997, 713715, 3799, 167009
+    10200, 195, 2810, 997, 713715, 3799, 167009, 80084
   ],
   "supportedTransactionType": {
     "1": ["BUNDLER"],
@@ -73,7 +73,8 @@
     "997": ["BUNDLER"],
     "713715": ["BUNDLER"],
     "3799": ["BUNDLER"],
-    "167009": ["BUNDLER"]
+    "167009": ["BUNDLER"],
+    "80084": ["BUNDLER"]
   },
   "chains": {
     "providers": {
@@ -171,7 +172,8 @@
       "997": "5ire",
       "713715": "SEI",
       "3799": "tTNT",
-      "167009": "ETH"
+      "167009": "ETH",
+      "80084": "ETH"
     },
     "decimal": {
       "137": 18,
@@ -230,7 +232,8 @@
       "997": 18,
       "713715": 18,
       "3799": 18,
-      "167009": 18
+      "167009": 18,
+      "80084": 18
     },
     "retryTransactionInterval": {
       "137": 30000,
@@ -289,7 +292,8 @@
       "997": 30000,
       "713715": 30000,
       "3799": 30000,
-      "167009": 30000
+      "167009": 30000,
+      "80084": 30000
     },
     "updateFrequencyInSeconds": {
       "137": 10,
@@ -348,7 +352,8 @@
       "997": 60,
       "713715": 60,
       "3799": 60,
-      "167009": 60
+      "167009": 60,
+      "80084": 60
     }
   },
   "maxPriorityFeePerGasThresholdPercentage": 0.5,
@@ -420,7 +425,8 @@
         "997": 2,
         "713715": 2,
         "3799": 2,
-        "167009": 2
+        "167009": 2,
+        "80084": 2
       },
       "maxRelayerCount": {
         "137": 400,
@@ -479,7 +485,8 @@
         "997": 5,
         "713715": 5,
         "3799": 5,
-        "167009": 5
+        "167009": 5,
+        "80084": 5
       },
       "inactiveRelayerCountThreshold": {
         "137": 250,
@@ -538,7 +545,8 @@
         "997": 3,
         "713715": 3,
         "3799": 3,
-        "167009": 3
+        "167009": 3,
+        "80084": 3
       },
       "pendingTransactionCountThreshold": {
         "137": 15,
@@ -597,7 +605,8 @@
         "997": 15,
         "713715": 15,
         "3799": 15,
-        "167009": 15
+        "167009": 15,
+        "80084": 15
       },
       "fundingRelayerAmount": {
         "137": 5,
@@ -656,7 +665,8 @@
         "997": 0.01,
         "713715": 0.1,
         "3799": 0.1,
-        "167009": 0.01
+        "167009": 0.01,
+        "80084": 0.01
       },
       "fundingBalanceThreshold": {
         "137": 3,
@@ -715,7 +725,8 @@
         "997": 0.005,
         "713715": 0.05,
         "3799": 0.05,
-        "167009": 0.005
+        "167009": 0.005,
+        "80084": 0.005
       },
       "newRelayerInstanceCount": {
         "137": 10,
@@ -774,7 +785,8 @@
         "997": 2,
         "713715": 2,
         "3799": 2,
-        "167009": 2
+        "167009": 2,
+        "80084": 2
       }
     }
   ],
@@ -831,7 +843,7 @@
         204, 5611, 5000, 169, 3441005, 1115, 1116, 1715, 9980, 421614, 11155111,
         84532, 168587773, 43113, 80085, 81457, 42170, 534351, 534352, 56400,
         7000, 11155420, 80002, 27827, 7001, 2442, 4653, 5003, 8101902,
-        666666666, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009
+        666666666, 100, 10200, 195, 196, 2810, 997, 713715, 3799, 167009, 80084
       ]
     },
     "0x00000061fefce24a79343c27127435286bb7a4e1": {
@@ -853,12 +865,12 @@
   "scrollNetworks": [534351, 534352],
   "networksNotSupportingEthCallStateOverrides": [
     1101, 81, 592, 169, 3441005, 1715, 7116, 9980, 88882, 88888, 81457,
-    666666666, 2442, 8101902, 7001, 196, 195, 167009
+    666666666, 2442, 8101902, 7001, 196, 195, 167009, 713715
   ],
   "trustWalletSupportedNetworks": [137, 56, 204, 42161, 10, 8453],
   "networksNotSupportingEthCallBytecodeStateOverrides": [
     1, 59140, 59144, 84532, 421614, 168587773, 43113, 11155111, 1101, 88882,
-    88888, 81457, 167009
+    88888, 81457, 167009, 713715
   ],
   "pvgMarkUp": {
     "1": 0.1,
diff --git a/package.json b/package.json
index b780e15a..9221e189 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "crypto-js": "^4.1.1",
     "dd-trace": "^4.17.0",
     "dotenv": "^16.0.3",
-    "entry-point-gas-estimations": "0.0.22",
+    "entry-point-gas-estimations": "0.0.23",
     "ethereumjs-util": "^7.1.5",
     "express": "^4.18.2",
     "express-handlebars": "^6.0.6",
diff --git a/src/common/constants/index.ts b/src/common/constants/index.ts
index 4df429a8..8b53bf33 100644
--- a/src/common/constants/index.ts
+++ b/src/common/constants/index.ts
@@ -52,4 +52,5 @@ export enum BLOCKCHAINS {
   SEI_TESTNET = 713715,
   TANGLE_TESTNET = 3799,
   TAIKO_HEKLA_TESTNET = 167009,
+  BERACHAIN_BARTIO_TESTNET = 80084,
 }
diff --git a/yarn.lock b/yarn.lock
index 71c515a7..99839cab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3711,10 +3711,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-entry-point-gas-estimations@0.0.22:
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/entry-point-gas-estimations/-/entry-point-gas-estimations-0.0.22.tgz#e269d704c816262084396f97e23afcc4a39d3e7a"
-  integrity sha512-rJrLmFvJbotTNoX7OHF45eFEDojLSMtS3+BjMHlHBf1dueYE2XjaglC1213DtTpI90bVZoEf17Mx/HGOWrWG0Q==
+entry-point-gas-estimations@0.0.23:
+  version "0.0.23"
+  resolved "https://registry.yarnpkg.com/entry-point-gas-estimations/-/entry-point-gas-estimations-0.0.23.tgz#25535a3748908a4a8e2ff0398e7d0bba11c8a5f1"
+  integrity sha512-k1RiZxbKx6Icj9jHGenKqT5+JmJVWUg5c/hsUulIRv9oBHhVy5W3L0jOJWiDBX1wz5CeMNQnd0VhfJFlppvnDg==
   dependencies:
     viem "^2.17.3"
     zod "^3.22.4"