Merge branch 'develop' of https://github.com/buidler-labs/hedera-stra…

…to-js into develop
buidler-labs · Nov 23, 2022 · 31c4a29 · 31c4a29
2 parents afe53f6 + d338119
commit 31c4a29
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/lib/ApiSession.ts b/lib/ApiSession.ts
@@ -89,6 +89,7 @@ export type SessionDefaults = {
   emitLiveContractReceipts: boolean;
   onlyReceiptsFromContractRequests: boolean;
   paymentForContractQuery: number;
+  tokenCreateTransactionFee: number;
 };
 
 const SESSION_CONSTRUCTOR_GUARD = {};

diff --git a/lib/StratoContext.ts b/lib/StratoContext.ts
@@ -252,6 +252,12 @@ export class StratoContext {
           resolveSessionDefaultValueFor("payment_for_contract_query") ??
             "20000000"
         ),
+      tokenCreateTransactionFee:
+        rParams.session?.defaults?.tokenCreateTransactionFee ??
+        parseInt(
+          resolveSessionDefaultValueFor("token_create_transaction_fee") ??
+            "5000000000"
+        ),
     };
   }
 }
diff --git a/lib/static/create/Token.ts b/lib/static/create/Token.ts
@@ -1,5 +1,6 @@
 import {
   AccountId,
+  Hbar,
   TokenType as HederaTokenType,
   Key,
   Timestamp,
@@ -35,6 +36,7 @@ export type CreateTokenFeatures = TokenFeatures & {
   decimals?: number | Long.Long;
   customFees?: { feeCollectorAccountId?: string | AccountId | undefined }[];
   freezeDefault?: boolean;
+  maxTransactionFee?: number | Long.Long | Hbar;
 };
 
 type TokenKeys = {
@@ -162,6 +164,20 @@ export class Token extends BasicCreatableEntity<LiveToken> {
     const createTokenTransaction = new TokenCreateTransaction(
       constructorArgs as unknown
     );
+
+    let transactionFee: Hbar;
+    if(this.info.maxTransactionFee) {
+      transactionFee = this.info.maxTransactionFee instanceof Hbar 
+        ? this.info.maxTransactionFee 
+        : new Hbar(this.info.maxTransactionFee)
+    } else if (session.defaults.tokenCreateTransactionFee > 0) {
+      transactionFee = Hbar.fromTinybars(
+        session.defaults.tokenCreateTransactionFee
+      );
+    }
+    if(transactionFee) {
+      createTokenTransaction.setMaxTransactionFee(transactionFee);
+    }
     const creationReceipt = await session.execute(
       createTokenTransaction,
       TypeOfExecutionReturn.Receipt,

diff --git a/package-lock.json b/package-lock.json