Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion internal/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ func IsAddressValidForNetwork(address flow.Address, networkName string) bool {
case "emulator", "testing":
return address.IsValid(flow.Emulator)
default:
return address.IsValid(flow.Emulator)
// For custom networks, we can't validate the address format without knowing the chain ID,
// so we allow all addresses
return true
Comment on lines +67 to +69
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel like we could try to use something like GetNetworkParameters chain ID for some stronger validation here in the future, but probably not strictly necessary for this fix.

}
}

Expand Down
38 changes: 38 additions & 0 deletions internal/util/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,48 @@ import (
"strings"
"testing"

"github.com/onflow/flow-go-sdk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestIsAddressValidForNetwork(t *testing.T) {
testnetAddr := flow.HexToAddress("8efde57e98c557fa") // Valid testnet address
emulatorAddr := flow.HexToAddress("f8d6e0586b0a20c7") // Valid emulator address
mainnetAddr := flow.HexToAddress("1654653399040a61") // Valid mainnet address

t.Run("mainnet address valid for mainnet", func(t *testing.T) {
assert.True(t, IsAddressValidForNetwork(mainnetAddr, "mainnet"))
})

t.Run("mainnet address invalid for testnet", func(t *testing.T) {
assert.False(t, IsAddressValidForNetwork(mainnetAddr, "testnet"))
})

t.Run("testnet address valid for testnet", func(t *testing.T) {
assert.True(t, IsAddressValidForNetwork(testnetAddr, "testnet"))
})

t.Run("testnet address invalid for mainnet", func(t *testing.T) {
assert.False(t, IsAddressValidForNetwork(testnetAddr, "mainnet"))
})

t.Run("emulator address valid for emulator", func(t *testing.T) {
assert.True(t, IsAddressValidForNetwork(emulatorAddr, "emulator"))
})

t.Run("emulator address valid for testing", func(t *testing.T) {
assert.True(t, IsAddressValidForNetwork(emulatorAddr, "testing"))
})

t.Run("custom network allows any address", func(t *testing.T) {
// Custom networks should allow all addresses since we can't validate without knowing the chain ID
assert.True(t, IsAddressValidForNetwork(mainnetAddr, "my-custom-network"))
assert.True(t, IsAddressValidForNetwork(testnetAddr, "my-custom-network"))
assert.True(t, IsAddressValidForNetwork(emulatorAddr, "my-custom-network"))
})
}

func TestAddFlowEntriesToGitIgnore_NoDuplicates(t *testing.T) {
_, state, _ := TestMocks(t)

Expand Down
Loading