feat: account deployContract ts overide base class

starknet-io · Nov 25, 2022 · dd4502d · dd4502d
1 parent f695629
commit dd4502d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/__tests__/account.test.ts b/__tests__/account.test.ts
@@ -180,7 +180,7 @@ describe('deploy and test Wallet', () => {
     });
 
     test('UDC DeployContract', async () => {
-      const deployResponse = await account.deployContract2({
+      const deployResponse = await account.deployContract({
         classHash: erc20ClassHash,
         constructorCalldata: [
           encodeShortString('Token'),

diff --git a/src/account/default.ts b/src/account/default.ts
@@ -7,8 +7,8 @@ import {
   Abi,
   Call,
   DeclareContractResponse,
-  DeployContract2Response,
   DeployContractResponse,
+  DeployContractUDCResponse,
   EstimateFeeAction,
   InvocationsDetails,
   InvocationsSignerDetails,
@@ -327,10 +327,10 @@ export class Account extends Provider implements AccountInterface {
    * @param detials InvocationsDetails
    * @returns Promise<AccountDeployContractResponse>
    */
-  public async deployContract2(
+  public async deployContract(
     payload: UniversalDeployerContractPayload,
     details: InvocationsDetails = {}
-  ): Promise<DeployContract2Response> {
+  ): Promise<DeployContractUDCResponse> {
     const deployTx = await this.deploy(payload, details);
     const txReceipt = await this.waitForTransaction(deployTx.transaction_hash);
     return parseUDCEvent(txReceipt);
@@ -342,7 +342,7 @@ export class Account extends Provider implements AccountInterface {
   ) {
     const { transaction_hash } = await this.declare({ contract, classHash }, details);
     const declare = await this.waitForTransaction(transaction_hash);
-    const deploy = await this.deployContract2({ classHash, constructorCalldata }, details);
+    const deploy = await this.deployContract({ classHash, constructorCalldata }, details);
     return { declare: { ...declare, class_hash: classHash }, deploy };
   }
 

diff --git a/src/account/interface.ts b/src/account/interface.ts
@@ -7,6 +7,7 @@ import {
   DeclareContractResponse,
   DeclareDeployContractResponse,
   DeployContractResponse,
+  DeployContractUDCResponse,
   EstimateFeeAction,
   EstimateFeeDetails,
   EstimateFeeResponse,
@@ -164,6 +165,18 @@ export abstract class AccountInterface extends ProviderInterface {
     transactionsDetail?: InvocationsDetails
   ): Promise<InvokeFunctionResponse>;
 
+  /**
+   * Simplify deploy simulating old DeployContract with same response + UDC specific response
+   *
+   * @param payload UniversalDeployerContractPayload
+   * @param detials InvocationsDetails
+   * @returns Promise<AccountDeployContractResponse>
+   */
+  public abstract deployContract(
+    payload: UniversalDeployerContractPayload,
+    details: InvocationsDetails
+  ): Promise<DeployContractUDCResponse>;
+
   /**
    * Declares and Deploy a given compiled contract (json) to starknet using UDC
    *

diff --git a/src/provider/default.ts b/src/provider/default.ts
@@ -147,7 +147,7 @@ export class Provider implements ProviderInterface {
    * @deprecated This method won't be supported, use Account.deploy instead
    */
   public async deployContract(
-    payload: DeployContractPayload,
+    payload: DeployContractPayload | any,
     details: InvocationsDetails
   ): Promise<DeployContractResponse> {
     return this.provider.deployContract(payload, details);

diff --git a/src/provider/interface.ts b/src/provider/interface.ts
@@ -149,7 +149,7 @@ export abstract class ProviderInterface {
    * @returns a confirmation of sending a transaction on the starknet contract
    */
   public abstract deployContract(
-    payload: DeployContractPayload,
+    payload: DeployContractPayload | any,
     details?: InvocationsDetails
   ): Promise<DeployContractResponse>;
 

diff --git a/src/types/account.ts b/src/types/account.ts
@@ -18,7 +18,7 @@ export interface DeployContractResponse {
   transaction_hash: string;
 }
 
-export interface DeployContract2Response extends DeployContractResponse {
+export interface DeployContractUDCResponse extends DeployContractResponse {
   address: string;
   deployer: string;
   unique: string;
@@ -30,5 +30,5 @@ export interface DeployContract2Response extends DeployContractResponse {
 
 export type DeclareDeployContractResponse = {
   declare: DeclareTransactionReceiptResponse;
-  deploy: DeployContract2Response;
+  deploy: DeployContractUDCResponse;
 };