starknet 4.3.0 → 4.3.1

package/CHANGELOG.md

@@ -1,8 +1,23 @@
+## [4.3.1](https://github.com/0xs34n/starknet.js/compare/v4.3.0...v4.3.1) (2022-08-31)
+
+### Bug Fixes
+
+- getClassAt and Test Fixes ([548cf6e](https://github.com/0xs34n/starknet.js/commit/548cf6e69d16292b9c216493c77e1c7a14be2ae9))
+- getCode removed from RPC 0.1.0 ([744a988](https://github.com/0xs34n/starknet.js/commit/744a9882c363331ff47f409971cacbfda977c4c2))
+- merge ([67d87fc](https://github.com/0xs34n/starknet.js/commit/67d87fc834ea5b877029445f39782457584fb4ec))
+- naming ([0c75f6f](https://github.com/0xs34n/starknet.js/commit/0c75f6f431c3828b1078d955123b2d13aef6b5d0))
+- restore GetCode to common interface for backward compatibility ([52f8e61](https://github.com/0xs34n/starknet.js/commit/52f8e61797a3f2390577b3a6e977adae11346a23))
+- rpc 0.1.0 getStorageAt ([c622913](https://github.com/0xs34n/starknet.js/commit/c6229138c57cd9a04b982c386c7278d63b931a1f))
+- **RpcProvider:** update of RpcProvider getBlock method to work with v0.3.0 of pathfinder ([3b12421](https://github.com/0xs34n/starknet.js/commit/3b124219dd25ef5a0c81583fcfe67d6a3cc5a70e))
+- test getBlock('latest') ([2c92f79](https://github.com/0xs34n/starknet.js/commit/2c92f79aefe3af68834aa9a9a16754c0ff4116cc))
+- test getBlock(latest) ([0c5e31e](https://github.com/0xs34n/starknet.js/commit/0c5e31effb63bf7afb26c9f2049b66c93c6b1366))
+- unoptimise getClassAt test to work with integration ([e98220b](https://github.com/0xs34n/starknet.js/commit/e98220bc6e6fff55bc439773bd1258844de312e2))
+
 # [4.3.0](https://github.com/0xs34n/starknet.js/compare/v4.2.0...v4.3.0) (2022-08-09)
 
 ### Bug Fixes
 
-- intendations in provider.md ([4a310c6](https://github.com/0xs34n/starknet.js/commit/4a310c6c992c77f9f6729a70c1af14481cd891f7))
+- indentations in provider.md ([4a310c6](https://github.com/0xs34n/starknet.js/commit/4a310c6c992c77f9f6729a70c1af14481cd891f7))
 - **sequenceProvider:** feedergatewayUrl and gatewayUrl ([e236d23](https://github.com/0xs34n/starknet.js/commit/e236d2352e3fbb0f78965decac5893217347ceb7))
 
 ### Features

package/__tests__/defaultProvider.test.ts

@@ -50,11 +50,11 @@ describe('defaultProvider', () => {
     test('getBlock(blockIdentifier=latest)', async () => {
       expect(exampleBlock).not.toBeNull();
 
-      const { block_number, accepted_time } = exampleBlock;
+      const { block_number, timestamp } = exampleBlock;
 
       expect(typeof block_number).toEqual('number');
 
-      return expect(typeof accepted_time).toEqual('number');
+      return expect(typeof timestamp).toEqual('number');
     });
 
     test('getBlock() -> { blockNumber }', async () => {
@@ -62,11 +62,6 @@ describe('defaultProvider', () => {
       return expect(block).toHaveProperty('block_number');
     });
 
-    test('getCode() -> { bytecode }', async () => {
-      const code = await testProvider.getCode(exampleContractAddress);
-      return expect(Array.isArray(code.bytecode)).toBe(true);
-    });
-
     describe('getStorageAt', () => {
       test('with "key" type of number', () => {
         return expect(testProvider.getStorageAt(exampleContractAddress, 0)).resolves.not.toThrow();
@@ -144,7 +139,7 @@ describe('defaultProvider', () => {
 
   describeIfNotDevnet('Provider', () => {
     const provider = getTestProvider();
-    describe(`Provider methods`, () => {
+    describe(`Provider methods if not devnet`, () => {
       describe('getBlock', () => {
         test('pending', async () => {
           const latestBlock = await provider.getBlock();
@@ -152,11 +147,8 @@ describe('defaultProvider', () => {
           expect(latestBlock).toHaveProperty('parent_hash');
           expect(latestBlock).toHaveProperty('block_number');
           expect(latestBlock).toHaveProperty('status');
-          expect(latestBlock).toHaveProperty('sequencer');
           expect(latestBlock).toHaveProperty('new_root');
-          expect(latestBlock).toHaveProperty('old_root');
-          expect(latestBlock).toHaveProperty('accepted_time');
-          expect(latestBlock).toHaveProperty('gas_price');
+          expect(latestBlock).toHaveProperty('timestamp');
           expect(latestBlock).toHaveProperty('transactions');
           expect(Array.isArray(latestBlock.transactions)).toBe(true);
         });
@@ -170,11 +162,8 @@ describe('defaultProvider', () => {
           expect(block).toHaveProperty('parent_hash');
           expect(block).toHaveProperty('block_number');
           expect(block).toHaveProperty('status');
-          expect(block).toHaveProperty('sequencer');
           expect(block).toHaveProperty('new_root');
-          expect(block).toHaveProperty('old_root');
-          expect(block).toHaveProperty('accepted_time');
-          expect(block).toHaveProperty('gas_price');
+          expect(block).toHaveProperty('timestamp');
           expect(block).toHaveProperty('transactions');
           expect(Array.isArray(block.transactions)).toBe(true);
         });
@@ -185,11 +174,8 @@ describe('defaultProvider', () => {
           expect(block).toHaveProperty('parent_hash');
           expect(block).toHaveProperty('block_number');
           expect(block).toHaveProperty('status');
-          expect(block).toHaveProperty('sequencer');
           expect(block).toHaveProperty('new_root');
-          expect(block).toHaveProperty('old_root');
-          expect(block).toHaveProperty('accepted_time');
-          expect(block).toHaveProperty('gas_price');
+          expect(block).toHaveProperty('timestamp');
           expect(block).toHaveProperty('transactions');
           expect(Array.isArray(block.transactions)).toBe(true);
         });
@@ -199,7 +185,7 @@ describe('defaultProvider', () => {
         test('pending', async () => {
           const storage = await provider.getStorageAt(
             '0x01d1f307c073bb786a66e6e042ec2a9bdc385a3373bb3738d95b966d5ce56166',
-            0
+            '0'
           );
           expect(typeof storage).toBe('string');
         });
@@ -207,7 +193,7 @@ describe('defaultProvider', () => {
         test('Block Hash 0x7104702055c2a5773a870ceada9552ec659d69c18053b14078983f07527dea8', async () => {
           const storage = await provider.getStorageAt(
             '0x01d1f307c073bb786a66e6e042ec2a9bdc385a3373bb3738d95b966d5ce56166',
-            0,
+            '0',
             '0x7225762c7ff5e7e5f0867f0a8e73594df4f44f05a65375339a76398e8ae3e64'
           );
           expect(typeof storage).toBe('string');
@@ -245,7 +231,6 @@ describe('defaultProvider', () => {
           expect(transaction.max_fee).toBeTruthy();
           expect(transaction.transaction_hash).toBeTruthy();
           expect(transaction).toHaveProperty('nonce');
-          expect(transaction).toHaveProperty('sender_address');
           expect(transaction).toHaveProperty('version');
         });
       });
@@ -269,6 +254,7 @@ describe('defaultProvider', () => {
         let contractAddress: string;
         let deployResponse: DeployContractResponse;
         let declareResponse: DeclareContractResponse;
+        let blockNumber: BlockNumber;
 
         beforeAll(async () => {
           deployResponse = await provider.deployContract({ contract: compiledErc20 });
@@ -278,6 +264,7 @@ describe('defaultProvider', () => {
             provider.waitForTransaction(deployResponse.transaction_hash),
             provider.waitForTransaction(declareResponse.transaction_hash),
           ]);
+          ({ block_number: blockNumber } = await provider.getBlock('latest'));
         });
 
         describe('deployContract', () => {
@@ -296,7 +283,7 @@ describe('defaultProvider', () => {
 
         describe('getClassAt', () => {
           test('response', async () => {
-            const classResponse = await provider.getClassAt(contractAddress);
+            const classResponse = await provider.getClassAt(contractAddress, blockNumber);
 
             expect(classResponse).toHaveProperty('program');
             expect(classResponse).toHaveProperty('entry_points_by_type');

package/__tests__/rpcProvider.test.ts

@@ -2,15 +2,15 @@ import { RpcProvider } from '../src';
 import { describeIfRpc, getTestProvider } from './fixtures';
 
 describeIfRpc('RPCProvider', () => {
-  let provider: RpcProvider;
+  let rpcProvider: RpcProvider;
 
   beforeAll(async () => {
-    provider = getTestProvider() as RpcProvider;
+    rpcProvider = getTestProvider() as RpcProvider;
   });
 
   describe('RPC methods', () => {
     test('getChainId', async () => {
-      const chainId = await provider.getChainId();
+      const chainId = await rpcProvider.getChainId();
       expect(chainId).toBe('0x534e5f474f45524c49');
     });
   });

package/__tests__/sequencerProvider.test.ts

@@ -7,9 +7,11 @@ import {
   getTestProvider,
 } from './fixtures';
 
+// Run only if Devnet Sequencer
 describeIfSequencer('SequencerProvider', () => {
   let provider: SequencerProvider;
   let customSequencerProvider: Provider;
+  let exampleContractAddress: string;
 
   beforeAll(async () => {
     provider = getTestProvider() as SequencerProvider;
@@ -26,11 +28,12 @@ describeIfSequencer('SequencerProvider', () => {
     let exampleTransactionHash: string;
 
     beforeAll(async () => {
-      const { transaction_hash } = await provider.deployContract({
+      const { transaction_hash, contract_address } = await provider.deployContract({
         contract: compiledErc20,
       });
       await provider.waitForTransaction(transaction_hash);
       exampleTransactionHash = transaction_hash;
+      exampleContractAddress = contract_address;
     });
 
     test('getTransactionStatus()', async () => {
@@ -43,6 +46,11 @@ describeIfSequencer('SequencerProvider', () => {
       expect(transactionTrace).toHaveProperty('signature');
     });
 
+    test('getCode() -> { bytecode }', async () => {
+      const code = await provider.getCode(exampleContractAddress);
+      return expect(Array.isArray(code.bytecode)).toBe(true);
+    });
+
     describeIfNotDevnet('which are not available on devnet', () => {
       test('getContractAddresses()', async () => {
         const { GpsStatementVerifier, Starknet } = await provider.getContractAddresses();

package/dist/provider/default.d.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import { BlockTag, Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import { Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
 import { RpcProviderOptions } from './rpc';
@@ -16,7 +16,7 @@ export declare class Provider implements ProviderInterface {
     getBlock(blockIdentifier?: BlockIdentifier): Promise<GetBlockResponse>;
     getClassAt(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<ContractClass>;
     getEstimateFee(invocation: Invocation, blockIdentifier?: BlockIdentifier, invocationDetails?: InvocationsDetails): Promise<EstimateFeeResponse>;
-    getStorageAt(contractAddress: string, key: BigNumberish, blockTagOrHash?: BlockTag | BigNumberish): Promise<BigNumberish>;
+    getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
     getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
     getTransactionReceipt(txHash: BigNumberish): Promise<GetTransactionReceiptResponse>;
     callContract(request: Call, blockIdentifier?: BlockIdentifier): Promise<CallContractResponse>;

package/dist/provider/default.js

@@ -86,11 +86,11 @@ var Provider = /** @class */ (function () {
             });
         });
     };
-    Provider.prototype.getStorageAt = function (contractAddress, key, blockTagOrHash) {
-        if (blockTagOrHash === void 0) { blockTagOrHash = 'pending'; }
+    Provider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.provider.getStorageAt(contractAddress, key, blockTagOrHash)];
+                return [2 /*return*/, this.provider.getStorageAt(contractAddress, key, blockIdentifier)];
             });
         });
     };

package/dist/provider/interface.d.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import type { BlockTag, Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import type { Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
 import type { BigNumberish } from '../utils/number';
 import { BlockIdentifier } from './utils';
 export declare abstract class ProviderInterface {
@@ -19,6 +19,9 @@ export declare abstract class ProviderInterface {
      * @returns the block object
      */
     abstract getBlock(blockIdentifier: BlockIdentifier): Promise<GetBlockResponse>;
+    /**
+     * @deprecated The method should not be used
+     */
     abstract getCode(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<GetCodeResponse>;
     /**
      * Gets the contract class of the deployed contract.
@@ -33,10 +36,10 @@ export declare abstract class ProviderInterface {
      *
      * @param contractAddress
      * @param key - from getStorageVarAddress('<STORAGE_VARIABLE_NAME>') (WIP)
-     * @param blockHashOrTag - block hash or tag (pending, latest)
+     * @param blockIdentifier - block identifier
      * @returns the value of the storage variable
      */
-    abstract getStorageAt(contractAddress: string, key: BigNumberish, blockHashOrTag?: BlockTag | BigNumberish): Promise<BigNumberish>;
+    abstract getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier: BlockIdentifier): Promise<BigNumberish>;
     /**
      * Gets the transaction information from a tx id.
      *

package/dist/provider/rpc.d.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import { BlockTag, Call, CallContractResponse, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import { Call, CallContractResponse, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetCodeResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
 import { RPC } from '../types/api';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
@@ -15,16 +15,21 @@ export declare class RpcProvider implements ProviderInterface {
     protected fetchEndpoint<T extends keyof RPC.Methods>(method: T, request?: RPC.Methods[T]['REQUEST']): Promise<RPC.Methods[T]['RESPONSE']>;
     getChainId(): Promise<StarknetChainId>;
     getBlock(blockIdentifier?: BlockIdentifier): Promise<GetBlockResponse>;
-    getStorageAt(contractAddress: string, key: BigNumberish, blockHashOrTag?: BlockTag | BigNumberish): Promise<BigNumberish>;
+    getBlockWithTxHashes(blockIdentifier?: BlockIdentifier): Promise<RPC.GetBlockWithTxHashesResponse>;
+    getBlockWithTxs(blockIdentifier?: BlockIdentifier): Promise<RPC.GetBlockWithTxs>;
+    getNonce(contractAddress: string): Promise<any>;
+    getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
     getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
+    getTransactionByHash(txHash: BigNumberish): Promise<RPC.GetTransactionByHashResponse>;
+    getTransactionByBlockIdAndIndex(blockIdentifier: BlockIdentifier, index: number): Promise<RPC.GetTransactionByBlockIdAndIndex>;
     getTransactionReceipt(txHash: BigNumberish): Promise<GetTransactionReceiptResponse>;
-    getClassAt(contractAddress: string, _blockIdentifier?: BlockIdentifier): Promise<any>;
+    getClassAt(contractAddress: string, blockIdentifier: BlockIdentifier): Promise<any>;
     getEstimateFee(invocation: Invocation, blockIdentifier?: BlockIdentifier, invocationDetails?: InvocationsDetails): Promise<EstimateFeeResponse>;
     declareContract({ contract, version, }: DeclareContractPayload): Promise<DeclareContractResponse>;
     deployContract({ contract, constructorCalldata, addressSalt, }: DeployContractPayload): Promise<DeployContractResponse>;
     invokeFunction(functionInvocation: Invocation, details: InvocationsDetails): Promise<InvokeFunctionResponse>;
     callContract(call: Call, blockIdentifier?: BlockIdentifier): Promise<CallContractResponse>;
-    getCode(contractAddress: string, _blockIdentifier?: BlockIdentifier): Promise<RPC.GetCodeResponse>;
+    getCode(_contractAddress: string, _blockIdentifier?: BlockIdentifier): Promise<GetCodeResponse>;
     waitForTransaction(txHash: BigNumberish, retryInterval?: number): Promise<void>;
     /**
      * Gets the transaction count from a block.

package/dist/provider/rpc.js

@@ -47,6 +47,7 @@ var number_1 = require("../utils/number");
 var provider_1 = require("../utils/provider");
 var rpc_1 = require("../utils/responseParser/rpc");
 var stark_1 = require("../utils/stark");
+var utils_1 = require("./utils");
 var RpcProvider = /** @class */ (function () {
     function RpcProvider(optionsOrProvider) {
         var _this = this;
@@ -112,36 +113,78 @@ var RpcProvider = /** @class */ (function () {
             });
         });
     };
+    // Common Interface
     RpcProvider.prototype.getBlock = function (blockIdentifier) {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
-            var method;
             return __generator(this, function (_a) {
-                method = typeof blockIdentifier === 'string' && (0, number_1.isHex)(blockIdentifier)
-                    ? 'starknet_getBlockByHash'
-                    : 'starknet_getBlockByNumber';
-                return [2 /*return*/, this.fetchEndpoint(method, [blockIdentifier]).then(this.responseParser.parseGetBlockResponse)];
+                return [2 /*return*/, this.getBlockWithTxHashes(blockIdentifier).then(this.responseParser.parseGetBlockResponse)];
             });
         });
     };
-    RpcProvider.prototype.getStorageAt = function (contractAddress, key, blockHashOrTag) {
-        if (blockHashOrTag === void 0) { blockHashOrTag = 'pending'; }
+    RpcProvider.prototype.getBlockWithTxHashes = function (blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
+        return __awaiter(this, void 0, void 0, function () {
+            var blockIdentifierGetter;
+            return __generator(this, function (_a) {
+                blockIdentifierGetter = new utils_1.BlockIdentifierClass(blockIdentifier);
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxHashes', [
+                        blockIdentifierGetter.getIdentifier(),
+                    ])];
+            });
+        });
+    };
+    RpcProvider.prototype.getBlockWithTxs = function (blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
+        return __awaiter(this, void 0, void 0, function () {
+            var blockIdentifierGetter;
+            return __generator(this, function (_a) {
+                blockIdentifierGetter = new utils_1.BlockIdentifierClass(blockIdentifier);
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockWithTxs', [blockIdentifierGetter.getIdentifier()])];
+            });
+        });
+    };
+    RpcProvider.prototype.getNonce = function (contractAddress) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.fetchEndpoint('starknet_getNonce', [contractAddress])];
+            });
+        });
+    };
+    RpcProvider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
-            var parsedKey;
+            var parsedKey, blockIdentifierGetter;
             return __generator(this, function (_a) {
                 parsedKey = (0, number_1.toHex)((0, number_1.toBN)(key));
+                blockIdentifierGetter = new utils_1.BlockIdentifierClass(blockIdentifier);
                 return [2 /*return*/, this.fetchEndpoint('starknet_getStorageAt', [
                         contractAddress,
                         parsedKey,
-                        blockHashOrTag,
+                        blockIdentifierGetter.getIdentifier(),
                     ])];
             });
         });
     };
+    // common interface
     RpcProvider.prototype.getTransaction = function (txHash) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByHash', [txHash]).then(this.responseParser.parseGetTransactionResponse)];
+                return [2 /*return*/, this.getTransactionByHash(txHash).then(this.responseParser.parseGetTransactionResponse)];
+            });
+        });
+    };
+    RpcProvider.prototype.getTransactionByHash = function (txHash) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByHash', [txHash])];
+            });
+        });
+    };
+    RpcProvider.prototype.getTransactionByBlockIdAndIndex = function (blockIdentifier, index) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.fetchEndpoint('starknet_getTransactionByHash', [blockIdentifier, index])];
             });
         });
     };
@@ -152,11 +195,15 @@ var RpcProvider = /** @class */ (function () {
             });
         });
     };
-    RpcProvider.prototype.getClassAt = function (contractAddress, _blockIdentifier) {
-        if (_blockIdentifier === void 0) { _blockIdentifier = 'pending'; }
+    RpcProvider.prototype.getClassAt = function (contractAddress, blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
+            var blockIdentifierGetter;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('starknet_getClassAt', [contractAddress])];
+                blockIdentifierGetter = new utils_1.BlockIdentifierClass(blockIdentifier);
+                return [2 /*return*/, this.fetchEndpoint('starknet_getClassAt', [
+                        blockIdentifierGetter.getIdentifier(),
+                        contractAddress,
+                    ])];
             });
         });
     };
@@ -248,16 +295,10 @@ var RpcProvider = /** @class */ (function () {
             });
         });
     };
-    RpcProvider.prototype.getCode = function (contractAddress, _blockIdentifier) {
+    RpcProvider.prototype.getCode = function (_contractAddress, _blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
-            var result;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.fetchEndpoint('starknet_getCode', [contractAddress])];
-                    case 1:
-                        result = _a.sent();
-                        return [2 /*return*/, this.responseParser.parseGetCodeResponse(result)];
-                }
+                throw new Error('RPC 0.1.0 does not implement getCode function');
             });
         });
     };
@@ -325,11 +366,12 @@ var RpcProvider = /** @class */ (function () {
      */
     RpcProvider.prototype.getTransactionCount = function (blockIdentifier) {
         return __awaiter(this, void 0, void 0, function () {
+            var blockIdentifierGetter;
             return __generator(this, function (_a) {
-                if (typeof blockIdentifier === 'number') {
-                    return [2 /*return*/, this.fetchEndpoint('starknet_getBlockTransactionCountByNumber', [blockIdentifier])];
-                }
-                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockTransactionCountByHash', [blockIdentifier])];
+                blockIdentifierGetter = new utils_1.BlockIdentifierClass(blockIdentifier);
+                return [2 /*return*/, this.fetchEndpoint('starknet_getBlockTransactionCount', [
+                        blockIdentifierGetter.getIdentifier(),
+                    ])];
             });
         });
     };

package/dist/provider/sequencer.d.ts

@@ -1,5 +1,5 @@
 import { StarknetChainId } from '../constants';
-import { BlockTag, Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
+import { Call, CallContractResponse, ContractClass, DeclareContractPayload, DeclareContractResponse, DeployContractPayload, DeployContractResponse, EstimateFeeResponse, GetBlockResponse, GetTransactionReceiptResponse, GetTransactionResponse, Invocation, InvocationsDetails, InvokeFunctionResponse } from '../types';
 import { GetContractAddressesResponse, GetTransactionStatusResponse, GetTransactionTraceResponse, Sequencer } from '../types/api';
 import { BigNumberish } from '../utils/number';
 import { ProviderInterface } from './interface';
@@ -29,7 +29,7 @@ export declare class SequencerProvider implements ProviderInterface {
     protected fetchEndpoint<T extends keyof Sequencer.Endpoints>(endpoint: T, ...[query, request]: Sequencer.Endpoints[T]['QUERY'] extends never ? Sequencer.Endpoints[T]['REQUEST'] extends never ? [] : [undefined, Sequencer.Endpoints[T]['REQUEST']] : Sequencer.Endpoints[T]['REQUEST'] extends never ? [Sequencer.Endpoints[T]['QUERY']] : [Sequencer.Endpoints[T]['QUERY'], Sequencer.Endpoints[T]['REQUEST']]): Promise<Sequencer.Endpoints[T]['RESPONSE']>;
     callContract({ contractAddress, entrypoint: entryPointSelector, calldata }: Call, blockIdentifier?: BlockIdentifier): Promise<CallContractResponse>;
     getBlock(blockIdentifier?: BlockIdentifier): Promise<GetBlockResponse>;
-    getStorageAt(contractAddress: string, key: BigNumberish, blockHashOrTag?: BlockTag | BigNumberish): Promise<BigNumberish>;
+    getStorageAt(contractAddress: string, key: BigNumberish, blockIdentifier?: BlockIdentifier): Promise<BigNumberish>;
     getTransaction(txHash: BigNumberish): Promise<GetTransactionResponse>;
     getTransactionReceipt(txHash: BigNumberish): Promise<GetTransactionReceiptResponse>;
     getClassAt(contractAddress: string, blockIdentifier?: BlockIdentifier): Promise<ContractClass>;

package/dist/provider/sequencer.js

@@ -249,14 +249,14 @@ var SequencerProvider = /** @class */ (function () {
             });
         });
     };
-    SequencerProvider.prototype.getStorageAt = function (contractAddress, key, blockHashOrTag) {
-        if (blockHashOrTag === void 0) { blockHashOrTag = 'pending'; }
+    SequencerProvider.prototype.getStorageAt = function (contractAddress, key, blockIdentifier) {
+        if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
             var parsedKey;
             return __generator(this, function (_a) {
                 parsedKey = (0, number_1.toBN)(key).toString(10);
                 return [2 /*return*/, this.fetchEndpoint('get_storage_at', {
-                        blockIdentifier: blockHashOrTag,
+                        blockIdentifier: blockIdentifier,
                         contractAddress: contractAddress,
                         key: parsedKey,
                     })];
@@ -359,7 +359,7 @@ var SequencerProvider = /** @class */ (function () {
         if (blockIdentifier === void 0) { blockIdentifier = 'pending'; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.fetchEndpoint('get_code', { contractAddress: contractAddress, blockIdentifier: blockIdentifier }).then(this.responseParser.parseGetCodeResponse)];
+                return [2 /*return*/, this.fetchEndpoint('get_code', { contractAddress: contractAddress, blockIdentifier: blockIdentifier })];
             });
         });
     };

package/dist/provider/utils.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import type { BlockNumber } from '../types';
 import { BigNumberish } from '../utils/number';
 /**
@@ -23,6 +24,17 @@ declare type BlockIdentifierObject = {
     type: 'BLOCK_HASH';
     data: BigNumberish;
 };
+export declare class BlockIdentifierClass {
+    blockIdentifier: BlockIdentifier;
+    constructor(blockIdentifier: BlockIdentifier);
+    getIdentifier(): string | import("bn.js") | {
+        block_hash: string;
+        block_number?: undefined;
+    } | {
+        block_number: number;
+        block_hash?: undefined;
+    } | null;
+}
 /**
  * Identifies the block to be queried.
  *

package/dist/provider/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFormattedBlockIdentifier = exports.getBlockIdentifier = exports.txIdentifier = exports.formatHash = void 0;
+exports.getFormattedBlockIdentifier = exports.getBlockIdentifier = exports.BlockIdentifierClass = exports.txIdentifier = exports.formatHash = void 0;
 var number_1 = require("../utils/number");
 /**
  *
@@ -29,6 +29,22 @@ function txIdentifier(txHash, txId) {
     return "transactionHash=".concat(hashString);
 }
 exports.txIdentifier = txIdentifier;
+var BlockIdentifierClass = /** @class */ (function () {
+    function BlockIdentifierClass(blockIdentifier) {
+        this.blockIdentifier = blockIdentifier;
+    }
+    BlockIdentifierClass.prototype.getIdentifier = function () {
+        if (typeof this.blockIdentifier === 'string' && (0, number_1.isHex)(this.blockIdentifier)) {
+            return { block_hash: this.blockIdentifier };
+        }
+        if (typeof this.blockIdentifier === 'number') {
+            return { block_number: this.blockIdentifier };
+        }
+        return this.blockIdentifier;
+    };
+    return BlockIdentifierClass;
+}());
+exports.BlockIdentifierClass = BlockIdentifierClass;
 /**
  * Identifies the block to be queried.
  *