starknet 3.14.1 → 3.15.2

package/__tests__/utils/utils.browser.test.ts

@@ -8,21 +8,19 @@ import { constants, json, stark } from '../../src';
 
 const { IS_BROWSER } = constants;
 
-const compiledArgentAccount = json.parse(
-  fs.readFileSync('./__mocks__/ArgentAccount.json').toString('ascii')
-);
+const compiledAccount = json.parse(fs.readFileSync('./__mocks__/Account.json').toString('ascii'));
 
 test('isBrowser', () => {
   expect(IS_BROWSER).toBe(true);
 });
 describe('compressProgram()', () => {
   test('compresses a contract program', () => {
-    const compressed = stark.compressProgram(compiledArgentAccount.program);
+    const compressed = stark.compressProgram(compiledAccount.program);
 
     expect(compressed).toMatchSnapshot();
   });
   test('works with strings', () => {
-    const inputProgram = json.stringify(compiledArgentAccount.program);
+    const inputProgram = json.stringify(compiledAccount.program);
 
     const compressed = stark.compressProgram(inputProgram);
 

package/__tests__/utils/utils.test.ts

@@ -1,26 +1,25 @@
 import fs from 'fs';
 
 import { constants, hash, json, number, stark } from '../../src';
+import { pedersen } from '../../src/utils/hash';
 
 const { IS_BROWSER } = constants;
 
-const compiledArgentAccount = json.parse(
-  fs.readFileSync('./__mocks__/ArgentAccount.json').toString('ascii')
-);
+const compiledAccount = json.parse(fs.readFileSync('./__mocks__/Account.json').toString('ascii'));
 
 test('isNode', () => {
   expect(IS_BROWSER).toBe(false);
 });
 describe('compressProgram()', () => {
   test('compresses a contract program', () => {
-    const inputProgram = compiledArgentAccount.program;
+    const inputProgram = compiledAccount.program;
 
     const compressed = stark.compressProgram(inputProgram);
 
     expect(compressed).toMatchSnapshot();
   });
   test('works with strings', () => {
-    const inputProgram = json.stringify(compiledArgentAccount.program);
+    const inputProgram = json.stringify(compiledAccount.program);
 
     const compressed = stark.compressProgram(inputProgram);
 
@@ -87,3 +86,29 @@ describe('estimatedFeeToMaxFee()', () => {
     expect(res).toBe(11_500);
   });
 });
+
+describe('calculateContractAddressFromHash()', () => {
+  // This test just show how to use calculateContractAddressFromHash for new devs
+
+  test('calculated contract address should match the snapshot', () => {
+    const ethAddress = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
+
+    const daiAddress = '0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9';
+    const factoryAddress = '0x249827618A01858A72B7D04339C47195A324D20D6037033DFE2829F98AFF4FC';
+    const classHash = '0x55187E68C60664A947048E0C9E5322F9BF55F7D435ECDCF17ED75724E77368F';
+
+    // Any type of salt can be used. It depends on the dApp what kind of salt it wants to use.
+    const salt = pedersen([ethAddress, daiAddress]);
+
+    const res = hash.calculateContractAddressFromHash(
+      salt,
+      classHash,
+      [ethAddress, daiAddress, factoryAddress],
+      factoryAddress
+    );
+
+    expect(res).toMatchInlineSnapshot(
+      `"0x36dc8dcb3440596472ddde11facacc45d0cd250df764ae7c3d1a360c853c324"`
+    );
+  });
+});

package/dist/provider/default.js

@@ -196,7 +196,12 @@ var Provider = /** @class */ (function () {
                         body: (0, json_1.stringify)(request),
                         headers: headers,
                     })
-                        .then(function (res) { return res.text(); })
+                        .then(function (res) {
+                        if (res.status >= 400) {
+                            throw Error(res.statusText);
+                        }
+                        return res.text();
+                    })
                         .then(function (res) {
                         if (endpoint === 'estimate_fee') {
                             return (0, json_1.parse)(res, function (_, v) {
@@ -207,6 +212,9 @@ var Provider = /** @class */ (function () {
                             });
                         }
                         return (0, json_1.parse)(res);
+                    })
+                        .catch(function (err) {
+                        throw Error("Could not ".concat(method, " from endpoint `").concat(url, "`: ").concat(err.message));
                     })];
             });
         });

package/dist/provider/utils.js

@@ -42,7 +42,7 @@ function getBlockIdentifier(blockIdentifier) {
     if (blockIdentifier === 'pending') {
         return { type: 'BLOCK_NUMBER', data: 'pending' };
     }
-    if (typeof blockIdentifier === 'number') {
+    if (typeof blockIdentifier === 'number' || typeof blockIdentifier === 'bigint') {
         return { type: 'BLOCK_NUMBER', data: blockIdentifier };
     }
     if (typeof blockIdentifier === 'string' && blockIdentifier.startsWith('0x')) {

package/dist/types/api.d.ts

@@ -109,6 +109,9 @@ export declare type InvokeFunctionTransaction = {
     max_fee?: BigNumberish;
     version?: BigNumberish;
 };
+export interface InvokeFunctionTransactionResponse extends InvokeFunctionTransaction {
+    transaction_hash: string;
+}
 export declare type InvokeFunctionTrace = {
     caller_address: string;
     contract_address: string;
@@ -135,6 +138,7 @@ export declare type ExecutionResources = {
 };
 export declare type CallContractTransaction = Omit<InvokeFunctionTransaction, 'type' | 'entry_point_type' | 'nonce'>;
 export declare type Transaction = DeclareTransaction | DeployTransaction | InvokeFunctionTransaction;
+export declare type TransactionResponse = DeclareTransaction | DeployTransaction | InvokeFunctionTransactionResponse;
 export declare type CallContractResponse = {
     result: string[];
 };
@@ -143,7 +147,7 @@ export declare type GetBlockResponse = {
     state_root: string;
     block_hash: string;
     transactions: {
-        [txHash: string]: Transaction;
+        [txHash: string]: TransactionResponse;
     };
     timestamp: number;
     transaction_receipts: {
@@ -193,7 +197,7 @@ export declare type GetTransactionTraceResponse = {
 };
 export declare type SuccessfulTransactionResponse = {
     status: Status;
-    transaction: Transaction;
+    transaction: TransactionResponse;
     block_hash: string;
     block_number: BlockNumber;
     transaction_index: number;
@@ -204,7 +208,7 @@ export declare type FailedTransactionResponse = {
         code: string;
         error_message: string;
     };
-    transaction: Transaction;
+    transaction: TransactionResponse;
 };
 export declare type GetTransactionResponse = SuccessfulTransactionResponse | FailedTransactionResponse;
 export declare type AddTransactionResponse = {

package/dist/utils/hash.d.ts

@@ -1,5 +1,6 @@
 import BN from 'bn.js';
 import { StarknetChainId, TransactionHashPrefix } from '../constants';
+import { RawCalldata } from '../types/lib';
 import { BigNumberish } from './number';
 export declare const transactionVersion = 0;
 export declare const feeTransactionVersion: BN;
@@ -24,3 +25,4 @@ export declare function computeHashOnElements(data: BigNumberish[]): string;
 export declare function calculateTransactionHashCommon(txHashPrefix: TransactionHashPrefix, version: BigNumberish, contractAddress: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId, additionalData?: BigNumberish[]): string;
 export declare function calculateDeployTransactionHash(contractAddress: BigNumberish, constructorCalldata: BigNumberish[], version: BigNumberish, chainId: StarknetChainId): string;
 export declare function calculcateTransactionHash(contractAddress: BigNumberish, version: BigNumberish, entryPointSelector: BigNumberish, calldata: BigNumberish[], maxFee: BigNumberish, chainId: StarknetChainId): string;
+export declare function calculateContractAddressFromHash(salt: BigNumberish, classHash: BigNumberish, constructorCalldata: RawCalldata, deployerAddress: BigNumberish): 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.calculcateTransactionHash = exports.calculateDeployTransactionHash = exports.calculateTransactionHashCommon = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.feeTransactionVersion = exports.transactionVersion = void 0;
+exports.calculateContractAddressFromHash = exports.calculcateTransactionHash = exports.calculateDeployTransactionHash = exports.calculateTransactionHashCommon = exports.computeHashOnElements = exports.pedersen = exports.getSelectorFromName = exports.starknetKeccak = exports.feeTransactionVersion = exports.transactionVersion = void 0;
 var keccak_1 = require("ethereum-cryptography/keccak");
 var minimalistic_assert_1 = __importDefault(require("minimalistic-assert"));
 var constants_1 = require("../constants");
@@ -112,3 +112,16 @@ function calculcateTransactionHash(contractAddress, version, entryPointSelector,
     return calculateTransactionHashCommon(constants_1.TransactionHashPrefix.INVOKE, version, contractAddress, entryPointSelector, calldata, maxFee, chainId);
 }
 exports.calculcateTransactionHash = calculcateTransactionHash;
+function calculateContractAddressFromHash(salt, classHash, constructorCalldata, deployerAddress) {
+    var constructorCalldataHash = computeHashOnElements(constructorCalldata);
+    var CONTRACT_ADDRESS_PREFIX = (0, number_1.toFelt)('0x535441524b4e45545f434f4e54524143545f41444452455353'); // Equivalent to 'STARKNET_CONTRACT_ADDRESS'
+    var dataToHash = [
+        CONTRACT_ADDRESS_PREFIX,
+        deployerAddress,
+        salt,
+        classHash,
+        constructorCalldataHash,
+    ];
+    return computeHashOnElements(dataToHash);
+}
+exports.calculateContractAddressFromHash = calculateContractAddressFromHash;

package/package.json

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

package/provider/default.js

@@ -314,6 +314,9 @@ var Provider = /** @class */ (function () {
             headers: headers,
           })
             .then(function (res) {
+              if (res.status >= 400) {
+                throw Error(res.statusText);
+              }
               return res.text();
             })
             .then(function (res) {
@@ -326,6 +329,14 @@ var Provider = /** @class */ (function () {
                 });
               }
               return (0, json_1.parse)(res);
+            })
+            .catch(function (err) {
+              throw Error(
+                'Could not '
+                  .concat(method, ' from endpoint `')
+                  .concat(url, '`: ')
+                  .concat(err.message)
+              );
             }),
         ];
       });

package/provider/utils.js

@@ -45,7 +45,7 @@ function getBlockIdentifier(blockIdentifier) {
   if (blockIdentifier === 'pending') {
     return { type: 'BLOCK_NUMBER', data: 'pending' };
   }
-  if (typeof blockIdentifier === 'number') {
+  if (typeof blockIdentifier === 'number' || typeof blockIdentifier === 'bigint') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
   if (typeof blockIdentifier === 'string' && blockIdentifier.startsWith('0x')) {

package/src/provider/default.ts

@@ -159,7 +159,12 @@ export class Provider implements ProviderInterface {
       body: stringify(request),
       headers,
     })
-      .then((res) => res.text())
+      .then((res) => {
+        if (res.status >= 400) {
+          throw Error(res.statusText);
+        }
+        return res.text();
+      })
       .then((res) => {
         if (endpoint === 'estimate_fee') {
           return parse(res, (_, v) => {
@@ -170,6 +175,9 @@ export class Provider implements ProviderInterface {
           });
         }
         return parse(res) as Endpoints[T]['RESPONSE'];
+      })
+      .catch((err) => {
+        throw Error(`Could not ${method} from endpoint \`${url}\`: ${err.message}`);
       });
   }
 

package/src/provider/utils.ts

@@ -49,7 +49,7 @@ export function getBlockIdentifier(blockIdentifier: BlockIdentifier): BlockIdent
   if (blockIdentifier === 'pending') {
     return { type: 'BLOCK_NUMBER', data: 'pending' };
   }
-  if (typeof blockIdentifier === 'number') {
+  if (typeof blockIdentifier === 'number' || typeof blockIdentifier === 'bigint') {
     return { type: 'BLOCK_NUMBER', data: blockIdentifier };
   }
   if (typeof blockIdentifier === 'string' && blockIdentifier.startsWith('0x')) {

package/src/types/api.ts

@@ -125,6 +125,10 @@ export type InvokeFunctionTransaction = {
   version?: BigNumberish;
 };
 
+export interface InvokeFunctionTransactionResponse extends InvokeFunctionTransaction {
+  transaction_hash: string;
+}
+
 export type InvokeFunctionTrace = {
   caller_address: string;
   contract_address: string;
@@ -157,6 +161,10 @@ export type CallContractTransaction = Omit<
 >;
 
 export type Transaction = DeclareTransaction | DeployTransaction | InvokeFunctionTransaction;
+export type TransactionResponse =
+  | DeclareTransaction
+  | DeployTransaction
+  | InvokeFunctionTransactionResponse;
 
 export type CallContractResponse = {
   result: string[];
@@ -167,7 +175,7 @@ export type GetBlockResponse = {
   state_root: string;
   block_hash: string;
   transactions: {
-    [txHash: string]: Transaction;
+    [txHash: string]: TransactionResponse;
   };
   timestamp: number;
   transaction_receipts: {
@@ -221,7 +229,7 @@ export type GetTransactionTraceResponse = {
 
 export type SuccessfulTransactionResponse = {
   status: Status;
-  transaction: Transaction;
+  transaction: TransactionResponse;
   block_hash: string;
   block_number: BlockNumber;
   transaction_index: number;
@@ -233,7 +241,7 @@ export type FailedTransactionResponse = {
     code: string;
     error_message: string;
   };
-  transaction: Transaction;
+  transaction: TransactionResponse;
 };
 
 export type GetTransactionResponse = SuccessfulTransactionResponse | FailedTransactionResponse;

package/src/utils/hash.ts

@@ -11,9 +11,10 @@ import {
   TransactionHashPrefix,
   ZERO,
 } from '../constants';
+import { RawCalldata } from '../types/lib';
 import { ec } from './ellipticCurve';
 import { addHexPrefix, buf2hex, utf8ToArray } from './encode';
-import { BigNumberish, toBN, toHex } from './number';
+import { BigNumberish, toBN, toFelt, toHex } from './number';
 
 export const transactionVersion = 0;
 export const feeTransactionVersion = toBN(2).pow(toBN(128)).add(toBN(transactionVersion));
@@ -132,3 +133,24 @@ export function calculcateTransactionHash(
     chainId
   );
 }
+
+export function calculateContractAddressFromHash(
+  salt: BigNumberish,
+  classHash: BigNumberish,
+  constructorCalldata: RawCalldata,
+  deployerAddress: BigNumberish
+) {
+  const constructorCalldataHash = computeHashOnElements(constructorCalldata);
+
+  const CONTRACT_ADDRESS_PREFIX = toFelt('0x535441524b4e45545f434f4e54524143545f41444452455353'); // Equivalent to 'STARKNET_CONTRACT_ADDRESS'
+
+  const dataToHash = [
+    CONTRACT_ADDRESS_PREFIX,
+    deployerAddress,
+    salt,
+    classHash,
+    constructorCalldataHash,
+  ];
+
+  return computeHashOnElements(dataToHash);
+}

package/types/api.d.ts

@@ -119,6 +119,9 @@ export declare type InvokeFunctionTransaction = {
   max_fee?: BigNumberish;
   version?: BigNumberish;
 };
+export interface InvokeFunctionTransactionResponse extends InvokeFunctionTransaction {
+  transaction_hash: string;
+}
 export declare type InvokeFunctionTrace = {
   caller_address: string;
   contract_address: string;
@@ -151,6 +154,10 @@ export declare type Transaction =
   | DeclareTransaction
   | DeployTransaction
   | InvokeFunctionTransaction;
+export declare type TransactionResponse =
+  | DeclareTransaction
+  | DeployTransaction
+  | InvokeFunctionTransactionResponse;
 export declare type CallContractResponse = {
   result: string[];
 };
@@ -159,7 +166,7 @@ export declare type GetBlockResponse = {
   state_root: string;
   block_hash: string;
   transactions: {
-    [txHash: string]: Transaction;
+    [txHash: string]: TransactionResponse;
   };
   timestamp: number;
   transaction_receipts: {
@@ -209,7 +216,7 @@ export declare type GetTransactionTraceResponse = {
 };
 export declare type SuccessfulTransactionResponse = {
   status: Status;
-  transaction: Transaction;
+  transaction: TransactionResponse;
   block_hash: string;
   block_number: BlockNumber;
   transaction_index: number;
@@ -220,7 +227,7 @@ export declare type FailedTransactionResponse = {
     code: string;
     error_message: string;
   };
-  transaction: Transaction;
+  transaction: TransactionResponse;
 };
 export declare type GetTransactionResponse =
   | SuccessfulTransactionResponse

package/utils/hash.d.ts

@@ -1,6 +1,7 @@
 import BN from 'bn.js';
 
 import { StarknetChainId, TransactionHashPrefix } from '../constants';
+import { RawCalldata } from '../types/lib';
 import { BigNumberish } from './number';
 export declare const transactionVersion = 0;
 export declare const feeTransactionVersion: BN;
@@ -46,3 +47,9 @@ export declare function calculcateTransactionHash(
   maxFee: BigNumberish,
   chainId: StarknetChainId
 ): string;
+export declare function calculateContractAddressFromHash(
+  salt: BigNumberish,
+  classHash: BigNumberish,
+  constructorCalldata: RawCalldata,
+  deployerAddress: BigNumberish
+): string;

package/utils/hash.js

@@ -39,7 +39,8 @@ var __importDefault =
     return mod && mod.__esModule ? mod : { default: mod };
   };
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.calculcateTransactionHash =
+exports.calculateContractAddressFromHash =
+  exports.calculcateTransactionHash =
   exports.calculateDeployTransactionHash =
   exports.calculateTransactionHashCommon =
   exports.computeHashOnElements =
@@ -174,3 +175,18 @@ function calculcateTransactionHash(
   );
 }
 exports.calculcateTransactionHash = calculcateTransactionHash;
+function calculateContractAddressFromHash(salt, classHash, constructorCalldata, deployerAddress) {
+  var constructorCalldataHash = computeHashOnElements(constructorCalldata);
+  var CONTRACT_ADDRESS_PREFIX = (0, number_1.toFelt)(
+    '0x535441524b4e45545f434f4e54524143545f41444452455353'
+  ); // Equivalent to 'STARKNET_CONTRACT_ADDRESS'
+  var dataToHash = [
+    CONTRACT_ADDRESS_PREFIX,
+    deployerAddress,
+    salt,
+    classHash,
+    constructorCalldataHash,
+  ];
+  return computeHashOnElements(dataToHash);
+}
+exports.calculateContractAddressFromHash = calculateContractAddressFromHash;

package/www/guides/account.md

@@ -39,11 +39,11 @@ const starkKeyPub = ec.getStarkKey(starkKeyPair);;
 Deploy the Account contract and wait for it to be verified on StarkNet.
 
 ```javascript
-const compiledArgentAccount = json.parse(
-  fs.readFileSync("./ArgentAccount.json").toString("ascii")
+const compiledAccount = json.parse(
+  fs.readFileSync("./Account.json").toString("ascii")
 );
 const accountResponse = await defaultProvider.deployContract({
-  contract: compiledArgentAccount,
+  contract: compiledAccount,
   addressSalt: starkKeyPub,
 });
 ```
@@ -55,7 +55,7 @@ Wait for the deployment transaction to be accepted and assign the address of the
 ```javascript
 await defaultProvider.waitForTransaction(accountResponse.transaction_hash);
 const accountContract = new Contract(
-  compiledArgentAccount.abi,
+  compiledAccount.abi,
   accountResponse.address
 );
 const initializeResponse = await accountContract.initialize(starkKeyPub, "0");