feat: getContractVersion and getCairoVersion by classHash, deploy_acc…

…ount and bulk action autodetect
starknet-io · Sep 23, 2023 · 54ffca4 · 54ffca4
1 parent 85bbe39
commit 54ffca4
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 19 deletions.
diff --git a/__tests__/defaultProvider.test.ts b/__tests__/defaultProvider.test.ts
@@ -45,8 +45,9 @@ describe('defaultProvider', () => {
     });
 
     test('getContractVersion', async () => {
-      const version = await testProvider.getContractVersion(erc20ContractAddress);
-      expect(version).toEqual({ cairo: '0', compiler: '0' });
+      const expected = { cairo: '0', compiler: '0' };
+      expect(await testProvider.getContractVersion(erc20ContractAddress)).toEqual(expected);
+      expect(await testProvider.getContractVersion(undefined, erc20ClassHash)).toEqual(expected);
     });
 
     describe('getBlock', () => {

diff --git a/src/account/default.ts b/src/account/default.ts
@@ -100,12 +100,17 @@ export class Account extends Provider implements AccountInterface {
 
   /**
    * Async Get cairo version (auto set it, if not set by user)
-   * @param version CairoVersion
+   * @param classHash (optional) string - if provided detect cairoVersion from classHash
    */
-  public async getCairoVersion() {
+  public async getCairoVersion(classHash?: string) {
     if (!this.cairoVersion) {
-      const { cairo } = await super.getContractVersion(this.address);
-      this.cairoVersion = cairo;
+      if (classHash) {
+        const { cairo } = await super.getContractVersion(undefined, classHash);
+        this.cairoVersion = cairo;
+      } else {
+        const { cairo } = await super.getContractVersion(this.address);
+        this.cairoVersion = cairo;
+      }
     }
     return this.cairoVersion;
   }
@@ -167,7 +172,7 @@ export class Account extends Provider implements AccountInterface {
         version,
         walletAddress: this.address,
         maxFee: ZERO,
-        cairoVersion: await this.getCairoVersion(),
+        cairoVersion: undefined, // unused parameter
       }
     );
 
@@ -204,9 +209,9 @@ export class Account extends Provider implements AccountInterface {
         nonce,
         chainId,
         version,
-        walletAddress: this.address,
+        walletAddress: this.address, // unused parameter
         maxFee: ZERO,
-        cairoVersion: await this.getCairoVersion(),
+        cairoVersion: undefined, // unused parameter
       }
     );
 
@@ -354,7 +359,7 @@ export class Account extends Provider implements AccountInterface {
     const declareContractTransaction = await this.buildDeclarePayload(declareContractPayload, {
       ...details,
       walletAddress: this.address,
-      cairoVersion: await this.getCairoVersion(),
+      cairoVersion: await this.getCairoVersion(), // unused parameter
     });
 
     return this.declareContract(declareContractTransaction, details);
@@ -659,18 +664,26 @@ export class Account extends Provider implements AccountInterface {
     const version = versions[0];
     const safeNonce = await this.getNonceSafe(nonce);
     const chainId = await this.getChainId();
+    let newAccClassHash: string;
 
     return Promise.all(
       ([] as Invocations).concat(invocations).map(async (transaction, index: number) => {
+        const txPayload: any = 'payload' in transaction ? transaction.payload : transaction;
+        // BULK ACTION FROM NEW ACCOUNT START WITH DEPLOY_ACCOUNT
+        if (index === 0 && transaction.type === TransactionType.DEPLOY_ACCOUNT) {
+          newAccClassHash = txPayload.classHash;
+        }
+
         const signerDetails: InvocationsSignerDetails = {
           walletAddress: this.address,
           nonce: toBigInt(Number(safeNonce) + index),
           maxFee: ZERO,
           version,
           chainId,
-          cairoVersion: await this.getCairoVersion(),
+          cairoVersion: newAccClassHash
+            ? await this.getCairoVersion(newAccClassHash)
+            : await this.getCairoVersion(),
         };
-        const txPayload: any = 'payload' in transaction ? transaction.payload : transaction;
         const common = {
           type: transaction.type,
           version,

diff --git a/src/provider/default.ts b/src/provider/default.ts
@@ -223,7 +223,11 @@ export class Provider implements ProviderInterface {
     return getAddressFromStarkName(this, name, StarknetIdContract);
   }
 
-  public async getContractVersion(contractAddress: string, options?: getContractVersionOptions) {
-    return this.provider.getContractVersion(contractAddress, options);
+  public async getContractVersion(
+    contractAddress?: string,
+    classHash?: string,
+    options?: getContractVersionOptions
+  ) {
+    return this.provider.getContractVersion(contractAddress, classHash, options);
   }
 }
diff --git a/src/provider/interface.ts b/src/provider/interface.ts
@@ -335,13 +335,15 @@ export abstract class ProviderInterface {
 
   /**
    * Gets the contract version from the provided address
-   * @param contractAddress string
+   * @param contractAddress required if no classHash
+   * @param classHash required if no contractAddress
    * @param options - getContractVersionOptions
    *   - (optional) compiler - (default true) extract compiler version using type tactic from abi
    *   - (optional) blockIdentifier - block identifier
    */
   public abstract getContractVersion(
-    contractAddress: string,
+    contractAddress?: string,
+    classHash?: string,
     options?: getContractVersionOptions
   ): Promise<ContractVersion>;
 }
diff --git a/src/provider/rpc.ts b/src/provider/rpc.ts
@@ -256,9 +256,18 @@ export class RpcProvider implements ProviderInterface {
 
   public async getContractVersion(
     contractAddress: string,
+    classHash: string,
     { blockIdentifier = this.blockIdentifier, compiler = true }: getContractVersionOptions
   ): Promise<ContractVersion> {
-    const contractClass = await this.getClassAt(contractAddress, blockIdentifier);
+    let contractClass;
+    if (contractAddress) {
+      contractClass = await this.getClassAt(contractAddress, blockIdentifier);
+    } else if (classHash) {
+      contractClass = await this.getClass(classHash, blockIdentifier);
+    } else {
+      throw Error('getContractVersion require contractAddress or classHash');
+    }
+
     if (isSierra(contractClass)) {
       if (compiler) {
         const abiTest = getAbiContractVersion(contractClass.abi);

diff --git a/src/provider/sequencer.ts b/src/provider/sequencer.ts
@@ -346,13 +346,22 @@ export class SequencerProvider implements ProviderInterface {
   }
 
   public async getContractVersion(
-    contractAddress: string,
+    contractAddress?: string,
+    classHash?: string,
     { blockIdentifier, compiler }: getContractVersionOptions = {
       blockIdentifier: this.blockIdentifier,
       compiler: true,
     }
   ): Promise<ContractVersion> {
-    const contractClass = await this.getClassAt(contractAddress, blockIdentifier);
+    let contractClass;
+    if (contractAddress) {
+      contractClass = await this.getClassAt(contractAddress, blockIdentifier);
+    } else if (classHash) {
+      contractClass = await this.getClassByHash(classHash, blockIdentifier);
+    } else {
+      throw Error('getContractVersion require contractAddress or classHash');
+    }
+
     if (isSierra(contractClass)) {
       if (compiler) {
         const abiTest = getAbiContractVersion(contractClass.abi);