starknet 3.12.0 → 3.12.3

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,22 @@
+## [3.12.3](https://github.com/0xs34n/starknet.js/compare/v3.12.2...v3.12.3) (2022-05-30)
+
+### Bug Fixes
+
+- remove superstruct ([6f13cf0](https://github.com/0xs34n/starknet.js/commit/6f13cf0ec740e715fcbdacf846cd9bcd653c1399))
+
+## [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

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/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/utils/typedData/index.d.ts

@@ -35,24 +35,7 @@ export declare const getTypeHash: (typedData: TypedData, type: string) => string
  * @param {string} type
  * @param {Record<string, any>} data
  */
-export declare const encodeData: <T extends {
-    types: {
-        StarkNetDomain: {
-            type: string;
-            name: string;
-        }[];
-    } & Record<string, {
-        type: string;
-        name: string;
-    }[]>;
-    primaryType: string;
-    domain: {
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-}>(typedData: T, type: string, data: T["message"]) => string[][];
+export declare const encodeData: <T extends TypedData>(typedData: T, type: string, data: T["message"]) => string[][];
 /**
  * Get encoded data as a hash. The data should be a key -> value object with all the required values. All dependant
  * types are automatically encoded.
@@ -62,24 +45,7 @@ export declare const encodeData: <T extends {
  * @param {Record<string, any>} data
  * @return {Buffer}
  */
-export declare const getStructHash: <T extends {
-    types: {
-        StarkNetDomain: {
-            type: string;
-            name: string;
-        }[];
-    } & Record<string, {
-        type: string;
-        name: string;
-    }[]>;
-    primaryType: string;
-    domain: {
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-}>(typedData: T, type: string, data: T["message"]) => string;
+export declare const getStructHash: <T extends TypedData>(typedData: T, type: string, data: T["message"]) => string;
 /**
  * Get the EIP-191 encoded message to sign, from the typedData object. If `hash` is enabled, the message will be hashed
  * with Keccak256.

package/dist/utils/typedData/types.d.ts

@@ -1,82 +1,27 @@
-import { Infer } from 'superstruct';
-export declare const ATOMIC_TYPES: string[];
-/**
- * Checks if a type is valid with the given `typedData`. The following types are valid:
- * - Atomic types: felt, felt*
- * - Reference types: struct type (e.g. SomeStruct)
- *
- * @param {Record<string, unknown>} types
- * @param {string} type
- * @return {boolean}
- */
-export declare const isValidType: (types: Record<string, unknown>, type: string) => boolean;
-export declare const STARKNET_TYPE: import("superstruct").Struct<{
-    type: string;
-    name: string;
-}, {
-    name: import("superstruct").Struct<string, null>;
-    type: import("superstruct").Struct<string, null>;
-}>;
 /**
  * A single type, as part of a struct. The `type` field can be any of the EIP-712 supported types.
  *
  * Note that the `uint` and `int` aliases like in Solidity, and fixed point numbers are not supported by the EIP-712
  * standard.
  */
-export declare type StarkNetType = Infer<typeof STARKNET_TYPE>;
-export declare const STARKNET_DOMAIN_TYPE: import("superstruct").Struct<{
-    version?: string | undefined;
-    chainId?: string | number | undefined;
-    name?: string | undefined;
-}, {
-    name: import("superstruct").Struct<string | undefined, null>;
-    version: import("superstruct").Struct<string | undefined, null>;
-    chainId: import("superstruct").Struct<string | number | undefined, null>;
-}>;
+export interface StarkNetType {
+    name: string;
+    type: 'felt' | 'felt*' | string;
+}
 /**
  * The EIP712 domain struct. Any of these fields are optional, but it must contain at least one field.
  */
-export declare type StarkNetDomain = Infer<typeof STARKNET_DOMAIN_TYPE>;
-export declare const STARKNET_TYPED_DATA_TYPE: import("superstruct").Struct<{
-    types: {
-        StarkNetDomain: {
-            type: string;
-            name: string;
-        }[];
-    } & Record<string, {
-        type: string;
-        name: string;
-    }[]>;
-    primaryType: string;
-    domain: {
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-}, {
-    types: import("superstruct").Struct<{
-        StarkNetDomain: {
-            type: string;
-            name: string;
-        }[];
-    } & Record<string, {
-        type: string;
-        name: string;
-    }[]>, null>;
-    primaryType: import("superstruct").Struct<string, null>;
-    domain: import("superstruct").Struct<{
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-    }, {
-        name: import("superstruct").Struct<string | undefined, null>;
-        version: import("superstruct").Struct<string | undefined, null>;
-        chainId: import("superstruct").Struct<string | number | undefined, null>;
-    }>;
-    message: import("superstruct").Struct<Record<string, unknown>, null>;
-}>;
+export interface StarkNetDomain extends Record<string, unknown> {
+    name?: string;
+    version?: string;
+    chainId?: string | number;
+}
 /**
  * The complete typed data, with all the structs, domain data, primary type of the message, and the message itself.
  */
-export declare type TypedData = Infer<typeof STARKNET_TYPED_DATA_TYPE>;
+export interface TypedData {
+    types: Record<string, StarkNetType[]>;
+    primaryType: string;
+    domain: StarkNetDomain;
+    message: Record<string, unknown>;
+}

package/dist/utils/typedData/types.js

@@ -1,47 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STARKNET_TYPED_DATA_TYPE = exports.STARKNET_DOMAIN_TYPE = exports.STARKNET_TYPE = exports.isValidType = exports.ATOMIC_TYPES = void 0;
-var superstruct_1 = require("superstruct");
-exports.ATOMIC_TYPES = ['felt', 'felt*'];
-// Source: https://github.com/Mrtenz/eip-712/blob/master/src/eip-712.ts
-// and modified to support starknet types
-/**
- * Checks if a type is valid with the given `typedData`. The following types are valid:
- * - Atomic types: felt, felt*
- * - Reference types: struct type (e.g. SomeStruct)
- *
- * @param {Record<string, unknown>} types
- * @param {string} type
- * @return {boolean}
- */
-var isValidType = function (types, type) {
-    if (exports.ATOMIC_TYPES.includes(type)) {
-        return true;
-    }
-    if (types[type]) {
-        return true;
-    }
-    return false;
-};
-exports.isValidType = isValidType;
-var TYPE = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'Type', function (type, context) {
-    return (0, exports.isValidType)(context.branch[0].types, type);
-});
-exports.STARKNET_TYPE = (0, superstruct_1.object)({
-    name: (0, superstruct_1.string)(),
-    type: TYPE,
-});
-exports.STARKNET_DOMAIN_TYPE = (0, superstruct_1.object)({
-    name: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-    version: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-    chainId: (0, superstruct_1.optional)((0, superstruct_1.union)([(0, superstruct_1.string)(), (0, superstruct_1.number)()])),
-});
-exports.STARKNET_TYPED_DATA_TYPE = (0, superstruct_1.object)({
-    types: (0, superstruct_1.intersection)([
-        (0, superstruct_1.type)({ StarkNetDomain: (0, superstruct_1.array)(exports.STARKNET_TYPE) }),
-        (0, superstruct_1.record)((0, superstruct_1.string)(), (0, superstruct_1.array)(exports.STARKNET_TYPE)),
-    ]),
-    primaryType: (0, superstruct_1.string)(),
-    domain: exports.STARKNET_DOMAIN_TYPE,
-    message: (0, superstruct_1.object)(),
-});

package/dist/utils/typedData/utils.d.ts

@@ -1,24 +1,8 @@
+import { TypedData } from './types';
 /**
  * Validates that `data` matches the EIP-712 JSON schema.
  *
  * @param {any} data
  * @return {boolean}
  */
-export declare const validateTypedData: (data: unknown) => data is {
-    types: {
-        StarkNetDomain: {
-            type: string;
-            name: string;
-        }[];
-    } & Record<string, {
-        type: string;
-        name: string;
-    }[]>;
-    primaryType: string;
-    domain: {
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-};
+export declare const validateTypedData: (data: unknown) => data is TypedData;

package/dist/utils/typedData/utils.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateTypedData = void 0;
-var superstruct_1 = require("superstruct");
-var types_1 = require("./types");
 /**
  * Validates that `data` matches the EIP-712 JSON schema.
  *
@@ -10,6 +8,9 @@ var types_1 = require("./types");
  * @return {boolean}
  */
 var validateTypedData = function (data) {
-    return (0, superstruct_1.is)(data, types_1.STARKNET_TYPED_DATA_TYPE);
+    var typedData = data;
+    // Validate that the data matches the EIP-712 JSON schema
+    var valid = Boolean(typedData.types && typedData.primaryType && typedData.message);
+    return valid;
 };
 exports.validateTypedData = validateTypedData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "3.12.0",
+  "version": "3.12.3",
   "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,19 +57,20 @@
     "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",
     "pako": "^2.0.4",
-    "superstruct": "^0.15.3",
     "url-join": "^4.0.1"
   },
   "lint-staged": {

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/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/utils/typedData/types.ts

@@ -1,82 +1,29 @@
-import {
-  Infer,
-  array,
-  intersection,
-  number,
-  object,
-  optional,
-  record,
-  refine,
-  string,
-  type as t,
-  union,
-} from 'superstruct';
-
-export const ATOMIC_TYPES = ['felt', 'felt*'];
-
-// Source: https://github.com/Mrtenz/eip-712/blob/master/src/eip-712.ts
-// and modified to support starknet types
-
-/**
- * Checks if a type is valid with the given `typedData`. The following types are valid:
- * - Atomic types: felt, felt*
- * - Reference types: struct type (e.g. SomeStruct)
- *
- * @param {Record<string, unknown>} types
- * @param {string} type
- * @return {boolean}
- */
-export const isValidType = (types: Record<string, unknown>, type: string): boolean => {
-  if (ATOMIC_TYPES.includes(type as string)) {
-    return true;
-  }
-
-  if (types[type]) {
-    return true;
-  }
-
-  return false;
-};
-
-const TYPE = refine(string(), 'Type', (type, context) => {
-  return isValidType(context.branch[0].types, type);
-});
-
-export const STARKNET_TYPE = object({
-  name: string(),
-  type: TYPE,
-});
-
 /**
  * A single type, as part of a struct. The `type` field can be any of the EIP-712 supported types.
  *
  * Note that the `uint` and `int` aliases like in Solidity, and fixed point numbers are not supported by the EIP-712
  * standard.
  */
-export type StarkNetType = Infer<typeof STARKNET_TYPE>;
-
-export const STARKNET_DOMAIN_TYPE = object({
-  name: optional(string()),
-  version: optional(string()),
-  chainId: optional(union([string(), number()])),
-});
+export interface StarkNetType {
+  name: string;
+  type: 'felt' | 'felt*' | string;
+}
 
 /**
  * The EIP712 domain struct. Any of these fields are optional, but it must contain at least one field.
  */
-export type StarkNetDomain = Infer<typeof STARKNET_DOMAIN_TYPE>;
-
-export const STARKNET_TYPED_DATA_TYPE = object({
-  types: intersection([
-    t({ StarkNetDomain: array(STARKNET_TYPE) }),
-    record(string(), array(STARKNET_TYPE)),
-  ]),
-  primaryType: string(),
-  domain: STARKNET_DOMAIN_TYPE,
-  message: object(),
-});
+export interface StarkNetDomain extends Record<string, unknown> {
+  name?: string;
+  version?: string;
+  chainId?: string | number;
+}
 
 /**
  * The complete typed data, with all the structs, domain data, primary type of the message, and the message itself.
  */
-export type TypedData = Infer<typeof STARKNET_TYPED_DATA_TYPE>;
+export interface TypedData {
+  types: Record<string, StarkNetType[]>;
+  primaryType: string;
+  domain: StarkNetDomain;
+  message: Record<string, unknown>;
+}

package/src/utils/typedData/utils.ts

@@ -1,6 +1,4 @@
-import { is } from 'superstruct';
-
-import { STARKNET_TYPED_DATA_TYPE, TypedData } from './types';
+import { TypedData } from './types';
 
 /**
  * Validates that `data` matches the EIP-712 JSON schema.
@@ -9,5 +7,10 @@ import { STARKNET_TYPED_DATA_TYPE, TypedData } from './types';
  * @return {boolean}
  */
 export const validateTypedData = (data: unknown): data is TypedData => {
-  return is(data, STARKNET_TYPED_DATA_TYPE);
+  const typedData = data as TypedData;
+
+  // Validate that the data matches the EIP-712 JSON schema
+  const valid = Boolean(typedData.types && typedData.primaryType && typedData.message);
+
+  return valid;
 };

package/utils/typedData/index.d.ts

@@ -39,29 +39,7 @@ export declare const getTypeHash: (typedData: TypedData, type: string) => string
  * @param {string} type
  * @param {Record<string, any>} data
  */
-export declare const encodeData: <
-  T extends {
-    types: {
-      StarkNetDomain: {
-        type: string;
-        name: string;
-      }[];
-    } & Record<
-      string,
-      {
-        type: string;
-        name: string;
-      }[]
-    >;
-    primaryType: string;
-    domain: {
-      version?: string | undefined;
-      chainId?: string | number | undefined;
-      name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-  }
->(
+export declare const encodeData: <T extends TypedData>(
   typedData: T,
   type: string,
   data: T['message']
@@ -75,29 +53,7 @@ export declare const encodeData: <
  * @param {Record<string, any>} data
  * @return {Buffer}
  */
-export declare const getStructHash: <
-  T extends {
-    types: {
-      StarkNetDomain: {
-        type: string;
-        name: string;
-      }[];
-    } & Record<
-      string,
-      {
-        type: string;
-        name: string;
-      }[]
-    >;
-    primaryType: string;
-    domain: {
-      version?: string | undefined;
-      chainId?: string | number | undefined;
-      name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-  }
->(
+export declare const getStructHash: <T extends TypedData>(
   typedData: T,
   type: string,
   data: T['message']

package/utils/typedData/types.d.ts

@@ -1,103 +1,27 @@
-import { Infer } from 'superstruct';
-export declare const ATOMIC_TYPES: string[];
-/**
- * Checks if a type is valid with the given `typedData`. The following types are valid:
- * - Atomic types: felt, felt*
- * - Reference types: struct type (e.g. SomeStruct)
- *
- * @param {Record<string, unknown>} types
- * @param {string} type
- * @return {boolean}
- */
-export declare const isValidType: (types: Record<string, unknown>, type: string) => boolean;
-export declare const STARKNET_TYPE: import('superstruct').Struct<
-  {
-    type: string;
-    name: string;
-  },
-  {
-    name: import('superstruct').Struct<string, null>;
-    type: import('superstruct').Struct<string, null>;
-  }
->;
 /**
  * A single type, as part of a struct. The `type` field can be any of the EIP-712 supported types.
  *
  * Note that the `uint` and `int` aliases like in Solidity, and fixed point numbers are not supported by the EIP-712
  * standard.
  */
-export declare type StarkNetType = Infer<typeof STARKNET_TYPE>;
-export declare const STARKNET_DOMAIN_TYPE: import('superstruct').Struct<
-  {
-    version?: string | undefined;
-    chainId?: string | number | undefined;
-    name?: string | undefined;
-  },
-  {
-    name: import('superstruct').Struct<string | undefined, null>;
-    version: import('superstruct').Struct<string | undefined, null>;
-    chainId: import('superstruct').Struct<string | number | undefined, null>;
-  }
->;
+export interface StarkNetType {
+  name: string;
+  type: 'felt' | 'felt*' | string;
+}
 /**
  * The EIP712 domain struct. Any of these fields are optional, but it must contain at least one field.
  */
-export declare type StarkNetDomain = Infer<typeof STARKNET_DOMAIN_TYPE>;
-export declare const STARKNET_TYPED_DATA_TYPE: import('superstruct').Struct<
-  {
-    types: {
-      StarkNetDomain: {
-        type: string;
-        name: string;
-      }[];
-    } & Record<
-      string,
-      {
-        type: string;
-        name: string;
-      }[]
-    >;
-    primaryType: string;
-    domain: {
-      version?: string | undefined;
-      chainId?: string | number | undefined;
-      name?: string | undefined;
-    };
-    message: Record<string, unknown>;
-  },
-  {
-    types: import('superstruct').Struct<
-      {
-        StarkNetDomain: {
-          type: string;
-          name: string;
-        }[];
-      } & Record<
-        string,
-        {
-          type: string;
-          name: string;
-        }[]
-      >,
-      null
-    >;
-    primaryType: import('superstruct').Struct<string, null>;
-    domain: import('superstruct').Struct<
-      {
-        version?: string | undefined;
-        chainId?: string | number | undefined;
-        name?: string | undefined;
-      },
-      {
-        name: import('superstruct').Struct<string | undefined, null>;
-        version: import('superstruct').Struct<string | undefined, null>;
-        chainId: import('superstruct').Struct<string | number | undefined, null>;
-      }
-    >;
-    message: import('superstruct').Struct<Record<string, unknown>, null>;
-  }
->;
+export interface StarkNetDomain extends Record<string, unknown> {
+  name?: string;
+  version?: string;
+  chainId?: string | number;
+}
 /**
  * The complete typed data, with all the structs, domain data, primary type of the message, and the message itself.
  */
-export declare type TypedData = Infer<typeof STARKNET_TYPED_DATA_TYPE>;
+export interface TypedData {
+  types: Record<string, StarkNetType[]>;
+  primaryType: string;
+  domain: StarkNetDomain;
+  message: Record<string, unknown>;
+}

package/utils/typedData/types.js

@@ -1,57 +1,2 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.STARKNET_TYPED_DATA_TYPE =
-  exports.STARKNET_DOMAIN_TYPE =
-  exports.STARKNET_TYPE =
-  exports.isValidType =
-  exports.ATOMIC_TYPES =
-    void 0;
-var superstruct_1 = require('superstruct');
-exports.ATOMIC_TYPES = ['felt', 'felt*'];
-// Source: https://github.com/Mrtenz/eip-712/blob/master/src/eip-712.ts
-// and modified to support starknet types
-/**
- * Checks if a type is valid with the given `typedData`. The following types are valid:
- * - Atomic types: felt, felt*
- * - Reference types: struct type (e.g. SomeStruct)
- *
- * @param {Record<string, unknown>} types
- * @param {string} type
- * @return {boolean}
- */
-var isValidType = function (types, type) {
-  if (exports.ATOMIC_TYPES.includes(type)) {
-    return true;
-  }
-  if (types[type]) {
-    return true;
-  }
-  return false;
-};
-exports.isValidType = isValidType;
-var TYPE = (0, superstruct_1.refine)((0, superstruct_1.string)(), 'Type', function (type, context) {
-  return (0, exports.isValidType)(context.branch[0].types, type);
-});
-exports.STARKNET_TYPE = (0, superstruct_1.object)({
-  name: (0, superstruct_1.string)(),
-  type: TYPE,
-});
-exports.STARKNET_DOMAIN_TYPE = (0, superstruct_1.object)({
-  name: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-  version: (0, superstruct_1.optional)((0, superstruct_1.string)()),
-  chainId: (0, superstruct_1.optional)(
-    (0, superstruct_1.union)([(0, superstruct_1.string)(), (0, superstruct_1.number)()])
-  ),
-});
-exports.STARKNET_TYPED_DATA_TYPE = (0, superstruct_1.object)({
-  types: (0, superstruct_1.intersection)([
-    (0, superstruct_1.type)({ StarkNetDomain: (0, superstruct_1.array)(exports.STARKNET_TYPE) }),
-    (0, superstruct_1.record)(
-      (0, superstruct_1.string)(),
-      (0, superstruct_1.array)(exports.STARKNET_TYPE)
-    ),
-  ]),
-  primaryType: (0, superstruct_1.string)(),
-  domain: exports.STARKNET_DOMAIN_TYPE,
-  message: (0, superstruct_1.object)(),
-});

package/utils/typedData/utils.d.ts

@@ -1,27 +1,8 @@
+import { TypedData } from './types';
 /**
  * Validates that `data` matches the EIP-712 JSON schema.
  *
  * @param {any} data
  * @return {boolean}
  */
-export declare const validateTypedData: (data: unknown) => data is {
-  types: {
-    StarkNetDomain: {
-      type: string;
-      name: string;
-    }[];
-  } & Record<
-    string,
-    {
-      type: string;
-      name: string;
-    }[]
-  >;
-  primaryType: string;
-  domain: {
-    version?: string | undefined;
-    chainId?: string | number | undefined;
-    name?: string | undefined;
-  };
-  message: Record<string, unknown>;
-};
+export declare const validateTypedData: (data: unknown) => data is TypedData;

package/utils/typedData/utils.js

@@ -1,8 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.validateTypedData = void 0;
-var superstruct_1 = require('superstruct');
-var types_1 = require('./types');
 /**
  * Validates that `data` matches the EIP-712 JSON schema.
  *
@@ -10,6 +8,9 @@ var types_1 = require('./types');
  * @return {boolean}
  */
 var validateTypedData = function (data) {
-  return (0, superstruct_1.is)(data, types_1.STARKNET_TYPED_DATA_TYPE);
+  var typedData = data;
+  // Validate that the data matches the EIP-712 JSON schema
+  var valid = Boolean(typedData.types && typedData.primaryType && typedData.message);
+  return valid;
 };
 exports.validateTypedData = validateTypedData;