Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade subnet-evm to v0.5.11 #161

Merged
merged 9 commits into from
Feb 1, 2024
Merged

Upgrade subnet-evm to v0.5.11 #161

merged 9 commits into from
Feb 1, 2024

Conversation

cam-schultz
Copy link
Collaborator

Why this should be merged

Upgrades subnet-evm to v0.5.11 and avalanchego to v1.10.18. Unblocks ava-labs/icm-contracts#263

How this works

Self explanatory for the most part. One change to note is that the relayer in the E2E test is now configured with NetworkID=0, rather than NetworkID=1337. This is to workaround a bug in avalanche-network-runner that has since been merged, but not yet included in a release.

How this was tested

CI

How is this documented

N/A

michaelkaplan13
michaelkaplan13 previously approved these changes Feb 1, 2024
Copy link
Collaborator

@michaelkaplan13 michaelkaplan13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@@ -125,6 +126,7 @@ func (h *RelayerExternalHandler) HandleInbound(_ context.Context, inboundMessage
h.responseChans[blockchainID] <- inboundMessage
}(inboundMessage, blockchainID)
} else {
h.log.Debug("ignoring message", zap.Stringer("op", inboundMessage.Op()))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: capitalize log

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalized all the logs in this package

@@ -96,8 +96,9 @@ func BasicRelay(network interfaces.LocalNetwork) {
)

relayerConfig := config.Config{
LogLevel: logging.Info.LowerString(),
NetworkID: peers.LocalNetworkID,
LogLevel: logging.Debug.LowerString(),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to leave as debug?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, reverted

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, reverted

NetworkID: peers.LocalNetworkID,
LogLevel: logging.Debug.LowerString(),
// TODO: There's currently a bug in ANR v1.7.4-rc.0 that specifies the network ID as 0. We should change this back to peers.LocalNetworkID once fixed.
NetworkID: 0,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you update peer.LocalNetworkID to use github.com/ava-labs/avalanche-network-runner/utils/constants.DefaultNetworkID?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing 👍

geoff-vball
geoff-vball previously approved these changes Feb 1, 2024
@cam-schultz cam-schultz merged commit b6ed2ce into main Feb 1, 2024
7 checks passed
@cam-schultz cam-schultz deleted the subnet-evm-v0.5.11 branch February 1, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants