Use message ID utility #160
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
geoff-vball
force-pushed
the
gstuart/integrate-message-id-util
branch
from
748c9a9 to
3a62f05
Compare
geoff-vball
commented
Feb 1, 2024
| @@ -142,6 +141,7 @@ func (m *messageManager) ShouldSendMessage(unsignedMessage *warp.UnsignedMessage | |||
| } | |||
|
|
|||
| // Check if the message has already been delivered to the destination chain | |||
| teleporterMessenger := m.getTeleporterMessenger(destinationClient) | |||
There was a problem hiding this comment.
This is just moved down from higher up
geoff-vball
commented
Feb 1, 2024
Comment on lines
-61
to
+63
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress) | ||
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress, 2) |
There was a problem hiding this comment.
This will be removed from this PR. Just needed to put anything here for it to compile. This will be solved in Cam's PRs.
There was a problem hiding this comment.
I think this can be updated now.
geoff-vball
commented
Feb 1, 2024
Comment on lines
-61
to
+63
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress) | ||
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress, 2) |
There was a problem hiding this comment.
This will be removed from this PR. Just needed to put anything here for it to compile. This will be solved in Cam's PRs.
geoff-vball
requested review from
michaelkaplan13,
cam-schultz,
minghinmatthewlam,
gwen917 and
bernard-avalabs
as code owners
| @@ -186,8 +186,7 @@ func (m *messageManager) SendMessage(signedMessage *warp.Message, destinationBlo | |||
| return fmt.Errorf("relayer not configured to deliver to destination. DestinationBlockchainID=%s", destinationBlockchainID) | |||
| } | |||
|
|
|||
| teleporterMessenger := m.getTeleporterMessenger(destinationClient) | |||
| teleporterMessageID, err := m.calculateMessageID(teleporterMessenger, signedMessage.SourceChainID, destinationBlockchainID, teleporterMessage.MessageNonce) | |||
| teleporterMessageID, err := teleporterutils.CalculateMessageID(m.protocolAddress, signedMessage.SourceChainID, destinationBlockchainID, teleporterMessage.MessageNonce) | |||
There was a problem hiding this comment.
I previously decided to leave the log in CalculateMessageID, can we add logs for handling these errors with the chagned function
There was a problem hiding this comment.
I've wrapped the error here so it's clear where the error is coming from. We log any errors outside of this function, so they will get logged. I'd like to talk about our error logging in this repo in standup today if there's time.
…bs/awm-relayer into gstuart/integrate-message-id-util
Comment on lines
-61
to
+63
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress) | ||
| unsignedMessage, warpEnabledChainConfigC := utils.InitChainConfig(networkID, cChainInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigA := utils.InitChainConfig(networkID, subnetAInfo, newProtocolAddress, 2) | ||
| _, warpEnabledChainConfigB := utils.InitChainConfig(networkID, subnetBInfo, newProtocolAddress, 2) |
There was a problem hiding this comment.
I think this can be updated now.
|
The merge here was a little messy so I just transposed these changes into a different PR #163 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why this should be merged
Closes #136
How this works
Uses a utility in the Teleporter repo to calculated the Teleporter Message ID without having to make an API call to a node.
How this was tested
Tested in the Teleporter repo.