Axios bug fixes

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [1.2.7] - 2023-09-20
+### Fixes
+- Fixed the issue on usage of axios when paymaster is called via react native by replacing it to fetch.
+
 ## [1.2.6] - 2023-09-12
 ### Fixes
 - Fixed the issue on setting gas prices by the user if specified on estimate step

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherspot/prime-sdk",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Etherspot Prime (Account Abstraction) SDK",
   "keywords": [
     "ether",
@@ -51,18 +51,17 @@
   },
   "dependencies": {
     "@apollo/client": "3.4.0",
-    "@lifi/sdk": "^2.2.3",
+    "@lifi/sdk": "2.2.3",
     "@nerdwallet/apollo-cache-policies": "1.2.1",
     "@thehubbleproject/bls": "0.5.1",
-    "apollo-link-ws": "^1.0.20",
-    "@walletconnect/universal-provider": "^2.10.0",
-    "axios": "1.3.4",
+    "apollo-link-ws": "1.0.20",
+    "@walletconnect/universal-provider": "2.10.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
-    "commander": "^10.0.1",
+    "commander": "10.0.1",
     "cross-fetch": "3.1.5",
     "ethers": "5.7.0",
-    "prettier": "^2.8.8",
+    "prettier": "2.8.8",
     "reflect-metadata": "0.1.13"
   },
   "devDependencies": {

src/sdk/base/VerifyingPaymasterAPI.ts

@@ -1,5 +1,5 @@
-import axios from 'axios';
 import { ethers } from 'ethers';
+import fetch from 'cross-fetch';
 import { calcPreVerificationGas } from './calcPreVerificationGas';
 import { PaymasterAPI } from './PaymasterAPI';
 import { UserOperationStruct } from '../contracts/account-abstraction/contracts/core/BaseAccount';
@@ -39,7 +39,7 @@ export class VerifyingPaymasterAPI extends PaymasterAPI {
       // userOp.preVerificationGas contains a promise that will resolve to an error.
       await ethers.utils.resolveProperties(userOp);
       // eslint-disable-next-line no-empty
-    } catch (_) {}
+    } catch (_) { }
     const pmOp: Partial<UserOperationStruct> = {
       sender: userOp.sender,
       nonce: userOp.nonce,
@@ -57,15 +57,23 @@ export class VerifyingPaymasterAPI extends PaymasterAPI {
     op.preVerificationGas = calcPreVerificationGas(op);
 
     // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
-    const paymasterAndData = await axios
-      .post<PaymasterResponse>(this.paymasterUrl, {
-        jsonrpc: '2.0',
-        id: 1,
-        method: 'pm_sponsorUserOperation',
-        params: [await toJSON(op), this.entryPoint, this.context, this.chainId, this.api_key],
+    const paymasterAndData = await fetch(this.paymasterUrl, {
+      method: 'POST',
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ params: [await toJSON(op), this.entryPoint, this.context, this.chainId, this.api_key], jsonrpc: '2', id: 2 }),
+    })
+      .then(async (res) => {
+        const response = await await res.json();
+        if (response.error) {
+          throw new Error(response.error);
+        }
+        return response
       })
-      .then((res) => {
-        return res.data
+      .catch((err) => {
+        throw new Error(err.message);
       })
 
     return paymasterAndData;