starknet 6.0.0-beta.1 → 6.0.0-beta.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [6.0.0-beta.3](https://github.com/starknet-io/starknet.js/compare/v6.0.0-beta.2...v6.0.0-beta.3) (2023-12-07)
+
+### Bug Fixes
+
+- **beta:** deploy account ([#880](https://github.com/starknet-io/starknet.js/issues/880)) ([00c58e3](https://github.com/starknet-io/starknet.js/commit/00c58e3c6d03b716b68c1b96b5a4adc1cff87dd0))
+
+# [6.0.0-beta.2](https://github.com/starknet-io/starknet.js/compare/v6.0.0-beta.1...v6.0.0-beta.2) (2023-12-07)
+
+### Features
+
+- v3 wip with est ([b95c462](https://github.com/starknet-io/starknet.js/commit/b95c462df0bd59293b7b42b5474311a3bbbfab1d))
+
 # [6.0.0-beta.1](https://github.com/starknet-io/starknet.js/compare/v5.24.4...v6.0.0-beta.1) (2023-12-06)
 
 ### Features

package/dist/index.d.ts

@@ -2979,6 +2979,8 @@ interface EstimateFeeDetails {
     nonceDataAvailabilityMode?: EDataAvailabilityMode;
     feeDataAvailabilityMode?: EDataAvailabilityMode;
     version?: BigNumberish;
+    resourceBounds?: ResourceBounds;
+    skipValidate?: boolean;
 }
 interface DeployContractResponse {
     contract_address: string;
@@ -4085,7 +4087,7 @@ declare abstract class AccountInterface extends ProviderInterface {
      * @param details -
      * - [nonce=getNonce]
      * - [version=transactionVersion]
-     * - [maxFee=getSuggestedMaxFee]
+     * - [maxFee=getSuggestedFee]
      * @returns
      * - contract_address[]
      * - transaction_hash
@@ -4103,7 +4105,7 @@ declare abstract class AccountInterface extends ProviderInterface {
      * @param details -
      * - [nonce=getNonce]
      * - [version=transactionVersion]
-     * - [maxFee=getSuggestedMaxFee]
+     * - [maxFee=getSuggestedFee]
      * @returns
      *  - contract_address
      *  - transaction_hash
@@ -4132,7 +4134,7 @@ declare abstract class AccountInterface extends ProviderInterface {
      * @param details
      * - [nonce=getNonce]
      * - [version=transactionVersion]
-     * - [maxFee=getSuggestedMaxFee]
+     * - [maxFee=getSuggestedFee]
      * @returns
      * - declare
      *    - transaction_hash
@@ -4214,7 +4216,7 @@ declare abstract class AccountInterface extends ProviderInterface {
      * @param  {EstimateFeeDetails} details
      * @returns suggestedMaxFee
      */
-    abstract getSuggestedMaxFee(estimateFeeAction: EstimateFeeAction, details: EstimateFeeDetails): Promise<bigint>;
+    abstract getSuggestedFee(estimateFeeAction: EstimateFeeAction, details: EstimateFeeDetails): Promise<EstimateFee>;
     /**
      * Simulates an array of transaction and returns an array of transaction trace and estimated fee.
      *
@@ -4266,7 +4268,7 @@ declare class Account extends RpcProvider implements AccountInterface {
     hashMessage(typedData: TypedData): Promise<string>;
     verifyMessageHash(hash: BigNumberish, signature: Signature): Promise<boolean>;
     verifyMessage(typedData: TypedData, signature: Signature): Promise<boolean>;
-    getSuggestedMaxFee({ type, payload }: EstimateFeeAction, details: EstimateFeeDetails): Promise<bigint>;
+    getSuggestedFee({ type, payload }: EstimateFeeAction, details: EstimateFeeDetails): Promise<EstimateFee>;
     /**
      * will be renamed to buildDeclareContractTransaction
      */

package/dist/index.global.js

@@ -11222,7 +11222,7 @@ var starknet = (() => {
         contract_address
       });
     }
-    async getEstimateFee(invocations, { blockIdentifier = this.blockIdentifier, skipValidate = false }) {
+    async getEstimateFee(invocations, { blockIdentifier = this.blockIdentifier, skipValidate = true }) {
       const block_id = new Block(blockIdentifier).identifier;
       let flags = {};
       if (isVersion("0.6", await this.getSpecVersion())) {
@@ -11429,9 +11429,12 @@ var starknet = (() => {
           resource_bounds: invocation.resourceBounds,
           tip: toHex(invocation.tip),
           paymaster_data: invocation.paymasterData.map((it) => toHex(it)),
-          account_deployment_data: invocation.accountDeploymentData.map((it) => toHex(it)),
           nonce_data_availability_mode: invocation.nonceDataAvailabilityMode,
-          fee_data_availability_mode: invocation.feeDataAvailabilityMode
+          fee_data_availability_mode: invocation.feeDataAvailabilityMode,
+          // dont add account_deployment_data if invocation.type === TransactionType.DEPLOY_ACCOUNT
+          ...invocation.type === "DEPLOY_ACCOUNT" /* DEPLOY_ACCOUNT */ ? {} : {
+            account_deployment_data: invocation.accountDeploymentData.map((it) => toHex(it))
+          }
         };
       }
       if (invocation.type === "INVOKE_FUNCTION" /* INVOKE */) {
@@ -12567,7 +12570,8 @@ var starknet = (() => {
       const estimateFeeResponse = await super.getInvokeEstimateFee(
         { ...invocation },
         { ...v3Details(details), version, nonce },
-        blockIdentifier
+        blockIdentifier,
+        details.skipValidate
       );
       return {
         ...estimateFeeResponse,
@@ -12599,7 +12603,8 @@ var starknet = (() => {
       const estimateFeeResponse = await super.getDeclareEstimateFee(
         declareContractTransaction,
         { ...v3Details(details), version, nonce },
-        blockIdentifier
+        blockIdentifier,
+        details.skipValidate
       );
       return {
         ...estimateFeeResponse,
@@ -12637,7 +12642,8 @@ var starknet = (() => {
       const estimateFeeResponse = await super.getDeployAccountEstimateFee(
         { ...payload },
         { ...v3Details(details), version, nonce },
-        blockIdentifier
+        blockIdentifier,
+        details.skipValidate
       );
       return {
         ...estimateFeeResponse,
@@ -12663,7 +12669,8 @@ var starknet = (() => {
         blockIdentifier
       });
       const EstimateFeeResponseBulk2 = await super.getEstimateFeeBulk(accountInvocations, {
-        blockIdentifier
+        blockIdentifier,
+        skipValidate: details.skipValidate
       });
       return [].concat(EstimateFeeResponseBulk2).map((elem) => {
         return {
@@ -12691,19 +12698,32 @@ var starknet = (() => {
         // TODO: does this depend on cairo version ?
         details.version
       );
-      const maxFee = details.maxFee ?? await this.getSuggestedMaxFee(
-        { type: "INVOKE_FUNCTION" /* INVOKE */, payload: calls },
-        {
-          ...details,
-          version
-        }
-      );
+      let suggestedMaxFee = 0;
+      let resourceBounds = estimateFeeToBounds(ZERO);
+      if (version === "0x3" /* V3 */) {
+        resourceBounds = details.resourceBounds ?? (await this.getSuggestedFee(
+          { type: "INVOKE_FUNCTION" /* INVOKE */, payload: calls },
+          {
+            ...details,
+            version
+          }
+        )).resourceBounds;
+      } else {
+        suggestedMaxFee = details.maxFee ?? (await this.getSuggestedFee(
+          { type: "INVOKE_FUNCTION" /* INVOKE */, payload: calls },
+          {
+            ...details,
+            version
+          }
+        )).suggestedMaxFee;
+      }
       const chainId = await this.getChainId();
       const signerDetails = {
         ...v3Details(details),
+        resourceBounds,
         walletAddress: this.address,
         nonce,
-        maxFee,
+        maxFee: suggestedMaxFee,
         version,
         chainId,
         cairoVersion: await this.getCairoVersion()
@@ -12714,8 +12734,9 @@ var starknet = (() => {
         { contractAddress: this.address, calldata, signature },
         {
           ...v3Details(details),
+          resourceBounds,
           nonce,
-          maxFee,
+          maxFee: suggestedMaxFee,
           version
         }
       );
@@ -12745,10 +12766,10 @@ var starknet = (() => {
         !isSierra(payload.contract) ? "0x1" /* V1 */ : this.getPreferredVersion("0x2" /* V2 */, "0x3" /* V3 */),
         providedVersion
       );
-      const declareDetails = {
-        ...v3Details(details),
-        nonce: toBigInt(nonce ?? await this.getNonce()),
-        maxFee: maxFee ?? await this.getSuggestedMaxFee(
+      let suggestedMaxFee = 0;
+      let resourceBounds = estimateFeeToBounds(ZERO);
+      if (version === "0x3" /* V3 */) {
+        resourceBounds = details.resourceBounds ?? (await this.getSuggestedFee(
           {
             type: "DECLARE" /* DECLARE */,
             payload: declareContractPayload
@@ -12757,7 +12778,24 @@ var starknet = (() => {
             ...details,
             version
           }
-        ),
+        )).resourceBounds;
+      } else {
+        suggestedMaxFee = maxFee ?? (await this.getSuggestedFee(
+          {
+            type: "DECLARE" /* DECLARE */,
+            payload: declareContractPayload
+          },
+          {
+            ...details,
+            version
+          }
+        )).suggestedMaxFee;
+      }
+      const declareDetails = {
+        ...v3Details(details),
+        resourceBounds,
+        maxFee: suggestedMaxFee,
+        nonce: toBigInt(nonce ?? await this.getNonce()),
         version,
         chainId: await this.getChainId(),
         walletAddress: this.address,
@@ -12839,18 +12877,35 @@ var starknet = (() => {
       const chainId = await this.getChainId();
       const compiledCalldata = CallData.compile(constructorCalldata);
       const contractAddress = providedContractAddress ?? calculateContractAddressFromHash(addressSalt, classHash, compiledCalldata, 0);
-      const maxFee = details.maxFee ?? await this.getSuggestedMaxFee(
-        {
-          type: "DEPLOY_ACCOUNT" /* DEPLOY_ACCOUNT */,
-          payload: {
-            classHash,
-            constructorCalldata: compiledCalldata,
-            addressSalt,
-            contractAddress
-          }
-        },
-        details
-      );
+      let suggestedMaxFee = 0;
+      let resourceBounds = estimateFeeToBounds(ZERO);
+      if (version === "0x3" /* V3 */) {
+        resourceBounds = details.resourceBounds ?? (await this.getSuggestedFee(
+          {
+            type: "DEPLOY_ACCOUNT" /* DEPLOY_ACCOUNT */,
+            payload: {
+              classHash,
+              constructorCalldata: compiledCalldata,
+              addressSalt,
+              contractAddress
+            }
+          },
+          details
+        )).resourceBounds;
+      } else {
+        suggestedMaxFee = details.maxFee ?? (await this.getSuggestedFee(
+          {
+            type: "DEPLOY_ACCOUNT" /* DEPLOY_ACCOUNT */,
+            payload: {
+              classHash,
+              constructorCalldata: compiledCalldata,
+              addressSalt,
+              contractAddress
+            }
+          },
+          details
+        )).suggestedMaxFee;
+      }
       const signature = await this.signer.signDeployAccountTransaction({
         ...v3Details(details),
         classHash,
@@ -12858,7 +12913,8 @@ var starknet = (() => {
         contractAddress,
         addressSalt,
         chainId,
-        maxFee,
+        resourceBounds,
+        maxFee: suggestedMaxFee,
         version,
         nonce
       });
@@ -12867,7 +12923,8 @@ var starknet = (() => {
         {
           ...v3Details(details),
           nonce,
-          maxFee,
+          resourceBounds,
+          maxFee: suggestedMaxFee,
           version
         }
       );
@@ -12897,7 +12954,7 @@ var starknet = (() => {
       const hash2 = await this.hashMessage(typedData);
       return this.verifyMessageHash(hash2, signature);
     }
-    async getSuggestedMaxFee({ type, payload }, details) {
+    async getSuggestedFee({ type, payload }, details) {
       let feeEstimate;
       switch (type) {
         case "INVOKE_FUNCTION" /* INVOKE */:
@@ -12920,7 +12977,7 @@ var starknet = (() => {
           };
           break;
       }
-      return feeEstimate.suggestedMaxFee;
+      return feeEstimate;
     }
     /**
      * will be renamed to buildDeclareContractTransaction