diff --git a/src/provider/rpc.ts b/src/provider/rpc.ts
index 994c17163..a89fcd4a0 100644
--- a/src/provider/rpc.ts
+++ b/src/provider/rpc.ts
@@ -325,7 +325,7 @@ export class RpcProvider implements ProviderInterface {
     const result = await this.fetchEndpoint('starknet_call', {
       request: {
         contract_address: call.contractAddress,
-        entry_point_selector: getSelectorFromName(call.entrypoint.toString()),
+        entry_point_selector: getSelectorFromName(call.entrypoint),
         calldata: parseCalldata(call.calldata),
       },
       block_id,
diff --git a/src/provider/sequencer.ts b/src/provider/sequencer.ts
index ac3c804ac..f1281486b 100644
--- a/src/provider/sequencer.ts
+++ b/src/provider/sequencer.ts
@@ -236,7 +236,7 @@ export class SequencerProvider implements ProviderInterface {
       {
         signature: [],
         contract_address: contractAddress,
-        entry_point_selector: getSelectorFromName(entryPointSelector.toString()),
+        entry_point_selector: getSelectorFromName(entryPointSelector),
         calldata,
       }
     ).then(this.responseParser.parseCallContractResponse);
diff --git a/src/types/lib.ts b/src/types/lib.ts
index b523919fd..6d009f835 100644
--- a/src/types/lib.ts
+++ b/src/types/lib.ts
@@ -37,7 +37,7 @@ export type CallDetails = {
 
 export type Invocation = CallDetails & { signature?: Signature };
 
-export type Call = CallDetails & { entrypoint: BigNumberish };
+export type Call = CallDetails & { entrypoint: string };
 
 export type InvocationsDetails = {
   nonce?: BigNumberish;
diff --git a/src/utils/hash.ts b/src/utils/hash.ts
index 42f273413..28656a184 100644
--- a/src/utils/hash.ts
+++ b/src/utils/hash.ts
@@ -156,26 +156,15 @@ export function calculateDeclareTransactionHash(
   chainId: StarknetChainId,
   nonce: BigNumberish
 ): string {
-  let calldata: BigNumberish[] = [];
-  let additionalData: BigNumberish[] = [];
-
-  if (version !== ZERO) {
-    calldata = [classHash];
-    additionalData = [nonce];
-  } else {
-    calldata = [];
-    additionalData = [classHash];
-  }
-
   return calculateTransactionHashCommon(
     TransactionHashPrefix.DECLARE,
     version,
     senderAddress,
     0,
-    calldata,
+    [classHash],
     maxFee,
     chainId,
-    additionalData
+    [nonce]
   );
 }
 
diff --git a/src/utils/transaction.ts b/src/utils/transaction.ts
index dd2ac0855..898966c62 100644
--- a/src/utils/transaction.ts
+++ b/src/utils/transaction.ts
@@ -15,7 +15,7 @@ export const transformCallsToMulticallArrays = (calls: Call[]) => {
     const data = call.calldata || [];
     callArray.push({
       to: toBN(call.contractAddress).toString(10),
-      selector: toBN(getSelectorFromName(call.entrypoint.toString())).toString(10),
+      selector: toBN(getSelectorFromName(call.entrypoint)).toString(10),
       data_offset: calldata.length.toString(),
       data_len: data.length.toString(),
     });