@cryptorubic/web3 1.6.2 → 1.16.2-295.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.6.2",
+    "version": "1.16.2-295.0",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/lib/adapter/adapters/adapter-evm/evm-adapter.d.ts

@@ -79,7 +79,9 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
      * @param [options] Additional options.
      * @returns Approval transaction hash.
      */
-    approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<string>;
+    approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions, resetPrevApprove?: boolean): Promise<string>;
+    private shouldResetApprove;
+    private _approve;
     /**
      * Build encoded approve transaction config.
      * @param tokenAddress Address of the smart-contract corresponding to the token.

package/src/lib/adapter/adapters/adapter-evm/evm-adapter.js

@@ -346,7 +346,18 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
      * @param [options] Additional options.
      * @returns Approval transaction hash.
      */
-    async approveTokens(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+    async approveTokens(tokenAddress, spenderAddress, amount = 'infinity', options = {}, resetPrevApprove) {
+        const resetApprove = resetPrevApprove && (await this.shouldResetApprove(tokenAddress, spenderAddress));
+        if (resetApprove) {
+            await this._approve(tokenAddress, spenderAddress, new bignumber_js_1.default(0), options);
+        }
+        return this._approve(tokenAddress, spenderAddress, amount, options);
+    }
+    async shouldResetApprove(tokenAddress, spenderAddress) {
+        const { allowanceWei } = await this.getAllowance(tokenAddress, this.signer.walletAddress, spenderAddress);
+        return allowanceWei.gt(0);
+    }
+    async _approve(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
         try {
             const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
             const encodedApprove = this.encodeApprove(tokenAddress, spenderAddress, rawValue.toFixed(0));