starknet 3.11.0 → 3.12.2

package/.releaserc

@@ -24,5 +24,5 @@
     ],
     "@semantic-release/github"
   ],
-  "repositoryUrl": "https://github.com/seanjameshan/starknet.js"
+  "repositoryUrl": "https://github.com/0xs34n/starknet.js"
 }

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [3.12.2](https://github.com/0xs34n/starknet.js/compare/v3.12.1...v3.12.2) (2022-05-30)
+
+### Bug Fixes
+
+- allow starknet.js in service workers ([7a500d1](https://github.com/0xs34n/starknet.js/commit/7a500d198cffed43f98a669edac2dbb215884a3b))
+- updated powered by starknet list ([aa36463](https://github.com/0xs34n/starknet.js/commit/aa36463e1adb281f79bf8462b2f0063801457782))
+
+## [3.12.1](https://github.com/0xs34n/starknet.js/compare/v3.12.0...v3.12.1) (2022-05-24)
+
+### Bug Fixes
+
+- update repo url ([c1312c0](https://github.com/0xs34n/starknet.js/commit/c1312c0e00e3387a49d1d7edc33e584687d607ea))
+
+# [3.12.0](https://github.com/seanjameshan/starknet.js/compare/v3.11.0...v3.12.0) (2022-05-24)
+
+### Bug Fixes
+
+- always default to latest block ([dafc575](https://github.com/seanjameshan/starknet.js/commit/dafc57550b9b175b79ec2fd728504ee14a992620))
+
+### Features
+
+- add suggestedMaxFee ([8977772](https://github.com/seanjameshan/starknet.js/commit/8977772763ecd895006c00c9cbe1397429a19b6f))
+
 # [3.11.0](https://github.com/seanjameshan/starknet.js/compare/v3.10.3...v3.11.0) (2022-05-11)
 
 ### Bug Fixes

package/README.md

@@ -57,8 +57,10 @@ Guides can be found [here](https://www.starknetjs.com/guides/intro)
 ## 🚀 Powered by Starknet.js
 
 - [Argent X - the first StarkNet wallet](https://github.com/argentlabs/argent-x)
+- [Braavos - your new wallet on top of StarkNet](https://chrome.google.com/webstore/detail/braavos-wallet/jnlgamecbpmbajjfhmmmlhejkemejdma)
 - [React + Starknet.js boilerplate](https://github.com/fracek/starknet-react-example)
 - [AMM Demo](https://www.starknetswap.com/)
+- [mySwap - the first DeFi app to launch on StarkNet](myswap.xyz)
 
 ## ✏️ Contributing
 

package/__tests__/jest.setup.ts

@@ -1,9 +1,28 @@
-import axios from 'axios';
-import * as AxiosLogger from 'axios-logger';
+/* eslint-disable no-console */
+import { register } from 'fetch-intercept';
 
 jest.setTimeout(50 * 60 * 1000);
 
 if (process.env.DEBUG === 'true') {
-  axios.interceptors.request.use(AxiosLogger.requestLogger, AxiosLogger.errorLogger);
-  axios.interceptors.response.use(AxiosLogger.responseLogger, AxiosLogger.errorLogger);
+  register({
+    request(url, config) {
+      console.log('[fetch.request]', [url, config]);
+      return [url, config];
+    },
+
+    requestError(error) {
+      console.log('[fetch.requestError]', error);
+      return Promise.reject(error);
+    },
+
+    response(response) {
+      console.log('[fetch.response]', response);
+      return response;
+    },
+
+    responseError(error) {
+      console.log('[fetch.responseError]', error);
+      return Promise.reject(error);
+    },
+  });
 }

package/account/default.d.ts

@@ -5,12 +5,12 @@ import {
   Abi,
   AddTransactionResponse,
   Call,
-  EstimateFeeResponse,
   InvocationsDetails,
   KeyPair,
   Signature,
   Transaction,
 } from '../types';
+import { EstimateFee } from '../types/account';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData';
 import { AccountInterface } from './interface';
@@ -32,13 +32,15 @@ export declare class Account extends Provider implements AccountInterface {
       nonce?: BigNumberish;
       blockIdentifier?: BlockIdentifier;
     }
-  ): Promise<EstimateFeeResponse>;
+  ): Promise<EstimateFee>;
   /**
    * Invoke execute function in account contract
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param transaction - transaction to be invoked
+   * @param calls - one or more calls to be executed
+   * @param abis - one or more abis which can be used to display the calls
+   * @param transactionsDetail - optional transaction details
    * @returns a confirmation of invoking a function on the starknet contract
    */
   execute(

package/account/default.js

@@ -24,6 +24,20 @@ var __extends =
       d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
     };
   })();
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+      };
+    return __assign.apply(this, arguments);
+  };
 var __awaiter =
   (this && this.__awaiter) ||
   function (thisArg, _arguments, P, generator) {
@@ -242,7 +256,15 @@ var Account = /** @class */ (function (_super) {
       _c = _b.blockIdentifier,
       blockIdentifier = _c === void 0 ? 'pending' : _c;
     return __awaiter(this, void 0, void 0, function () {
-      var transactions, nonce, _d, version, signerDetails, signature, calldata;
+      var transactions,
+        nonce,
+        _d,
+        version,
+        signerDetails,
+        signature,
+        calldata,
+        fetchedEstimate,
+        suggestedMaxFee;
       return __generator(this, function (_e) {
         switch (_e.label) {
           case 0:
@@ -270,7 +292,7 @@ var Account = /** @class */ (function (_super) {
             signature = _e.sent();
             calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, nonce);
             return [
-              2 /*return*/,
+              4 /*yield*/,
               this.fetchEndpoint(
                 'estimate_fee',
                 { blockIdentifier: blockIdentifier },
@@ -283,6 +305,13 @@ var Account = /** @class */ (function (_super) {
                 }
               ),
             ];
+          case 5:
+            fetchedEstimate = _e.sent();
+            suggestedMaxFee = (0, stark_1.estimatedFeeToMaxFee)(fetchedEstimate.amount);
+            return [
+              2 /*return*/,
+              __assign(__assign({}, fetchedEstimate), { suggestedMaxFee: suggestedMaxFee }),
+            ];
         }
       });
     });
@@ -292,7 +321,9 @@ var Account = /** @class */ (function (_super) {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param transaction - transaction to be invoked
+   * @param calls - one or more calls to be executed
+   * @param abis - one or more abis which can be used to display the calls
+   * @param transactionsDetail - optional transaction details
    * @returns a confirmation of invoking a function on the starknet contract
    */
   Account.prototype.execute = function (calls, abis, transactionsDetail) {
@@ -304,7 +335,7 @@ var Account = /** @class */ (function (_super) {
       transactionsDetail = {};
     }
     return __awaiter(this, void 0, void 0, function () {
-      var transactions, nonce, _b, _c, maxFee, estimatedFee, signerDetails, signature, calldata;
+      var transactions, nonce, _b, _c, maxFee, suggestedMaxFee, signerDetails, signature, calldata;
       return __generator(this, function (_d) {
         switch (_d.label) {
           case 0:
@@ -329,8 +360,8 @@ var Account = /** @class */ (function (_super) {
           case 4:
             return [4 /*yield*/, this.estimateFee(transactions, { nonce: nonce })];
           case 5:
-            estimatedFee = _d.sent().amount;
-            maxFee = (0, stark_1.estimatedFeeToMaxFee)(estimatedFee).toString();
+            suggestedMaxFee = _d.sent().suggestedMaxFee;
+            maxFee = suggestedMaxFee.toString();
             _d.label = 6;
           case 6:
             signerDetails = {

package/account/interface.d.ts

@@ -5,11 +5,11 @@ import {
   AddTransactionResponse,
   Call,
   DeployContractPayload,
-  EstimateFeeResponse,
   Invocation,
   InvocationsDetails,
   Signature,
 } from '../types';
+import { EstimateFee } from '../types/account';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData/types';
 export declare abstract class AccountInterface extends ProviderInterface {
@@ -40,7 +40,7 @@ export declare abstract class AccountInterface extends ProviderInterface {
    *
    * @returns response from addTransaction
    */
-  abstract estimateFee(invocation: Invocation): Promise<EstimateFeeResponse>;
+  abstract estimateFee(invocation: Invocation): Promise<EstimateFee>;
   /**
    * Invoke execute function in account contract
    *

package/contract/default.d.ts

@@ -148,6 +148,6 @@ export declare class Contract implements ContractInterface {
       blockIdentifier?: BlockIdentifier;
     }
   ): Promise<Result>;
-  estimate(method: string, args?: Array<any>): Promise<import('../types').EstimateFeeResponse>;
+  estimate(method: string, args?: Array<any>): Promise<import('../types/account').EstimateFee>;
   populate(method: string, args?: Array<any>): Invocation;
 }

package/dist/account/default.d.ts

@@ -1,7 +1,8 @@
 import { Provider, ProviderInterface } from '../provider';
 import { BlockIdentifier } from '../provider/utils';
 import { SignerInterface } from '../signer';
-import { Abi, AddTransactionResponse, Call, EstimateFeeResponse, InvocationsDetails, KeyPair, Signature, Transaction } from '../types';
+import { Abi, AddTransactionResponse, Call, InvocationsDetails, KeyPair, Signature, Transaction } from '../types';
+import { EstimateFee } from '../types/account';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData';
 import { AccountInterface } from './interface';
@@ -13,13 +14,15 @@ export declare class Account extends Provider implements AccountInterface {
     estimateFee(calls: Call | Call[], { nonce: providedNonce, blockIdentifier, }?: {
         nonce?: BigNumberish;
         blockIdentifier?: BlockIdentifier;
-    }): Promise<EstimateFeeResponse>;
+    }): Promise<EstimateFee>;
     /**
      * Invoke execute function in account contract
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param transaction - transaction to be invoked
+     * @param calls - one or more calls to be executed
+     * @param abis - one or more abis which can be used to display the calls
+     * @param transactionsDetail - optional transaction details
      * @returns a confirmation of invoking a function on the starknet contract
      */
     execute(calls: Call | Call[], abis?: Abi[] | undefined, transactionsDetail?: InvocationsDetails): Promise<AddTransactionResponse>;

package/dist/account/default.js

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -119,7 +130,7 @@ var Account = /** @class */ (function (_super) {
     Account.prototype.estimateFee = function (calls, _a) {
         var _b = _a === void 0 ? {} : _a, providedNonce = _b.nonce, _c = _b.blockIdentifier, blockIdentifier = _c === void 0 ? 'pending' : _c;
         return __awaiter(this, void 0, void 0, function () {
-            var transactions, nonce, _d, version, signerDetails, signature, calldata;
+            var transactions, nonce, _d, version, signerDetails, signature, calldata, fetchedEstimate, suggestedMaxFee;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -145,13 +156,17 @@ var Account = /** @class */ (function (_super) {
                     case 4:
                         signature = _e.sent();
                         calldata = (0, transaction_1.fromCallsToExecuteCalldataWithNonce)(transactions, nonce);
-                        return [2 /*return*/, this.fetchEndpoint('estimate_fee', { blockIdentifier: blockIdentifier }, {
+                        return [4 /*yield*/, this.fetchEndpoint('estimate_fee', { blockIdentifier: blockIdentifier }, {
                                 contract_address: this.address,
                                 entry_point_selector: (0, hash_1.getSelectorFromName)('__execute__'),
                                 calldata: calldata,
                                 version: (0, number_1.toHex)(version),
                                 signature: (0, number_1.bigNumberishArrayToDecimalStringArray)(signature),
                             })];
+                    case 5:
+                        fetchedEstimate = _e.sent();
+                        suggestedMaxFee = (0, stark_1.estimatedFeeToMaxFee)(fetchedEstimate.amount);
+                        return [2 /*return*/, __assign(__assign({}, fetchedEstimate), { suggestedMaxFee: suggestedMaxFee })];
                 }
             });
         });
@@ -161,7 +176,9 @@ var Account = /** @class */ (function (_super) {
      *
      * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
      *
-     * @param transaction - transaction to be invoked
+     * @param calls - one or more calls to be executed
+     * @param abis - one or more abis which can be used to display the calls
+     * @param transactionsDetail - optional transaction details
      * @returns a confirmation of invoking a function on the starknet contract
      */
     Account.prototype.execute = function (calls, abis, transactionsDetail) {
@@ -169,7 +186,7 @@ var Account = /** @class */ (function (_super) {
         if (abis === void 0) { abis = undefined; }
         if (transactionsDetail === void 0) { transactionsDetail = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var transactions, nonce, _b, _c, maxFee, estimatedFee, signerDetails, signature, calldata;
+            var transactions, nonce, _b, _c, maxFee, suggestedMaxFee, signerDetails, signature, calldata;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -190,8 +207,8 @@ var Account = /** @class */ (function (_super) {
                         return [3 /*break*/, 6];
                     case 4: return [4 /*yield*/, this.estimateFee(transactions, { nonce: nonce })];
                     case 5:
-                        estimatedFee = (_d.sent()).amount;
-                        maxFee = (0, stark_1.estimatedFeeToMaxFee)(estimatedFee).toString();
+                        suggestedMaxFee = (_d.sent()).suggestedMaxFee;
+                        maxFee = suggestedMaxFee.toString();
                         _d.label = 6;
                     case 6:
                         signerDetails = {

package/dist/account/interface.d.ts

@@ -1,6 +1,7 @@
 import { ProviderInterface } from '../provider';
 import { SignerInterface } from '../signer';
-import { Abi, AddTransactionResponse, Call, DeployContractPayload, EstimateFeeResponse, Invocation, InvocationsDetails, Signature } from '../types';
+import { Abi, AddTransactionResponse, Call, DeployContractPayload, Invocation, InvocationsDetails, Signature } from '../types';
+import { EstimateFee } from '../types/account';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData/types';
 export declare abstract class AccountInterface extends ProviderInterface {
@@ -28,7 +29,7 @@ export declare abstract class AccountInterface extends ProviderInterface {
      *
      * @returns response from addTransaction
      */
-    abstract estimateFee(invocation: Invocation): Promise<EstimateFeeResponse>;
+    abstract estimateFee(invocation: Invocation): Promise<EstimateFee>;
     /**
      * Invoke execute function in account contract
      *

package/dist/contract/default.d.ts

@@ -119,6 +119,6 @@ export declare class Contract implements ContractInterface {
     call(method: string, args?: Array<any>, { blockIdentifier, }?: {
         blockIdentifier?: BlockIdentifier;
     }): Promise<Result>;
-    estimate(method: string, args?: Array<any>): Promise<import("../types").EstimateFeeResponse>;
+    estimate(method: string, args?: Array<any>): Promise<import("../types/account").EstimateFee>;
     populate(method: string, args?: Array<any>): Invocation;
 }

package/dist/provider/default.js

@@ -67,7 +67,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
-var axios_1 = __importDefault(require("axios"));
+var cross_fetch_1 = __importDefault(require("cross-fetch"));
 var url_join_1 = __importDefault(require("url-join"));
 var constants_1 = require("../constants");
 var hash_1 = require("../utils/hash");
@@ -164,9 +164,8 @@ var Provider = /** @class */ (function () {
     };
     // typesafe fetch
     Provider.prototype.fetchEndpoint = function (endpoint) {
-        var _a;
         // typescript type magiuc to create a nice fitting function interface
-        var _b = []; // when both query and request are needed, we cant omit anything
+        var _a = []; // when both query and request are needed, we cant omit anything
         for (
         // typescript type magiuc to create a nice fitting function interface
         var _i = 1 // when both query and request are needed, we cant omit anything
@@ -178,50 +177,35 @@ var Provider = /** @class */ (function () {
         _i++ // when both query and request are needed, we cant omit anything
         ) {
             // typescript type magiuc to create a nice fitting function interface
-            _b[_i - 1] = arguments[_i]; // when both query and request are needed, we cant omit anything
+            _a[_i - 1] = arguments[_i]; // when both query and request are needed, we cant omit anything
         }
         // typescript type magiuc to create a nice fitting function interface
-        var _c = __read(_b, 2), query = _c[0], request = _c[1]; // when both query and request are needed, we cant omit anything
+        var _b = __read(_a, 2), query = _b[0], request = _b[1]; // when both query and request are needed, we cant omit anything
         return __awaiter(this, void 0, void 0, function () {
-            var baseUrl, method, queryString, headers, data, error_1, data;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        baseUrl = this.getFetchUrl(endpoint);
-                        method = this.getFetchMethod(endpoint);
-                        queryString = this.getQueryString(query);
-                        headers = this.getHeaders(method);
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, axios_1.default.request({
-                                method: method,
-                                transformResponse: endpoint === 'estimate_fee'
-                                    ? function (res) {
-                                        return (0, json_1.parse)(res, function (_, v) {
-                                            if (v && typeof v === 'bigint') {
-                                                return (0, number_1.toBN)(v.toString());
-                                            }
-                                            return v;
-                                        });
-                                    }
-                                    : axios_1.default.defaults.transformResponse,
-                                url: (0, url_join_1.default)(baseUrl, endpoint, queryString),
-                                data: (0, json_1.stringify)(request),
-                                headers: headers,
-                            })];
-                    case 2:
-                        data = (_d.sent()).data;
-                        return [2 /*return*/, data];
-                    case 3:
-                        error_1 = _d.sent();
-                        data = (_a = error_1 === null || error_1 === void 0 ? void 0 : error_1.response) === null || _a === void 0 ? void 0 : _a.data;
-                        if (data === null || data === void 0 ? void 0 : data.message) {
-                            throw new Error(data.code + ": " + data.message);
+            var baseUrl, method, queryString, headers, url;
+            return __generator(this, function (_c) {
+                baseUrl = this.getFetchUrl(endpoint);
+                method = this.getFetchMethod(endpoint);
+                queryString = this.getQueryString(query);
+                headers = this.getHeaders(method);
+                url = (0, url_join_1.default)(baseUrl, endpoint, queryString);
+                return [2 /*return*/, (0, cross_fetch_1.default)(url, {
+                        method: method,
+                        body: (0, json_1.stringify)(request),
+                        headers: headers,
+                    })
+                        .then(function (res) { return res.text(); })
+                        .then(function (res) {
+                        if (endpoint === 'estimate_fee') {
+                            return (0, json_1.parse)(res, function (_, v) {
+                                if (v && typeof v === 'bigint') {
+                                    return (0, number_1.toBN)(v.toString());
+                                }
+                                return v;
+                            });
                         }
-                        throw error_1;
-                    case 4: return [2 /*return*/];
-                }
+                        return (0, json_1.parse)(res);
+                    })];
             });
         });
     };

package/dist/provider/utils.js

@@ -36,8 +36,8 @@ exports.txIdentifier = txIdentifier;
  * @returns block identifier object
  */
 function getBlockIdentifier(blockIdentifier) {
-    if (blockIdentifier === null) {
-        return { type: 'BLOCK_NUMBER', data: null };
+    if (blockIdentifier === null || blockIdentifier === 'latest') {
+        return { type: 'BLOCK_NUMBER', data: 'latest' }; // default to latest block
     }
     if (blockIdentifier === 'pending') {
         return { type: 'BLOCK_NUMBER', data: 'pending' };

package/dist/types/account.d.ts

@@ -0,0 +1,5 @@
+import BN from 'bn.js';
+import { EstimateFeeResponse } from './api';
+export interface EstimateFee extends EstimateFeeResponse {
+    suggestedMaxFee: BN;
+}

package/dist/types/account.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/lib.d.ts

@@ -47,7 +47,7 @@ export declare type StructAbi = {
 export declare type Abi = Array<FunctionAbi | StructAbi>;
 export declare type EntryPointsByType = object;
 export declare type Program = Record<any, any>;
-export declare type BlockNumber = 'pending' | null | number;
+export declare type BlockNumber = 'pending' | 'latest' | null | number;
 export declare type CompiledContract = {
     abi: Abi;
     entry_points_by_type: EntryPointsByType;

package/dist/utils/stark.js

@@ -83,7 +83,7 @@ function compileCalldata(args) {
 }
 exports.compileCalldata = compileCalldata;
 function estimatedFeeToMaxFee(estimatedFee, overhead) {
-    if (overhead === void 0) { overhead = 0.15; }
+    if (overhead === void 0) { overhead = 0.5; }
     // BN can only handle Integers, so we need to do all calulations with integers
     var overHeadPercent = Math.round((1 + overhead) * 100);
     return (0, number_1.toBN)(estimatedFee).mul((0, number_1.toBN)(overHeadPercent)).div((0, number_1.toBN)(100));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.11.0",
+  "version": "3.12.2",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,7 +44,6 @@
     "@types/url-join": "^4.0.1",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "axios-logger": "^2.6.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^14.0.1",
@@ -58,14 +57,16 @@
     "prettier": "^2.4.1",
     "prettier-plugin-import-sort": "^0.0.7",
     "typedoc": "^0.22.6",
-    "typescript": "^4.4.4"
+    "typescript": "^4.4.4",
+    "whatwg-fetch": "^3.6.2"
   },
   "dependencies": {
     "@ethersproject/bytes": "^5.6.1",
-    "axios": "^0.23.0",
     "bn.js": "^5.2.0",
+    "cross-fetch": "^3.1.5",
     "elliptic": "^6.5.4",
     "ethereum-cryptography": "^0.2.0",
+    "fetch-intercept": "^2.4.0",
     "hash.js": "^1.1.7",
     "json-bigint": "^1.0.0",
     "minimalistic-assert": "^1.0.1",

package/provider/default.js

@@ -173,7 +173,7 @@ var __importDefault =
   };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.Provider = void 0;
-var axios_1 = __importDefault(require('axios'));
+var cross_fetch_1 = __importDefault(require('cross-fetch'));
 var url_join_1 = __importDefault(require('url-join'));
 var constants_1 = require('../constants');
 var hash_1 = require('../utils/hash');
@@ -281,9 +281,8 @@ var Provider = /** @class */ (function () {
   };
   // typesafe fetch
   Provider.prototype.fetchEndpoint = function (endpoint) {
-    var _a;
     // typescript type magiuc to create a nice fitting function interface
-    var _b = []; // when both query and request are needed, we cant omit anything
+    var _a = []; // when both query and request are needed, we cant omit anything
     for (
       // typescript type magiuc to create a nice fitting function interface
       var _i = 1; // when both query and request are needed, we cant omit anything
@@ -293,61 +292,42 @@ var Provider = /** @class */ (function () {
       _i++ // when both query and request are needed, we cant omit anything
     ) {
       // typescript type magiuc to create a nice fitting function interface
-      _b[_i - 1] = arguments[_i]; // when both query and request are needed, we cant omit anything
+      _a[_i - 1] = arguments[_i]; // when both query and request are needed, we cant omit anything
     }
     // typescript type magiuc to create a nice fitting function interface
-    var _c = __read(_b, 2),
-      query = _c[0],
-      request = _c[1]; // when both query and request are needed, we cant omit anything
+    var _b = __read(_a, 2),
+      query = _b[0],
+      request = _b[1]; // when both query and request are needed, we cant omit anything
     return __awaiter(this, void 0, void 0, function () {
-      var baseUrl, method, queryString, headers, data, error_1, data;
-      return __generator(this, function (_d) {
-        switch (_d.label) {
-          case 0:
-            baseUrl = this.getFetchUrl(endpoint);
-            method = this.getFetchMethod(endpoint);
-            queryString = this.getQueryString(query);
-            headers = this.getHeaders(method);
-            _d.label = 1;
-          case 1:
-            _d.trys.push([1, 3, , 4]);
-            return [
-              4 /*yield*/,
-              axios_1.default.request({
-                method: method,
-                transformResponse:
-                  endpoint === 'estimate_fee'
-                    ? function (res) {
-                        return (0, json_1.parse)(res, function (_, v) {
-                          if (v && typeof v === 'bigint') {
-                            return (0, number_1.toBN)(v.toString());
-                          }
-                          return v;
-                        });
-                      }
-                    : axios_1.default.defaults.transformResponse,
-                url: (0, url_join_1.default)(baseUrl, endpoint, queryString),
-                data: (0, json_1.stringify)(request),
-                headers: headers,
-              }),
-            ];
-          case 2:
-            data = _d.sent().data;
-            return [2 /*return*/, data];
-          case 3:
-            error_1 = _d.sent();
-            data =
-              (_a = error_1 === null || error_1 === void 0 ? void 0 : error_1.response) === null ||
-              _a === void 0
-                ? void 0
-                : _a.data;
-            if (data === null || data === void 0 ? void 0 : data.message) {
-              throw new Error(data.code + ': ' + data.message);
-            }
-            throw error_1;
-          case 4:
-            return [2 /*return*/];
-        }
+      var baseUrl, method, queryString, headers, url;
+      return __generator(this, function (_c) {
+        baseUrl = this.getFetchUrl(endpoint);
+        method = this.getFetchMethod(endpoint);
+        queryString = this.getQueryString(query);
+        headers = this.getHeaders(method);
+        url = (0, url_join_1.default)(baseUrl, endpoint, queryString);
+        return [
+          2 /*return*/,
+          (0, cross_fetch_1.default)(url, {
+            method: method,
+            body: (0, json_1.stringify)(request),
+            headers: headers,
+          })
+            .then(function (res) {
+              return res.text();
+            })
+            .then(function (res) {
+              if (endpoint === 'estimate_fee') {
+                return (0, json_1.parse)(res, function (_, v) {
+                  if (v && typeof v === 'bigint') {
+                    return (0, number_1.toBN)(v.toString());
+                  }
+                  return v;
+                });
+              }
+              return (0, json_1.parse)(res);
+            }),
+        ];
       });
     });
   };

package/provider/utils.js

@@ -39,8 +39,8 @@ exports.txIdentifier = txIdentifier;
  * @returns block identifier object
  */
 function getBlockIdentifier(blockIdentifier) {
-  if (blockIdentifier === null) {
-    return { type: 'BLOCK_NUMBER', data: null };
+  if (blockIdentifier === null || blockIdentifier === 'latest') {
+    return { type: 'BLOCK_NUMBER', data: 'latest' }; // default to latest block
   }
   if (blockIdentifier === 'pending') {
     return { type: 'BLOCK_NUMBER', data: 'pending' };

package/src/account/default.ts

@@ -8,7 +8,6 @@ import {
   Abi,
   AddTransactionResponse,
   Call,
-  EstimateFeeResponse,
   InvocationsDetails,
   InvocationsSignerDetails,
   InvokeFunctionTransaction,
@@ -16,6 +15,7 @@ import {
   Signature,
   Transaction,
 } from '../types';
+import { EstimateFee } from '../types/account';
 import { sign } from '../utils/ellipticCurve';
 import {
   computeHashOnElements,
@@ -60,7 +60,7 @@ export class Account extends Provider implements AccountInterface {
       nonce: providedNonce,
       blockIdentifier = 'pending',
     }: { nonce?: BigNumberish; blockIdentifier?: BlockIdentifier } = {}
-  ): Promise<EstimateFeeResponse> {
+  ): Promise<EstimateFee> {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = providedNonce ?? (await this.getNonce());
     const version = toBN(feeTransactionVersion);
@@ -76,7 +76,7 @@ export class Account extends Provider implements AccountInterface {
     const signature = await this.signer.signTransaction(transactions, signerDetails);
 
     const calldata = fromCallsToExecuteCalldataWithNonce(transactions, nonce);
-    return this.fetchEndpoint(
+    const fetchedEstimate = await this.fetchEndpoint(
       'estimate_fee',
       { blockIdentifier },
       {
@@ -87,6 +87,12 @@ export class Account extends Provider implements AccountInterface {
         signature: bigNumberishArrayToDecimalStringArray(signature),
       }
     );
+    const suggestedMaxFee = estimatedFeeToMaxFee(fetchedEstimate.amount);
+
+    return {
+      ...fetchedEstimate,
+      suggestedMaxFee,
+    };
   }
 
   /**
@@ -94,7 +100,9 @@ export class Account extends Provider implements AccountInterface {
    *
    * [Reference](https://github.com/starkware-libs/cairo-lang/blob/f464ec4797361b6be8989e36e02ec690e74ef285/src/starkware/starknet/services/api/gateway/gateway_client.py#L13-L17)
    *
-   * @param transaction - transaction to be invoked
+   * @param calls - one or more calls to be executed
+   * @param abis - one or more abis which can be used to display the calls
+   * @param transactionsDetail - optional transaction details
    * @returns a confirmation of invoking a function on the starknet contract
    */
   public async execute(
@@ -108,8 +116,8 @@ export class Account extends Provider implements AccountInterface {
     if (transactionsDetail.maxFee || transactionsDetail.maxFee === 0) {
       maxFee = transactionsDetail.maxFee;
     } else {
-      const estimatedFee = (await this.estimateFee(transactions, { nonce })).amount;
-      maxFee = estimatedFeeToMaxFee(estimatedFee).toString();
+      const { suggestedMaxFee } = await this.estimateFee(transactions, { nonce });
+      maxFee = suggestedMaxFee.toString();
     }
 
     const signerDetails: InvocationsSignerDetails = {

package/src/account/interface.ts

@@ -5,11 +5,11 @@ import {
   AddTransactionResponse,
   Call,
   DeployContractPayload,
-  EstimateFeeResponse,
   Invocation,
   InvocationsDetails,
   Signature,
 } from '../types';
+import { EstimateFee } from '../types/account';
 import { BigNumberish } from '../utils/number';
 import { TypedData } from '../utils/typedData/types';
 
@@ -44,7 +44,7 @@ export abstract class AccountInterface extends ProviderInterface {
    *
    * @returns response from addTransaction
    */
-  public abstract estimateFee(invocation: Invocation): Promise<EstimateFeeResponse>;
+  public abstract estimateFee(invocation: Invocation): Promise<EstimateFee>;
 
   /**
    * Invoke execute function in account contract

package/src/provider/default.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosRequestHeaders } from 'axios';
+import fetch from 'cross-fetch';
 import urljoin from 'url-join';
 
 import { StarknetChainId } from '../constants';
@@ -10,7 +10,6 @@ import {
   CompiledContract,
   DeployContractPayload,
   Endpoints,
-  EstimateFeeResponse,
   GetBlockResponse,
   GetCodeResponse,
   GetContractAddressesResponse,
@@ -125,7 +124,7 @@ export class Provider implements ProviderInterface {
     return `?${queryString}`;
   }
 
-  private getHeaders(method: 'POST' | 'GET'): AxiosRequestHeaders | undefined {
+  private getHeaders(method: 'POST' | 'GET'): Record<string, string> | undefined {
     if (method === 'POST') {
       return {
         'Content-Type': 'application/json',
@@ -150,33 +149,25 @@ export class Provider implements ProviderInterface {
     const method = this.getFetchMethod(endpoint);
     const queryString = this.getQueryString(query);
     const headers = this.getHeaders(method);
-
-    try {
-      const { data } = await axios.request<Endpoints[T]['RESPONSE']>({
-        method,
-        transformResponse:
-          endpoint === 'estimate_fee'
-            ? (res): EstimateFeeResponse => {
-                return parse(res, (_, v) => {
-                  if (v && typeof v === 'bigint') {
-                    return toBN(v.toString());
-                  }
-                  return v;
-                });
-              }
-            : axios.defaults.transformResponse,
-        url: urljoin(baseUrl, endpoint, queryString),
-        data: stringify(request),
-        headers,
+    const url = urljoin(baseUrl, endpoint, queryString);
+
+    return fetch(url, {
+      method,
+      body: stringify(request),
+      headers,
+    })
+      .then((res) => res.text())
+      .then((res) => {
+        if (endpoint === 'estimate_fee') {
+          return parse(res, (_, v) => {
+            if (v && typeof v === 'bigint') {
+              return toBN(v.toString());
+            }
+            return v;
+          });
+        }
+        return parse(res) as Endpoints[T]['RESPONSE'];
       });
-      return data;
-    } catch (error: any) {
-      const data = error?.response?.data;
-      if (data?.message) {
-        throw new Error(`${data.code}: ${data.message}`);
-      }
-      throw error;
-    }
   }
 
   /**

package/src/provider/utils.ts

@@ -43,8 +43,8 @@ type BlockIdentifierObject =
  * @returns block identifier object
  */
 export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdentifierObject {
-  if (blockIdentifier === null) {
-    return { type: 'BLOCK_NUMBER', data: null };
+  if (blockIdentifier === null || blockIdentifier === 'latest') {
+    return { type: 'BLOCK_NUMBER', data: 'latest' }; // default to latest block
   }
   if (blockIdentifier === 'pending') {
     return { type: 'BLOCK_NUMBER', data: 'pending' };

package/src/types/account.ts

@@ -0,0 +1,7 @@
+import BN from 'bn.js';
+
+import { EstimateFeeResponse } from './api';
+
+export interface EstimateFee extends EstimateFeeResponse {
+  suggestedMaxFee: BN;
+}

package/src/types/lib.ts

@@ -60,7 +60,7 @@ export type Abi = Array<FunctionAbi | StructAbi>;
 
 export type EntryPointsByType = object;
 export type Program = Record<any, any>;
-export type BlockNumber = 'pending' | null | number;
+export type BlockNumber = 'pending' | 'latest' | null | number;
 
 export type CompiledContract = {
   abi: Abi;

package/src/utils/stark.ts

@@ -50,7 +50,7 @@ export function compileCalldata(args: RawArgs): Calldata {
   });
 }
 
-export function estimatedFeeToMaxFee(estimatedFee: BigNumberish, overhead: number = 0.15): BN {
+export function estimatedFeeToMaxFee(estimatedFee: BigNumberish, overhead: number = 0.5): BN {
   // BN can only handle Integers, so we need to do all calulations with integers
   const overHeadPercent = Math.round((1 + overhead) * 100);
   return toBN(estimatedFee).mul(toBN(overHeadPercent)).div(toBN(100));

package/types/account.d.ts

@@ -0,0 +1,6 @@
+import BN from 'bn.js';
+
+import { EstimateFeeResponse } from './api';
+export interface EstimateFee extends EstimateFeeResponse {
+  suggestedMaxFee: BN;
+}

package/types/account.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/types/lib.d.ts

@@ -54,7 +54,7 @@ export declare type StructAbi = {
 export declare type Abi = Array<FunctionAbi | StructAbi>;
 export declare type EntryPointsByType = object;
 export declare type Program = Record<any, any>;
-export declare type BlockNumber = 'pending' | null | number;
+export declare type BlockNumber = 'pending' | 'latest' | null | number;
 export declare type CompiledContract = {
   abi: Abi;
   entry_points_by_type: EntryPointsByType;

package/utils/stark.js

@@ -114,7 +114,7 @@ function compileCalldata(args) {
 exports.compileCalldata = compileCalldata;
 function estimatedFeeToMaxFee(estimatedFee, overhead) {
   if (overhead === void 0) {
-    overhead = 0.15;
+    overhead = 0.5;
   }
   // BN can only handle Integers, so we need to do all calulations with integers
   var overHeadPercent = Math.round((1 + overhead) * 100);