@rabby-wallet/gnosis-sdk 1.2.1 → 1.3.0

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import { Axios } from "axios";
+import { Axios, AxiosAdapter } from 'axios';
 export interface SafeInfo {
     address: string;
     fallbackHandler: string;
@@ -43,7 +43,7 @@ export interface SafeTransactionItem {
 export default class RequestProvider {
     host: string;
     request: Axios;
-    constructor(networkId: string);
+    constructor(networkId: string, adapter?: AxiosAdapter);
     getPendingTransactions(safeAddress: string, nonce: number): Promise<{
         results: SafeTransactionItem[];
     }>;

package/dist/api.js

@@ -1,19 +1,20 @@
-import axios from "axios";
-import { toChecksumAddress } from "web3-utils";
+import axios from 'axios';
+import { toChecksumAddress } from 'web3-utils';
 const HOST_MAP = {
-    '1': "https://safe-transaction.gnosis.io/api/v1",
+    '1': 'https://safe-transaction.gnosis.io/api/v1',
     '137': 'https://safe-transaction.polygon.gnosis.io/api/v1',
     '56': 'https://safe-transaction.bsc.gnosis.io/api/v1',
     '100': 'https://safe-transaction.xdai.gnosis.io/api/v1'
 };
 export default class RequestProvider {
-    constructor(networkId) {
+    constructor(networkId, adapter) {
         if (!(networkId in HOST_MAP)) {
             throw new Error('Wrong networkId');
         }
         this.host = HOST_MAP[networkId];
         this.request = axios.create({
-            baseURL: this.host
+            baseURL: this.host,
+            adapter
         });
         this.request.interceptors.response.use((response) => {
             return response.data;
@@ -23,8 +24,8 @@ export default class RequestProvider {
         return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/multisig-transactions/`, {
             params: {
                 executed: false,
-                nonce__gte: nonce,
-            },
+                nonce__gte: nonce
+            }
         });
     }
     postTransactions(safeAddres, data) {

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { Contract } from "ethers";
-import { BigNumber } from "@ethersproject/bignumber";
-import { providers } from "ethers";
-import { SafeTransactionDataPartial, SafeSignature } from "@gnosis.pm/safe-core-sdk-types";
-import { TransactionResult, TransactionOptions } from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types";
-import SafeTransaction from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction";
-import RequestProvider, { SafeInfo } from "./api";
+import { Contract } from 'ethers';
+import { BigNumber } from '@ethersproject/bignumber';
+import { providers } from 'ethers';
+import { SafeTransactionDataPartial, SafeSignature } from '@gnosis.pm/safe-core-sdk-types';
+import { TransactionResult, TransactionOptions } from '@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types';
+import SafeTransaction from '@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction';
+import RequestProvider, { SafeInfo } from './api';
+import { AxiosAdapter } from 'axios';
 declare class Safe {
     contract: Contract;
     safeAddress: string;
@@ -14,6 +15,7 @@ declare class Safe {
     safeInfo: SafeInfo | null;
     request: RequestProvider;
     network: string;
+    static adapter: AxiosAdapter;
     constructor(safeAddress: string, version: string, provider: providers.Web3Provider, network?: string);
     static getSafeInfo(safeAddress: string, network: string): Promise<SafeInfo>;
     static getPendingTransactions(safeAddress: string, network: string): Promise<{

package/dist/index.js

@@ -1,37 +1,38 @@
-import { Contract } from "ethers";
-import { BigNumber } from "@ethersproject/bignumber";
+import { Contract } from 'ethers';
+import { BigNumber } from '@ethersproject/bignumber';
 import BN from 'bignumber.js';
-import { getSafeSingletonDeployment } from "@gnosis.pm/safe-deployments";
-import { toChecksumAddress } from "web3-utils";
-import SafeTransaction from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction";
-import RequestProvider from "./api";
-import { standardizeSafeTransactionData, sameString, generateSignature, generatePreValidatedSignature, estimateGasForTransactionExecution, } from "./utils";
+import { getSafeSingletonDeployment } from '@gnosis.pm/safe-deployments';
+import { toChecksumAddress } from 'web3-utils';
+import SafeTransaction from '@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction';
+import RequestProvider from './api';
+import { standardizeSafeTransactionData, sameString, generateSignature, generatePreValidatedSignature, estimateGasForTransactionExecution } from './utils';
 class Safe {
-    constructor(safeAddress, version, provider, network = "1") {
+    constructor(safeAddress, version, provider, network = '1') {
         this.owners = [];
         this.safeInfo = null;
         const contract = getSafeSingletonDeployment({
             version,
-            network,
+            network
         });
         if (!contract) {
-            throw new Error("Wrong version or network");
+            throw new Error('Wrong version or network');
         }
         this.provider = provider;
         this.contract = new Contract(safeAddress, contract.abi, this.provider);
         this.version = version;
         this.safeAddress = safeAddress;
         this.network = network;
-        this.request = new RequestProvider(network);
+        this.request = new RequestProvider(network, Safe.adapter);
         this.init();
     }
     static getSafeInfo(safeAddress, network) {
-        const request = new RequestProvider(network);
+        const request = new RequestProvider(network, Safe.adapter);
         return request.getSafeInfo(toChecksumAddress(safeAddress));
     }
     static async getPendingTransactions(safeAddress, network) {
-        const request = new RequestProvider(network);
-        const nonce = (await request.getSafeInfo(toChecksumAddress(safeAddress))).nonce;
+        const request = new RequestProvider(network, Safe.adapter);
+        const nonce = (await request.getSafeInfo(toChecksumAddress(safeAddress)))
+            .nonce;
         const transactions = await request.getPendingTransactions(safeAddress, nonce);
         return transactions;
     }
@@ -70,7 +71,7 @@ class Safe {
         const signerAddress = await signer.getAddress();
         const addressIsOwner = owners.find((owner) => signerAddress && sameString(owner, signerAddress));
         if (!addressIsOwner) {
-            throw new Error("Transactions can only be signed by Safe owners");
+            throw new Error('Transactions can only be signed by Safe owners');
         }
         return generateSignature(this.provider, hash);
     }
@@ -108,7 +109,7 @@ class Safe {
             nonce: transaction.data.nonce,
             contractTransactionHash: hash,
             sender: toChecksumAddress(signerAddress),
-            signature: transaction.encodedSignatures(),
+            signature: transaction.encodedSignatures()
         });
     }
     async confirmTransaction(safeTransaction) {
@@ -141,20 +142,20 @@ class Safe {
         const threshold = await this.getThreshold();
         if (threshold > safeTransaction.signatures.size) {
             const signaturesMissing = threshold - safeTransaction.signatures.size;
-            throw new Error(`There ${signaturesMissing > 1 ? "are" : "is"} ${signaturesMissing} signature${signaturesMissing > 1 ? "s" : ""} missing`);
+            throw new Error(`There ${signaturesMissing > 1 ? 'are' : 'is'} ${signaturesMissing} signature${signaturesMissing > 1 ? 's' : ''} missing`);
         }
         const value = BigNumber.from(safeTransaction.data.value);
         if (!value.isZero()) {
             const balance = await this.getBalance();
             if (value.gt(BigNumber.from(balance))) {
-                throw new Error("Not enough Ether funds");
+                throw new Error('Not enough Ether funds');
             }
         }
         const gasLimit = await estimateGasForTransactionExecution(contract, signerAddress, safeTransaction);
         const executionOptions = {
             gasLimit,
             gasPrice: options === null || options === void 0 ? void 0 : options.gasPrice,
-            from: signerAddress,
+            from: signerAddress
         };
         const txResponse = await contract.execTransaction(safeTransaction.data.to, safeTransaction.data.value, safeTransaction.data.data, safeTransaction.data.operation, safeTransaction.data.safeTxGas, safeTransaction.data.baseGas, safeTransaction.data.gasPrice, safeTransaction.data.gasToken, safeTransaction.data.refundReceiver, safeTransaction.encodedSignatures(), executionOptions);
         return txResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/gnosis-sdk",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/api.ts

@@ -1,5 +1,5 @@
-import axios, { Axios } from "axios";
-import { toChecksumAddress } from "web3-utils";
+import axios, { Axios, AxiosAdapter } from 'axios';
+import { toChecksumAddress } from 'web3-utils';
 
 export interface SafeInfo {
   address: string;
@@ -46,26 +46,27 @@ export interface SafeTransactionItem {
 }
 
 const HOST_MAP = {
-  '1': "https://safe-transaction.gnosis.io/api/v1",
+  '1': 'https://safe-transaction.gnosis.io/api/v1',
   '137': 'https://safe-transaction.polygon.gnosis.io/api/v1',
   '56': 'https://safe-transaction.bsc.gnosis.io/api/v1',
   '100': 'https://safe-transaction.xdai.gnosis.io/api/v1'
-}
+};
 
 export default class RequestProvider {
-  host: string
-  request: Axios
+  host: string;
+  request: Axios;
 
-  constructor(networkId: string) {
+  constructor(networkId: string, adapter?: AxiosAdapter) {
     if (!(networkId in HOST_MAP)) {
-      throw new Error('Wrong networkId')
+      throw new Error('Wrong networkId');
     }
 
-    this.host = HOST_MAP[networkId]
+    this.host = HOST_MAP[networkId];
 
     this.request = axios.create({
-      baseURL: this.host
-    })
+      baseURL: this.host,
+      adapter
+    });
 
     this.request.interceptors.response.use((response) => {
       return response.data;
@@ -76,12 +77,15 @@ export default class RequestProvider {
     safeAddress: string,
     nonce: number
   ): Promise<{ results: SafeTransactionItem[] }> {
-    return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/multisig-transactions/`, {
-      params: {
-        executed: false,
-        nonce__gte: nonce,
-      },
-    });
+    return this.request.get(
+      `/safes/${toChecksumAddress(safeAddress)}/multisig-transactions/`,
+      {
+        params: {
+          executed: false,
+          nonce__gte: nonce
+        }
+      }
+    );
   }
 
   postTransactions(safeAddres: string, data): Promise<void> {
@@ -96,6 +100,9 @@ export default class RequestProvider {
   }
 
   confirmTransaction(hash: string, data): Promise<void> {
-    return this.request.post(`/multisig-transactions/${hash}/confirmations/`, data);
+    return this.request.post(
+      `/multisig-transactions/${hash}/confirmations/`,
+      data
+    );
   }
 }

package/src/index.ts

@@ -1,26 +1,27 @@
-import { Contract } from "ethers";
-import { BigNumber } from "@ethersproject/bignumber";
+import { Contract } from 'ethers';
+import { BigNumber } from '@ethersproject/bignumber';
 import BN from 'bignumber.js';
-import { getSafeSingletonDeployment } from "@gnosis.pm/safe-deployments";
-import { providers } from "ethers";
-import { toChecksumAddress } from "web3-utils";
+import { getSafeSingletonDeployment } from '@gnosis.pm/safe-deployments';
+import { providers } from 'ethers';
+import { toChecksumAddress } from 'web3-utils';
 import {
   SafeTransactionDataPartial,
-  SafeSignature,
-} from "@gnosis.pm/safe-core-sdk-types";
+  SafeSignature
+} from '@gnosis.pm/safe-core-sdk-types';
 import {
   TransactionResult,
-  TransactionOptions,
-} from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types";
-import SafeTransaction from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction";
-import RequestProvider, { SafeInfo } from "./api";
+  TransactionOptions
+} from '@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types';
+import SafeTransaction from '@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/SafeTransaction';
+import RequestProvider, { SafeInfo } from './api';
 import {
   standardizeSafeTransactionData,
   sameString,
   generateSignature,
   generatePreValidatedSignature,
-  estimateGasForTransactionExecution,
-} from "./utils";
+  estimateGasForTransactionExecution
+} from './utils';
+import { AxiosAdapter } from 'axios';
 
 class Safe {
   contract: Contract;
@@ -32,36 +33,39 @@ class Safe {
   request: RequestProvider;
   network: string;
 
+  static adapter: AxiosAdapter;
+
   constructor(
     safeAddress: string,
     version: string,
     provider: providers.Web3Provider,
-    network = "1"
+    network = '1'
   ) {
     const contract = getSafeSingletonDeployment({
       version,
-      network,
+      network
     });
     if (!contract) {
-      throw new Error("Wrong version or network");
+      throw new Error('Wrong version or network');
     }
     this.provider = provider;
     this.contract = new Contract(safeAddress, contract.abi, this.provider);
     this.version = version;
     this.safeAddress = safeAddress;
     this.network = network;
-    this.request = new RequestProvider(network);
+    this.request = new RequestProvider(network, Safe.adapter);
     this.init();
   }
 
   static getSafeInfo(safeAddress: string, network: string) {
-    const request = new RequestProvider(network);
+    const request = new RequestProvider(network, Safe.adapter);
     return request.getSafeInfo(toChecksumAddress(safeAddress));
   }
 
   static async getPendingTransactions(safeAddress: string, network: string) {
-    const request = new RequestProvider(network);
-    const nonce = (await request.getSafeInfo(toChecksumAddress(safeAddress))).nonce;
+    const request = new RequestProvider(network, Safe.adapter);
+    const nonce = (await request.getSafeInfo(toChecksumAddress(safeAddress)))
+      .nonce;
     const transactions = await request.getPendingTransactions(
       safeAddress,
       nonce
@@ -132,7 +136,7 @@ class Safe {
       (owner: string) => signerAddress && sameString(owner, signerAddress)
     );
     if (!addressIsOwner) {
-      throw new Error("Transactions can only be signed by Safe owners");
+      throw new Error('Transactions can only be signed by Safe owners');
     }
     return generateSignature(this.provider, hash);
   }
@@ -173,7 +177,7 @@ class Safe {
       nonce: transaction.data.nonce,
       contractTransactionHash: hash,
       sender: toChecksumAddress(signerAddress),
-      signature: transaction.encodedSignatures(),
+      signature: transaction.encodedSignatures()
     });
   }
 
@@ -217,9 +221,9 @@ class Safe {
       const signaturesMissing = threshold - safeTransaction.signatures.size;
       throw new Error(
         `There ${
-          signaturesMissing > 1 ? "are" : "is"
+          signaturesMissing > 1 ? 'are' : 'is'
         } ${signaturesMissing} signature${
-          signaturesMissing > 1 ? "s" : ""
+          signaturesMissing > 1 ? 's' : ''
         } missing`
       );
     }
@@ -228,7 +232,7 @@ class Safe {
     if (!value.isZero()) {
       const balance = await this.getBalance();
       if (value.gt(BigNumber.from(balance))) {
-        throw new Error("Not enough Ether funds");
+        throw new Error('Not enough Ether funds');
       }
     }
 
@@ -240,7 +244,7 @@ class Safe {
     const executionOptions: TransactionOptions = {
       gasLimit,
       gasPrice: options?.gasPrice,
-      from: signerAddress,
+      from: signerAddress
     };
 
     const txResponse = await contract.execTransaction(