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.

Sign up for GitHub

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

Jump to bottom

p2p: Segregate V3 Mesh network from V2 network #455

Merged
merged 5 commits into from
Oct 21, 2019
Merged

p2p: Segregate V3 Mesh network from V2 network #455

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ba78b9
Update pubSubTopic, rendezvous string and DHT ID so that the V3 Mesh …
fabioberger Oct 17, 2019
1931b6f
Add CHANGELOG entry
fabioberger Oct 17, 2019
3dbdab7
Change version to simply increment beta tag
fabioberger Oct 17, 2019
250c62a
Modify 0xV3 Mesh version to increment separately from V2 Mesh
fabioberger Oct 18, 2019
a2b3638
Keep DHT version the same for 0xV3 Mesh nodes can use the same bootst…
fabioberger Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

This changelog is a work in progress and may contain notes for versions which have not actually been released. Check the [Releases](https://github.com/0xProject/0x-mesh/releases) page to see full release notes and more information about the latest released versions.

## v5.0.1-beta-0xv3
## v5.0.1-beta-0xv3.1
fabioberger marked this conversation as resolved.
Show resolved Hide resolved

### Bug fixes 🐞

- Updated DevUtils.sol contract address for the Kovan network to one including a bug fix for validating orders with nulled out `feeAssetData` fields. ([#446](https://github.com/0xProject/0x-mesh/pull/446)])
- Added back Ropsten and Rinkeby support and fixed `exchange` address on Kovan ([#451](https://github.com/0xProject/0x-mesh/pull/451))
- Segregate V3 Mesh network from V2 network ([#455](https://github.com/0xProject/0x-mesh/pull/455))

## v5.0.0-beta

Expand Down
4 changes: 2 additions & 2 deletions core/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ func unquoteConfig(config Config) Config {
}

func getPubSubTopic(networkID int) string {
return fmt.Sprintf("/0x-orders/network/%d/version/1", networkID)
return fmt.Sprintf("/0x-orders/network/%d/version/2", networkID)
}

func getRendezvous(networkID int) string {
return fmt.Sprintf("/0x-mesh/network/%d/version/1", networkID)
return fmt.Sprintf("/0x-mesh/network/%d/version/2", networkID)
}

func initPrivateKey(path string) (p2pcrypto.PrivKey, error) {
Expand Down
2 changes: 1 addition & 1 deletion p2p/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
log "github.com/sirupsen/logrus"
)

const dhtProtocolID = protocol.ID("/0x-mesh-dht/version/1")
const dhtProtocolID = protocol.ID("/0x-mesh-dht/version/2")
fabioberger marked this conversation as resolved.
Show resolved Hide resolved

// DefaultBootstrapList is a list of addresses to use by default for
// bootstrapping the DHT.
Expand Down