luxfi/netrunner
1
0
Fork 0
mirror of https://github.com/luxfi/netrunner.git synced 2026-07-27 00:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop ethAddr/luxAddr string tags — canonical is evmAddr/utxoAddr

Browse Source
This commit is contained in:
Hanzo AI
2026-05-22 20:40:50 -07:00
parent 052eabc032
commit 1ad2281065
5 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
genesis.json
+26 -26
View File
@@ -1,8 +1,8 @@
{ {
"allocations": [ "allocations": [
{ {
"ethAddr": "0xf4b5be7a6deA583dA4CddCDa4D9B3afd51684b6e", "evmAddr": "0xf4b5be7a6deA583dA4CddCDa4D9B3afd51684b6e",
"luxAddr": "P-lux1x7rtxtkh6538hqdwp624tryu33853phfl8sy85", "utxoAddr": "P-lux1x7rtxtkh6538hqdwp624tryu33853phfl8sy85",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -408,8 +408,8 @@
] ]
}, },
{ {
"ethAddr": "0x202335dd1c21C9B90277F8BcA78Db98db0bBc293", "evmAddr": "0x202335dd1c21C9B90277F8BcA78Db98db0bBc293",
"luxAddr": "P-lux184tuwjk0np3n4mm2d7d7y0f397ksmzy0uk2ufy", "utxoAddr": "P-lux184tuwjk0np3n4mm2d7d7y0f397ksmzy0uk2ufy",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -815,8 +815,8 @@
] ]
}, },
{ {
"ethAddr": "0xf6e9EaE8211e4a4532a480100068783D9Cb75c3b", "evmAddr": "0xf6e9EaE8211e4a4532a480100068783D9Cb75c3b",
"luxAddr": "P-lux14pfm4k9k3mx30yf2kpd9cvfcs7mzkkn6yuujpd", "utxoAddr": "P-lux14pfm4k9k3mx30yf2kpd9cvfcs7mzkkn6yuujpd",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -1222,8 +1222,8 @@
] ]
}, },
{ {
"ethAddr": "0x32712D64011E135A24Bb13B5934b53B6d6790812", "evmAddr": "0x32712D64011E135A24Bb13B5934b53B6d6790812",
"luxAddr": "P-lux15953qfaga3w5txjmr0fl4clu37kak0ah4gjprr", "utxoAddr": "P-lux15953qfaga3w5txjmr0fl4clu37kak0ah4gjprr",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -1629,8 +1629,8 @@
] ]
}, },
{ {
"ethAddr": "0x5CB26690fE4f5b60808BF8f1be7D11094789862b", "evmAddr": "0x5CB26690fE4f5b60808BF8f1be7D11094789862b",
"luxAddr": "P-lux1jx9p2hxfemcgdlylth05zj20klsn4t06zddpv7", "utxoAddr": "P-lux1jx9p2hxfemcgdlylth05zj20klsn4t06zddpv7",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -2036,8 +2036,8 @@
] ]
}, },
{ {
"ethAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714", "evmAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714",
"luxAddr": "P-lux1c7wevm4667l4umtzh93r25wpxlpsadkhka6gv6", "utxoAddr": "P-lux1c7wevm4667l4umtzh93r25wpxlpsadkhka6gv6",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -2047,8 +2047,8 @@
] ]
}, },
{ {
"ethAddr": "0x17F7c3C6D56C41F32a7DAF65dB0743A7D6cb74A6", "evmAddr": "0x17F7c3C6D56C41F32a7DAF65dB0743A7D6cb74A6",
"luxAddr": "P-lux1642mv829lx2rzdydtdmyeakvm0g0yz5gmteuze", "utxoAddr": "P-lux1642mv829lx2rzdydtdmyeakvm0g0yz5gmteuze",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -2454,8 +2454,8 @@
] ]
}, },
{ {
"ethAddr": "0x775438812D358fD1e090Cf04962F1f8F34DafbaC", "evmAddr": "0x775438812D358fD1e090Cf04962F1f8F34DafbaC",
"luxAddr": "P-lux1zjx8c7mjmy4sm366308myet7luklngke3gkl7c", "utxoAddr": "P-lux1zjx8c7mjmy4sm366308myet7luklngke3gkl7c",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -2861,8 +2861,8 @@
] ]
}, },
{ {
"ethAddr": "0x8078fC2bD0DF7A5943BA1a81d0Ae9572089A24d1", "evmAddr": "0x8078fC2bD0DF7A5943BA1a81d0Ae9572089A24d1",
"luxAddr": "P-lux15f7cwhu3d6pyvtuzylmk9lnywfgseq5qde8eef", "utxoAddr": "P-lux15f7cwhu3d6pyvtuzylmk9lnywfgseq5qde8eef",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -3268,8 +3268,8 @@
] ]
}, },
{ {
"ethAddr": "0xe3c9c6B304B875f0BE94481ce1F1f634ceee0338", "evmAddr": "0xe3c9c6B304B875f0BE94481ce1F1f634ceee0338",
"luxAddr": "P-lux1n63raxw20q6n0z2rsyk6ucrk89r29jwx6v0639", "utxoAddr": "P-lux1n63raxw20q6n0z2rsyk6ucrk89r29jwx6v0639",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -3675,8 +3675,8 @@
] ]
}, },
{ {
"ethAddr": "0xc18f7344B235903e796F52e8c0e5b21247d3Faa4", "evmAddr": "0xc18f7344B235903e796F52e8c0e5b21247d3Faa4",
"luxAddr": "P-lux1zsq3a0h08kqzk6eegpspv8lslygrt30pwplevk", "utxoAddr": "P-lux1zsq3a0h08kqzk6eegpspv8lslygrt30pwplevk",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [ "unlockSchedule": [
{ {
@@ -4082,14 +4082,14 @@
] ]
}, },
{ {
"ethAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714", "evmAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714",
"luxAddr": "X-lux1jqg73zp9r2c98daarnd4nrd5l80dj3c5eha5fl", "utxoAddr": "X-lux1jqg73zp9r2c98daarnd4nrd5l80dj3c5eha5fl",
"initialAmount": 1000000000000000, "initialAmount": 1000000000000000,
"unlockSchedule": [] "unlockSchedule": []
}, },
{ {
"ethAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714", "evmAddr": "0x9011E888251AB053B7bD1cdB598Db4f9DEd94714",
"luxAddr": "P-lux1jqg73zp9r2c98daarnd4nrd5l80dj3c5eha5fl", "utxoAddr": "P-lux1jqg73zp9r2c98daarnd4nrd5l80dj3c5eha5fl",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {
local/genesis_config.go
+30 -30
View File
@@ -222,15 +222,15 @@ func NewConfigForNetwork(binaryPath string, numNodes uint32, networkID uint32) (
fmt.Printf("🔑 Setting X+P allocations for mnemonic: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr) fmt.Printf("🔑 Setting X+P allocations for mnemonic: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr)
// X-chain allocation // X-chain allocation
newAllocations = append(newAllocations, map[string]interface{}{ newAllocations = append(newAllocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": xLuxAddr, "utxoAddr": xLuxAddr,
"initialAmount": GigaLux, "initialAmount": GigaLux,
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
// P-chain allocation // P-chain allocation
newAllocations = append(newAllocations, map[string]interface{}{ newAllocations = append(newAllocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": pLuxAddr, "utxoAddr": pLuxAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, {"amount": GigaLux, "locktime": uint64(0)},
@@ -254,14 +254,14 @@ func NewConfigForNetwork(binaryPath string, numNodes uint32, networkID uint32) (
fmt.Printf("🔑 Adding X+P allocations for PRIVATE_KEY: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr) fmt.Printf("🔑 Adding X+P allocations for PRIVATE_KEY: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr)
ethAddr := "0x" + hex.EncodeToString(addr[:]) ethAddr := "0x" + hex.EncodeToString(addr[:])
newAllocations = append(newAllocations, map[string]interface{}{ newAllocations = append(newAllocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": xLuxAddr, "utxoAddr": xLuxAddr,
"initialAmount": GigaLux, "initialAmount": GigaLux,
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
newAllocations = append(newAllocations, map[string]interface{}{ newAllocations = append(newAllocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": pLuxAddr, "utxoAddr": pLuxAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, {"amount": GigaLux, "locktime": uint64(0)},
@@ -745,8 +745,8 @@ func NewConfigWithPreExistingKeys(binaryPath string, networkID uint32, keysDir s
} }
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": xChainAddr, "utxoAddr": xChainAddr,
"initialAmount": oneGigaLux, "initialAmount": oneGigaLux,
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
@@ -759,8 +759,8 @@ func NewConfigWithPreExistingKeys(binaryPath string, networkID uint32, keysDir s
} }
} }
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": pChainAddr, "utxoAddr": pChainAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": pchainUnlockSchedule, "unlockSchedule": pchainUnlockSchedule,
}) })
@@ -772,8 +772,8 @@ func NewConfigWithPreExistingKeys(binaryPath string, networkID uint32, keysDir s
if mnemonic := getMnemonic(); mnemonic != "" { if mnemonic := getMnemonic(); mnemonic != "" {
fmt.Printf("🔑 Mnemonic set, adding mnemonic allocation to genesis\n") fmt.Printf("🔑 Mnemonic set, adding mnemonic allocation to genesis\n")
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": "0x0406d56943a38ad8398a738527f27e2cf01731a8", "evmAddr": "0x0406d56943a38ad8398a738527f27e2cf01731a8",
"luxAddr": "P-lux1qsrd262r5w9dswv2wwzj0un79ncpwvdgkpqzqu", "utxoAddr": "P-lux1qsrd262r5w9dswv2wwzj0un79ncpwvdgkpqzqu",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": uint64(100000000000000), "locktime": uint64(0)}, {"amount": uint64(100000000000000), "locktime": uint64(0)},
@@ -796,14 +796,14 @@ func NewConfigWithPreExistingKeys(binaryPath string, networkID uint32, keysDir s
ethAddr := "0x" + hex.EncodeToString(pChainAddr[:]) ethAddr := "0x" + hex.EncodeToString(pChainAddr[:])
fmt.Printf("🔑 Adding PRIVATE_KEY allocations: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr) fmt.Printf("🔑 Adding PRIVATE_KEY allocations: X=%s, P=%s (1B each)\n", xLuxAddr, pLuxAddr)
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": xLuxAddr, "utxoAddr": xLuxAddr,
"initialAmount": GigaLux, "initialAmount": GigaLux,
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": pLuxAddr, "utxoAddr": pLuxAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, {"amount": GigaLux, "locktime": uint64(0)},
@@ -1019,14 +1019,14 @@ func NewConfigFromMnemonic(binaryPath string, networkID uint32, numNodes uint32)
initialStakers[i] = staker initialStakers[i] = staker
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": xChainAddr, "utxoAddr": xChainAddr,
"initialAmount": GigaLux, // 1B LUX (1e15 nLUX) "initialAmount": GigaLux, // 1B LUX (1e15 nLUX)
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": vk.CChainAddrHex(), "evmAddr": vk.CChainAddrHex(),
"luxAddr": pChainAddr, "utxoAddr": pChainAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, // 1B LUX (1e15 nLUX) {"amount": GigaLux, "locktime": uint64(0)}, // 1B LUX (1e15 nLUX)
@@ -1048,14 +1048,14 @@ func NewConfigFromMnemonic(binaryPath string, networkID uint32, numNodes uint32)
} }
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": walletKey.CChainAddrHex(), "evmAddr": walletKey.CChainAddrHex(),
"luxAddr": walletXAddr, "utxoAddr": walletXAddr,
"initialAmount": GigaLux, // 1B LUX (1e15 nLUX) "initialAmount": GigaLux, // 1B LUX (1e15 nLUX)
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": walletKey.CChainAddrHex(), "evmAddr": walletKey.CChainAddrHex(),
"luxAddr": walletPAddr, "utxoAddr": walletPAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, // 1B LUX (1e15 nLUX) {"amount": GigaLux, "locktime": uint64(0)}, // 1B LUX (1e15 nLUX)
@@ -1080,14 +1080,14 @@ func NewConfigFromMnemonic(binaryPath string, networkID uint32, numNodes uint32)
fmt.Printf("🔑 Adding PRIVATE_KEY allocations: X=%s P=%s (1B each)\n", privKeyXAddr, privKeyPAddr) fmt.Printf("🔑 Adding PRIVATE_KEY allocations: X=%s P=%s (1B each)\n", privKeyXAddr, privKeyPAddr)
ethAddr := "0x" + hex.EncodeToString(privKeyAddr[:]) ethAddr := "0x" + hex.EncodeToString(privKeyAddr[:])
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": privKeyXAddr, "utxoAddr": privKeyXAddr,
"initialAmount": GigaLux, "initialAmount": GigaLux,
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"ethAddr": ethAddr, "evmAddr": ethAddr,
"luxAddr": privKeyPAddr, "utxoAddr": privKeyPAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{"amount": GigaLux, "locktime": uint64(0)}, {"amount": GigaLux, "locktime": uint64(0)},
local/keys.go
+2 -2
View File
@@ -141,8 +141,8 @@ func GenerateValidatorAllocations(numValidators uint32, hrp string) ([]map[strin
} }
allocations[i] = map[string]interface{}{ allocations[i] = map[string]interface{}{
"ethAddr": key.EthAddr, "evmAddr": key.EthAddr,
"luxAddr": luxAddr, "utxoAddr": luxAddr,
"initialAmount": uint64(0), "initialAmount": uint64(0),
"unlockSchedule": []map[string]interface{}{ "unlockSchedule": []map[string]interface{}{
{ {
local/network.go
+6 -6
View File
@@ -203,8 +203,8 @@ func init() {
if err == nil { if err == nil {
fmt.Printf("🔑 Adding default network allocation for PRIVATE_KEY address: %s\n", luxAddr) fmt.Printf("🔑 Adding default network allocation for PRIVATE_KEY address: %s\n", luxAddr)
privKeyAlloc := map[string]interface{}{ privKeyAlloc := map[string]interface{}{
"ethAddr": "0x" + hex.EncodeToString(pChainAddr[:]), "evmAddr": "0x" + hex.EncodeToString(pChainAddr[:]),
"luxAddr": luxAddr, "utxoAddr": luxAddr,
"initialAmount": float64(0), "initialAmount": float64(0),
"unlockSchedule": []interface{}{ "unlockSchedule": []interface{}{
map[string]interface{}{ map[string]interface{}{
@@ -494,16 +494,16 @@ func NewDefaultConfigNNodes(binaryPath string, numNodes uint32) (network.Config,
// Add X-chain allocation // Add X-chain allocation
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"luxAddr": xLuxAddr, "utxoAddr": xLuxAddr,
"ethAddr": "0x0000000000000000000000000000000000000000", "evmAddr": "0x0000000000000000000000000000000000000000",
"initialAmount": 2_000_000_000_000_000_000, // 2B LUX "initialAmount": 2_000_000_000_000_000_000, // 2B LUX
"unlockSchedule": []interface{}{}, "unlockSchedule": []interface{}{},
}) })
// Add P-chain allocation with unlockSchedule (builder only reads P-chain amounts from unlockSchedule) // Add P-chain allocation with unlockSchedule (builder only reads P-chain amounts from unlockSchedule)
allocations = append(allocations, map[string]interface{}{ allocations = append(allocations, map[string]interface{}{
"luxAddr": pLuxAddr, "utxoAddr": pLuxAddr,
"ethAddr": "0x0000000000000000000000000000000000000000", "evmAddr": "0x0000000000000000000000000000000000000000",
"initialAmount": 0, // Not used for P-chain - amounts come from unlockSchedule "initialAmount": 0, // Not used for P-chain - amounts come from unlockSchedule
"unlockSchedule": []interface{}{ "unlockSchedule": []interface{}{
map[string]interface{}{ map[string]interface{}{
utils/utils_test.go
+2 -2
View File
@@ -13,8 +13,8 @@ var genesis = []byte(
"networkID": 1337, "networkID": 1337,
"allocations": [ "allocations": [
{ {
"ethAddr": "0xb3d82b1367d362de99ab59a658165aff520cbd4d", "evmAddr": "0xb3d82b1367d362de99ab59a658165aff520cbd4d",
"luxAddr": "X-custom1g65uqn6t77p656w64023nh8nd9updzmxwd59gh", "utxoAddr": "X-custom1g65uqn6t77p656w64023nh8nd9updzmxwd59gh",
"initialAmount": 0, "initialAmount": 0,
"unlockSchedule": [ "unlockSchedule": [
{ {