Add etna-time configs
#463
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
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 |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ import ( | |
| "github.com/ava-labs/avalanchego/proto/pb/p2p" | ||
| "github.com/ava-labs/avalanchego/proto/pb/sdk" | ||
| "github.com/ava-labs/avalanchego/subnets" | ||
| "github.com/ava-labs/avalanchego/utils/constants" | ||
| "github.com/ava-labs/avalanchego/utils/crypto/bls" | ||
| "github.com/ava-labs/avalanchego/utils/logging" | ||
| "github.com/ava-labs/avalanchego/utils/set" | ||
|
|
@@ -27,6 +28,8 @@ import ( | |
| "github.com/ava-labs/awm-relayer/signature-aggregator/aggregator/cache" | ||
| "github.com/ava-labs/awm-relayer/signature-aggregator/metrics" | ||
| "github.com/ava-labs/awm-relayer/utils" | ||
| corethMsg "github.com/ava-labs/coreth/plugin/evm/message" | ||
| msg "github.com/ava-labs/subnet-evm/plugin/evm/message" | ||
| "go.uber.org/zap" | ||
| "google.golang.org/protobuf/proto" | ||
| ) | ||
|
|
@@ -42,6 +45,9 @@ const ( | |
| ) | ||
|
|
||
| var ( | ||
| codec = msg.Codec | ||
| corethCodec = corethMsg.Codec | ||
|
|
||
| // Errors | ||
| errNotEnoughSignatures = errors.New("failed to collect a threshold of signatures") | ||
| errNotEnoughConnectedStake = errors.New("failed to connect to a threshold of stake") | ||
|
|
@@ -57,6 +63,7 @@ type SignatureAggregator struct { | |
| subnetsMapLock sync.RWMutex | ||
| metrics *metrics.SignatureAggregatorMetrics | ||
| cache *cache.Cache | ||
| etnaTime time.Time | ||
| } | ||
|
|
||
| func NewSignatureAggregator( | ||
|
|
@@ -65,6 +72,7 @@ func NewSignatureAggregator( | |
| signatureCacheSize uint64, | ||
| metrics *metrics.SignatureAggregatorMetrics, | ||
| messageCreator message.Creator, | ||
| etnaTime time.Time, | ||
| ) (*SignatureAggregator, error) { | ||
| cache, err := cache.NewCache(signatureCacheSize, logger) | ||
| if err != nil { | ||
|
|
@@ -81,6 +89,7 @@ func NewSignatureAggregator( | |
| messageCreator: messageCreator, | ||
| currentRequestID: atomic.Uint32{}, | ||
| cache: cache, | ||
| etnaTime: etnaTime, | ||
| } | ||
| sa.currentRequestID.Store(rand.Uint32()) | ||
| return &sa, nil | ||
|
|
@@ -174,14 +183,7 @@ func (s *SignatureAggregator) CreateSignedMessage( | |
| )) | ||
| } | ||
|
|
||
| reqBytes, err := s.marshalRequest(unsignedMessage, justification, sourceSubnet) | ||
| if err != nil { | ||
| msg := "Failed to marshal request bytes" | ||
| s.logger.Error( | ||
|
|
@@ -517,15 +519,13 @@ func (s *SignatureAggregator) isValidSignatureResponse( | |
| return blsSignatureBuf{}, false | ||
| } | ||
|
|
||
| signature, err := s.unmarshalResponse(appResponse.AppBytes) | ||
| if err != nil { | ||
| s.logger.Error( | ||
| "Error unmarshaling signature response", | ||
| zap.Error(err), | ||
| ) | ||
| } | ||
|
|
||
| // If the node returned an empty signature, then it has not yet seen the warp message. Retry later. | ||
| emptySignature := blsSignatureBuf{} | ||
|
|
@@ -560,9 +560,8 @@ func (s *SignatureAggregator) isValidSignatureResponse( | |
| ) | ||
| return blsSignatureBuf{}, false | ||
| } | ||
|
|
||
| return signature, true | ||
| } | ||
|
|
||
| // aggregateSignatures constructs a BLS aggregate signature from the collected validator signatures. Also | ||
|
|
@@ -594,3 +593,61 @@ func (s *SignatureAggregator) aggregateSignatures( | |
| } | ||
| return aggSig, vdrBitSet, nil | ||
| } | ||
|
|
||
| // TODO: refactor this to remove special handling based on etnaTime | ||
| // after Etna release, along with related config and testing code | ||
| func (s *SignatureAggregator) marshalRequest( | ||
| unsignedMessage *avalancheWarp.UnsignedMessage, | ||
| justification []byte, | ||
| sourceSubnet ids.ID, | ||
| ) ([]byte, error) { | ||
| if !s.etnaTime.IsZero() && s.etnaTime.Before(time.Now()) { | ||
| // Post-Etna case | ||
| messageBytes, err := proto.Marshal( | ||
| &sdk.SignatureRequest{ | ||
| Message: unsignedMessage.Bytes(), | ||
| Justification: justification, | ||
| }, | ||
| ) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return networkP2P.PrefixMessage( | ||
| networkP2P.ProtocolPrefix(networkP2P.SignatureRequestHandlerID), | ||
| messageBytes, | ||
| ), nil | ||
| } else { | ||
| // Pre-Etna case | ||
| if sourceSubnet == constants.PrimaryNetworkID { | ||
| req := corethMsg.MessageSignatureRequest{ | ||
| MessageID: unsignedMessage.ID(), | ||
| } | ||
| return corethMsg.RequestToBytes(corethCodec, req) | ||
| } else { | ||
| req := msg.MessageSignatureRequest{ | ||
| MessageID: unsignedMessage.ID(), | ||
| } | ||
| return msg.RequestToBytes(codec, req) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (s *SignatureAggregator) unmarshalResponse(responseBytes []byte) (blsSignatureBuf, error) { | ||
|
There was a problem hiding this comment. Can we leave TODOs and create a ticket for when this logic is okay to clean up? There was a problem hiding this comment. Added TODO and entered: #466 |
||
| if !s.etnaTime.IsZero() && s.etnaTime.Before(time.Now()) { | ||
| // Post-Etna case | ||
| var sigResponse sdk.SignatureResponse | ||
| err := proto.Unmarshal(responseBytes, &sigResponse) | ||
| if err != nil { | ||
| return blsSignatureBuf{}, err | ||
| } | ||
| return blsSignatureBuf(sigResponse.Signature), nil | ||
| } else { | ||
| // Pre-Etna case | ||
| var sigResponse msg.SignatureResponse | ||
| _, err := msg.Codec.Unmarshal(responseBytes, &sigResponse) | ||
| if err != nil { | ||
| return blsSignatureBuf{}, err | ||
| } | ||
| return sigResponse.Signature, nil | ||
| } | ||
| } | ||
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
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.
I would have liked to do
omitemptyso that tests don't write the field out when marshaling JSON here but zero time value still gets written out unless the field type is*time.Timewhich seemed messier.The value that does get written out is correctly parsed by viper to be zero time value. As a result tests run the pre-Etna case unless otherwise specified.