feat(account): adding new transaction version for fee estimation

starknet-io · Apr 7, 2022 · 2f7cb3f · 2f7cb3f
1 parent d63deb2
commit 2f7cb3f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/account/default.ts b/src/account/default.ts
@@ -17,6 +17,7 @@ import {
 import { sign } from '../utils/ellipticCurve';
 import {
   computeHashOnElements,
+  feeTransactionVersion,
   getSelectorFromName,
   transactionPrefix,
   transactionVersion,
@@ -56,10 +57,12 @@ export class Account extends Provider implements AccountInterface {
   ): Promise<EstimateFeeResponse> {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = providedNonce ?? (await this.getNonce());
+    const version = toBN(feeTransactionVersion);
     const signerDetails = {
       walletAddress: this.address,
       nonce: toBN(nonce),
       maxFee: toBN('0'),
+      txVersion: version,
     };
     const signature = await this.signer.signTransaction(transactions, signerDetails);
 
@@ -71,6 +74,7 @@ export class Account extends Provider implements AccountInterface {
         contract_address: this.address,
         entry_point_selector: getSelectorFromName('__execute__'),
         calldata,
+        version: toHex(version),
         signature: bigNumberishArrayToDecimalStringArray(signature),
       }
     );
@@ -97,6 +101,7 @@ export class Account extends Provider implements AccountInterface {
       walletAddress: this.address,
       nonce,
       maxFee,
+      txVersion: toBN(transactionVersion),
     };
 
     const signature = await this.signer.signTransaction(transactions, signerDetails, abis);

diff --git a/src/signer/default.ts b/src/signer/default.ts
@@ -29,7 +29,8 @@ export class Signer implements SignerInterface {
       transactionsDetail.walletAddress,
       transactions,
       transactionsDetail.nonce.toString(),
-      transactionsDetail.maxFee.toString()
+      transactionsDetail.maxFee.toString(),
+      transactionsDetail.txVersion.toString()
     );
 
     return sign(this.keyPair, msgHash);

diff --git a/src/types/api.ts b/src/types/api.ts
@@ -105,6 +105,7 @@ export type InvokeFunctionTransaction = {
   calldata?: RawCalldata;
   nonce?: BigNumberish;
   max_fee?: BigNumberish;
+  version?: BigNumberish;
 };
 
 export type InvokeFunctionTrace = {

diff --git a/src/types/lib.ts b/src/types/lib.ts
@@ -24,6 +24,7 @@ export type Call = Omit<Invocation, 'signature'>;
 export type InvocationsDetails = {
   nonce?: BigNumberish;
   maxFee?: BigNumberish;
+  txVersion?: BigNumberish;
 };
 
 export type Status =

diff --git a/src/utils/hash.ts b/src/utils/hash.ts
@@ -11,6 +11,7 @@ import { encodeShortString } from './shortString';
 
 export const transactionPrefix = encodeShortString('StarkNet Transaction');
 export const transactionVersion = 0;
+export const feeTransactionVersion = toBN(2).pow(toBN(128)).add(toBN(transactionVersion));
 
 function keccakHex(value: string): string {
   return addHexPrefix(buf2hex(keccak256(utf8ToArray(value))));
@@ -68,7 +69,8 @@ export function hashMulticall(
   account: string,
   transactions: Call[],
   nonce: string,
-  maxFee: string
+  maxFee: string,
+  txVersion: string | number = transactionVersion
 ) {
   const hashArray = transactions
     .map(({ contractAddress, entrypoint, calldata }) => [
@@ -85,6 +87,6 @@ export function hashMulticall(
     computeHashOnElements(hashArray),
     nonce,
     maxFee,
-    transactionVersion,
+    txVersion,
   ]);
 }