Skip to content

Fix for ShardIDFromKey #4566

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

Merged
sophoah merged 2 commits into from
Jan 30, 2025
Merged

Fix for ShardIDFromKey #4566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9369fe7
Fix for num shards.
Frozen Nov 17, 2023
f8b7bfb
add test for ShardIDFromKey
sophoah Jan 29, 2025
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
2 changes: 1 addition & 1 deletion internal/configs/node/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ func (conf *ConfigType) ShardIDFromKey(key *bls_core.PublicKey) (uint32, error)
"cannot convert libbls public key %s to internal form",
key.SerializeToHexStr())
}
epoch := conf.networkType.ChainConfig().StakingEpoch
epoch := conf.networkType.ChainConfig().HIP30Epoch
numShards := conf.shardingSchedule.InstanceForEpoch(epoch).NumShards()
shardID := new(big.Int).Mod(pubKey.Big(), big.NewInt(int64(numShards)))
return uint32(shardID.Uint64()), nil
Expand Down
57 changes: 57 additions & 0 deletions internal/configs/node/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package nodeconfig
import (
"testing"

bls_core "github.com/harmony-one/bls/ffi/go/bls"
"github.com/harmony-one/harmony/crypto/bls"

"github.com/harmony-one/harmony/internal/blsgen"
Expand Down Expand Up @@ -94,3 +95,59 @@ func TestValidateConsensusKeysForSameShard(t *testing.T) {
t.Error("expected", e, "got", nil)
}
}
func TestShardIDFromKey(t *testing.T) {
// set mainnet config
networkType := "mainnet"
schedule := shardingconfig.MainnetSchedule
netType := NetworkType(networkType)
SetNetworkType(netType)
SetShardingSchedule(schedule)

// define a static public key that should belong to shard 0 after mainnet HIP30
pubKeyHex := "ee2474f93cba9241562efc7475ac2721ab0899edf8f7f115a656c0c1f9ef8203add678064878d174bb478fa2e6630502"
pubKey := &bls_core.PublicKey{}
err := pubKey.DeserializeHexStr(pubKeyHex)
if err != nil {
t.Error(err)
}

shardID, err := GetDefaultConfig().ShardIDFromKey(pubKey)
if err != nil {
t.Error("expected", nil, "got", err)
}
expectedShardID := uint32(0)
if shardID != expectedShardID {
t.Errorf("expected shard ID %d, got %d", expectedShardID, shardID)
}

// define 2 static public key that should be equal
// and belongs to shard 1 after mainnet HIP30
pubKeyHex1 := "76e43d5a0593235d883ed8b1a834a08107da29c64ac5388958351694dce8f183690f29672939e37548753236105ee715"
pubKey1 := &bls_core.PublicKey{}
err = pubKey1.DeserializeHexStr(pubKeyHex1)
if err != nil {
t.Error(err)
}
pubKeyHex2 := "c54958e723531fba4665007b74e48c5feae8f73485f97120f0aa0e4879c4677032179d6af216fd07d9786d74c92ff40f"
pubKey2 := &bls_core.PublicKey{}
err = pubKey2.DeserializeHexStr(pubKeyHex2)
if err != nil {
t.Error(err)
}
shardID_1, err := GetDefaultConfig().ShardIDFromKey(pubKey1)
if err != nil {
t.Error("expected", nil, "got", err)
}

shardID_2, err := GetDefaultConfig().ShardIDFromKey(pubKey2)
if err != nil {
t.Error("expected", nil, "got", err)
}

if shardID_1 != shardID_2 {
t.Errorf("expected same shard ID, got %d and %d", shardID_1, shardID_2)
}
if shardID_2 != 1 {
t.Errorf("expected shard ID 1, got %d", shardID_2)
}
}