@rabby-wallet/gnosis-sdk 1.4.4 → 1.4.5-alpha.0

package/dist/api.d.ts

@@ -138,7 +138,11 @@ export declare const HOST_MAP: {
 export default class RequestProvider {
     host: string;
     request: Axios;
-    constructor(networkId: string, adapter?: AxiosAdapter);
+    constructor({ networkId, adapter, apiKey, }: {
+        networkId: string;
+        adapter?: AxiosAdapter;
+        apiKey: string;
+    });
     getPendingTransactions(safeAddress: string, nonce: number): Promise<{
         results: SafeTransactionItem[];
     }>;

package/dist/api.js

@@ -93,10 +93,10 @@ export const HOST_MAP = {
     /**
      * Katana
      */
-    "747474": "https://safe-transaction-katana.safe.global/api"
+    "747474": "https://safe-transaction-katana.safe.global/api",
 };
 export default class RequestProvider {
-    constructor(networkId, adapter) {
+    constructor({ networkId, adapter, apiKey, }) {
         if (!(networkId in HOST_MAP)) {
             throw new Error("Wrong networkId");
         }
@@ -104,6 +104,11 @@ export default class RequestProvider {
         this.request = axios.create({
             baseURL: this.host,
             adapter,
+            headers: apiKey
+                ? {
+                    Authorization: `Bearer ${apiKey}`,
+                }
+                : undefined,
         });
         this.request.interceptors.response.use((response) => {
             return response.data;

package/dist/index.d.ts

@@ -16,6 +16,7 @@ declare class Safe {
     network: string;
     apiKit: SafeApiKit;
     static adapter: AxiosAdapter;
+    static apiKey: string;
     constructor(safeAddress: string, version: string, provider: providers.Web3Provider, network?: string);
     /**
      * @deprecated

package/dist/index.js

@@ -3,7 +3,7 @@ import { Contract, ethers } from "ethers";
 import { EthSafeTransaction } from "@safe-global/protocol-kit";
 import { calculateSafeMessageHash } from "@safe-global/protocol-kit/dist/src/utils";
 import SafeApiKit from "@safe-global/api-kit";
-import { TRANSACTION_SERVICE_URLS } from "@safe-global/api-kit/dist/src/utils/config";
+import { getTransactionServiceUrl } from "@safe-global/api-kit/dist/src/utils/config";
 import { getSafeSingletonDeployment } from "@safe-global/safe-deployments";
 import RequestProvider, { HOST_MAP } from "./api";
 import { estimateGasForTransactionExecution, generatePreValidatedSignature, generateSignature, sameString, standardizeSafeTransactionData, } from "./utils";
@@ -53,7 +53,11 @@ class Safe {
         this.version = version;
         this.safeAddress = safeAddress;
         this.network = network;
-        this.request = new RequestProvider(network, Safe.adapter);
+        this.request = new RequestProvider({
+            networkId: network,
+            adapter: Safe.adapter,
+            apiKey: Safe.apiKey,
+        });
         this.apiKit = Safe.createSafeApiKit(network);
         // this.init();
     }
@@ -64,11 +68,19 @@ class Safe {
      * @returns
      */
     static getSafeInfo(safeAddress, network) {
-        const request = new RequestProvider(network, Safe.adapter);
+        const request = new RequestProvider({
+            networkId: network,
+            adapter: Safe.adapter,
+            apiKey: Safe.apiKey,
+        });
         return request.getSafeInfo(ethers.utils.getAddress(safeAddress));
     }
     static async getPendingTransactions(safeAddress, network, nonce) {
-        const request = new RequestProvider(network, Safe.adapter);
+        const request = new RequestProvider({
+            networkId: network,
+            adapter: Safe.adapter,
+            apiKey: Safe.apiKey,
+        });
         const transactions = await request.getPendingTransactions(safeAddress, nonce);
         return transactions;
     }
@@ -246,7 +258,10 @@ class Safe {
 Safe.createSafeApiKit = (network) => {
     return new SafeApiKit({
         chainId: BigInt(network),
-        txServiceUrl: HOST_MAP[network] || TRANSACTION_SERVICE_URLS[network] || undefined,
+        txServiceUrl: HOST_MAP[network] ||
+            getTransactionServiceUrl(BigInt(network)) ||
+            undefined,
+        apiKey: Safe.apiKey,
     });
 };
 export default Safe;

package/dist/utils.js

@@ -1,5 +1,5 @@
 import { BigNumber } from "@ethersproject/bignumber";
-import { OperationType } from "@safe-global/types-kit";
+import { OperationType, } from "@safe-global/types-kit";
 import { EthSafeSignature } from "@safe-global/protocol-kit";
 import { bufferToHex, ecrecover, pubToAddress } from "ethereumjs-util";
 import { ZERO_ADDRESS, SENTINEL_ADDRESS } from "./constants";
@@ -97,7 +97,11 @@ export async function standardizeSafeTransactionData(safeAddress, safeContract,
         refundReceiver: tx.refundReceiver || ZERO_ADDRESS,
         nonce: tx.nonce ?? (await safeContract.nonce()).toNumber(),
     };
-    const request = new RequestProvider(network, Safe.adapter);
+    const request = new RequestProvider({
+        networkId: network,
+        adapter: Safe.adapter,
+        apiKey: Safe.apiKey,
+    });
     const safeTxGas = tx.safeTxGas ??
         (await request.getSafeTxGas(safeAddress, version, standardizedTxs));
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/gnosis-sdk",
-  "version": "1.4.4",
+  "version": "1.4.5-alpha.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "@ethersproject/contracts": "5.5.0",
     "@ethersproject/providers": "5.5.0",
     "@ethersproject/solidity": "5.5.0",
-    "@safe-global/api-kit": "2.5.8",
+    "@safe-global/api-kit": "4.0.0",
     "@safe-global/protocol-kit": "5.2.1",
     "@safe-global/safe-deployments": "1.37.36",
     "@safe-global/types-kit": "1.0.2",

package/src/api.ts

@@ -139,14 +139,22 @@ export const HOST_MAP = {
   /**
    * Katana
    */
-  "747474": "https://safe-transaction-katana.safe.global/api"
+  "747474": "https://safe-transaction-katana.safe.global/api",
 };
 
 export default class RequestProvider {
   host: string;
   request: Axios;
 
-  constructor(networkId: string, adapter?: AxiosAdapter) {
+  constructor({
+    networkId,
+    adapter,
+    apiKey,
+  }: {
+    networkId: string;
+    adapter?: AxiosAdapter;
+    apiKey: string;
+  }) {
     if (!(networkId in HOST_MAP)) {
       throw new Error("Wrong networkId");
     }
@@ -156,6 +164,12 @@ export default class RequestProvider {
     this.request = axios.create({
       baseURL: this.host,
       adapter,
+
+      headers: apiKey
+        ? {
+            Authorization: `Bearer ${apiKey}`,
+          }
+        : undefined,
     });
 
     this.request.interceptors.response.use((response) => {
@@ -168,7 +182,9 @@ export default class RequestProvider {
     nonce: number
   ): Promise<{ results: SafeTransactionItem[] }> {
     return this.request.get(
-      `/v1/safes/${ethers.utils.getAddress(safeAddress)}/multisig-transactions/`,
+      `/v1/safes/${ethers.utils.getAddress(
+        safeAddress
+      )}/multisig-transactions/`,
       {
         params: {
           executed: false,
@@ -186,7 +202,9 @@ export default class RequestProvider {
   }
 
   getSafeInfo(safeAddress: string): Promise<SafeInfo> {
-    return this.request.get(`/v1/safes/${ethers.utils.getAddress(safeAddress)}/`);
+    return this.request.get(
+      `/v1/safes/${ethers.utils.getAddress(safeAddress)}/`
+    );
   }
 
   confirmTransaction(safeTransactionHash: string, data): Promise<void> {

package/src/index.ts

@@ -7,14 +7,14 @@ import {
   SafeSignature,
   SafeTransaction,
   SafeTransactionDataPartial,
+  EIP712TypedData as ApiKitEIP712TypedData,
 } from "@safe-global/types-kit";
 import { EthSafeMessage, EthSafeTransaction } from "@safe-global/protocol-kit";
 import { calculateSafeMessageHash } from "@safe-global/protocol-kit/dist/src/utils";
 import SafeApiKit, {
-  EIP712TypedData as ApiKitEIP712TypedData,
   SafeMessage as ApiKitSafeMessage,
 } from "@safe-global/api-kit";
-import { TRANSACTION_SERVICE_URLS } from "@safe-global/api-kit/dist/src/utils/config";
+import { getTransactionServiceUrl } from "@safe-global/api-kit/dist/src/utils/config";
 import { getSafeSingletonDeployment } from "@safe-global/safe-deployments";
 import RequestProvider, { HOST_MAP, SafeInfo } from "./api";
 import {
@@ -37,6 +37,7 @@ class Safe {
   apiKit: SafeApiKit;
 
   static adapter: AxiosAdapter;
+  static apiKey: string;
 
   constructor(
     safeAddress: string,
@@ -56,7 +57,11 @@ class Safe {
     this.version = version;
     this.safeAddress = safeAddress;
     this.network = network;
-    this.request = new RequestProvider(network, Safe.adapter);
+    this.request = new RequestProvider({
+      networkId: network,
+      adapter: Safe.adapter,
+      apiKey: Safe.apiKey,
+    });
     this.apiKit = Safe.createSafeApiKit(network);
 
     // this.init();
@@ -69,7 +74,11 @@ class Safe {
    * @returns
    */
   static getSafeInfo(safeAddress: string, network: string) {
-    const request = new RequestProvider(network, Safe.adapter);
+    const request = new RequestProvider({
+      networkId: network,
+      adapter: Safe.adapter,
+      apiKey: Safe.apiKey,
+    });
     return request.getSafeInfo(ethers.utils.getAddress(safeAddress));
   }
 
@@ -78,7 +87,11 @@ class Safe {
     network: string,
     nonce: number
   ) {
-    const request = new RequestProvider(network, Safe.adapter);
+    const request = new RequestProvider({
+      networkId: network,
+      adapter: Safe.adapter,
+      apiKey: Safe.apiKey,
+    });
     const transactions = await request.getPendingTransactions(
       safeAddress,
       nonce
@@ -91,7 +104,10 @@ class Safe {
     return new SafeApiKit({
       chainId: BigInt(network),
       txServiceUrl:
-        HOST_MAP[network] || TRANSACTION_SERVICE_URLS[network] || undefined,
+        HOST_MAP[network] ||
+        getTransactionServiceUrl(BigInt(network)) ||
+        undefined,
+      apiKey: Safe.apiKey,
     });
   };
 

package/src/utils.ts

@@ -5,9 +5,9 @@ import {
   SafeSignature,
   SafeTransaction,
   SafeTransactionData,
-  SafeTransactionDataPartial
-} from "@safe-global/types-kit"
-import { EthSafeSignature } from "@safe-global/protocol-kit"
+  SafeTransactionDataPartial,
+} from "@safe-global/types-kit";
+import { EthSafeSignature } from "@safe-global/protocol-kit";
 import { bufferToHex, ecrecover, pubToAddress } from "ethereumjs-util";
 import { ZERO_ADDRESS, SENTINEL_ADDRESS } from "./constants";
 import semverSatisfies from "semver/functions/satisfies";
@@ -132,7 +132,11 @@ export async function standardizeSafeTransactionData(
     refundReceiver: tx.refundReceiver || ZERO_ADDRESS,
     nonce: tx.nonce ?? (await safeContract.nonce()).toNumber(),
   };
-  const request = new RequestProvider(network, Safe.adapter);
+  const request = new RequestProvider({
+    networkId: network,
+    adapter: Safe.adapter,
+    apiKey: Safe.apiKey,
+  });
   const safeTxGas =
     tx.safeTxGas ??
     (await request.getSafeTxGas(safeAddress, version, standardizedTxs));