From 38d4b35ee39b6d3ae62f865ad770eda02a9847b9 Mon Sep 17 00:00:00 2001
From: pheuberger <philipp@pheuberger.com>
Date: Mon, 10 Feb 2025 13:15:36 +0200
Subject: [PATCH 1/2] fix(safe): tx service url missing /api path

The Filecoin documentation doesn't exactly specifiy the full path to be
used with the SafeAPIKit SDK. After some digging I found that the API
isn't expected to be under /api by default. That means it needs to be
specified explicitly.

https://docs.safe.global/sdk/api-kit/guides/migrate-to-v2
---
 src/lib/safe/SafeApiKitStrategy.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/safe/SafeApiKitStrategy.ts b/src/lib/safe/SafeApiKitStrategy.ts
index 2f2ce1f..c54954a 100644
--- a/src/lib/safe/SafeApiKitStrategy.ts
+++ b/src/lib/safe/SafeApiKitStrategy.ts
@@ -8,7 +8,7 @@ export class FilecoinMainnetStrategy implements SafeApiKitStrategy {
   createInstance(): SafeApiKit.default {
     return new SafeApiKit.default({
       chainId: BigInt(314),
-      txServiceUrl: "https://transaction.safe.filecoin.io/",
+      txServiceUrl: "https://transaction.safe.filecoin.io/api",
     });
   }
 }
@@ -17,7 +17,7 @@ export class FilecoinTestnetStrategy implements SafeApiKitStrategy {
   createInstance(): SafeApiKit.default {
     return new SafeApiKit.default({
       chainId: BigInt(314159),
-      txServiceUrl: "https://transaction-testnet.safe.filecoin.io/",
+      txServiceUrl: "https://transaction-testnet.safe.filecoin.io/api",
     });
   }
 }

From 13262d5fb5ca5edd81587444c0ebd475a933d606 Mon Sep 17 00:00:00 2001
From: pheuberger <philipp@pheuberger.com>
Date: Mon, 10 Feb 2025 13:18:15 +0200
Subject: [PATCH 2/2] fix(safe): use api kit strategy in multisig upsert

Without this patch the Multisig upsert strategy is trying to construct
the SafeAPIKit instance using the default constructor. The problem is
that on Filecoin and Filecoin Calibration the transaction service is
hosted by a third party and thus needs a custom txServiceUrl in the
config.
---
 src/lib/users/MultisigUpsertStrategy.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/users/MultisigUpsertStrategy.ts b/src/lib/users/MultisigUpsertStrategy.ts
index 03a940f..3dc1197 100644
--- a/src/lib/users/MultisigUpsertStrategy.ts
+++ b/src/lib/users/MultisigUpsertStrategy.ts
@@ -1,10 +1,11 @@
 import { z } from "zod";
-import SafeApiKit, { type SafeApiKitConfig } from "@safe-global/api-kit";
+import SafeApiKit from "@safe-global/api-kit";
 
 import { SignatureRequestPurpose } from "../../graphql/schemas/typeDefs/signatureRequestTypeDefs.js";
 import { SupabaseDataService } from "../../services/SupabaseDataService.js";
 import { UserResponse } from "../../types/api.js";
 import { isTypedMessage } from "../../utils/signatures.js";
+import { SafeApiStrategyFactory } from "../safe/SafeApiKitStrategy.js";
 
 import type { UserUpsertStrategy } from "./UserUpsertStrategy.js";
 import type { MultisigUpdateRequest } from "./schemas.js";
@@ -30,17 +31,16 @@ export default class MultisigUpdateStrategy implements UserUpsertStrategy {
   private readonly dataService: SupabaseDataService;
   // Safe SDKs only support CommonJS, so TS interprets `SafeApiKit` as a namespace.
   // https://docs.safe.global/sdk/overview
-  // Hence the explicit `default` here and on the instantiation further down.
+  // Hence the explicit `default` here.
   private readonly safeApiKit: SafeApiKit.default;
 
   constructor(
     private readonly address: string,
     private readonly request: MultisigUpdateRequest,
   ) {
-    const config: SafeApiKitConfig = {
-      chainId: BigInt(request.chain_id),
-    };
-    this.safeApiKit = new SafeApiKit.default(config);
+    this.safeApiKit = SafeApiStrategyFactory.getStrategy(
+      this.request.chain_id,
+    ).createInstance();
     this.dataService = new SupabaseDataService();
   }