@rabby-wallet/gnosis-sdk 1.0.1 → 1.2.0

package/dist/api.js

@@ -20,7 +20,7 @@ export default class RequestProvider {
         });
     }
     getPendingTransactions(safeAddress, nonce) {
-        return this.request.get(`/safes/${safeAddress}/multisig-transactions/`, {
+        return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/multisig-transactions/`, {
             params: {
                 executed: false,
                 nonce__gte: nonce,
@@ -31,7 +31,7 @@ export default class RequestProvider {
         return this.request.post(`/safes/${toChecksumAddress(safeAddres)}/multisig-transactions/`, data);
     }
     getSafeInfo(safeAddress) {
-        return this.request.get(`/safes/${safeAddress}/`);
+        return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/`);
     }
     confirmTransaction(hash, data) {
         return this.request.post(`/multisig-transactions/${hash}/confirmations/`, data);

package/dist/index.d.ts

@@ -16,13 +16,13 @@ declare class Safe {
     network: string;
     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<{
+        results: import("./api").SafeTransactionItem[];
+    }>;
     init(): Promise<void>;
     getOwners(): Promise<string[]>;
     getThreshold(): Promise<any>;
     getNonce(): Promise<number>;
-    getPendingTransactions(): Promise<{
-        results: import("./api").SafeTransactionItem[];
-    }>;
     buildTransaction(data: SafeTransactionDataPartial): Promise<SafeTransaction>;
     getTransactionHash(transaction: SafeTransaction): Promise<any>;
     signTransactionHash(hash: string): Promise<SafeSignature>;

package/dist/index.js

@@ -1,10 +1,11 @@
 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, toTxResult, } from "./utils";
+import { standardizeSafeTransactionData, sameString, generateSignature, generatePreValidatedSignature, estimateGasForTransactionExecution, } from "./utils";
 class Safe {
     constructor(safeAddress, version, provider, network = "1") {
         this.owners = [];
@@ -26,7 +27,13 @@ class Safe {
     }
     static getSafeInfo(safeAddress, network) {
         const request = new RequestProvider(network);
-        return request.getSafeInfo(safeAddress);
+        return request.getSafeInfo(toChecksumAddress(safeAddress));
+    }
+    static async getPendingTransactions(safeAddress, network) {
+        const request = new RequestProvider(network);
+        const nonce = (await request.getSafeInfo(toChecksumAddress(safeAddress))).nonce;
+        const transactions = await request.getPendingTransactions(safeAddress, nonce);
+        return transactions;
     }
     async init() {
         const safeInfo = await Safe.getSafeInfo(this.safeAddress, this.network);
@@ -49,11 +56,6 @@ class Safe {
         const nonce = await this.contract.nonce();
         return nonce.toNumber();
     }
-    async getPendingTransactions() {
-        const nonce = await this.getNonce();
-        const transactions = await this.request.getPendingTransactions(this.safeAddress, nonce);
-        return transactions;
-    }
     async buildTransaction(data) {
         const transaction = await standardizeSafeTransactionData(this.safeAddress, this.contract, this.provider, data);
         return new SafeTransaction(transaction);
@@ -95,7 +97,7 @@ class Safe {
         await this.request.postTransactions(this.safeAddress, {
             safe: safeAddress,
             to: toChecksumAddress(transaction.data.to),
-            value: Number(transaction.data.value),
+            value: new BN(transaction.data.value).toFixed(),
             data: transaction.data.data,
             operation: transaction.data.operation,
             gasToken: transaction.data.gasToken,
@@ -155,7 +157,7 @@ class Safe {
             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 toTxResult(txResponse, executionOptions);
+        return txResponse;
     }
 }
 export default Safe;

package/dist/utils.d.ts

@@ -1,7 +1,5 @@
 import { Contract, providers } from "ethers";
 import { OperationType, SafeTransactionData, SafeTransactionDataPartial, SafeSignature, SafeTransaction } from "@gnosis.pm/safe-core-sdk-types";
-import { TransactionOptions, Web3TransactionResult } from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types";
-import { PromiEvent, TransactionReceipt } from "web3-core/types";
 import EthSignSignature from "@gnosis.pm/safe-core-sdk/dist/src/utils/signatures/SafeSignature";
 export declare function sameString(str1: string, str2: string): boolean;
 export declare function isRestrictedAddress(address: string): boolean;
@@ -12,4 +10,3 @@ export declare function isTxHashSignedWithPrefix(txHash: string, signature: stri
 export declare function adjustVInSignature(signature: string, hasPrefix: boolean): string;
 export declare function generateSignature(provider: providers.Web3Provider, hash: string): Promise<EthSignSignature>;
 export declare function estimateGasForTransactionExecution(safeContract: Contract, from: string, tx: SafeTransaction): Promise<number>;
-export declare function toTxResult(promiEvent: PromiEvent<TransactionReceipt>, options?: TransactionOptions): Promise<Web3TransactionResult>;

package/dist/utils.js

@@ -154,8 +154,3 @@ export async function estimateGasForTransactionExecution(safeContract, from, tx)
         return Promise.reject(error);
     }
 }
-export function toTxResult(promiEvent, options) {
-    return new Promise((resolve, reject) => promiEvent
-        .once("transactionHash", (hash) => resolve({ hash, promiEvent, options }))
-        .catch(reject));
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/gnosis-sdk",
-  "version": "1.0.1",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,6 +18,7 @@
     "@gnosis.pm/safe-core-sdk-types": "^0.1.1",
     "@gnosis.pm/safe-deployments": "^1.4.0",
     "axios": "^0.24.0",
+    "bignumber.js": "^9.0.2",
     "ethereumjs-util": "^7.1.3",
     "ethers": "^5.5.1",
     "typescript": "^4.4.4",

package/src/api.ts

@@ -76,7 +76,7 @@ export default class RequestProvider {
     safeAddress: string,
     nonce: number
   ): Promise<{ results: SafeTransactionItem[] }> {
-    return this.request.get(`/safes/${safeAddress}/multisig-transactions/`, {
+    return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/multisig-transactions/`, {
       params: {
         executed: false,
         nonce__gte: nonce,
@@ -92,7 +92,7 @@ export default class RequestProvider {
   }
 
   getSafeInfo(safeAddress: string): Promise<SafeInfo> {
-    return this.request.get(`/safes/${safeAddress}/`);
+    return this.request.get(`/safes/${toChecksumAddress(safeAddress)}/`);
   }
 
   confirmTransaction(hash: string, data): Promise<void> {

package/src/index.ts

@@ -1,5 +1,6 @@
 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";
@@ -19,7 +20,6 @@ import {
   generateSignature,
   generatePreValidatedSignature,
   estimateGasForTransactionExecution,
-  toTxResult,
 } from "./utils";
 
 class Safe {
@@ -56,7 +56,18 @@ class Safe {
 
   static getSafeInfo(safeAddress: string, network: string) {
     const request = new RequestProvider(network);
-    return request.getSafeInfo(safeAddress);
+    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 transactions = await request.getPendingTransactions(
+      safeAddress,
+      nonce
+    );
+
+    return transactions;
   }
 
   async init() {
@@ -87,13 +98,6 @@ class Safe {
     return nonce.toNumber();
   }
 
-  async getPendingTransactions() {
-    const nonce = await this.getNonce();
-    const transactions = await this.request.getPendingTransactions(this.safeAddress, nonce);
-
-    return transactions;
-  }
-
   async buildTransaction(data: SafeTransactionDataPartial) {
     const transaction = await standardizeSafeTransactionData(
       this.safeAddress,
@@ -158,7 +162,7 @@ class Safe {
     await this.request.postTransactions(this.safeAddress, {
       safe: safeAddress,
       to: toChecksumAddress(transaction.data.to),
-      value: Number(transaction.data.value),
+      value: new BN(transaction.data.value).toFixed(),
       data: transaction.data.data,
       operation: transaction.data.operation,
       gasToken: transaction.data.gasToken,
@@ -251,9 +255,9 @@ class Safe {
       safeTransaction.data.refundReceiver,
       safeTransaction.encodedSignatures(),
       executionOptions
-    )
+    );
 
-    return toTxResult(txResponse, executionOptions);
+    return txResponse;
   }
 }
 

package/src/utils.ts

@@ -1,18 +1,12 @@
 import { BigNumber } from "@ethersproject/bignumber";
 import { Contract, providers } from "ethers";
 import {
-  MetaTransactionData,
   OperationType,
   SafeTransactionData,
   SafeTransactionDataPartial,
   SafeSignature,
   SafeTransaction,
 } from "@gnosis.pm/safe-core-sdk-types";
-import {
-  TransactionOptions,
-  Web3TransactionResult,
-} from "@gnosis.pm/safe-core-sdk/dist/src/utils/transactions/types";
-import { PromiEvent, TransactionReceipt } from "web3-core/types";
 import { bufferToHex, ecrecover, pubToAddress } from "ethereumjs-util";
 import { ZERO_ADDRESS, SENTINEL_ADDRESS } from "./constants";
 import EthSignSignature from "@gnosis.pm/safe-core-sdk/dist/src/utils/signatures/SafeSignature";
@@ -236,16 +230,3 @@ export async function estimateGasForTransactionExecution(
     return Promise.reject(error);
   }
 }
-
-export function toTxResult(
-  promiEvent: PromiEvent<TransactionReceipt>,
-  options?: TransactionOptions
-): Promise<Web3TransactionResult> {
-  return new Promise((resolve, reject) =>
-    promiEvent
-      .once("transactionHash", (hash: string) =>
-        resolve({ hash, promiEvent, options })
-      )
-      .catch(reject)
-  );
-}