fix: prevent undefined rpc chainId in account

starknet-io · Sep 8, 2022 · 9f69229 · 9f69229
1 parent d81f24d
commit 9f69229
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/account/default.ts b/src/account/default.ts
@@ -1,4 +1,4 @@
-import { ZERO } from '../constants';
+import { StarknetChainId, ZERO } from '../constants';
 import { ProviderInterface, ProviderOptions } from '../provider';
 import { Provider } from '../provider/default';
 import { Signer, SignerInterface } from '../signer';
@@ -32,6 +32,10 @@ export class Account extends Provider implements AccountInterface {
       'getPubKey' in keyPairOrSigner ? keyPairOrSigner : new Signer(keyPairOrSigner as KeyPair);
   }
 
+  public async getChainId(): Promise<StarknetChainId> {
+    return this.getChainId();
+  }
+
   public async getNonce(): Promise<string> {
     const { result } = await this.callContract({
       contractAddress: this.address,
@@ -47,13 +51,14 @@ export class Account extends Provider implements AccountInterface {
     const transactions = Array.isArray(calls) ? calls : [calls];
     const nonce = providedNonce ?? (await this.getNonce());
     const version = toBN(feeTransactionVersion);
+    const chainId = await this.getChainId();
 
     const signerDetails: InvocationsSignerDetails = {
       walletAddress: this.address,
       nonce: toBN(nonce),
       maxFee: ZERO,
       version,
-      chainId: this.chainId,
+      chainId,
     };
 
     const signature = await this.signer.signTransaction(transactions, signerDetails);
@@ -99,13 +104,14 @@ export class Account extends Provider implements AccountInterface {
     }
 
     const version = toBN(transactionVersion);
+    const chainId = await this.getChainId();
 
     const signerDetails: InvocationsSignerDetails = {
       walletAddress: this.address,
       nonce,
       maxFee,
       version,
-      chainId: this.chainId,
+      chainId,
     };
 
     const signature = await this.signer.signTransaction(transactions, signerDetails, abis);

diff --git a/src/provider/sequencer.ts b/src/provider/sequencer.ts
@@ -207,6 +207,10 @@ export class SequencerProvider implements ProviderInterface {
     }
   }
 
+  public async getChainId(): Promise<StarknetChainId> {
+    return Promise.resolve(this.chainId);
+  }
+
   public async callContract(
     { contractAddress, entrypoint: entryPointSelector, calldata = [] }: Call,
     blockIdentifier: BlockIdentifier = 'pending'