Signature Aggregator ACP-118 updates #422
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ import ( | |
|
|
||
| "github.com/ava-labs/avalanchego/ids" | ||
| "github.com/ava-labs/avalanchego/message" | ||
| networkP2P "github.com/ava-labs/avalanchego/network/p2p" | ||
| "github.com/ava-labs/avalanchego/proto/pb/p2p" | ||
| "github.com/ava-labs/avalanchego/proto/pb/sdk" | ||
| "github.com/ava-labs/avalanchego/subnets" | ||
|
|
@@ -24,7 +25,6 @@ import ( | |
| avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" | ||
| "github.com/ava-labs/awm-relayer/peers" | ||
| "github.com/ava-labs/awm-relayer/utils" | ||
| "go.uber.org/zap" | ||
| "google.golang.org/protobuf/proto" | ||
| ) | ||
|
|
@@ -120,9 +120,11 @@ func (s *SignatureAggregator) CreateSignedMessage( | |
| return nil, errNotEnoughConnectedStake | ||
| } | ||
|
|
||
| reqBytes := networkP2P.ProtocolPrefix(networkP2P.SignatureRequestHandlerID) | ||
| messageBytes, err := proto.Marshal( | ||
| &sdk.SignatureRequest{Message: unsignedMessage.Bytes()}, | ||
| ) | ||
| reqBytes = append(reqBytes, messageBytes...) | ||
| if err != nil { | ||
| msg := "Failed to marshal request bytes" | ||
| s.logger.Error( | ||
|
|
@@ -360,44 +362,44 @@ func (s *SignatureAggregator) handleResponse( | |
| } | ||
|
|
||
| // As soon as the signatures exceed the stake weight threshold we try to aggregate and send the transaction. | ||
| if !utils.CheckStakeWeightPercentageExceedsThreshold( | ||
| accumulatedSignatureWeight, | ||
| connectedValidators.TotalValidatorWeight, | ||
| quorumPercentage, | ||
| ) { | ||
| // Not enough signatures, continue processing messages | ||
| return nil, true, nil | ||
| } | ||
| aggSig, vdrBitSet, err := s.aggregateSignatures(signatureMap) | ||
| if err != nil { | ||
| msg := "Failed to aggregate signature." | ||
| s.logger.Error( | ||
| msg, | ||
| zap.String("sourceBlockchainID", unsignedMessage.SourceChainID.String()), | ||
| zap.String("warpMessageID", unsignedMessage.ID().String()), | ||
| zap.Error(err), | ||
| ) | ||
| return nil, true, fmt.Errorf("%s: %w", msg, err) | ||
| } | ||
|
|
||
| signedMsg, err := avalancheWarp.NewMessage( | ||
| unsignedMessage, | ||
| &avalancheWarp.BitSetSignature{ | ||
| Signers: vdrBitSet.Bytes(), | ||
| Signature: *(*[bls.SignatureLen]byte)(bls.SignatureToBytes(aggSig)), | ||
| }, | ||
| ) | ||
| if err != nil { | ||
| msg := "Failed to create new signed message" | ||
| s.logger.Error( | ||
| msg, | ||
| zap.String("sourceBlockchainID", unsignedMessage.SourceChainID.String()), | ||
| zap.String("warpMessageID", unsignedMessage.ID().String()), | ||
| zap.Error(err), | ||
| ) | ||
| return nil, true, fmt.Errorf("%s: %w", msg, err) | ||
| } | ||
| return signedMsg, true, nil | ||
| } | ||
|
|
||
| // isValidSignatureResponse tries to generate a signature from the peer.AsyncResponse, then verifies | ||
|
|
@@ -426,8 +428,9 @@ func (s *SignatureAggregator) isValidSignatureResponse( | |
| return blsSignatureBuf{}, false | ||
| } | ||
|
|
||
| sigResponse := sdk.SignatureResponse{} | ||
| err := proto.Unmarshal(appResponse.AppBytes, &sigResponse) | ||
| if err != nil { | ||
| s.logger.Error( | ||
| "Error unmarshaling signature response", | ||
| zap.Error(err), | ||
|
|
@@ -459,8 +462,9 @@ func (s *SignatureAggregator) isValidSignatureResponse( | |
| ) | ||
| return blsSignatureBuf{}, false | ||
| } | ||
| blsSig := blsSignatureBuf{} | ||
| copy(blsSig[:], signature[:]) | ||
|
There was a problem hiding this comment. Should we have a check higher up that the length of There was a problem hiding this comment. Possibly, we do call There was a problem hiding this comment. Addressed in 811c97a |
||
| return blsSig, true | ||
| } | ||
|
|
||
| // aggregateSignatures constructs a BLS aggregate signature from the collected validator signatures. Also | ||
|
|
||
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
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
Submodule teleporter
updated
from 1c7df1 to a3092c
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is messy checking but I used this to see error codes received from validator nodes which we don't log anywhere right now