feat: minimal changes api

starknet-io · Mar 6, 2023 · 7cec344 · 7cec344
1 parent 50a2c29
commit 7cec344
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 24 deletions.
diff --git a/src/provider/interface.ts b/src/provider/interface.ts
@@ -208,7 +208,8 @@ export abstract class ProviderInterface {
   public abstract getEstimateFee(
     invocation: Invocation,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier: BlockIdentifier
+    blockIdentifier: BlockIdentifier,
+    skipValidate?: boolean
   ): Promise<EstimateFeeResponse>;
 
   /**
@@ -228,7 +229,8 @@ export abstract class ProviderInterface {
   public abstract getInvokeEstimateFee(
     invocation: Invocation,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier?: BlockIdentifier
+    blockIdentifier?: BlockIdentifier,
+    skipValidate?: boolean
   ): Promise<EstimateFeeResponse>;
 
   /**
@@ -248,7 +250,8 @@ export abstract class ProviderInterface {
   public abstract getDeclareEstimateFee(
     transaction: DeclareContractTransaction,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier?: BlockIdentifier
+    blockIdentifier?: BlockIdentifier,
+    skipValidate?: boolean
   ): Promise<EstimateFeeResponse>;
 
   /**
@@ -269,7 +272,8 @@ export abstract class ProviderInterface {
   public abstract getDeployAccountEstimateFee(
     transaction: DeployAccountContractTransaction,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier?: BlockIdentifier
+    blockIdentifier?: BlockIdentifier,
+    skipValidate?: boolean
   ): Promise<EstimateFeeResponse>;
 
   /**

diff --git a/src/provider/sequencer.ts b/src/provider/sequencer.ts
@@ -359,7 +359,7 @@ export class SequencerProvider implements ProviderInterface {
   ): Promise<InvokeFunctionResponse> {
     return this.fetchEndpoint('add_transaction', undefined, {
       type: TransactionType.INVOKE,
-      contract_address: functionInvocation.contractAddress,
+      sender_address: functionInvocation.contractAddress,
       calldata: bigNumberishArrayToDecimalStringArray(functionInvocation.calldata ?? []),
       signature: signatureToDecimalArray(functionInvocation.signature),
       nonce: toHex(details.nonce),
@@ -402,22 +402,24 @@ export class SequencerProvider implements ProviderInterface {
   public async getEstimateFee(
     invocation: Invocation,
     invocationDetails: InvocationsDetailsWithNonce,
-    blockIdentifier: BlockIdentifier = this.blockIdentifier
+    blockIdentifier: BlockIdentifier = this.blockIdentifier,
+    skipValidate: boolean = false
   ): Promise<EstimateFeeResponse> {
-    return this.getInvokeEstimateFee(invocation, invocationDetails, blockIdentifier);
+    return this.getInvokeEstimateFee(invocation, invocationDetails, blockIdentifier, skipValidate);
   }
 
   public async getInvokeEstimateFee(
     invocation: Invocation,
     invocationDetails: InvocationsDetailsWithNonce,
-    blockIdentifier: BlockIdentifier = this.blockIdentifier
+    blockIdentifier: BlockIdentifier = this.blockIdentifier,
+    skipValidate: boolean = false
   ): Promise<EstimateFeeResponse> {
     return this.fetchEndpoint(
       'estimate_fee',
-      { blockIdentifier },
+      { blockIdentifier, skip_validate: skipValidate },
       {
         type: TransactionType.INVOKE,
-        contract_address: invocation.contractAddress,
+        sender_address: invocation.contractAddress,
         calldata: invocation.calldata ?? [],
         signature: signatureToDecimalArray(invocation.signature),
         version: toHex(invocationDetails?.version || 1),
@@ -429,11 +431,12 @@ export class SequencerProvider implements ProviderInterface {
   public async getDeclareEstimateFee(
     { senderAddress, contractDefinition, signature }: DeclareContractTransaction,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier: BlockIdentifier = this.blockIdentifier
+    blockIdentifier: BlockIdentifier = this.blockIdentifier,
+    skipValidate: boolean = false
   ): Promise<EstimateFeeResponse> {
     return this.fetchEndpoint(
       'estimate_fee',
-      { blockIdentifier },
+      { blockIdentifier, skip_validate: skipValidate },
       {
         type: TransactionType.DECLARE,
         sender_address: senderAddress,
@@ -448,11 +451,12 @@ export class SequencerProvider implements ProviderInterface {
   public async getDeployAccountEstimateFee(
     { classHash, addressSalt, constructorCalldata, signature }: DeployAccountContractTransaction,
     details: InvocationsDetailsWithNonce,
-    blockIdentifier: BlockIdentifier = this.blockIdentifier
+    blockIdentifier: BlockIdentifier = this.blockIdentifier,
+    skipValidate: boolean = false
   ): Promise<EstimateFeeResponse> {
     return this.fetchEndpoint(
       'estimate_fee',
-      { blockIdentifier },
+      { blockIdentifier, skip_validate: skipValidate },
       {
         type: TransactionType.DEPLOY_ACCOUNT,
         class_hash: toHex(classHash),
@@ -474,7 +478,7 @@ export class SequencerProvider implements ProviderInterface {
       if (invocation.type === 'INVOKE_FUNCTION') {
         res = {
           type: invocation.type,
-          contract_address: invocation.contractAddress,
+          sender_address: invocation.contractAddress,
           calldata: invocation.calldata ?? [],
         };
       } else if (invocation.type === 'DECLARE') {
@@ -603,7 +607,7 @@ export class SequencerProvider implements ProviderInterface {
       { blockIdentifier },
       {
         type: 'INVOKE_FUNCTION',
-        contract_address: invocation.contractAddress,
+        sender_address: invocation.contractAddress,
         calldata: invocation.calldata ?? [],
         signature: signatureToDecimalArray(invocation.signature),
         version: toHex(invocationDetails?.version || 1),

diff --git a/src/types/api/sequencer.ts b/src/types/api/sequencer.ts
@@ -109,7 +109,7 @@ export namespace Sequencer {
 
   export type InvokeFunctionTransaction = {
     type: 'INVOKE_FUNCTION';
-    contract_address: string;
+    sender_address: string;
     signature?: string[];
     entry_point_type?: EntryPointType;
     calldata?: RawCalldata;
@@ -221,10 +221,14 @@ export namespace Sequencer {
     starknet_version: string;
   };
 
-  export type CallContractTransaction = Omit<
-    InvokeFunctionTransaction,
-    'type' | 'entry_point_type' | 'nonce'
-  > & { entry_point_selector: string };
+  export type CallContractTransaction = {
+    contract_address: string;
+    signature?: string[];
+    calldata?: RawCalldata;
+    max_fee?: BigNumberish;
+    version?: BigNumberish;
+    entry_point_selector: string;
+  };
 
   export type CallContractResponse = {
     result: string[];
@@ -386,6 +390,7 @@ export namespace Sequencer {
     estimate_fee: {
       QUERY: {
         blockIdentifier: BlockIdentifier;
+        skip_validate: boolean;
       };
       REQUEST: EstimateFeeRequest;
       RESPONSE: EstimateFeeResponse;

diff --git a/src/types/provider.ts b/src/types/provider.ts
@@ -48,7 +48,8 @@ export interface CommonTransactionResponse {
 }
 
 export interface InvokeTransactionResponse extends CommonTransactionResponse {
-  contract_address?: string;
+  contract_address?: string; // TODO: Added for RPC comp, remove when rpc update to sender_address
+  sender_address?: string;
   entry_point_selector?: string;
   calldata: RawCalldata;
 }

diff --git a/src/utils/responseParser/rpc.ts b/src/utils/responseParser/rpc.ts
@@ -46,6 +46,7 @@ export class RPCResponseParser
     return {
       calldata: res.calldata || [],
       contract_address: res.contract_address,
+      sender_address: res.contract_address,
       max_fee: res.max_fee,
       nonce: res.nonce,
       signature: res.signature || [],

diff --git a/src/utils/responseParser/sequencer.ts b/src/utils/responseParser/sequencer.ts
@@ -38,8 +38,6 @@ export class SequencerAPIResponseParser extends ResponseParser {
     return {
       ...res,
       calldata: 'calldata' in res.transaction ? (res.transaction.calldata as Array<string>) : [],
-      contract_address:
-        'contract_address' in res.transaction ? res.transaction.contract_address : undefined,
       contract_class:
         'contract_class' in res.transaction ? (res.transaction.contract_class as any) : undefined,
       entry_point_selector: