@rabby-wallet/gnosis-sdk 1.0.1 → 1.0.2

package/dist/index.js

@@ -4,7 +4,7 @@ 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 = [];
@@ -155,7 +155,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.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -19,7 +19,6 @@ import {
   generateSignature,
   generatePreValidatedSignature,
   estimateGasForTransactionExecution,
-  toTxResult,
 } from "./utils";
 
 class Safe {
@@ -89,7 +88,10 @@ class Safe {
 
   async getPendingTransactions() {
     const nonce = await this.getNonce();
-    const transactions = await this.request.getPendingTransactions(this.safeAddress, nonce);
+    const transactions = await this.request.getPendingTransactions(
+      this.safeAddress,
+      nonce
+    );
 
     return transactions;
   }
@@ -251,9 +253,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)
-  );
-}