Skip to content

Commit ac00572

Browse files
authored
Merge pull request #474 from blinklabs-io/fix/address-network-id
fix: use correct address network ID for testnets
2 parents bfcaf52 + 7cabeb6 commit ac00572

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

ledger/common.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ const (
189189
AddressHeaderNetworkMask = 0x0F
190190
AddressHashSize = 28
191191

192+
AddressNetworkTestnet = 0
193+
AddressNetworkMainnet = 1
194+
192195
AddressTypeKeyKey = 0b0000
193196
AddressTypeScriptKey = 0b0001
194197
AddressTypeKeyScript = 0b0010
@@ -323,7 +326,7 @@ func (a Address) generateHRP() string {
323326
ret = "addr"
324327
}
325328
// Add test_ suffix if not mainnet
326-
if a.networkId != 1 {
329+
if a.networkId != AddressNetworkMainnet {
327330
ret += "_test"
328331
}
329332
return ret

networks.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,40 @@
1414

1515
package ouroboros
1616

17+
import (
18+
"github.com/blinklabs-io/gouroboros/ledger"
19+
)
20+
1721
// Network definitions
1822
var (
19-
NetworkTestnet = Network{Id: 0, Name: "testnet", NetworkMagic: 1097911063}
23+
NetworkTestnet = Network{
24+
Id: ledger.AddressNetworkTestnet,
25+
Name: "testnet",
26+
NetworkMagic: 1097911063,
27+
}
2028
NetworkMainnet = Network{
21-
Id: 1,
29+
Id: ledger.AddressNetworkMainnet,
2230
Name: "mainnet",
2331
NetworkMagic: 764824073,
2432
PublicRootAddress: "backbone.cardano-mainnet.iohk.io",
2533
PublicRootPort: 3001,
2634
}
2735
NetworkPreprod = Network{
28-
Id: 2,
36+
Id: ledger.AddressNetworkTestnet,
2937
Name: "preprod",
3038
NetworkMagic: 1,
3139
PublicRootAddress: "preprod-node.world.dev.cardano.org",
3240
PublicRootPort: 30000,
3341
}
3442
NetworkPreview = Network{
35-
Id: 3,
43+
Id: ledger.AddressNetworkTestnet,
3644
Name: "preview",
3745
NetworkMagic: 2,
3846
PublicRootAddress: "preview-node.play.dev.cardano.org",
3947
PublicRootPort: 3001,
4048
}
4149
NetworkSancho = Network{
42-
Id: 4,
50+
Id: ledger.AddressNetworkTestnet,
4351
Name: "sanchonet",
4452
NetworkMagic: 4,
4553
PublicRootAddress: "sanchonet-node.play.dev.cardano.org",
@@ -94,7 +102,7 @@ func NetworkByNetworkMagic(networkMagic uint32) Network {
94102

95103
// Network represents a Cardano network
96104
type Network struct {
97-
Id uint8
105+
Id uint8 // network ID used for addresses
98106
Name string
99107
NetworkMagic uint32
100108
PublicRootAddress string

0 commit comments

Comments
 (0)