starknet 1.6.0 → 2.0.2

package/__tests__/utils/ellipticalCurve.test.ts

@@ -1,4 +1,4 @@
-import { getKeyPair, getStarkKey, sign } from '../../src/utils/ellipticCurve';
+import { getKeyPair, getStarkKey, sign, verify, ec } from '../../src/utils/ellipticCurve';
 import { removeHexPrefix } from '../../src/utils/encode';
 import { hashCalldata, hashMessage, pedersen } from '../../src/utils/hash';
 import { toBN, toHex } from '../../src/utils/number';
@@ -20,12 +20,12 @@ test('pedersen()', () => {
 test('hashCalldata()', () => {
   const array = ['1', '2', '3', '4'];
   expect(hashCalldata(array)).toBe(
-    '0x1439c58e1c389a2ac51f8462ecc0a4ec7f812be1c04e3b82ce2af1c2cf959ef'
+    '0x66bd4335902683054d08a0572747ea78ebd9e531536fb43125424ca9f902084'
   );
   expect(array).toStrictEqual(['1', '2', '3', '4']);
 
   expect(hashCalldata(['1', '2'])).toBe(
-    '0x2ab889bd35e684623df9b4ea4a4a1f6d9e0ef39b67c1293b8a89dd17e351235'
+    '0x501a3a8e6cd4f5241c639c74052aaa34557aafa84dd4ba983d6443c590ab7df'
   );
 });
 
@@ -38,13 +38,25 @@ test('hashMessage()', () => {
     ['1', '2'],
     '2'
   );
-  expect(hashMsg).toBe('0xf7ec4a68876819eed838be83b5d5dc337081f4a5fb8e421f3d9bdef7c69e9b');
+  expect(hashMsg).toBe('0x7f15c38ea577a26f4f553282fcfe4f1feeb8ecfaad8f221ae41abf8224cbddd');
   const keyPair = getKeyPair(privateKey);
   const { r, s } = sign(keyPair, removeHexPrefix(hashMsg));
   expect(r.toString()).toStrictEqual(
-    toBN('2699852629692218907583414128365108566181098618321049245303767746418549764831').toString()
+    toBN('2458502865976494910213617956670505342647705497324144349552978333078363662855').toString()
   );
   expect(s.toString()).toStrictEqual(
-    toBN('2362979021721299440845279407227912881357338080403308888611869245024056250189').toString()
+    toBN('3439514492576562277095748549117516048613512930236865921315982886313695689433').toString()
   );
 });
+
+test('verify signed message()', () => {
+  const pk = '0x019800ea6a9a73f94aee6a3d2edf018fc770443e90c7ba121e8303ec6b349279';
+  const account = '0x33f45f07e1bd1a51b45fc24ec8c8c9908db9e42191be9e169bfcac0c0d99745';
+  const price = '1';
+  const hashMsg = pedersen([account, price]);
+  const keyPair = getKeyPair(pk);
+  const signature = sign(keyPair, removeHexPrefix(hashMsg));
+  const pubKey = keyPair.getPublic('hex');
+  const pubKeyPair = ec.keyFromPublic(pubKey, 'hex');
+  expect(verify(pubKeyPair, removeHexPrefix(hashMsg), signature)).toBe(true);
+});

package/__tests__/utils/utils.test.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 
-import { constants, json, number, stark } from '../../src';
+import { constants, hash, json, number, stark } from '../../src';
 
 const { IS_BROWSER } = constants;
 
@@ -59,3 +59,21 @@ describe('getSelectorFromName()', () => {
     );
   });
 });
+describe('computeHashOnElements()', () => {
+  test('should return valid hash for empty array', () => {
+    const res = hash.computeHashOnElements([]);
+    expect(res).toMatchInlineSnapshot(
+      `"0x49ee3eba8c1600700ee1b87eb599f16716b0b1022947733551fde4050ca6804"`
+    );
+  });
+  test('should return valid hash for valid array', () => {
+    const res = hash.computeHashOnElements([
+      number.toBN(123782376),
+      number.toBN(213984),
+      number.toBN(128763521321),
+    ]);
+    expect(res).toMatchInlineSnapshot(
+      `"0x7b422405da6571242dfc245a43de3b0fe695e7021c148b918cd9cdb462cac59"`
+    );
+  });
+});

package/constants.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="bn.js" />
+import BN from 'bn.js';
 export { IS_BROWSER } from './utils/encode';
-export declare const ZERO: import('bn.js');
-export declare const ONE: import('bn.js');
-export declare const TWO: import('bn.js');
-export declare const MASK_250: import('bn.js');
+export declare const ZERO: BN;
+export declare const ONE: BN;
+export declare const TWO: BN;
+export declare const MASK_250: BN;
 /**
  * The following is taken from https://github.com/starkware-libs/starkex-resources/blob/master/crypto/starkware/crypto/signature/pedersen_params.json but converted to hex, because JS is very bad handling big integers by default
  * Please do not edit until the JSON changes.

package/contract.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from './provider';
-import { Abi } from './types';
+import { Abi, StructAbi } from './types';
 import { BigNumberish } from './utils/number';
 export declare type Args = {
   [inputName: string]: string | string[];
@@ -9,6 +9,9 @@ export declare function compileCalldata(args: Args): Calldata;
 export declare class Contract {
   connectedTo: string | null;
   abi: Abi[];
+  structs: {
+    [name: string]: StructAbi;
+  };
   provider: Provider;
   /**
    * Contract class to handle contract methods
@@ -19,6 +22,7 @@ export declare class Contract {
   constructor(abi: Abi[], address?: string | null, provider?: Provider);
   connect(address: string): Contract;
   private validateMethodAndArgs;
+  private parseResponseField;
   private parseResponse;
   invoke(
     method: string,

package/contract.js

@@ -238,6 +238,14 @@ var Contract = /** @class */ (function () {
     this.connectedTo = address;
     this.provider = provider;
     this.abi = abi;
+    this.structs = abi
+      .filter(function (abiEntry) {
+        return abiEntry.type === 'struct';
+      })
+      .reduce(function (acc, abiEntry) {
+        var _a;
+        return __assign(__assign({}, acc), ((_a = {}), (_a[abiEntry.name] = abiEntry), _a));
+      }, {});
   }
   Contract.prototype.connect = function (address) {
     this.connectedTo = address;
@@ -250,9 +258,9 @@ var Contract = /** @class */ (function () {
     // ensure provided method exists
     var invokeableFunctionNames = this.abi
       .filter(function (abi) {
+        if (abi.type !== 'function') return false;
         var isView = abi.stateMutability === 'view';
-        var isFunction = abi.type === 'function';
-        return isFunction && type === 'INVOKE' ? !isView : isView;
+        return type === 'INVOKE' ? !isView : isView;
       })
       .map(function (abi) {
         return abi.name;
@@ -263,7 +271,7 @@ var Contract = /** @class */ (function () {
     );
     // ensure args match abi type
     var methodAbi = this.abi.find(function (abi) {
-      return abi.name === method;
+      return abi.name === method && abi.type === 'function';
     });
     methodAbi.inputs.forEach(function (input) {
       if (args[input.name] !== undefined) {
@@ -291,14 +299,31 @@ var Contract = /** @class */ (function () {
       }
     });
   };
+  Contract.prototype.parseResponseField = function (element, responseIterator) {
+    var _this = this;
+    var entries = [];
+    if (['felt', 'felt*'].includes(element.type)) {
+      return responseIterator.next().value;
+    }
+    if (element.type in this.structs) {
+      entries = this.structs[element.type].members;
+    } else if ('outputs' in element) {
+      entries = element.outputs;
+    }
+    return entries.reduce(function (acc, member) {
+      var _a;
+      return __assign(
+        __assign({}, acc),
+        ((_a = {}), (_a[member.name] = _this.parseResponseField(member, responseIterator)), _a)
+      );
+    }, {});
+  };
   Contract.prototype.parseResponse = function (method, response) {
     var methodAbi = this.abi.find(function (abi) {
       return abi.name === method;
     });
-    return methodAbi.outputs.reduce(function (acc, output, i) {
-      var _a;
-      return __assign(__assign({}, acc), ((_a = {}), (_a[output.name] = response[i]), _a));
-    }, {});
+    var responseIterator = response.flat()[Symbol.iterator]();
+    return this.parseResponseField(methodAbi, responseIterator);
   };
   Contract.prototype.invoke = function (method, args, signature) {
     if (args === void 0) {

package/dist/constants.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="bn.js" />
+import BN from 'bn.js';
 export { IS_BROWSER } from './utils/encode';
-export declare const ZERO: import("bn.js");
-export declare const ONE: import("bn.js");
-export declare const TWO: import("bn.js");
-export declare const MASK_250: import("bn.js");
+export declare const ZERO: BN;
+export declare const ONE: BN;
+export declare const TWO: BN;
+export declare const MASK_250: BN;
 /**
  * The following is taken from https://github.com/starkware-libs/starkex-resources/blob/master/crypto/starkware/crypto/signature/pedersen_params.json but converted to hex, because JS is very bad handling big integers by default
  * Please do not edit until the JSON changes.

package/dist/contract.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from './provider';
-import { Abi } from './types';
+import { Abi, StructAbi } from './types';
 import { BigNumberish } from './utils/number';
 export declare type Args = {
     [inputName: string]: string | string[];
@@ -9,6 +9,9 @@ export declare function compileCalldata(args: Args): Calldata;
 export declare class Contract {
     connectedTo: string | null;
     abi: Abi[];
+    structs: {
+        [name: string]: StructAbi;
+    };
     provider: Provider;
     /**
      * Contract class to handle contract methods
@@ -19,6 +22,7 @@ export declare class Contract {
     constructor(abi: Abi[], address?: string | null, provider?: Provider);
     connect(address: string): Contract;
     private validateMethodAndArgs;
+    private parseResponseField;
     private parseResponse;
     invoke(method: string, args?: Args, signature?: [BigNumberish, BigNumberish]): Promise<import("./types").AddTransactionResponse>;
     call(method: string, args?: Args): Promise<Args>;

package/dist/contract.js

@@ -119,6 +119,12 @@ var Contract = /** @class */ (function () {
         this.connectedTo = address;
         this.provider = provider;
         this.abi = abi;
+        this.structs = abi
+            .filter(function (abiEntry) { return abiEntry.type === 'struct'; })
+            .reduce(function (acc, abiEntry) {
+            var _a;
+            return (__assign(__assign({}, acc), (_a = {}, _a[abiEntry.name] = abiEntry, _a)));
+        }, {});
     }
     Contract.prototype.connect = function (address) {
         this.connectedTo = address;
@@ -129,14 +135,15 @@ var Contract = /** @class */ (function () {
         // ensure provided method exists
         var invokeableFunctionNames = this.abi
             .filter(function (abi) {
+            if (abi.type !== 'function')
+                return false;
             var isView = abi.stateMutability === 'view';
-            var isFunction = abi.type === 'function';
-            return isFunction && type === 'INVOKE' ? !isView : isView;
+            return type === 'INVOKE' ? !isView : isView;
         })
             .map(function (abi) { return abi.name; });
         (0, minimalistic_assert_1.default)(invokeableFunctionNames.includes(method), (type === 'INVOKE' ? 'invokeable' : 'viewable') + " method not found in abi");
         // ensure args match abi type
-        var methodAbi = this.abi.find(function (abi) { return abi.name === method; });
+        var methodAbi = this.abi.find(function (abi) { return abi.name === method && abi.type === 'function'; });
         methodAbi.inputs.forEach(function (input) {
             if (args[input.name] !== undefined) {
                 if (input.type === 'felt') {
@@ -153,13 +160,28 @@ var Contract = /** @class */ (function () {
             }
         });
     };
-    Contract.prototype.parseResponse = function (method, response) {
-        var methodAbi = this.abi.find(function (abi) { return abi.name === method; });
-        return methodAbi.outputs.reduce(function (acc, output, i) {
+    Contract.prototype.parseResponseField = function (element, responseIterator) {
+        var _this = this;
+        var entries = [];
+        if (['felt', 'felt*'].includes(element.type)) {
+            return responseIterator.next().value;
+        }
+        if (element.type in this.structs) {
+            entries = this.structs[element.type].members;
+        }
+        else if ('outputs' in element) {
+            entries = element.outputs;
+        }
+        return entries.reduce(function (acc, member) {
             var _a;
-            return __assign(__assign({}, acc), (_a = {}, _a[output.name] = response[i], _a));
+            return (__assign(__assign({}, acc), (_a = {}, _a[member.name] = _this.parseResponseField(member, responseIterator), _a)));
         }, {});
     };
+    Contract.prototype.parseResponse = function (method, response) {
+        var methodAbi = this.abi.find(function (abi) { return abi.name === method; });
+        var responseIterator = response.flat()[Symbol.iterator]();
+        return this.parseResponseField(methodAbi, responseIterator);
+    };
     Contract.prototype.invoke = function (method, args, signature) {
         if (args === void 0) { args = {}; }
         // ensure contract is connected

package/dist/provider/default.js

@@ -77,7 +77,7 @@ var Provider = /** @class */ (function () {
         switch (name) {
             case 'alpha':
             default:
-                return 'https://alpha3.starknet.io';
+                return 'https://alpha4.starknet.io';
         }
     };
     /**
@@ -296,13 +296,14 @@ var Provider = /** @class */ (function () {
         });
     };
     Provider.prototype.waitForTx = function (txHash, retryInterval) {
-        if (retryInterval === void 0) { retryInterval = 2000; }
+        if (retryInterval === void 0) { retryInterval = 5000; }
         return __awaiter(this, void 0, void 0, function () {
-            var onchain, res;
+            var onchain, firstRun, res;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         onchain = false;
+                        firstRun = true;
                         _a.label = 1;
                     case 1:
                         if (!!onchain) return [3 /*break*/, 4];
@@ -320,9 +321,10 @@ var Provider = /** @class */ (function () {
                         else if (res.tx_status === 'REJECTED') {
                             throw Error('REJECTED');
                         }
-                        else if (res.tx_status === 'NOT_RECEIVED') {
+                        else if (res.tx_status === 'NOT_RECEIVED' && !firstRun) {
                             throw Error('NOT_RECEIVED');
                         }
+                        firstRun = false;
                         return [3 /*break*/, 1];
                     case 4: return [2 /*return*/];
                 }

package/dist/signer/default.js

@@ -114,14 +114,13 @@ var Signer = /** @class */ (function (_super) {
                         (0, minimalistic_assert_1.default)(!tx.signature, "Adding signatures to a signer tx currently isn't supported");
                         return [4 /*yield*/, this.callContract({
                                 contract_address: this.address,
-                                entry_point_selector: (0, stark_1.getSelectorFromName)('get_current_nonce'),
+                                entry_point_selector: (0, stark_1.getSelectorFromName)('get_nonce'),
                             })];
                     case 1:
                         result = (_b.sent()).result;
                         nonceBn = (0, number_1.toBN)(result[0]);
                         calldataDecimal = (tx.calldata || []).map(function (x) { return (0, number_1.toBN)(x).toString(); });
-                        msgHash = (0, encode_1.addHexPrefix)((0, hash_1.hashMessage)('0', // needs to be walletAddress once it's possible to retrieve address(self) in cairo
-                        tx.contract_address, tx.entry_point_selector, calldataDecimal, nonceBn.toString()));
+                        msgHash = (0, encode_1.addHexPrefix)((0, hash_1.hashMessage)(this.address, tx.contract_address, tx.entry_point_selector, calldataDecimal, nonceBn.toString()));
                         _a = (0, ellipticCurve_1.sign)(this.keyPair, msgHash), r = _a.r, s = _a.s;
                         return [2 /*return*/, _super.prototype.addTransaction.call(this, {
                                 type: 'INVOKE_FUNCTION',

package/dist/types.d.ts

@@ -11,19 +11,26 @@ export declare type TxStatus = 'TRANSACTION_RECEIVED';
 export declare type Type = 'DEPLOY' | 'INVOKE_FUNCTION';
 export declare type EntryPointType = 'EXTERNAL';
 export declare type CompressedProgram = string;
-export declare type Abi = {
-    inputs: {
-        name: string;
-        type: 'felt' | 'felt*';
-    }[];
+export declare type AbiEntry = {
     name: string;
-    outputs: {
-        name: string;
-        type: 'felt' | 'felt*';
-    }[];
+    type: 'felt' | 'felt*' | string;
+};
+export declare type FunctionAbi = {
+    inputs: AbiEntry[];
+    name: string;
+    outputs: AbiEntry[];
     stateMutability?: 'view';
     type: 'function';
 };
+export declare type StructAbi = {
+    members: (AbiEntry & {
+        offset: number;
+    })[];
+    name: string;
+    size: number;
+    type: 'struct';
+};
+export declare type Abi = FunctionAbi | StructAbi;
 export declare type EntryPointsByType = object;
 export declare type Program = object;
 export declare type CompiledContract = {
@@ -95,5 +102,5 @@ export declare type GetTransactionResponse = {
 export declare type AddTransactionResponse = {
     code: TxStatus;
     transaction_hash: string;
-    address: string;
+    address?: string;
 };

package/dist/utils/ellipticCurve.js

@@ -84,6 +84,6 @@ function verify(keyPair, msgHash, sig) {
     (0, number_1.assertInRange)(r, constants_1.ONE, (0, number_1.toBN)((0, encode_1.addHexPrefix)(constants_1.MAX_ECDSA_VAL)), 'r');
     (0, number_1.assertInRange)(s, constants_1.ONE, (0, number_1.toBN)((0, encode_1.addHexPrefix)(constants_1.EC_ORDER)), 's');
     (0, number_1.assertInRange)(w, constants_1.ONE, (0, number_1.toBN)((0, encode_1.addHexPrefix)(constants_1.MAX_ECDSA_VAL)), 'w');
-    return keyPair.verify(msgHash, sig);
+    return keyPair.verify(fixMessage(msgHash), sig);
 }
 exports.verify = verify;

package/dist/utils/hash.d.ts

@@ -9,5 +9,6 @@ import { BigNumberish } from './number';
  */
 export declare function starknetKeccak(value: string): BN;
 export declare function pedersen(input: [BigNumberish, BigNumberish]): string;
+export declare function computeHashOnElements(data: BigNumberish[]): string;
 export declare function hashCalldata(calldata: string[]): string;
 export declare function hashMessage(account: string, to: string, selector: string, calldata: string[], nonce: string): string;

package/dist/utils/hash.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashMessage = exports.hashCalldata = exports.pedersen = exports.starknetKeccak = void 0;
+exports.hashMessage = exports.hashCalldata = exports.computeHashOnElements = exports.pedersen = exports.starknetKeccak = void 0;
 var keccak_1 = require("ethereum-cryptography/keccak");
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
 var constants_1 = require("../constants");
@@ -69,24 +69,16 @@ function pedersen(input) {
     return (0, encode_1.addHexPrefix)(point.getX().toString(16));
 }
 exports.pedersen = pedersen;
+function computeHashOnElements(data) {
+    return __spreadArray(__spreadArray([], __read(data), false), [data.length], false).reduce(function (x, y) { return pedersen([x, y]); }, 0).toString();
+}
+exports.computeHashOnElements = computeHashOnElements;
 function hashCalldata(calldata) {
-    var calldataCopy = __spreadArray([], __read(calldata), false);
-    if (calldataCopy.length === 0) {
-        return '0';
-    }
-    if (calldataCopy.length === 1) {
-        return calldataCopy[0];
-    }
-    // calldata element will always be there as it was checked by an if statement before (!)
-    var calldataEl = calldataCopy.shift();
-    return pedersen([hashCalldata(calldataCopy), calldataEl]);
+    return computeHashOnElements(calldata);
 }
 exports.hashCalldata = hashCalldata;
 function hashMessage(account, to, selector, calldata, nonce) {
-    var hash0 = pedersen([account, to]);
-    var hash1 = pedersen([hash0, selector]);
     var calldataHash = hashCalldata(calldata);
-    var hash2 = pedersen([hash1, calldataHash]);
-    return pedersen([hash2, nonce]);
+    return computeHashOnElements([account, to, selector, calldataHash, nonce]);
 }
 exports.hashMessage = hashMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starknet",
-  "version": "1.6.0",
+  "version": "2.0.2",
   "description": "JavaScript library for StarkNet",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/provider/default.js

@@ -179,7 +179,7 @@ var Provider = /** @class */ (function () {
     switch (name) {
       case 'alpha':
       default:
-        return 'https://alpha3.starknet.io';
+        return 'https://alpha4.starknet.io';
     }
   };
   /**
@@ -484,14 +484,15 @@ var Provider = /** @class */ (function () {
   };
   Provider.prototype.waitForTx = function (txHash, retryInterval) {
     if (retryInterval === void 0) {
-      retryInterval = 2000;
+      retryInterval = 5000;
     }
     return __awaiter(this, void 0, void 0, function () {
-      var onchain, res;
+      var onchain, firstRun, res;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             onchain = false;
+            firstRun = true;
             _a.label = 1;
           case 1:
             if (!!onchain) return [3 /*break*/, 4];
@@ -507,9 +508,10 @@ var Provider = /** @class */ (function () {
               onchain = true;
             } else if (res.tx_status === 'REJECTED') {
               throw Error('REJECTED');
-            } else if (res.tx_status === 'NOT_RECEIVED') {
+            } else if (res.tx_status === 'NOT_RECEIVED' && !firstRun) {
               throw Error('NOT_RECEIVED');
             }
+            firstRun = false;
             return [3 /*break*/, 1];
           case 4:
             return [2 /*return*/];

package/signer/default.js

@@ -233,7 +233,7 @@ var Signer = /** @class */ (function (_super) {
               4 /*yield*/,
               this.callContract({
                 contract_address: this.address,
-                entry_point_selector: (0, stark_1.getSelectorFromName)('get_current_nonce'),
+                entry_point_selector: (0, stark_1.getSelectorFromName)('get_nonce'),
               }),
             ];
           case 1:
@@ -244,7 +244,7 @@ var Signer = /** @class */ (function (_super) {
             });
             msgHash = (0, encode_1.addHexPrefix)(
               (0, hash_1.hashMessage)(
-                '0', // needs to be walletAddress once it's possible to retrieve address(self) in cairo
+                this.address,
                 tx.contract_address,
                 tx.entry_point_selector,
                 calldataDecimal,

package/src/constants.ts

@@ -1,11 +1,13 @@
+import BN from 'bn.js';
+
 import { toBN } from './utils/number';
 
 export { IS_BROWSER } from './utils/encode';
 
-export const ZERO = toBN(0);
-export const ONE = toBN(1);
-export const TWO = toBN(2);
-export const MASK_250 = TWO.pow(toBN(250)).sub(ONE); // 2 ** 250 - 1
+export const ZERO: BN = toBN(0);
+export const ONE: BN = toBN(1);
+export const TWO: BN = toBN(2);
+export const MASK_250: BN = TWO.pow(toBN(250)).sub(ONE); // 2 ** 250 - 1
 
 /**
  * The following is taken from https://github.com/starkware-libs/starkex-resources/blob/master/crypto/starkware/crypto/signature/pedersen_params.json but converted to hex, because JS is very bad handling big integers by default

package/src/contract.ts

@@ -2,7 +2,7 @@ import BN from 'bn.js';
 import assert from 'minimalistic-assert';
 
 import { Provider, defaultProvider } from './provider';
-import { Abi } from './types';
+import { Abi, AbiEntry, FunctionAbi, StructAbi } from './types';
 import { BigNumberish, toBN } from './utils/number';
 import { getSelectorFromName } from './utils/stark';
 
@@ -39,6 +39,8 @@ export class Contract {
 
   abi: Abi[];
 
+  structs: { [name: string]: StructAbi };
+
   provider: Provider;
 
   /**
@@ -51,6 +53,15 @@ export class Contract {
     this.connectedTo = address;
     this.provider = provider;
     this.abi = abi;
+    this.structs = abi
+      .filter((abiEntry) => abiEntry.type === 'struct')
+      .reduce(
+        (acc, abiEntry) => ({
+          ...acc,
+          [abiEntry.name]: abiEntry,
+        }),
+        {}
+      );
   }
 
   public connect(address: string): Contract {
@@ -62,9 +73,9 @@ export class Contract {
     // ensure provided method exists
     const invokeableFunctionNames = this.abi
       .filter((abi) => {
+        if (abi.type !== 'function') return false;
         const isView = abi.stateMutability === 'view';
-        const isFunction = abi.type === 'function';
-        return isFunction && type === 'INVOKE' ? !isView : isView;
+        return type === 'INVOKE' ? !isView : isView;
       })
       .map((abi) => abi.name);
     assert(
@@ -73,7 +84,9 @@ export class Contract {
     );
 
     // ensure args match abi type
-    const methodAbi = this.abi.find((abi) => abi.name === method)!;
+    const methodAbi = this.abi.find(
+      (abi) => abi.name === method && abi.type === 'function'
+    ) as FunctionAbi;
     methodAbi.inputs.forEach((input) => {
       if (args[input.name] !== undefined) {
         if (input.type === 'felt') {
@@ -102,14 +115,32 @@ export class Contract {
     });
   }
 
-  private parseResponse(method: string, response: (string | string[])[]): Args {
-    const methodAbi = this.abi.find((abi) => abi.name === method)!;
-    return methodAbi.outputs.reduce((acc, output, i) => {
-      return {
+  private parseResponseField(
+    element: AbiEntry | FunctionAbi,
+    responseIterator: Iterator<string>
+  ): Args {
+    let entries: AbiEntry[] = [];
+    if (['felt', 'felt*'].includes(element.type)) {
+      return responseIterator.next().value;
+    }
+    if (element.type in this.structs) {
+      entries = this.structs[element.type].members;
+    } else if ('outputs' in element) {
+      entries = element.outputs;
+    }
+    return entries.reduce(
+      (acc, member) => ({
         ...acc,
-        [output.name]: response[i],
-      };
-    }, {} as Args);
+        [member.name]: this.parseResponseField(member, responseIterator),
+      }),
+      {}
+    );
+  }
+
+  private parseResponse(method: string, response: string[]): Args {
+    const methodAbi = this.abi.find((abi) => abi.name === method) as FunctionAbi;
+    const responseIterator = response.flat()[Symbol.iterator]();
+    return this.parseResponseField(methodAbi, responseIterator);
   }
 
   public invoke(method: string, args: Args = {}, signature?: [BigNumberish, BigNumberish]) {