Skip to content

Commit 5c7b60d

Browse files
joshmarinaccijoshmarinacci
committed
fix merge conflicts
Signed-off-by: Josh Marinacci <[email protected]>
1 parent d659dab commit 5c7b60d

File tree

5 files changed

+46
-7
lines changed

5 files changed

+46
-7
lines changed

‎hapi/hedera-protobuf-java-api/src/main/proto/fees/fee_schedule.proto‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ enum Extra {
101101
TOKEN_CREATE_NFT=23;
102102
TOKEN_MINT_FUNGIBLE=24;
103103
TOKEN_MINT_NFT=25;
104+
TOKEN_CREATE_WITH_CUSTOM_FEE=26;
104105
}
105106

106107
/**

‎hedera-node/hedera-file-service-impl/src/main/resources/genesis/simpleFeesSchedules.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
{ "name": "CUSTOM_FEE", "fee": 0 },
2929
{ "name": "GAS", "fee": 1 },
3030
{ "name": "ALLOWANCES", "fee": 500000000 },
31-
{ "name": "TOKEN_CREATE_FUNGIBLE", "fee": 9999000000 },
32-
{ "name": "TOKEN_CREATE_NFT", "fee": 19999000000 },
31+
{ "name": "TOKEN_CREATE_FUNGIBLE", "fee": 0 },
32+
{ "name": "TOKEN_CREATE_NFT", "fee": 0 },
33+
{ "name": "TOKEN_CREATE_WITH_CUSTOM_FEE", "fee": 10000000000 },
3334
{ "name": "TOKEN_MINT_FUNGIBLE", "fee": 0 },
3435
{ "name": "TOKEN_MINT_NFT", "fee": 199000000 },
3536
{ "name": "AIRDROPS", "fee": 8800 },
@@ -181,11 +182,12 @@
181182
"schedule": [
182183
{
183184
"name": "TokenCreate",
184-
"baseFee": 0,
185+
"baseFee": 9999000000,
185186
"extras": [
186187
{"name": "KEYS", "includedCount": 1},
187188
{"name": "TOKEN_CREATE_FUNGIBLE", "includedCount": 0 },
188-
{"name": "TOKEN_CREATE_NFT", "includedCount": 0 }
189+
{"name": "TOKEN_CREATE_NFT", "includedCount": 0 },
190+
{"name": "TOKEN_CREATE_WITH_CUSTOM_FEE", "includedCount": 0 }
189191
]
190192
},
191193
{

‎hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/calculator/TokenCreateFeeCalculator.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@ public void accumulateServiceFee(
5656
addExtraFee(feeResult, serviceDef, Extra.KEYS, feeSchedule, keys);
5757

5858
if (op.tokenType() == TokenType.FUNGIBLE_COMMON) {
59-
addExtraFee(feeResult, serviceDef, Extra.TOKEN_CREATE_FUNGIBLE, feeSchedule, 1);
59+
// addExtraFee(feeResult, serviceDef, Extra.TOKEN_CREATE_FUNGIBLE, feeSchedule, 1);
6060
}
6161
if (op.tokenType() == TokenType.NON_FUNGIBLE_UNIQUE) {
62-
addExtraFee(feeResult, serviceDef, Extra.TOKEN_CREATE_NFT, feeSchedule, 1);
62+
// addExtraFee(feeResult, serviceDef, Extra.TOKEN_CREATE_NFT, feeSchedule, 1);
63+
}
64+
if (!op.customFees().isEmpty()) {
65+
addExtraFee(feeResult, serviceDef, Extra.TOKEN_CREATE_WITH_CUSTOM_FEE, feeSchedule, 1);
6366
}
6467
}
6568

‎hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/handlers/TokenServiceFeeCalculatorTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.hiero.hapi.support.fees.NetworkFee;
4949
import org.hiero.hapi.support.fees.NodeFee;
5050
import org.junit.jupiter.api.BeforeEach;
51+
import org.junit.jupiter.api.DisplayName;
5152
import org.junit.jupiter.api.Test;
5253
import org.junit.jupiter.api.extension.ExtendWith;
5354
import org.mockito.Mock;

‎hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/fees/TokenServiceSimpleFeesSuite.java‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenPause;
1414
import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenUnfreeze;
1515
import static com.hedera.services.bdd.spec.transactions.TxnVerbs.tokenUnpause;
16+
import static com.hedera.services.bdd.spec.transactions.token.CustomFeeSpecs.fixedHbarFee;
1617
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.compareSimpleToOld;
1718
import static com.hedera.services.bdd.spec.utilops.UtilVerbs.newKeyNamed;
1819
import static com.hedera.services.bdd.suites.HapiSuite.ONE_BILLION_HBARS;
@@ -45,6 +46,7 @@ public class TokenServiceSimpleFeesSuite {
4546
private static final String PAYER = "payer";
4647
private static final String ADMIN = "admin";
4748
private static final String OTHER = "other";
49+
private static final String HBAR_COLLECTOR = "hbarCollector";
4850

4951
@LeakyHapiTest(overrides = {"fees.simpleFeesEnabled"})
5052
@DisplayName("compare create fungible token")
@@ -101,12 +103,42 @@ final Stream<DynamicTest> compareCreateNonFungibleToken() {
101103
// fungible = 19999000000,
102104
// node+network = 1000000
103105
// total = 20000000000 = 2.0
106+
1,
107+
1,
108+
1,
109+
1);
110+
}
111+
112+
113+
@LeakyHapiTest(overrides = {"fees.simpleFeesEnabled"})
114+
@DisplayName("compare create fungible token with custom fees")
115+
final Stream<DynamicTest> compareCreateFungibleTokenWithCustomFees() {
116+
return compareSimpleToOld(
117+
() -> Arrays.asList(
118+
newKeyNamed(SUPPLY_KEY),
119+
cryptoCreate(ADMIN).balance(ONE_BILLION_HBARS),
120+
cryptoCreate(PAYER).balance(ONE_BILLION_HBARS),
121+
cryptoCreate(HBAR_COLLECTOR).balance(0L),
122+
tokenCreate("commonCustomFees")
123+
.blankMemo()
124+
.payingWith(PAYER)
125+
.fee(ONE_HUNDRED_HBARS)
126+
.treasury(ADMIN)
127+
.tokenType(NON_FUNGIBLE_UNIQUE)
128+
.initialSupply(0L)
129+
.supplyKey(SUPPLY_KEY)
130+
.autoRenewAccount(ADMIN)
131+
.autoRenewPeriod(THREE_MONTHS_IN_SECONDS)
132+
.withCustom(fixedHbarFee(1L, HBAR_COLLECTOR))
133+
.logged()
134+
.hasKnownStatus(SUCCESS)
135+
.via("create-token-txn")),
136+
"create-token-txn",
104137
2,
105138
1,
106139
2,
107140
1);
108141
}
109-
110142
@LeakyHapiTest(overrides = {"fees.simpleFeesEnabled"})
111143
@DisplayName("compare mint common token")
112144
final Stream<DynamicTest> compareMintCommonToken() {

0 commit comments

Comments
 (0)