fix_: fix swap in routerV2

This commit is contained in:
Dario Gabriel Lipicar 2024-06-30 18:38:32 -03:00 committed by saledjenic
parent 443cd412f7
commit 4d7c2683f5
2 changed files with 10 additions and 18 deletions

View File

@ -22,7 +22,7 @@ import (
type SwapParaswapTxArgs struct {
transactions.SendTxArgs
ChainID uint64 `json:"chainId"`
ChainIDTo uint64 `json:"chainIdFrom"`
ChainIDTo uint64 `json:"chainIdTo"`
TokenIDFrom string `json:"tokenIdFrom"`
TokenIDTo string `json:"tokenIdTo"`
SlippagePercentage float32 `json:"slippagePercentage"`
@ -162,7 +162,10 @@ func (s *SwapParaswapProcessor) BuildTx(params ProcessorInputParams) (*ethTypes.
Data: types.HexBytes("0x0"),
Symbol: params.FromToken.Symbol,
},
ChainID: params.FromChain.ChainID,
ChainID: params.FromChain.ChainID,
ChainIDTo: params.ToChain.ChainID,
TokenIDFrom: params.FromToken.Symbol,
TokenIDTo: params.ToToken.Symbol,
},
}
@ -224,25 +227,12 @@ func (s *SwapParaswapProcessor) BuildTransaction(sendArgs *MultipathProcessorTxA
}
func (s *SwapParaswapProcessor) Send(sendArgs *MultipathProcessorTxArgs, verifiedAccount *account.SelectedExtKey) (types.Hash, error) {
txBridgeArgs := &MultipathProcessorTxArgs{
SwapTx: &SwapParaswapTxArgs{
SendTxArgs: transactions.SendTxArgs{
From: sendArgs.SwapTx.From,
To: sendArgs.SwapTx.To,
MultiTransactionID: sendArgs.SwapTx.MultiTransactionID,
Symbol: sendArgs.SwapTx.Symbol,
},
SlippagePercentage: sendArgs.SwapTx.SlippagePercentage,
},
}
err := s.prepareTransaction(txBridgeArgs)
err := s.prepareTransaction(sendArgs)
if err != nil {
return types.Hash{}, statusErrors.CreateErrorResponseFromError(err)
}
return s.transactor.SendTransactionWithChainID(txBridgeArgs.ChainID, txBridgeArgs.SwapTx.SendTxArgs, verifiedAccount)
return s.transactor.SendTransactionWithChainID(sendArgs.ChainID, sendArgs.SwapTx.SendTxArgs, verifiedAccount)
}
func (s *SwapParaswapProcessor) CalculateAmountOut(params ProcessorInputParams) (*big.Int, error) {

View File

@ -94,7 +94,8 @@ type PathV2 struct {
ProcessorName string
FromChain *params.Network // Source chain
ToChain *params.Network // Destination chain
FromToken *walletToken.Token // Token on the source chain
FromToken *walletToken.Token // Source token
ToToken *walletToken.Token // Destination token, set if applicable
AmountIn *hexutil.Big // Amount that will be sent from the source chain
AmountInLocked bool // Is the amount locked
AmountOut *hexutil.Big // Amount that will be received on the destination chain
@ -664,6 +665,7 @@ func (r *Router) resolveCandidates(ctx context.Context, input *RouteInputParams)
FromChain: network,
ToChain: dest,
FromToken: token,
ToToken: toToken,
AmountIn: (*hexutil.Big)(amountToSend),
AmountInLocked: amountLocked,
AmountOut: (*hexutil.Big)(amountOut),