Fix irrelevant checks on Native Token creation

Author: jkrvivian

pkg/tests/combined_account_transition_test.go

@@ -252,7 +252,7 @@ func createNativetoken(ts *testsuite.TestSuite) {
 	node1 := ts.Node("node1")
 	node2 := ts.Node("node2")
 
-	tx := wallet.CreateNativeTokenFromInput("TX7", "TX5:0", "TX4:0", 50_000, 100_000)
+	tx := wallet.CreateNativeTokenFromInput("TX7", "TX5:0", "TX4:0", 5_000_000, 10_000_000_000)
 	ts.IssueBasicBlockWithOptions("block6", wallet, tx)
 
 	ts.AssertTransactionsExist(wallet.Transactions("TX7"), true, node1)

pkg/testsuite/mock/wallet_transactions.go

@@ -10,7 +10,6 @@ import (
 	"github.com/iotaledger/hive.go/lo"
 	"github.com/iotaledger/hive.go/runtime/options"
 	"github.com/iotaledger/iota-core/pkg/protocol/engine/utxoledger"
-	"github.com/iotaledger/iota-core/pkg/testsuite/depositcalculator"
 	iotago "github.com/iotaledger/iota.go/v4"
 	"github.com/iotaledger/iota.go/v4/builder"
 	"github.com/iotaledger/iota.go/v4/tpkg"
@@ -668,18 +667,13 @@ func (w *Wallet) CreateNFTFromInput(transactionName string, inputName string, op
 
 //nolint:forcetypeassert
 func (w *Wallet) CreateNativeTokenFromInput(transactionName string, inputName string, accountOutputName string, mintedAmount iotago.BaseToken, maxSupply iotago.BaseToken) *iotago.SignedTransaction {
+	if mintedAmount > maxSupply {
+		panic("minted amount cannot be greater than max supply")
+	}
+
 	input := w.Output(inputName)
 	accountOutput := w.AccountOutput(accountOutputName)
 
-	minMintedAmount := lo.PanicOnErr(depositcalculator.MinDeposit(w.Node.Protocol.CommittedAPI().ProtocolParameters(), iotago.OutputFoundry, depositcalculator.WithHasNativeToken()))
-	mintedAmount = lo.Max(minMintedAmount, mintedAmount)
-	maxSupply = lo.Max(maxSupply, mintedAmount)
-
-	if mintedAmount > input.BaseTokenAmount() {
-		panic(fmt.Sprintf("input %s does not have enough funds to mint native token", inputName))
-	}
-	remainderAmount := input.BaseTokenAmount() - mintedAmount
-
 	// transition account output, increase foundry counter by 1, the amount of account stays the same
 	accID := accountOutput.Output().(*iotago.AccountOutput).AccountID
 	accAddr := accID.ToAddress().(*iotago.AccountAddress)
@@ -694,28 +688,16 @@ func (w *Wallet) CreateNativeTokenFromInput(transactionName string, inputName st
 		MeltedTokens:  big.NewInt(0),
 	}
 
-	foundryOutput := builder.NewFoundryOutputBuilder(accAddr, mintedAmount, accTransitionOutput.FoundryCounter, tokenScheme).
+	foundryOutput := builder.NewFoundryOutputBuilder(accAddr, input.BaseTokenAmount(), accTransitionOutput.FoundryCounter, tokenScheme).
 		NativeToken(&iotago.NativeTokenFeature{
 			ID:     foundryID,
 			Amount: big.NewInt(int64(mintedAmount)),
 		}).MustBuild()
 
-	outputStates := iotago.Outputs[iotago.Output]{accTransitionOutput, foundryOutput}
-	// prepare remainder output if needed
-	if remainderAmount > 0 {
-		outputStates = append(outputStates, &iotago.BasicOutput{
-			Amount: remainderAmount,
-			UnlockConditions: iotago.BasicOutputUnlockConditions{
-				&iotago.AddressUnlockCondition{Address: w.Address()},
-			},
-			Features: iotago.BasicOutputFeatures{},
-		})
-	}
-
 	return w.createSignedTransactionWithOptions(
 		transactionName,
 		WithInputs(utxoledger.Outputs{accountOutput, input}),
-		WithOutputs(outputStates),
+		WithOutputs(iotago.Outputs[iotago.Output]{accTransitionOutput, foundryOutput}),
 		WithBlockIssuanceCreditInput(&iotago.BlockIssuanceCreditInput{
 			AccountID: accID,
 		}),

tools/docker-network/tests/accounttransition_test.go

@@ -55,5 +55,5 @@ func Test_AccountTransitions(t *testing.T) {
 
 	// create native token
 	fmt.Println("\nCreating native token")
-	account2 = d.CreateNativeToken(account2, 5000, 10000)
+	account2 = d.CreateNativeToken(account2, 5_000_000, 10_000_000_000)
 }

tools/docker-network/tests/dockerframework.go

@@ -22,7 +22,6 @@ import (
 	"github.com/iotaledger/hive.go/lo"
 	"github.com/iotaledger/hive.go/runtime/options"
 	"github.com/iotaledger/iota-core/pkg/protocol"
-	"github.com/iotaledger/iota-core/pkg/testsuite/depositcalculator"
 	"github.com/iotaledger/iota-core/pkg/testsuite/snapshotcreator"
 	iotago "github.com/iotaledger/iota.go/v4"
 	"github.com/iotaledger/iota.go/v4/api"
@@ -486,6 +485,8 @@ func (d *DockerTestFramework) AllotManaTo(from *Account, to *Account, manaToAllo
 
 // CreateNativeToken request faucet funds then use it to create native token for the account, and returns the updated Account.
 func (d *DockerTestFramework) CreateNativeToken(from *Account, mintedAmount iotago.BaseToken, maxSupply iotago.BaseToken) (updatedAccount *Account) {
+	require.GreaterOrEqual(d.Testing, maxSupply, mintedAmount)
+
 	// requesting faucet funds for native token creation
 	ctx := context.TODO()
 	fundsAddr, privateKey := d.getAddress(iotago.AddressEd25519)
@@ -495,15 +496,6 @@ func (d *DockerTestFramework) CreateNativeToken(from *Account, mintedAmount iota
 	currentSlot := clt.LatestAPI().TimeProvider().SlotFromTime(time.Now())
 	apiForSlot := clt.APIForSlot(currentSlot)
 
-	minMintedAmount, err := depositcalculator.MinDeposit(apiForSlot.ProtocolParameters(), iotago.OutputFoundry, depositcalculator.WithHasNativeToken())
-	require.NoError(d.Testing, err)
-
-	mintedAmount = lo.Max(minMintedAmount, mintedAmount)
-	require.GreaterOrEqual(d.Testing, mintedAmount, fundsUTXOOutput.BaseTokenAmount())
-	maxSupply = lo.Max(maxSupply, mintedAmount)
-
-	remainderAmount := fundsUTXOOutput.BaseTokenAmount() - mintedAmount
-
 	// increase foundry counter
 	accTransitionOutput := builder.NewAccountOutputBuilderFromPrevious(from.AccountOutput).
 		FoundriesToGenerate(1).MustBuild()
@@ -517,34 +509,22 @@ func (d *DockerTestFramework) CreateNativeToken(from *Account, mintedAmount iota
 		MeltedTokens:  big.NewInt(0),
 	}
 
-	foundryOutput := builder.NewFoundryOutputBuilder(from.AccountAddress, mintedAmount, accTransitionOutput.FoundryCounter, tokenScheme).
+	foundryOutput := builder.NewFoundryOutputBuilder(from.AccountAddress, fundsUTXOOutput.BaseTokenAmount(), accTransitionOutput.FoundryCounter, tokenScheme).
 		NativeToken(&iotago.NativeTokenFeature{
 			ID:     foundryID,
 			Amount: big.NewInt(int64(mintedAmount)),
 		}).MustBuild()
 
-	addressKeys := []iotago.AddressKeys{
-		iotago.NewAddressKeysForEd25519Address(fundsAddr.(*iotago.Ed25519Address), privateKey),
-		iotago.NewAddressKeysForEd25519Address(from.AccountOutput.UnlockConditionSet().Address().Address.(*iotago.Ed25519Address), from.BlockIssuerKey),
-	}
-
-	signedTxBuilder := builder.NewTransactionBuilder(apiForSlot)
-
-	// prepare remainder output if needed
-	if remainderAmount > 0 {
-		receiveAddr, privKey := d.getAddress(iotago.AddressEd25519)
-		remainderOutput := builder.NewBasicOutputBuilder(receiveAddr, remainderAmount).MustBuild()
-		addressKeys = append(addressKeys, iotago.NewAddressKeysForEd25519Address(receiveAddr.(*iotago.Ed25519Address), privKey))
-		signedTxBuilder = signedTxBuilder.AddOutput(remainderOutput)
-	}
+	signer := iotago.NewInMemoryAddressSigner(iotago.NewAddressKeysForEd25519Address(fundsAddr.(*iotago.Ed25519Address), privateKey),
+		iotago.NewAddressKeysForEd25519Address(from.AccountOutput.UnlockConditionSet().Address().Address.(*iotago.Ed25519Address), from.BlockIssuerKey))
 
 	issuerResp, err := clt.BlockIssuance(ctx)
 	require.NoError(d.Testing, err)
 
 	congestionResp, err := clt.Congestion(ctx, from.AccountAddress, lo.PanicOnErr(issuerResp.LatestCommitment.ID()))
 	require.NoError(d.Testing, err)
 
-	signedTx, err := signedTxBuilder.
+	signedTx, err := builder.NewTransactionBuilder(apiForSlot).
 		AddInput(&builder.TxInput{
 			UnlockTarget: fundsAddr,
 			InputID:      fundsOutputID,
@@ -562,7 +542,7 @@ func (d *DockerTestFramework) CreateNativeToken(from *Account, mintedAmount iota
 		AddCommitmentInput(&iotago.CommitmentInput{CommitmentID: lo.Return1(issuerResp.LatestCommitment.ID())}).
 		WithTransactionCapabilities(iotago.TransactionCapabilitiesBitMaskWithCapabilities(iotago.WithTransactionCanDoAnything())).
 		AllotAllMana(currentSlot, from.AccountID).
-		Build(iotago.NewInMemoryAddressSigner(addressKeys...))
+		Build(signer)
 	require.NoError(d.Testing, err)
 
 	blkID := d.SubmitPayload(ctx, signedTx, wallet.NewEd25519Account(from.AccountID, from.BlockIssuerKey), congestionResp, issuerResp)