From e5786dd493c0a379e39af1276fb6ec6db83d14d4 Mon Sep 17 00:00:00 2001 From: tcar Date: Wed, 11 Sep 2024 11:10:48 +0200 Subject: [PATCH 1/3] remove comma from depositNonce string number; Signed-off-by: tcar --- src/indexer/utils/substrate/index.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/indexer/utils/substrate/index.ts b/src/indexer/utils/substrate/index.ts index 47e0c761..90916ea3 100644 --- a/src/indexer/utils/substrate/index.ts +++ b/src/indexer/utils/substrate/index.ts @@ -41,11 +41,11 @@ export async function saveProposalExecution( ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, timestamp } = proposalExecutionData - let transfer = await transferRepository.findTransfer(Number(depositNonce), Number(originDomainId), toDomainId) + let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), Number(originDomainId), toDomainId) if (!transfer) { transfer = await transferRepository.insertExecutionTransfer( { - depositNonce: Number(depositNonce), + depositNonce: Number(depositNonce.replace(/,/g, '')), fromDomainId: originDomainId, }, toDomainId, @@ -72,12 +72,12 @@ export async function saveFailedHandlerExecution( ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, error, timestamp } = failedHandlerExecutionData - let transfer = await transferRepository.findTransfer(Number(depositNonce), Number(originDomainId), toDomainId) + let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), Number(originDomainId), toDomainId) // there is no transfer yet, but a proposal execution exists if (!transfer) { transfer = await transferRepository.insertFailedTransfer( { - depositNonce: Number(depositNonce), + depositNonce: Number(depositNonce.replace(/,/g, '')), domainId: originDomainId, message: Buffer.from(error).toString(), }, @@ -125,7 +125,7 @@ export async function saveDeposit( const decodedAmount = getDecodedAmount(depositData) - let transfer = await transferRepository.findTransfer(Number(depositNonce), originDomainId, Number(destinationDomainId)) + let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), originDomainId, Number(destinationDomainId)) let amountInUSD @@ -138,7 +138,7 @@ export async function saveDeposit( if (transfer) { let dataTransferToUpdate = { - depositNonce: Number(depositNonce), + depositNonce: Number(depositNonce.replace(/,/g, '')), amount: decodedAmount, resourceID: resourceId, fromDomainId: originDomainId.toString(), @@ -168,7 +168,7 @@ export async function saveDeposit( } else { const transferData = { id: new ObjectId().toString(), - depositNonce: Number(depositNonce), + depositNonce: Number(depositNonce.replace(/,/g, '')), sender, amount: decodedAmount, resourceID: resourceId, From 516518401ef86ac30234046d76244e04c2a90fe6 Mon Sep 17 00:00:00 2001 From: tcar Date: Wed, 11 Sep 2024 11:21:55 +0200 Subject: [PATCH 2/3] optimize code; Signed-off-by: tcar --- src/indexer/utils/substrate/index.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/indexer/utils/substrate/index.ts b/src/indexer/utils/substrate/index.ts index 90916ea3..a90a9da8 100644 --- a/src/indexer/utils/substrate/index.ts +++ b/src/indexer/utils/substrate/index.ts @@ -40,12 +40,12 @@ export async function saveProposalExecution( transferRepository: TransferRepository, ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, timestamp } = proposalExecutionData - - let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), Number(originDomainId), toDomainId) + const numDepositNonce = Number(depositNonce.replace(/,/g, '')) + let transfer = await transferRepository.findTransfer(numDepositNonce, Number(originDomainId), toDomainId) if (!transfer) { transfer = await transferRepository.insertExecutionTransfer( { - depositNonce: Number(depositNonce.replace(/,/g, '')), + depositNonce: numDepositNonce, fromDomainId: originDomainId, }, toDomainId, @@ -71,13 +71,14 @@ export async function saveFailedHandlerExecution( transferRepository: TransferRepository, ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, error, timestamp } = failedHandlerExecutionData + const numDepositNonce = Number(depositNonce.replace(/,/g, '')) - let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), Number(originDomainId), toDomainId) + let transfer = await transferRepository.findTransfer(numDepositNonce, Number(originDomainId), toDomainId) // there is no transfer yet, but a proposal execution exists if (!transfer) { transfer = await transferRepository.insertFailedTransfer( { - depositNonce: Number(depositNonce.replace(/,/g, '')), + depositNonce: numDepositNonce, domainId: originDomainId, message: Buffer.from(error).toString(), }, @@ -120,12 +121,11 @@ export async function saveDeposit( } = substrateDepositData const currentDomain = sharedConfig.domains.find(domain => domain.id === originDomainId) - const tokenSymbol = currentDomain?.resources.find(resource => resource.resourceId === resourceId)?.symbol - const decodedAmount = getDecodedAmount(depositData) + const numDepositNonce = Number(depositNonce.replace(/,/g, '')) - let transfer = await transferRepository.findTransfer(Number(depositNonce.replace(/,/g, '')), originDomainId, Number(destinationDomainId)) + let transfer = await transferRepository.findTransfer(numDepositNonce, originDomainId, Number(destinationDomainId)) let amountInUSD @@ -138,7 +138,7 @@ export async function saveDeposit( if (transfer) { let dataTransferToUpdate = { - depositNonce: Number(depositNonce.replace(/,/g, '')), + depositNonce: numDepositNonce, amount: decodedAmount, resourceID: resourceId, fromDomainId: originDomainId.toString(), @@ -168,7 +168,7 @@ export async function saveDeposit( } else { const transferData = { id: new ObjectId().toString(), - depositNonce: Number(depositNonce.replace(/,/g, '')), + depositNonce: numDepositNonce, sender, amount: decodedAmount, resourceID: resourceId, From f31915db18235f7b87c73cf2611b40bf07f70c27 Mon Sep 17 00:00:00 2001 From: tcar Date: Wed, 11 Sep 2024 11:25:12 +0200 Subject: [PATCH 3/3] lint code; Signed-off-by: tcar --- src/indexer/utils/substrate/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/indexer/utils/substrate/index.ts b/src/indexer/utils/substrate/index.ts index a90a9da8..9f41f727 100644 --- a/src/indexer/utils/substrate/index.ts +++ b/src/indexer/utils/substrate/index.ts @@ -40,7 +40,7 @@ export async function saveProposalExecution( transferRepository: TransferRepository, ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, timestamp } = proposalExecutionData - const numDepositNonce = Number(depositNonce.replace(/,/g, '')) + const numDepositNonce = Number(depositNonce.replace(/,/g, "")) let transfer = await transferRepository.findTransfer(numDepositNonce, Number(originDomainId), toDomainId) if (!transfer) { transfer = await transferRepository.insertExecutionTransfer( @@ -71,7 +71,7 @@ export async function saveFailedHandlerExecution( transferRepository: TransferRepository, ): Promise { const { originDomainId, depositNonce, txIdentifier, blockNumber, error, timestamp } = failedHandlerExecutionData - const numDepositNonce = Number(depositNonce.replace(/,/g, '')) + const numDepositNonce = Number(depositNonce.replace(/,/g, "")) let transfer = await transferRepository.findTransfer(numDepositNonce, Number(originDomainId), toDomainId) // there is no transfer yet, but a proposal execution exists @@ -123,7 +123,7 @@ export async function saveDeposit( const currentDomain = sharedConfig.domains.find(domain => domain.id === originDomainId) const tokenSymbol = currentDomain?.resources.find(resource => resource.resourceId === resourceId)?.symbol const decodedAmount = getDecodedAmount(depositData) - const numDepositNonce = Number(depositNonce.replace(/,/g, '')) + const numDepositNonce = Number(depositNonce.replace(/,/g, "")) let transfer = await transferRepository.findTransfer(numDepositNonce, originDomainId, Number(destinationDomainId))