From de5c7b8e5b8ecc33b122a7ee576a8972e8b96037 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 3 Oct 2023 16:22:20 -0400 Subject: [PATCH] feat: shard fleet Adds shard.test fleet and changes the non protected shard index to 64 --- config/cli/fleet-shards.test.json | 33 ++++++++++++++++ params/cluster.go | 1 + protocol/common/shard.go | 8 ++-- protocol/communities/manager.go | 5 --- services/mailservers/fleet.go | 37 +++++++++++++++++- static/bindata.go | 64 +++++++++++++++++++++---------- 6 files changed, 118 insertions(+), 30 deletions(-) create mode 100644 config/cli/fleet-shards.test.json diff --git a/config/cli/fleet-shards.test.json b/config/cli/fleet-shards.test.json new file mode 100644 index 000000000..addbb718e --- /dev/null +++ b/config/cli/fleet-shards.test.json @@ -0,0 +1,33 @@ +{ + "Rendezvous": false, + "NoDiscovery": true, + "ClusterConfig": { + "Enabled": true, + "Fleet": "status.prod", + "BootNodes": [], + "TrustedMailServers": [], + "PushNotificationsServers": [ + "401ba5eda402678dc78a0a40fd0795f4ea8b1e34972c4d15cf33ac01292341c89f0cbc637fa9f7a3ffe0b9dfe90e9cdae7a14925500ab01b6a91c67bae42a97a", + "181141b1d111908aaf05f4788e6778ec07073a1d4e1ce43c73815c40ee4e7345a1cbf5a90a45f601bf3763f12be63b01624ba1f36eeb9572455e7034b8f9f2c4", + "5ffc34d5ffda180d94cd3974d9ed2bb082ede68f342babdbe801ceffb7da902087d43f9aa961c7b85029358874c08ef04ecad9f1d95a1f0e448cbdd5d04350c7" + ], + "StaticNodes": [], + "RendezvousNodes": [], + "WakuNodes": [ + "/dns4/boot-01.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmAR24Mbb6VuzoyUiGx42UenDkshENVDj4qnmmbabLvo31", + "/dns4/boot-01.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm8mUZ18tBWPXDQsaF7PbCKYA35z7WB2xNZH2EVq1qS8LJ", + "/dns4/boot-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmGwcE8v7gmJNEWFtZtojYpPMTHy2jBLL6xRk33qgDxFWX" + ], + "WakuStoreNodes": [ + "/dns4/store-01.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT", + "/dns4/store-02.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9aDJPkhGxc2SFcEACTFdZ91Q5TJjp76qZEhq9iF59x7R", + "/dns4/store-01.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmMELCo218hncCtTvC2Dwbej3rbyHQcR8erXNnKGei7WPZ", + "/dns4/store-02.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJnVR7ZzFaYvciPVafUXuYGLHPzSUigqAmeNw9nJUVGeM", + "/dns4/store-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2M7xs7cLPc3jamawkEqbr7cUJX11uvY7LxQ6WFUdUKUT", + "/dns4/store-02.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9CQhsuwPR54q27kNj9iaQVfyRzTGKrhFmr94oD8ujU6P" + ] + }, + "WakuV2Config": { + "Enabled": true + } +} diff --git a/params/cluster.go b/params/cluster.go index 1576789d1..e46698365 100644 --- a/params/cluster.go +++ b/params/cluster.go @@ -10,6 +10,7 @@ const ( FleetWakuV2Test = "wakuv2.test" FleetStatusTest = "status.test" FleetStatusProd = "status.prod" + FleetShardsTest = "shards.test" ) // Cluster defines a list of Ethereum nodes. diff --git a/protocol/common/shard.go b/protocol/common/shard.go index 5b7f3f973..a60cc23aa 100644 --- a/protocol/common/shard.go +++ b/protocol/common/shard.go @@ -7,7 +7,7 @@ import ( ) const MainStatusShardCluster = 16 -const NonProtectedIndex = 128 +const NonProtectedShardIndex = 64 const UndefinedShardValue = 0 type Shard struct { @@ -54,9 +54,9 @@ func DefaultNonProtectedPubsubTopic(shard *Shard) string { if shard != nil { return transport.GetPubsubTopic(&transport.Shard{ Cluster: MainStatusShardCluster, - Index: NonProtectedIndex, + Index: NonProtectedShardIndex, }) - } else { - return relay.DefaultWakuTopic } + + return relay.DefaultWakuTopic } diff --git a/protocol/communities/manager.go b/protocol/communities/manager.go index 5749da7b8..c668ec71a 100644 --- a/protocol/communities/manager.go +++ b/protocol/communities/manager.go @@ -518,11 +518,6 @@ type CommunityShard struct { Shard *common.Shard `json:"shard"` } -type CommunityShard struct { - CommunityID string `json:"communityID"` - Shard *common.Shard `json:"shard"` -} - type KnownCommunitiesResponse struct { ContractCommunities []string `json:"contractCommunities"` // TODO: use CommunityShard ContractFeaturedCommunities []string `json:"contractFeaturedCommunities"` // TODO: use CommunityShard diff --git a/services/mailservers/fleet.go b/services/mailservers/fleet.go index 24d1b535e..d91886c84 100644 --- a/services/mailservers/fleet.go +++ b/services/mailservers/fleet.go @@ -167,7 +167,6 @@ func DefaultMailservers() []Mailserver { Fleet: params.FleetStatusProd, Version: 2, }, - Mailserver{ ID: "node-01.ac-cn-hongkong-c.status.test", Address: "/dns4/node-01.ac-cn-hongkong-c.status.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2BjXxCp1sYFJQKpLLbPbwd5juxbsYofu3TsS3auvT9Yi", @@ -186,5 +185,41 @@ func DefaultMailservers() []Mailserver { Fleet: params.FleetStatusTest, Version: 2, }, + Mailserver{ + ID: "store-01.do-ams3.shards.test", + Address: "/dns4/store-01.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmAUdrQ3uwzuE4Gy4D56hX6uLKEeerJAnhKEHZ3DxF1EfT", + Fleet: params.FleetShardsTest, + Version: 2, + }, + Mailserver{ + ID: "store-02.do-ams3.shards.test", + Address: "/dns4/store-02.do-ams3.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9aDJPkhGxc2SFcEACTFdZ91Q5TJjp76qZEhq9iF59x7R", + Fleet: params.FleetShardsTest, + Version: 2, + }, + Mailserver{ + ID: "store-01.gc-us-central1-a.shards.test", + Address: "/dns4/store-01.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmMELCo218hncCtTvC2Dwbej3rbyHQcR8erXNnKGei7WPZ", + Fleet: params.FleetShardsTest, + Version: 2, + }, + Mailserver{ + ID: "store-02.gc-us-central1-a.shards.test", + Address: "/dns4/store-02.gc-us-central1-a.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAmJnVR7ZzFaYvciPVafUXuYGLHPzSUigqAmeNw9nJUVGeM", + Fleet: params.FleetShardsTest, + Version: 2, + }, + Mailserver{ + ID: "store-01.ac-cn-hongkong-c.shards.test", + Address: "/dns4/store-01.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm2M7xs7cLPc3jamawkEqbr7cUJX11uvY7LxQ6WFUdUKUT", + Fleet: params.FleetShardsTest, + Version: 2, + }, + Mailserver{ + ID: "store-02.ac-cn-hongkong-c.shards.test", + Address: "/dns4/store-02.ac-cn-hongkong-c.shards.test.statusim.net/tcp/30303/p2p/16Uiu2HAm9CQhsuwPR54q27kNj9iaQVfyRzTGKrhFmr94oD8ujU6P", + Fleet: params.FleetShardsTest, + Version: 2, + }, } } diff --git a/static/bindata.go b/static/bindata.go index 12983e050..70a38cf36 100644 --- a/static/bindata.go +++ b/static/bindata.go @@ -6,6 +6,7 @@ // ../config/cli/anon-metric-node-server.json (696B) // ../config/cli/fleet-eth.prod.json (3.619kB) // ../config/cli/fleet-eth.staging.json (2.139kB) +// ../config/cli/fleet-shards.test.json (1.954kB) // ../config/cli/fleet-status.prod.json (2.338kB) // ../config/cli/fleet-status.test.json (1.457kB) // ../config/cli/fleet-wakuv2.prod.json (1.264kB) @@ -103,7 +104,7 @@ func emojisTxt() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "emojis.txt", size: 28134, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "emojis.txt", size: 28134, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf5, 0x28, 0xc, 0x22, 0x34, 0xa1, 0xeb, 0x8, 0x8d, 0xef, 0x38, 0x1b, 0xd8, 0xc2, 0x1a, 0x6d, 0xa2, 0x62, 0xad, 0x43, 0xfc, 0x1c, 0x38, 0xda, 0x8c, 0x3f, 0x34, 0xa, 0x8c, 0x6f, 0x5d, 0xd8}} return a, nil } @@ -123,7 +124,7 @@ func ConfigReadmeMd() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/README.md", size: 3031, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/README.md", size: 3031, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x15, 0x44, 0x2b, 0x13, 0x14, 0x34, 0xa, 0x66, 0x62, 0x1b, 0xc6, 0x4a, 0x2c, 0x7d, 0x4d, 0x89, 0xfb, 0xc9, 0x69, 0xe4, 0x18, 0x5f, 0x3, 0x98, 0x6d, 0x3c, 0x9e, 0xa8, 0xcd, 0x53, 0x5d, 0x75}} return a, nil } @@ -143,7 +144,7 @@ func ConfigCliAnonMetricNodeClientJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/anon-metric-node-client.json", size: 857, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/anon-metric-node-client.json", size: 857, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x90, 0xdf, 0xcd, 0xc8, 0x92, 0x1d, 0x63, 0x5e, 0xe1, 0xf9, 0x7f, 0xed, 0xf2, 0x68, 0x6b, 0x20, 0xff, 0x1d, 0x3b, 0xc9, 0x7b, 0xb9, 0x6a, 0xba, 0xd3, 0xbd, 0xf7, 0x48, 0x7b, 0x5a, 0x52, 0x79}} return a, nil } @@ -163,7 +164,7 @@ func ConfigCliAnonMetricNodeServerJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/anon-metric-node-server.json", size: 696, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/anon-metric-node-server.json", size: 696, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf0, 0x2f, 0x97, 0xab, 0x77, 0x61, 0x93, 0x9d, 0x1f, 0x33, 0x18, 0x72, 0xad, 0xce, 0xa3, 0x35, 0xa9, 0x44, 0xbf, 0x29, 0xa8, 0xea, 0x21, 0xb7, 0x22, 0x7f, 0x7d, 0x3a, 0x6b, 0x55, 0x3c, 0x66}} return a, nil } @@ -183,7 +184,7 @@ func ConfigCliFleetEthProdJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-eth.prod.json", size: 3619, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-eth.prod.json", size: 3619, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x92, 0x4f, 0x86, 0x8b, 0x6e, 0x2, 0x27, 0xa3, 0x37, 0x27, 0x74, 0x51, 0xf0, 0x97, 0x5b, 0x64, 0x8e, 0xbd, 0x29, 0xba, 0x75, 0x2d, 0x75, 0x78, 0x46, 0xb9, 0x56, 0x6, 0xb1, 0xf9, 0x85, 0xdd}} return a, nil } @@ -203,11 +204,31 @@ func ConfigCliFleetEthStagingJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-eth.staging.json", size: 2139, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-eth.staging.json", size: 2139, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb0, 0xac, 0xc9, 0x61, 0x97, 0x42, 0x0, 0x3a, 0xfc, 0x78, 0x11, 0xa1, 0xc7, 0x55, 0x71, 0x46, 0x72, 0x3e, 0x52, 0xb0, 0x89, 0x69, 0x7f, 0x8f, 0xf1, 0x26, 0x44, 0xc5, 0xfc, 0x20, 0x9f, 0xa1}} return a, nil } +var _ConfigCliFleetShardsTestJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x55\x4d\x6f\x22\x39\x14\xbc\xe7\x57\xb4\x38\x2f\x89\x3f\xdb\x76\x6e\x09\x5f\x11\x21\x08\x08\x0d\x09\xab\x3d\x3c\xdb\xcf\xd0\x10\xba\x43\x7f\x10\xc2\x6a\xfe\xfb\x8a\x99\xcc\xce\xcc\x8e\xb2\xd2\x6c\xf6\xfa\x5e\xc9\x55\xae\x2a\xcb\x7f\x9e\x45\x51\x63\x82\x99\xc7\xe3\x3e\xaf\xcb\xc6\x65\x14\xe0\xa9\xc4\xdf\x4e\xe3\x61\xde\x4e\x4b\x97\xef\xb1\x78\x6d\x5c\x46\x55\x51\x7f\x19\xb7\x9e\xea\xb2\xc2\xa2\x95\x67\x21\x5d\x36\x2e\xa3\xd3\x11\x51\xd4\xe8\x64\x60\x9f\xd0\x7f\x87\x8c\xa2\x46\xf7\x09\xb1\x6a\x5c\x46\x8d\xb2\x82\xaa\x2e\xcf\x9f\x8b\xdc\x37\xde\x76\xd7\x79\x5e\x0d\x73\x8f\x27\xd2\xdf\xff\x78\x1b\x4e\x8b\xd3\xe1\xfe\x0e\xd2\xa7\x7b\x2c\xf6\x58\xfc\xb0\x1d\xd5\xe5\x6a\x98\x57\x69\x48\x1d\x54\x69\x9e\x95\xdf\x61\x3e\x23\xa2\xa8\x21\x08\xb5\x20\xd1\x83\x20\x2c\x56\xda\x3b\xa5\x81\x80\x20\xc1\x13\x65\x64\x10\x08\xda\x52\xe4\xc2\x28\xe6\x84\xa7\xd2\x05\xce\xc1\x11\xca\x0c\xe3\x82\x3a\x6d\x02\x71\xd6\xc5\x5c\x05\x30\x41\x01\x0f\x01\x89\x35\x3e\xa0\x21\x68\x9c\x07\x54\x40\x85\x61\x52\x12\x02\x96\x50\x1b\x83\xa1\x2e\x56\x16\x50\x30\x30\x0a\xde\xae\x17\x45\x0d\xaa\x29\x15\xd4\x52\x4f\x29\x35\x44\x03\x04\x22\x83\x50\x5a\x63\xac\x94\x46\x47\x14\x51\x1c\xa8\x17\x48\x1d\x0a\xee\x14\xd7\x54\x3a\x41\x10\x05\x2a\x2e\x24\x50\x67\x83\x04\x43\x40\xc8\x10\x13\x6a\x03\x57\x31\x0f\x94\x59\x8c\xb9\x25\x34\x66\xc2\x02\x0d\x3c\x46\xb4\x46\x2a\x26\xa4\x44\x45\xb8\xb0\x3a\x98\xc0\x9c\xf8\xa6\x44\x86\xe0\xb8\xf0\x32\x04\x0f\x54\x13\x6f\x84\xf3\xdc\x28\xe1\x0d\x7a\x66\x2d\xd1\x0c\x3d\xc6\x3a\x70\xc1\x2c\x58\x6f\x51\x13\xea\x30\x04\xab\x3c\x18\xc2\x88\x56\x5e\xf0\x60\x00\x4c\x4c\x9d\xb2\x5a\x12\x66\xb8\xd4\x5a\x09\x47\x34\x06\x22\xd0\x81\x37\x81\x7a\x23\x81\x06\x82\x42\x68\x67\xbd\x97\x9e\x08\x2e\x89\x53\x8d\xcf\x42\xbe\xa6\x78\x5f\x41\x95\xba\x9f\xa2\xff\xd6\xc2\x9f\x56\x73\xd8\xd4\x7f\x0f\xbf\x5e\xea\xc2\x67\xa5\xb8\xb0\x79\x5e\x35\x09\x3d\xf7\x79\x13\xb6\x25\x3f\x2f\x57\x50\xf8\xf2\xbc\xc2\xb2\x3a\xff\x52\xba\x74\x7b\x9e\x61\x75\x51\xb9\xe7\x0b\x4e\x38\xe1\x17\xcf\xec\xf9\x82\xc6\x49\x5a\xb3\x9b\xab\xed\xd5\x84\x89\x3b\x6b\xe3\x59\x7d\xcc\x5f\x93\xb4\x77\x10\x2c\xc1\xac\xbd\x29\x57\x9d\xe1\xac\xbd\x16\xbb\x6c\xbb\xb5\x60\x07\xfb\x9c\xd3\x6f\x86\xfe\xc8\xbd\x74\xcd\xba\x6c\x3a\xcc\xaa\x02\x9e\x68\x13\x7e\x59\x84\xde\x26\x0b\xaa\xab\xeb\xf9\xe8\xa1\x3d\x2e\xa1\xab\x46\xb6\x75\xfb\x78\xc5\xe5\x51\xcd\xaf\xd9\x61\xb8\xb8\x61\x9d\xd9\x8e\xee\xee\xf5\xa0\xff\x9e\x08\x70\x4d\x97\x35\x57\x79\xb6\xdc\xe4\xd9\xb2\xe9\x7e\x59\x44\xef\xc5\x75\xf4\x5e\x2d\xb7\xfd\x61\x67\xde\xad\x16\x55\xbe\x7e\x7c\x1e\xdd\x4d\x6f\x5e\xd9\xfa\x7a\x30\x88\x0f\x93\x0d\xe7\xbb\x65\xfb\xd0\x9d\x3f\xfc\x18\xe8\x29\x9e\xfb\x2a\x2f\xf0\x9d\x8c\xca\xd3\xee\x43\x21\x25\xbe\x18\xf3\xfa\xe5\x58\x77\x44\xef\x55\xb4\x65\xbc\x7a\x88\xeb\xc1\x6d\x07\xb1\xe8\x5f\x65\xab\xdb\xce\xcd\x82\xb7\x0f\x5d\xda\x09\xd3\x7f\xfa\xf3\x46\xce\xfe\x33\xb9\x81\x76\x7f\xb4\x59\xf5\x0e\x8e\xdd\x77\x5d\xe7\xaa\x35\xed\xfa\x85\xa1\x63\x39\xed\xaf\x9f\x55\xbc\x5b\x74\x56\x3b\x93\x76\xa5\x39\xa8\xc9\x3b\xe4\xff\x43\x45\xee\x3a\x83\x56\xce\xa8\x5e\x65\xae\x55\x4d\xf7\x2d\xd6\x7e\xb1\xb8\xe6\x85\x7d\xbd\x19\xbb\x89\xc6\xe2\x61\x98\xdd\xf6\x30\x55\xf3\xd1\xe2\x5d\x0b\x3e\xac\xa2\x9f\xcd\x26\x6a\x71\xec\xc2\xe3\xde\xa5\xa3\x19\x84\xe4\xa1\x7e\xec\x0d\x6e\x46\xc7\xfb\x24\x5d\xee\xae\xb6\x38\x7c\x31\x59\x3f\x99\xf5\xf0\xee\x5d\x2f\x3e\xdc\x54\x76\xa7\x0e\xa5\x72\x83\x91\xe3\x6b\xd8\xc2\xcb\xa6\xb3\xb3\x85\x72\x49\xff\x81\xd2\x7a\xff\xa8\x06\x87\x71\x3c\xef\x26\x3e\xb9\x4d\xde\xaf\xc3\x87\x55\x98\xd6\x78\x55\xd6\x2f\xa3\x89\x14\x3b\xa6\x36\xc3\xb5\x49\x61\x3c\x0b\xaf\x93\xe3\xb4\x77\x5b\xac\xba\xdb\xc2\x88\xbc\xad\xeb\x75\x12\x8f\xde\xde\xcb\x59\x14\x7d\xfa\xfc\x87\x9e\x5e\xcc\x8c\xfd\xfb\x17\x7a\x02\x9f\x7d\x3a\xfb\x2b\x00\x00\xff\xff\xfd\x07\x20\x5a\xa2\x07\x00\x00") + +func ConfigCliFleetShardsTestJsonBytes() ([]byte, error) { + return bindataRead( + _ConfigCliFleetShardsTestJson, + "../config/cli/fleet-shards.test.json", + ) +} + +func ConfigCliFleetShardsTestJson() (*asset, error) { + bytes, err := ConfigCliFleetShardsTestJsonBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "../config/cli/fleet-shards.test.json", size: 1954, mode: os.FileMode(0664), modTime: time.Unix(1696363813, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xcf, 0xeb, 0x33, 0xd4, 0x3, 0x54, 0xff, 0xda, 0x1f, 0xc4, 0xc, 0x91, 0x88, 0x1e, 0x53, 0xbf, 0x49, 0xa, 0x6c, 0x45, 0xf9, 0x19, 0x91, 0xec, 0xe, 0x1a, 0xfc, 0x14, 0x86, 0x8d, 0xa3, 0x5a}} + return a, nil +} + var _ConfigCliFleetStatusProdJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x4d\x6f\x1b\x37\x10\xbd\xfb\x57\x2c\xf6\x5c\x59\xfc\x5c\x92\xbe\x59\xb2\x62\x43\xb6\x04\x47\x1f\x8e\xed\xa2\x87\x21\x39\x5c\xad\x25\xed\xaa\xfb\x25\x29\x45\xfe\x7b\x21\xc7\xa9\x1d\xa4\x6e\x91\x06\x48\x7d\x23\x66\x1e\xf8\x1e\x1f\xe7\x11\xfc\xe3\x28\x8a\xe2\x09\xe6\x1e\x3f\xb6\x45\x53\xc5\x27\x51\x80\x55\x85\xbf\x1c\xca\xe3\xe2\x2c\xab\x5c\xd1\x62\xb9\x8f\x4f\xa2\xba\x6c\x3e\x97\xfb\xab\xa6\xaa\xb1\xec\x17\x79\xc8\xd2\xf8\x24\x3a\x6c\x11\x45\xf1\x20\x07\xbb\x42\xff\x02\x19\x45\xf1\xbb\x15\x62\x1d\x9f\x44\x71\x55\x43\xdd\x54\xc7\x9b\xb2\xf0\xf1\x53\xaf\x57\x14\xf5\xb8\xf0\x78\x20\xfd\xf5\xb7\xa7\xe2\xac\x3c\x6c\xee\x47\x90\xad\xa6\x58\xb6\x58\x7e\xd5\xbd\x6e\xaa\xc5\xb8\xa8\xb3\x90\x39\xa8\xb3\x22\xaf\x5e\x60\x1e\x11\x51\x14\x0b\x42\x2d\x48\xf4\x20\x08\x4b\x94\xf6\x4e\x69\x20\x20\x48\xf0\x44\x19\x19\x04\x82\xb6\x14\xb9\x30\x8a\x39\xe1\xa9\x74\x81\x73\x70\x84\x32\xc3\xb8\xa0\x4e\x9b\x40\x9c\x75\x09\x57\x01\x4c\x50\xc0\x43\x40\x62\x8d\x0f\x68\x08\x1a\xe7\x01\x15\x50\x61\x98\x94\x84\x80\x25\xd4\x26\x60\xa8\x4b\x94\x05\x14\x0c\x8c\x82\xa7\xe3\x45\x51\x4c\x35\xa5\x82\x5a\xea\x29\xa5\x86\x68\x80\x40\x64\x10\x4a\x6b\x4c\x94\xd2\xe8\x88\x22\x8a\x03\xf5\x02\xa9\x43\xc1\x9d\xe2\x9a\x4a\x27\x08\xa2\x40\xc5\x85\x04\xea\x6c\x90\x60\x08\x08\x19\x12\x42\x6d\xe0\x2a\xe1\x81\x32\x8b\x09\xb7\x84\x26\x4c\x58\xa0\x81\x27\x88\xd6\x48\xc5\x84\x94\xa8\x08\x17\x56\x07\x13\x98\x13\xcf\x4a\x64\x08\x8e\x0b\x2f\x43\xf0\x40\x35\xf1\x46\x38\xcf\x8d\x12\xde\xa0\x67\xd6\x12\xcd\xd0\x63\xa2\x03\x17\xcc\x82\xf5\x16\x35\xa1\x0e\x43\xb0\xca\x83\x21\x8c\x68\xe5\x05\x0f\x06\xc0\x24\xd4\x29\xab\x25\x61\x86\x4b\xad\x95\x70\x44\x63\x20\x02\x1d\x78\x13\xa8\x37\x12\x68\x20\x28\x84\x76\xd6\x7b\xe9\x89\xe0\x92\x38\x15\x3f\x0a\xf9\x72\x8b\xd3\x1a\xea\xcc\x7d\x73\xf5\xcf\x53\xf8\x4d\xeb\x03\x2c\x9b\xbf\x8a\x5f\x0e\xd5\xf5\x79\x25\xba\x79\xe1\xb1\x43\xe8\xb1\x2f\x3a\xb0\xae\xf8\xf1\x8b\x41\x7b\x5a\x67\xeb\xe3\x1c\xeb\x6e\xed\x36\x5d\x4e\x38\xe1\xdd\x0d\xdb\x74\x69\x32\xcf\x1a\x76\x71\xba\x4e\x2e\xee\xef\x4b\x05\xb3\x62\xd6\x0e\x7a\xd7\x9b\x6c\x5f\x89\xf9\x0e\x1e\xfa\xb3\xb9\x51\x1f\x1f\x64\xab\x26\xe3\x09\x4b\x6d\x9e\xed\xe9\xd9\xb3\xa1\x2f\xb9\xd9\x7f\xe6\x9e\xb6\xa8\xea\x89\xbc\xbb\x6f\xd2\x4d\xb5\x1c\xb5\xcc\xaf\x87\xa7\xd5\x68\x7e\xb9\x0e\x1f\xee\x06\x97\x93\xdb\xf1\x7c\x37\x81\x59\x3f\xaf\x6e\x6f\xfe\x9e\x9b\x1e\xa7\xae\xd3\x54\x1d\x87\x79\x5d\xc2\x8a\x76\xe0\x7b\x45\x2c\xb7\xbd\x8d\x9e\x25\xe7\x4a\x2d\xdf\xdf\x4e\xc7\xa3\x7c\x97\xc2\x68\xb9\xa7\x43\xdc\x8f\xae\xe4\xfe\xf7\x62\x76\x31\x19\x69\x6f\xb1\xdf\x1b\xdb\xd7\x0c\xf8\x51\x11\xeb\xb3\xf7\x4d\xba\x3d\xbb\x18\xf1\x3b\x9c\x6f\x74\x92\x9d\x3f\x94\xf3\xd6\xfa\x2d\x1f\x5e\x4f\xd2\x6c\xd9\x57\x77\xc5\x79\xaf\x9a\xb1\xfd\x7a\x94\xbe\xe6\x04\xb8\x8e\xcb\x3b\x8b\x22\x4f\x97\x45\x9e\x76\xdc\x77\x3b\xd1\x0e\xee\xd3\x05\xbf\xbc\xda\x2e\xae\xb6\xb7\xa9\x91\x28\x8b\x87\x91\xbe\xdd\x2f\x87\xe2\x72\x97\xb1\x99\x5a\x2c\x19\x2b\xf3\x53\xb5\x19\xf6\x5f\x73\xe2\x47\x45\xac\xdf\xed\x75\xaf\x1c\x2e\xfa\x83\x75\xff\xae\x9c\x87\x9e\x9f\x8e\x97\xe5\xf5\x36\xb9\xb9\x18\xec\xea\x56\x94\x93\x0d\x3d\x9b\xf6\xf2\xfe\x75\xba\xd3\x5f\xc7\xea\x10\x92\x69\x5d\x94\xf8\x2f\x49\x79\x03\x3e\xfd\x9f\x71\x7d\x23\x91\xf9\xb9\x83\xf2\xe6\x1e\xae\x9f\xfd\x66\x7c\x4e\xca\x51\x14\x7d\x7a\xfc\xc3\x1c\xb2\x72\xc3\xfe\xf9\x0b\x73\x00\x1f\x7d\x3a\xfa\x33\x00\x00\xff\xff\x12\x91\x08\xc5\x22\x09\x00\x00") func ConfigCliFleetStatusProdJsonBytes() ([]byte, error) { @@ -223,7 +244,7 @@ func ConfigCliFleetStatusProdJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-status.prod.json", size: 2338, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-status.prod.json", size: 2338, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x59, 0xea, 0x14, 0x57, 0xed, 0x60, 0x4d, 0xb6, 0x32, 0x7e, 0xd3, 0xbe, 0x1e, 0xc7, 0xfe, 0x42, 0xee, 0xfe, 0x10, 0xe4, 0x22, 0x64, 0xc1, 0xb9, 0xce, 0x34, 0xcd, 0xdd, 0xe3, 0x38, 0x43, 0xd3}} return a, nil } @@ -243,7 +264,7 @@ func ConfigCliFleetStatusTestJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-status.test.json", size: 1457, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-status.test.json", size: 1457, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc9, 0x9f, 0x8f, 0x25, 0x1f, 0x31, 0xbd, 0x72, 0x26, 0xb7, 0xd, 0x7e, 0xcb, 0xbb, 0x12, 0xef, 0x9f, 0x1a, 0x2e, 0xb, 0x96, 0x64, 0x7d, 0x52, 0x9e, 0x68, 0x13, 0x55, 0xd5, 0x88, 0x38, 0x7b}} return a, nil } @@ -263,7 +284,7 @@ func ConfigCliFleetWakuv2ProdJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.prod.json", size: 1264, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.prod.json", size: 1264, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x71, 0xb9, 0x1c, 0x57, 0x50, 0xa9, 0x93, 0x70, 0xcd, 0xd7, 0x22, 0xee, 0x65, 0x72, 0x11, 0x71, 0xd3, 0x20, 0xd0, 0xf0, 0x4d, 0x53, 0x94, 0x44, 0x81, 0xbd, 0x11, 0xed, 0x5e, 0x72, 0x0, 0x12}} return a, nil } @@ -283,7 +304,7 @@ func ConfigCliFleetWakuv2TestJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.test.json", size: 1264, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/fleet-wakuv2.test.json", size: 1264, mode: os.FileMode(0664), modTime: time.Unix(1685365190, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x2c, 0x67, 0x1e, 0xd1, 0x98, 0x7b, 0xf3, 0x9f, 0x76, 0xa0, 0xbe, 0x67, 0x29, 0xdb, 0xd7, 0x3e, 0xb8, 0x7c, 0x65, 0x2d, 0x2, 0x84, 0xe0, 0xab, 0x8d, 0x3d, 0x4a, 0x53, 0xb4, 0xa7, 0x2e, 0xf0}} return a, nil } @@ -303,7 +324,7 @@ func ConfigCliLesEnabledJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/les-enabled.json", size: 58, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/les-enabled.json", size: 58, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x7e, 0xee, 0x27, 0xa7, 0x74, 0xa0, 0x46, 0xa1, 0x41, 0xed, 0x4d, 0x16, 0x5b, 0xf3, 0xf0, 0x7c, 0xc8, 0x2f, 0x6f, 0x47, 0xa4, 0xbb, 0x5f, 0x43, 0x33, 0xd, 0x9, 0x9d, 0xea, 0x9e, 0x15, 0xee}} return a, nil } @@ -323,7 +344,7 @@ func ConfigCliMailserverEnabledJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/cli/mailserver-enabled.json", size: 176, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/cli/mailserver-enabled.json", size: 176, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x34, 0xec, 0x81, 0x8b, 0x99, 0xb6, 0xdb, 0xc0, 0x8b, 0x46, 0x97, 0x96, 0xc7, 0x58, 0x30, 0x33, 0xef, 0x54, 0x25, 0x87, 0x7b, 0xb9, 0x94, 0x6b, 0x18, 0xa4, 0x5b, 0x58, 0x67, 0x7c, 0x44, 0xa6}} return a, nil } @@ -343,7 +364,7 @@ func ConfigStatusChainGenesisJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "../config/status-chain-genesis.json", size: 612, mode: os.FileMode(0644), modTime: time.Unix(1694703774, 0)} + info := bindataFileInfo{name: "../config/status-chain-genesis.json", size: 612, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb, 0xf0, 0xc, 0x1, 0x95, 0x65, 0x6, 0x55, 0x48, 0x8f, 0x83, 0xa0, 0xb4, 0x81, 0xda, 0xad, 0x30, 0x6d, 0xb2, 0x78, 0x1b, 0x26, 0x4, 0x13, 0x12, 0x9, 0x6, 0xae, 0x3a, 0x2c, 0x1, 0x71}} return a, nil } @@ -363,7 +384,7 @@ func keysBootnodeKey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/bootnode.key", size: 65, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/bootnode.key", size: 65, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x31, 0xcf, 0x27, 0xd4, 0x96, 0x2e, 0x32, 0xcd, 0x58, 0x96, 0x2a, 0xe5, 0x8c, 0xa0, 0xf1, 0x73, 0x1f, 0xd6, 0xd6, 0x8b, 0xb, 0x73, 0xd3, 0x2c, 0x84, 0x1a, 0x56, 0xa4, 0x74, 0xb6, 0x95, 0x20}} return a, nil } @@ -383,7 +404,7 @@ func keysFirebaseauthkey() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/firebaseauthkey", size: 153, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xe, 0x69, 0x23, 0x64, 0x7d, 0xf9, 0x14, 0x37, 0x6f, 0x2b, 0x1, 0xf0, 0xb0, 0xa4, 0xb2, 0xd0, 0x18, 0xcd, 0xf9, 0xeb, 0x57, 0xa3, 0xfd, 0x79, 0x25, 0xa7, 0x9c, 0x3, 0xce, 0x26, 0xec, 0xe1}} return a, nil } @@ -403,7 +424,7 @@ func keysTestAccount1StatusChainPk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account1-status-chain.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/test-account1-status-chain.pk", size: 489, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x8f, 0xba, 0x35, 0x1, 0x2b, 0x9d, 0xad, 0xf0, 0x2d, 0x3c, 0x4d, 0x6, 0xb5, 0x22, 0x2, 0x47, 0xd4, 0x1c, 0xf4, 0x31, 0x2f, 0xb, 0x5b, 0x27, 0x5d, 0x43, 0x97, 0x58, 0x2d, 0xf0, 0xe1, 0xbe}} return a, nil } @@ -423,7 +444,7 @@ func keysTestAccount1Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account1.pk", size: 491, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/test-account1.pk", size: 491, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9, 0x43, 0xc2, 0xf4, 0x8c, 0xc6, 0x64, 0x25, 0x8c, 0x7, 0x8c, 0xa8, 0x89, 0x2b, 0x7b, 0x9b, 0x4f, 0x81, 0xcb, 0xce, 0x3d, 0xef, 0x82, 0x9c, 0x27, 0x27, 0xa9, 0xc5, 0x46, 0x70, 0x30, 0x38}} return a, nil } @@ -443,7 +464,7 @@ func keysTestAccount2StatusChainPk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account2-status-chain.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/test-account2-status-chain.pk", size: 489, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9, 0xf8, 0x5c, 0xe9, 0x92, 0x96, 0x2d, 0x88, 0x2b, 0x8e, 0x42, 0x3f, 0xa4, 0x93, 0x6c, 0xad, 0xe9, 0xc0, 0x1b, 0x8a, 0x8, 0x8c, 0x5e, 0x7a, 0x84, 0xa2, 0xf, 0x9f, 0x77, 0x58, 0x2c, 0x2c}} return a, nil } @@ -463,7 +484,7 @@ func keysTestAccount2Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account2.pk", size: 491, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/test-account2.pk", size: 491, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9f, 0x72, 0xd5, 0x95, 0x5c, 0x5a, 0x99, 0x9d, 0x2f, 0x21, 0x83, 0xd7, 0x10, 0x17, 0x4a, 0x3d, 0x65, 0xc9, 0x26, 0x1a, 0x2c, 0x9d, 0x65, 0x63, 0xd2, 0xa0, 0xfc, 0x7c, 0x0, 0x87, 0x38, 0x9f}} return a, nil } @@ -483,7 +504,7 @@ func keysTestAccount3BeforeEip55Pk() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "keys/test-account3-before-eip55.pk", size: 489, mode: os.FileMode(0644), modTime: time.Unix(1694703775, 0)} + info := bindataFileInfo{name: "keys/test-account3-before-eip55.pk", size: 489, mode: os.FileMode(0664), modTime: time.Unix(1663713040, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x81, 0x40, 0x56, 0xc1, 0x5e, 0x10, 0x6e, 0x28, 0x15, 0x3, 0x4e, 0xc4, 0xc4, 0x71, 0x4d, 0x16, 0x99, 0xcc, 0x1b, 0x63, 0xee, 0x10, 0x20, 0xe4, 0x59, 0x52, 0x3f, 0xc0, 0xad, 0x15, 0x13, 0x72}} return a, nil } @@ -591,6 +612,8 @@ var _bindata = map[string]func() (*asset, error){ "../config/cli/fleet-eth.staging.json": ConfigCliFleetEthStagingJson, + "../config/cli/fleet-shards.test.json": ConfigCliFleetShardsTestJson, + "../config/cli/fleet-status.prod.json": ConfigCliFleetStatusProdJson, "../config/cli/fleet-status.test.json": ConfigCliFleetStatusTestJson, @@ -669,6 +692,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ "anon-metric-node-server.json": &bintree{ConfigCliAnonMetricNodeServerJson, map[string]*bintree{}}, "fleet-eth.prod.json": &bintree{ConfigCliFleetEthProdJson, map[string]*bintree{}}, "fleet-eth.staging.json": &bintree{ConfigCliFleetEthStagingJson, map[string]*bintree{}}, + "fleet-shards.test.json": &bintree{ConfigCliFleetShardsTestJson, map[string]*bintree{}}, "fleet-status.prod.json": &bintree{ConfigCliFleetStatusProdJson, map[string]*bintree{}}, "fleet-status.test.json": &bintree{ConfigCliFleetStatusTestJson, map[string]*bintree{}}, "fleet-wakuv2.prod.json": &bintree{ConfigCliFleetWakuv2ProdJson, map[string]*bintree{}},