From 3f97d54799d0510d35be6163c6474b7a0bc06d5a Mon Sep 17 00:00:00 2001
From: sanyu1225 <pan831225@gmail.com>
Date: Mon, 13 May 2024 18:11:37 +0800
Subject: [PATCH 1/3] feat: support merlin chain

---
 src/services/evm.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/services/evm.ts b/src/services/evm.ts
index 39cfe4c..6fcbd34 100644
--- a/src/services/evm.ts
+++ b/src/services/evm.ts
@@ -158,6 +158,19 @@ export const supportedChains = [
     faucet: "https://faucet.quicknode.com/blast/sepolia",
     environment: "testnet",
   },
+  {
+    name: "Merlin",
+    chainId: "0x1068",
+    rpcUrls: ["https://rpc.merlinchain.io"],
+    environment: "mainnet",
+  },
+  {
+    name: "Merlin Testnet",
+    chainId: "0xa8a4c",
+    rpcUrls: ["https://testnet-rpc.merlinchain.io"],
+    faucet: "https://coinfaucet.eu/en/btc-testnet/",
+    environment: "testnet",
+  },
 ];
 
 const bloctoSDK = new BloctoSDK({

From ab543c7f7135965641435d724f592a5aa47a2eaa Mon Sep 17 00:00:00 2001
From: sanyu1225 <pan831225@gmail.com>
Date: Thu, 16 May 2024 17:50:13 +0800
Subject: [PATCH 2/3] feat: merlin test net chain Id

---
 src/services/evm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/evm.ts b/src/services/evm.ts
index 6fcbd34..184c64b 100644
--- a/src/services/evm.ts
+++ b/src/services/evm.ts
@@ -166,7 +166,7 @@ export const supportedChains = [
   },
   {
     name: "Merlin Testnet",
-    chainId: "0xa8a4c",
+    chainId: "0xA7B14",
     rpcUrls: ["https://testnet-rpc.merlinchain.io"],
     faucet: "https://coinfaucet.eu/en/btc-testnet/",
     environment: "testnet",

From 05d676952124fbb92ebcff6c4d044468e8ad641e Mon Sep 17 00:00:00 2001
From: mordochi <lynn@portto.com>
Date: Fri, 17 May 2024 16:04:06 +0800
Subject: [PATCH 3/3] build: update blocto sdk version

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 29a270f..fb87236 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@blocto/dappauth": "^2.1.0",
     "@blocto/fcl": "^1.0.0-alpha.1",
-    "@blocto/sdk": "^0.10.2",
+    "@blocto/sdk": "0.10.3-beta.0",
     "@chakra-ui/icons": "^1.1.1",
     "@chakra-ui/react": "^1.7.4",
     "@emotion/react": "^11",
diff --git a/yarn.lock b/yarn.lock
index 950a516..6b5bba8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1407,10 +1407,10 @@
     deepmerge "^4.2.2"
     sha3 "^2.1.4"
 
-"@blocto/sdk@^0.10.2":
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/@blocto/sdk/-/sdk-0.10.2.tgz#d29c652d25ac367a3c8d5fabdcb770b5cbb07c1c"
-  integrity sha512-9gCIUKA7/7/hMHaa5n94+OYU/3tHd6vmBgTgv4o2h3z9SFueQXAJMO4aBggH9+EldgHQDI6wHsnvytEt9AWb6g==
+"@blocto/sdk@0.10.3-beta.0":
+  version "0.10.3-beta.0"
+  resolved "https://registry.yarnpkg.com/@blocto/sdk/-/sdk-0.10.3-beta.0.tgz#23f46a0a3882897d023d3a8331082df3cf5c9127"
+  integrity sha512-lp3HAbK7xEY/FOYDAVIS510TquqWud/tMfwDPihtpJGo74ZehFgoat7C+2HgC7S5U+RcaOyDcrvihHEWDlMBRA==
   dependencies:
     buffer "^6.0.3"
     eip1193-provider "^1.0.1"