starknet 1.7.0 → 2.1.0

package/__tests__/utils/ellipticalCurve.test.ts

@@ -1,4 +1,4 @@
-import { getKeyPair, getStarkKey, sign } from '../../src/utils/ellipticCurve';
+import { ec, getKeyPair, getStarkKey, sign, verify } 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;
 
@@ -61,13 +61,13 @@ describe('getSelectorFromName()', () => {
 });
 describe('computeHashOnElements()', () => {
   test('should return valid hash for empty array', () => {
-    const res = stark.computeHashOnElements([]);
+    const res = hash.computeHashOnElements([]);
     expect(res).toMatchInlineSnapshot(
       `"0x49ee3eba8c1600700ee1b87eb599f16716b0b1022947733551fde4050ca6804"`
     );
   });
   test('should return valid hash for valid array', () => {
-    const res = stark.computeHashOnElements([
+    const res = hash.computeHashOnElements([
       number.toBN(123782376),
       number.toBN(213984),
       number.toBN(128763521321),

package/dist/provider/default.d.ts

@@ -1,16 +1,18 @@
 import { AddTransactionResponse, CallContractResponse, CallContractTransaction, CompiledContract, GetBlockResponse, GetCodeResponse, GetContractAddressesResponse, GetTransactionResponse, GetTransactionStatusResponse, Transaction } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
-declare type NetworkName = 'alpha';
-interface ProviderOptions {
-    network?: NetworkName;
-}
+declare type NetworkName = 'mainnet-alpha' | 'georli-alpha';
+declare type ProviderOptions = {
+    network: NetworkName;
+} | {
+    baseUrl: string;
+};
 export declare class Provider implements ProviderInterface {
     baseUrl: string;
     feederGatewayUrl: string;
     gatewayUrl: string;
     constructor(optionsOrProvider?: ProviderOptions | Provider);
-    protected static getNetworkFromName(name: NetworkName): string;
+    protected static getNetworkFromName(name: NetworkName): "http://alpha-mainnet.starknet.io/" | "https://alpha4.starknet.io";
     /**
      * Gets the smart contract address on the goerli testnet.
      *

package/dist/provider/default.js

@@ -60,14 +60,16 @@ function wait(delay) {
 }
 var Provider = /** @class */ (function () {
     function Provider(optionsOrProvider) {
+        if (optionsOrProvider === void 0) { optionsOrProvider = { network: 'georli-alpha' }; }
         if (optionsOrProvider instanceof Provider) {
             this.baseUrl = optionsOrProvider.baseUrl;
             this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
             this.gatewayUrl = optionsOrProvider.gatewayUrl;
         }
         else {
-            var _a = (optionsOrProvider || {}).network, network = _a === void 0 ? 'alpha' : _a;
-            var baseUrl = Provider.getNetworkFromName(network);
+            var baseUrl = 'baseUrl' in optionsOrProvider
+                ? optionsOrProvider.baseUrl
+                : Provider.getNetworkFromName(optionsOrProvider.network);
             this.baseUrl = baseUrl;
             this.feederGatewayUrl = baseUrl + "/feeder_gateway";
             this.gatewayUrl = baseUrl + "/gateway";
@@ -75,9 +77,11 @@ var Provider = /** @class */ (function () {
     }
     Provider.getNetworkFromName = function (name) {
         switch (name) {
-            case 'alpha':
+            case 'mainnet-alpha':
+                return 'http://alpha-mainnet.starknet.io/';
+            case 'georli-alpha':
             default:
-                return 'https://alpha3.starknet.io';
+                return 'https://alpha4.starknet.io';
         }
     };
     /**
@@ -296,7 +300,7 @@ var Provider = /** @class */ (function () {
         });
     };
     Provider.prototype.waitForTx = function (txHash, retryInterval) {
-        if (retryInterval === void 0) { retryInterval = 2000; }
+        if (retryInterval === void 0) { retryInterval = 8000; }
         return __awaiter(this, void 0, void 0, function () {
             var onchain, res;
             return __generator(this, function (_a) {
@@ -314,7 +318,9 @@ var Provider = /** @class */ (function () {
                         return [4 /*yield*/, this.getTransactionStatus(txHash)];
                     case 3:
                         res = _a.sent();
-                        if (res.tx_status === 'ACCEPTED_ONCHAIN' || res.tx_status === 'PENDING') {
+                        if (res.tx_status === 'ACCEPTED_ONCHAIN' ||
+                            (res.tx_status === 'PENDING' && res.block_hash !== 'pending') // This is needed as of today. In the future there will be a different status for pending transactions.
+                        ) {
                             onchain = true;
                         }
                         else if (res.tx_status === 'REJECTED') {

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

@@ -54,14 +54,14 @@ export declare type CallContractResponse = {
 export declare type GetBlockResponse = {
     sequence_number: number;
     state_root: string;
-    block_id: number;
+    block_hash: string;
     transactions: {
         [txHash: string]: Transaction;
     };
     timestamp: number;
     transaction_receipts: {
         [txHash: string]: {
-            block_id: number;
+            block_hash: string;
             transaction_hash: string;
             l2_to_l1_messages: {
                 to_address: string;
@@ -73,7 +73,7 @@ export declare type GetBlockResponse = {
             transaction_index: number;
         };
     };
-    previous_block_id: number;
+    previous_block_hash: string;
     status: Status;
 };
 export declare type GetCodeResponse = {
@@ -82,12 +82,12 @@ export declare type GetCodeResponse = {
 };
 export declare type GetTransactionStatusResponse = {
     tx_status: Status;
-    block_id: number;
+    block_hash: string;
 };
 export declare type GetTransactionResponse = {
     status: Status;
     transaction: Transaction;
-    block_id: number;
+    block_hash: string;
     block_number: number;
     transaction_index: number;
     transaction_hash: string;
@@ -95,5 +95,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/dist/utils/stark.d.ts

@@ -19,4 +19,3 @@ export declare function getSelectorFromName(funcName: string): string;
 export declare function randomAddress(): string;
 export declare function makeAddress(input: string): string;
 export declare function formatSignature(sig?: [BigNumberish, BigNumberish]): [string, string] | [];
-export declare function computeHashOnElements(data: BigNumberish[]): BigNumberish;

package/dist/utils/stark.js

@@ -1,31 +1,6 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.computeHashOnElements = exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.getSelectorFromName = exports.compressProgram = void 0;
+exports.formatSignature = exports.makeAddress = exports.randomAddress = exports.getSelectorFromName = exports.compressProgram = void 0;
 var pako_1 = require("pako");
 var ellipticCurve_1 = require("./ellipticCurve");
 var encode_1 = require("./encode");
@@ -77,7 +52,3 @@ function formatSignature(sig) {
     }
 }
 exports.formatSignature = formatSignature;
-function computeHashOnElements(data) {
-    return __spreadArray(__spreadArray([], __read(data), false), [data.length], false).reduce(function (x, y) { return (0, hash_1.pedersen)([x, y]); }, 0);
-}
-exports.computeHashOnElements = computeHashOnElements;

package/package.json

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

package/provider/default.d.ts

@@ -12,16 +12,22 @@ import {
 } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
-declare type NetworkName = 'alpha';
-interface ProviderOptions {
-  network?: NetworkName;
-}
+declare type NetworkName = 'mainnet-alpha' | 'georli-alpha';
+declare type ProviderOptions =
+  | {
+      network: NetworkName;
+    }
+  | {
+      baseUrl: string;
+    };
 export declare class Provider implements ProviderInterface {
   baseUrl: string;
   feederGatewayUrl: string;
   gatewayUrl: string;
   constructor(optionsOrProvider?: ProviderOptions | Provider);
-  protected static getNetworkFromName(name: NetworkName): string;
+  protected static getNetworkFromName(
+    name: NetworkName
+  ): 'http://alpha-mainnet.starknet.io/' | 'https://alpha4.starknet.io';
   /**
    * Gets the smart contract address on the goerli testnet.
    *

package/provider/default.js

@@ -162,14 +162,18 @@ function wait(delay) {
 }
 var Provider = /** @class */ (function () {
   function Provider(optionsOrProvider) {
+    if (optionsOrProvider === void 0) {
+      optionsOrProvider = { network: 'georli-alpha' };
+    }
     if (optionsOrProvider instanceof Provider) {
       this.baseUrl = optionsOrProvider.baseUrl;
       this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
       this.gatewayUrl = optionsOrProvider.gatewayUrl;
     } else {
-      var _a = (optionsOrProvider || {}).network,
-        network = _a === void 0 ? 'alpha' : _a;
-      var baseUrl = Provider.getNetworkFromName(network);
+      var baseUrl =
+        'baseUrl' in optionsOrProvider
+          ? optionsOrProvider.baseUrl
+          : Provider.getNetworkFromName(optionsOrProvider.network);
       this.baseUrl = baseUrl;
       this.feederGatewayUrl = baseUrl + '/feeder_gateway';
       this.gatewayUrl = baseUrl + '/gateway';
@@ -177,9 +181,11 @@ var Provider = /** @class */ (function () {
   }
   Provider.getNetworkFromName = function (name) {
     switch (name) {
-      case 'alpha':
+      case 'mainnet-alpha':
+        return 'http://alpha-mainnet.starknet.io/';
+      case 'georli-alpha':
       default:
-        return 'https://alpha3.starknet.io';
+        return 'https://alpha4.starknet.io';
     }
   };
   /**
@@ -484,7 +490,7 @@ var Provider = /** @class */ (function () {
   };
   Provider.prototype.waitForTx = function (txHash, retryInterval) {
     if (retryInterval === void 0) {
-      retryInterval = 2000;
+      retryInterval = 8000;
     }
     return __awaiter(this, void 0, void 0, function () {
       var onchain, res;
@@ -503,7 +509,10 @@ var Provider = /** @class */ (function () {
             return [4 /*yield*/, this.getTransactionStatus(txHash)];
           case 3:
             res = _a.sent();
-            if (res.tx_status === 'ACCEPTED_ONCHAIN' || res.tx_status === 'PENDING') {
+            if (
+              res.tx_status === 'ACCEPTED_ONCHAIN' ||
+              (res.tx_status === 'PENDING' && res.block_hash !== 'pending') // This is needed as of today. In the future there will be a different status for pending transactions.
+            ) {
               onchain = true;
             } else if (res.tx_status === 'REJECTED') {
               throw Error('REJECTED');

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/provider/default.ts

@@ -17,11 +17,15 @@ import { BigNumberish, toBN, toHex } from '../utils/number';
 import { compressProgram, formatSignature, randomAddress } from '../utils/stark';
 import { ProviderInterface } from './interface';
 
-type NetworkName = 'alpha';
+type NetworkName = 'mainnet-alpha' | 'georli-alpha';
 
-interface ProviderOptions {
-  network?: NetworkName;
-}
+type ProviderOptions =
+  | {
+      network: NetworkName;
+    }
+  | {
+      baseUrl: string;
+    };
 
 function wait(delay: number) {
   return new Promise((res) => setTimeout(res, delay));
@@ -34,14 +38,16 @@ export class Provider implements ProviderInterface {
 
   public gatewayUrl: string;
 
-  constructor(optionsOrProvider?: ProviderOptions | Provider) {
+  constructor(optionsOrProvider: ProviderOptions | Provider = { network: 'georli-alpha' }) {
     if (optionsOrProvider instanceof Provider) {
       this.baseUrl = optionsOrProvider.baseUrl;
       this.feederGatewayUrl = optionsOrProvider.feederGatewayUrl;
       this.gatewayUrl = optionsOrProvider.gatewayUrl;
     } else {
-      const { network = 'alpha' } = optionsOrProvider || {};
-      const baseUrl = Provider.getNetworkFromName(network);
+      const baseUrl =
+        'baseUrl' in optionsOrProvider
+          ? optionsOrProvider.baseUrl
+          : Provider.getNetworkFromName(optionsOrProvider.network);
       this.baseUrl = baseUrl;
       this.feederGatewayUrl = `${baseUrl}/feeder_gateway`;
       this.gatewayUrl = `${baseUrl}/gateway`;
@@ -50,9 +56,11 @@ export class Provider implements ProviderInterface {
 
   protected static getNetworkFromName(name: NetworkName) {
     switch (name) {
-      case 'alpha':
+      case 'mainnet-alpha':
+        return 'http://alpha-mainnet.starknet.io/';
+      case 'georli-alpha':
       default:
-        return 'https://alpha3.starknet.io';
+        return 'https://alpha4.starknet.io';
     }
   }
 
@@ -257,7 +265,7 @@ export class Provider implements ProviderInterface {
     });
   }
 
-  public async waitForTx(txHash: BigNumberish, retryInterval: number = 2000) {
+  public async waitForTx(txHash: BigNumberish, retryInterval: number = 8000) {
     let onchain = false;
     while (!onchain) {
       // eslint-disable-next-line no-await-in-loop
@@ -265,7 +273,10 @@ export class Provider implements ProviderInterface {
       // eslint-disable-next-line no-await-in-loop
       const res = await this.getTransactionStatus(txHash);
 
-      if (res.tx_status === 'ACCEPTED_ONCHAIN' || res.tx_status === 'PENDING') {
+      if (
+        res.tx_status === 'ACCEPTED_ONCHAIN' ||
+        (res.tx_status === 'PENDING' && res.block_hash !== 'pending') // This is needed as of today. In the future there will be a different status for pending transactions.
+      ) {
         onchain = true;
       } else if (res.tx_status === 'REJECTED') {
         throw Error('REJECTED');

package/src/signer/default.ts

@@ -35,14 +35,14 @@ export class Signer extends Provider implements SignerInterface {
 
     const { result } = await this.callContract({
       contract_address: this.address,
-      entry_point_selector: getSelectorFromName('get_current_nonce'),
+      entry_point_selector: getSelectorFromName('get_nonce'),
     });
     const nonceBn = toBN(result[0]);
     const calldataDecimal = (tx.calldata || []).map((x) => toBN(x).toString());
 
     const msgHash = addHexPrefix(
       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/types.ts

@@ -61,14 +61,14 @@ export type CallContractResponse = {
 export type GetBlockResponse = {
   sequence_number: number;
   state_root: string;
-  block_id: number;
+  block_hash: string;
   transactions: {
     [txHash: string]: Transaction;
   };
   timestamp: number;
   transaction_receipts: {
     [txHash: string]: {
-      block_id: number;
+      block_hash: string;
       transaction_hash: string;
       l2_to_l1_messages: {
         to_address: string;
@@ -80,7 +80,7 @@ export type GetBlockResponse = {
       transaction_index: number;
     };
   };
-  previous_block_id: number;
+  previous_block_hash: string;
   status: Status;
 };
 
@@ -91,13 +91,13 @@ export type GetCodeResponse = {
 
 export type GetTransactionStatusResponse = {
   tx_status: Status;
-  block_id: number;
+  block_hash: string;
 };
 
 export type GetTransactionResponse = {
   status: Status;
   transaction: Transaction;
-  block_id: number;
+  block_hash: string;
   block_number: number;
   transaction_index: number;
   transaction_hash: string;
@@ -106,5 +106,5 @@ export type GetTransactionResponse = {
 export type AddTransactionResponse = {
   code: TxStatus;
   transaction_hash: string;
-  address: string;
+  address?: string;
 };

package/src/utils/ellipticCurve.ts

@@ -88,5 +88,5 @@ export function verify(keyPair: KeyPair, msgHash: string, sig: Signature): boole
   assertInRange(s, ONE, toBN(addHexPrefix(EC_ORDER)), 's');
   assertInRange(w, ONE, toBN(addHexPrefix(MAX_ECDSA_VAL)), 'w');
 
-  return keyPair.verify(msgHash, sig);
+  return keyPair.verify(fixMessage(msgHash), sig);
 }

package/src/utils/hash.ts

@@ -43,17 +43,12 @@ export function pedersen(input: [BigNumberish, BigNumberish]) {
   return addHexPrefix(point.getX().toString(16));
 }
 
+export function computeHashOnElements(data: BigNumberish[]) {
+  return [...data, data.length].reduce((x, y) => pedersen([x, y]), 0).toString();
+}
+
 export function hashCalldata(calldata: string[]): string {
-  const calldataCopy = [...calldata];
-  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 (!)
-  const calldataEl = calldataCopy.shift()!;
-  return pedersen([hashCalldata(calldataCopy), calldataEl]);
+  return computeHashOnElements(calldata);
 }
 
 export function hashMessage(
@@ -63,9 +58,6 @@ export function hashMessage(
   calldata: string[],
   nonce: string
 ) {
-  const hash0 = pedersen([account, to]);
-  const hash1 = pedersen([hash0, selector]);
   const calldataHash = hashCalldata(calldata);
-  const hash2 = pedersen([hash1, calldataHash]);
-  return pedersen([hash2, nonce]);
+  return computeHashOnElements([account, to, selector, calldataHash, nonce]);
 }

package/src/utils/stark.ts

@@ -3,7 +3,7 @@ import { gzip } from 'pako';
 import { CompressedProgram, Program } from '../types';
 import { genKeyPair, getStarkKey } from './ellipticCurve';
 import { addHexPrefix, btoaUniversal } from './encode';
-import { pedersen, starknetKeccak } from './hash';
+import { starknetKeccak } from './hash';
 import { stringify } from './json';
 import { BigNumberish, toBN, toHex } from './number';
 
@@ -49,7 +49,3 @@ export function formatSignature(sig?: [BigNumberish, BigNumberish]): [string, st
     return [];
   }
 }
-
-export function computeHashOnElements(data: BigNumberish[]) {
-  return [...data, data.length].reduce((x, y) => pedersen([x, y]), 0);
-}

package/tsconfig.json

@@ -105,11 +105,12 @@
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "typedocOptions": {
-    "entryPoints": ["src/starknet.ts", "src/types.ts"],
+    "entryPoints": "src/index.ts",
+    "entryPointStrategy": "expand",
     "out": "docs",
     "githubPages": false,
     "readme": "./README.md",
     "name": "StarkNet.js Docs",
-    "sort": "source-order"
+    "sort": "required-first"
   }
 }