update kc token name references to kda

RomuloSiebra · RomuloSiebra · commit e49497945750 · 2025-06-17T09:26:27.000-03:00
diff --git a/integrationTests/mock/KleverContractStateMock.go b/integrationTests/mock/KleverContractStateMock.go
@@ -66,7 +66,7 @@ type kleverBlockchainContractStateMock struct {
 	lastExecutedEthBatchId           uint64
 	lastExecutedEthTxId              uint64
 
-	ProposeMultiTransferEsdtBatchCalled func()
+	ProposeMultiTransferKdaBatchCalled func()
 }
 
 func newKleverBlockchainContractStateMock() *kleverBlockchainContractStateMock {
@@ -92,12 +92,12 @@ func (mock *kleverBlockchainContractStateMock) processTransaction(tx *transactio
 	dataSplit := strings.Split(string(tx.GetRawData().GetData()[0]), "@")
 	funcName := dataSplit[0]
 	switch funcName {
-	case "proposeEsdtSafeSetCurrentTransactionBatchStatus":
-		mock.proposeEsdtSafeSetCurrentTransactionBatchStatus(dataSplit, tx)
+	case "proposeKdaSafeSetCurrentTransactionBatchStatus":
+		mock.proposeKdaSafeSetCurrentTransactionBatchStatus(dataSplit, tx)
 
 		return
-	case "proposeMultiTransferEsdtBatch":
-		mock.proposeMultiTransferEsdtBatch(dataSplit, tx)
+	case "proposeMultiTransferKdaBatch":
+		mock.proposeMultiTransferKdaBatch(dataSplit, tx)
 		return
 	case "sign":
 		mock.sign(dataSplit, tx)
@@ -114,19 +114,19 @@ func (mock *kleverBlockchainContractStateMock) processTransaction(tx *transactio
 	panic("can not execute transaction that calls function: " + funcName)
 }
 
-func (mock *kleverBlockchainContractStateMock) proposeEsdtSafeSetCurrentTransactionBatchStatus(dataSplit []string, _ *transaction.Transaction) {
+func (mock *kleverBlockchainContractStateMock) proposeKdaSafeSetCurrentTransactionBatchStatus(dataSplit []string, _ *transaction.Transaction) {
 	status, hash := mock.createProposedStatus(dataSplit)
 
 	mock.proposedStatus[hash] = status
 }
 
-func (mock *kleverBlockchainContractStateMock) proposeMultiTransferEsdtBatch(dataSplit []string, _ *transaction.Transaction) {
+func (mock *kleverBlockchainContractStateMock) proposeMultiTransferKdaBatch(dataSplit []string, _ *transaction.Transaction) {
 	transfer, hash := mock.createProposedTransfer(dataSplit)
 
 	mock.proposedTransfers[hash] = transfer
 
-	if mock.ProposeMultiTransferEsdtBatchCalled != nil {
-		mock.ProposeMultiTransferEsdtBatchCalled()
+	if mock.ProposeMultiTransferKdaBatchCalled != nil {
+		mock.ProposeMultiTransferKdaBatchCalled()
 	}
 }
 
diff --git a/integrationTests/mock/ethereumChainMock.go b/integrationTests/mock/ethereumChainMock.go
@@ -28,25 +28,25 @@ type EthereumProposedTransfer struct {
 
 // EthereumChainMock -
 type EthereumChainMock struct {
-	mutState                            sync.RWMutex
-	nonces                              map[common.Address]uint64
-	batches                             map[uint64]*contract.Batch
-	deposits                            map[uint64][]contract.Deposit
-	proposedTransfer                    *EthereumProposedTransfer
-	totalBalances                       map[common.Address]*big.Int
-	mintBalances                        map[common.Address]*big.Int
-	burnBalances                        map[common.Address]*big.Int
-	mintBurnTokens                      map[common.Address]bool
-	nativeTokens                        map[common.Address]bool
-	whitelistedTokens                   map[common.Address]bool
-	GetStatusesAfterExecutionHandler    func() ([]byte, bool)
-	ProcessFinishedHandler              func()
-	quorum                              int
-	relayers                            []common.Address
-	ProposeMultiTransferEsdtBatchCalled func()
-	BalanceAtCalled                     func(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error)
-	FilterLogsCalled                    func(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error)
-	finalNonce                          uint64
+	mutState                           sync.RWMutex
+	nonces                             map[common.Address]uint64
+	batches                            map[uint64]*contract.Batch
+	deposits                           map[uint64][]contract.Deposit
+	proposedTransfer                   *EthereumProposedTransfer
+	totalBalances                      map[common.Address]*big.Int
+	mintBalances                       map[common.Address]*big.Int
+	burnBalances                       map[common.Address]*big.Int
+	mintBurnTokens                     map[common.Address]bool
+	nativeTokens                       map[common.Address]bool
+	whitelistedTokens                  map[common.Address]bool
+	GetStatusesAfterExecutionHandler   func() ([]byte, bool)
+	ProcessFinishedHandler             func()
+	quorum                             int
+	relayers                           []common.Address
+	ProposeMultiTransferKdaBatchCalled func()
+	BalanceAtCalled                    func(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error)
+	FilterLogsCalled                   func(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error)
+	finalNonce                         uint64
 }
 
 // NewEthereumChainMock -
@@ -232,8 +232,8 @@ func (mock *EthereumChainMock) ExecuteTransfer(_ *bind.TransactOpts, tokens []co
 	mock.proposedTransfer = proposedTransfer
 	mock.mutState.Unlock()
 
-	if mock.ProposeMultiTransferEsdtBatchCalled != nil {
-		mock.ProposeMultiTransferEsdtBatchCalled()
+	if mock.ProposeMultiTransferKdaBatchCalled != nil {
+		mock.ProposeMultiTransferKdaBatchCalled()
 	}
 
 	return tx, nil
diff --git a/integrationTests/relayers/kcToEth_test.go b/integrationTests/relayers/kcToEth_test.go
@@ -181,7 +181,7 @@ func testRelayersShouldExecuteTransfersFromKcToEthIfTransactionsAppearInBatch(t
 	kcChainMock.SetPendingBatch(&pendingBatch)
 	kcChainMock.SetQuorum(numRelayers)
 
-	ethereumChainMock.ProposeMultiTransferEsdtBatchCalled = func() {
+	ethereumChainMock.ProposeMultiTransferKdaBatchCalled = func() {
 		deposit := deposits[0]
 
 		kcChainMock.AddDepositToCurrentBatch(deposit)
diff --git a/integrationTests/relayers/slowTests/framework/kcHandler.go b/integrationTests/relayers/slowTests/framework/kcHandler.go
@@ -42,40 +42,40 @@ const (
 	bridgeProxyContractPath   = "testdata/contracts/kda/bridge-proxy.wasm"
 	testCallerContractPath    = "testdata/contracts/kda/test-caller.wasm"
 
-	setBridgeProxyContractAddressFunction                = "setBridgeProxyContractAddress"
-	setWrappingContractAddressFunction                   = "setWrappingContractAddress"
-	changeOwnerAddressFunction                           = "ChangeOwnerAddress"
-	setEsdtSafeOnMultiTransferFunction                   = "setEsdtSafeOnMultiTransfer"
-	setEsdtSafeOnWrapperFunction                         = "setEsdtSafeContractAddress"
-	setEsdtSafeAddressFunction                           = "setEsdtSafeAddress"
-	stakeFunction                                        = "stake"
-	unpauseFunction                                      = "unpause"
-	unpauseEsdtSafeFunction                              = "unpauseEsdtSafe"
-	unpauseProxyFunction                                 = "unpauseProxy"
-	pauseEsdtSafeFunction                                = "pauseEsdtSafe"
-	pauseFunction                                        = "pause"
-	issueFunction                                        = "issue"
-	setSpecialRoleFunction                               = "setSpecialRole"
-	kdaTransferFunction                                  = "KDATransfer"
-	setPairDecimalsFunction                              = "setPairDecimals"
-	addWrappedTokenFunction                              = "addWrappedToken"
-	depositLiquidityFunction                             = "depositLiquidity"
-	whitelistTokenFunction                               = "whitelistToken"
-	addMappingFunction                                   = "addMapping"
-	kdaSafeAddTokenToWhitelistFunction                   = "kdaSafeAddTokenToWhitelist"
-	kdaSafeSetMaxBridgedAmountForTokenFunction           = "kdaSafeSetMaxBridgedAmountForToken"
-	multiTransferEsdtSetMaxBridgedAmountForTokenFunction = "multiTransferEsdtSetMaxBridgedAmountForToken"
-	submitBatchFunction                                  = "submitBatch"
-	unwrapTokenCreateTransactionFunction                 = "unwrapTokenCreateTransaction"
-	createTransactionFunction                            = "createTransaction"
-	setBridgedTokensWrapperAddressFunction               = "setBridgedTokensWrapperAddress"
-	setMultiTransferAddressFunction                      = "setMultiTransferAddress"
-	withdrawRefundFeesForEthereumFunction                = "withdrawRefundFeesForEthereum"
-	getRefundFeesForEthereumFunction                     = "getRefundFeesForEthereum"
-	withdrawTransactionFeesFunction                      = "withdrawTransactionFees"
-	getTransactionFeesFunction                           = "getTransactionFees"
-	initSupplyMintBurnEsdtSafe                           = "initSupplyMintBurnEsdtSafe"
-	initSupplyEsdtSafe                                   = "initSupplyEsdtSafe"
+	setBridgeProxyContractAddressFunction               = "setBridgeProxyContractAddress"
+	setWrappingContractAddressFunction                  = "setWrappingContractAddress"
+	changeOwnerAddressFunction                          = "ChangeOwnerAddress"
+	setKdaSafeOnMultiTransferFunction                   = "setKdaSafeOnMultiTransfer"
+	setKdaSafeOnWrapperFunction                         = "setKdaSafeContractAddress"
+	setKdaSafeAddressFunction                           = "setKdaSafeAddress"
+	stakeFunction                                       = "stake"
+	unpauseFunction                                     = "unpause"
+	unpauseKdaSafeFunction                              = "unpauseKdaSafe"
+	unpauseProxyFunction                                = "unpauseProxy"
+	pauseKdaSafeFunction                                = "pauseKdaSafe"
+	pauseFunction                                       = "pause"
+	issueFunction                                       = "issue"
+	setSpecialRoleFunction                              = "setSpecialRole"
+	kdaTransferFunction                                 = "KDATransfer"
+	setPairDecimalsFunction                             = "setPairDecimals"
+	addWrappedTokenFunction                             = "addWrappedToken"
+	depositLiquidityFunction                            = "depositLiquidity"
+	whitelistTokenFunction                              = "whitelistToken"
+	addMappingFunction                                  = "addMapping"
+	kdaSafeAddTokenToWhitelistFunction                  = "kdaSafeAddTokenToWhitelist"
+	kdaSafeSetMaxBridgedAmountForTokenFunction          = "kdaSafeSetMaxBridgedAmountForToken"
+	multiTransferKdaSetMaxBridgedAmountForTokenFunction = "multiTransferKdaSetMaxBridgedAmountForToken"
+	submitBatchFunction                                 = "submitBatch"
+	unwrapTokenCreateTransactionFunction                = "unwrapTokenCreateTransaction"
+	createTransactionFunction                           = "createTransaction"
+	setBridgedTokensWrapperAddressFunction              = "setBridgedTokensWrapperAddress"
+	setMultiTransferAddressFunction                     = "setMultiTransferAddress"
+	withdrawRefundFeesForEthereumFunction               = "withdrawRefundFeesForEthereum"
+	getRefundFeesForEthereumFunction                    = "getRefundFeesForEthereum"
+	withdrawTransactionFeesFunction                     = "withdrawTransactionFees"
+	getTransactionFeesFunction                          = "getTransactionFees"
+	initSupplyMintBurnKdaSafe                           = "initSupplyMintBurnKdaSafe"
+	initSupplyKdaSafe                                   = "initSupplyKdaSafe"
 )
 
 var (
@@ -309,14 +309,14 @@ func (handler *KcHandler) wireSCProxy(ctx context.Context) {
 	)
 	log.Info("Set in SC proxy contract the multi-transfer contract", "transaction hash", hash, "status", txResult.Status)
 
-	// setEsdtSafeAddress on bridge proxy
+	// setKdaSafeAddress on bridge proxy
 	hash, txResult = handler.ChainSimulator.ScCall(
 		ctx,
 		handler.OwnerKeys.KlvSk,
 		handler.ScProxyAddress,
 		zeroStringValue,
 		setCallsGasLimit,
-		setEsdtSafeAddressFunction,
+		setKdaSafeAddressFunction,
 		[]string{
 			handler.SafeAddress.Hex(),
 		},
@@ -403,14 +403,14 @@ func (handler *KcHandler) finishSettings(ctx context.Context) {
 	hash, txResult := handler.callContractNoParams(ctx, handler.MultisigAddress, unpauseProxyFunction)
 	log.Info("Un-paused SC proxy contract", "transaction hash", hash, "status", txResult.Status)
 
-	// setEsdtSafeOnMultiTransfer
+	// setKdaSafeOnMultiTransfer
 	hash, txResult = handler.ChainSimulator.ScCall(
 		ctx,
 		handler.OwnerKeys.KlvSk,
 		handler.MultisigAddress,
 		zeroStringValue,
 		setCallsGasLimit,
-		setEsdtSafeOnMultiTransferFunction,
+		setKdaSafeOnMultiTransferFunction,
 		[]string{},
 	)
 	log.Info("Set in multisig contract the safe contract (automatically)", "transaction hash", hash, "status", txResult.Status)
@@ -493,7 +493,7 @@ func (handler *KcHandler) callContractNoParams(ctx context.Context, contract *Kl
 // UnPauseContractsAfterTokenChanges can unpause contracts after token changes
 func (handler *KcHandler) UnPauseContractsAfterTokenChanges(ctx context.Context) {
 	// unpause safe
-	hash, txResult := handler.callContractNoParams(ctx, handler.MultisigAddress, unpauseEsdtSafeFunction)
+	hash, txResult := handler.callContractNoParams(ctx, handler.MultisigAddress, unpauseKdaSafeFunction)
 	log.Info("unpaused safe executed", "hash", hash, "status", txResult.Status)
 
 	// unpause wrapper
@@ -508,7 +508,7 @@ func (handler *KcHandler) UnPauseContractsAfterTokenChanges(ctx context.Context)
 // PauseContractsForTokenChanges can pause contracts for token changes
 func (handler *KcHandler) PauseContractsForTokenChanges(ctx context.Context) {
 	// pause safe
-	hash, txResult := handler.callContractNoParams(ctx, handler.MultisigAddress, pauseEsdtSafeFunction)
+	hash, txResult := handler.callContractNoParams(ctx, handler.MultisigAddress, pauseKdaSafeFunction)
 	log.Info("paused safe executed", "hash", hash, "status", txResult.Status)
 
 	// pause aggregator
@@ -790,7 +790,7 @@ func (handler *KcHandler) setInitialSupply(ctx context.Context, params IssueToke
 				handler.MultisigAddress,
 				zeroStringValue,
 				setCallsGasLimit,
-				initSupplyMintBurnEsdtSafe,
+				initSupplyMintBurnKdaSafe,
 				[]string{
 					hex.EncodeToString([]byte(tkData.KlvChainSpecificToken)),
 					hex.EncodeToString(initialSupply.Bytes()),
@@ -810,7 +810,7 @@ func (handler *KcHandler) setInitialSupply(ctx context.Context, params IssueToke
 				[]string{
 					hex.EncodeToString([]byte(tkData.KlvChainSpecificToken)),
 					hex.EncodeToString(initialSupply.Bytes()),
-					hex.EncodeToString([]byte(initSupplyEsdtSafe)),
+					hex.EncodeToString([]byte(initSupplyKdaSafe)),
 					hex.EncodeToString([]byte(tkData.KlvChainSpecificToken)),
 					hex.EncodeToString(initialSupply.Bytes()),
 				})
@@ -866,7 +866,7 @@ func (handler *KcHandler) setMaxBridgeAmountOnMultitransfer(ctx context.Context,
 		handler.MultisigAddress,
 		zeroStringValue,
 		setCallsGasLimit,
-		multiTransferEsdtSetMaxBridgedAmountForTokenFunction,
+		multiTransferKdaSetMaxBridgedAmountForTokenFunction,
 		[]string{
 			hex.EncodeToString([]byte(tkData.KlvChainSpecificToken)),
 			hex.EncodeToString(maxBridgedAmountForTokenInt.Bytes())})
diff --git a/integrationTests/relayers/slowTests/framework/testSetup.go b/integrationTests/relayers/slowTests/framework/testSetup.go
@@ -286,9 +286,9 @@ func (setup *TestSetup) isTransferDoneFromKcForToken(params TestTokenParams) boo
 	ethTestBalance := setup.EthereumHandler.GetBalance(setup.TestKeys.EthAddress, params.AbstractTokenIdentifier)
 	isTransferDoneFromKc := ethTestBalance.String() == expectedReceiver.String()
 
-	expectedEsdtSafe := big.NewInt(0).Add(initialBalanceForSafe, params.KDASafeExtraBalance)
+	expectedKdaSafe := big.NewInt(0).Add(initialBalanceForSafe, params.KDASafeExtraBalance)
 	balanceForSafe := setup.KcHandler.GetKDAChainSpecificTokenBalance(setup.Ctx, setup.KcHandler.SafeAddress, params.AbstractTokenIdentifier)
-	isSafeContractOnCorrectBalance := expectedEsdtSafe.String() == balanceForSafe.String()
+	isSafeContractOnCorrectBalance := expectedKdaSafe.String() == balanceForSafe.String()
 
 	return isTransferDoneFromKc && isSafeContractOnCorrectBalance
 }
