From 752881c65368de43633ce53b732d5189cca06de9 Mon Sep 17 00:00:00 2001 From: laodouya Date: Tue, 6 Aug 2019 22:13:34 +0800 Subject: [PATCH 1/4] Add -testnet param for cql generate. --- cmd/cql/internal/generate.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmd/cql/internal/generate.go b/cmd/cql/internal/generate.go index 3ad88496f..1e09d361c 100644 --- a/cmd/cql/internal/generate.go +++ b/cmd/cql/internal/generate.go @@ -57,10 +57,16 @@ or input a passphrase by DebugFlag: flag.NewFlagSet("Debug params", flag.ExitOnError), } +const ( + TestnetCN = "cn" + TestnetSydney = "w" +) + var ( privateKeyParam string source string minerListenAddr string + testnetRegion string ) func init() { @@ -70,7 +76,9 @@ func init() { CmdGenerate.Flag.StringVar(&source, "source", "", "Generate config using the specified config template") CmdGenerate.Flag.StringVar(&minerListenAddr, "miner", "", - "Generate miner config with specified miner address") + "Generate miner config with specified miner address. Conflict with -source param") + CmdGenerate.Flag.StringVar(&testnetRegion, "testnet", TestnetCN, + "Generate config using the specified testnet region: cn or w. Default cn. Conflict with -source param") addCommonFlags(CmdGenerate) } @@ -173,6 +181,11 @@ func runGenerate(cmd *Command, args []string) { testnet.SetMinerConfig(rawConfig) rawConfig.ListenAddr = "0.0.0.0:" + port } + + if testnetRegion == TestnetSydney { + rawConfig.DNSSeed.BPCount = 3 + rawConfig.DNSSeed.Domain = "testnetw.gridb.io" + } } else { // Load from template file sourceConfig, err := ioutil.ReadFile(source) From fbc5299177a2015f9f24c59cf37dfde80339f726 Mon Sep 17 00:00:00 2001 From: laodouya Date: Tue, 6 Aug 2019 22:22:39 +0800 Subject: [PATCH 2/4] Add testnet w node_c config. --- conf/testnet/w/config.yaml | 34 +++++++++++++++++++ conf/testnet/w/private.key | 1 + .../testnet-w-bp.yaml} | 0 route/ipv6seed_test.go | 4 +-- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 conf/testnet/w/config.yaml create mode 100644 conf/testnet/w/private.key rename conf/testnet/{testnet-sydney-bp.yaml => w/testnet-w-bp.yaml} (100%) diff --git a/conf/testnet/w/config.yaml b/conf/testnet/w/config.yaml new file mode 100644 index 000000000..e7f94443e --- /dev/null +++ b/conf/testnet/w/config.yaml @@ -0,0 +1,34 @@ +WorkingRoot: "" +PubKeyStoreFile: "" +PrivateKeyFile: private.key +WalletAddress: 29f96a13b3b587e061f4d4bdcbee31073d6ad83f9cec650004164405ec991494 +DHTFileName: "" +ListenAddr: "" +ThisNodeID: 000000e8186de2cac97b6d1ce03e80c546d4c34402e812afccb969e8a9324923 +ValidDNSKeys: {} +MinNodeIDDifficulty: 0 +DNSSeed: + EnforcedDNSSEC: false + DNSServers: [] + Domain: testnetw.gridb.io + BPCount: 3 +BlockProducer: null +KnownNodes: +- ID: 000000e8186de2cac97b6d1ce03e80c546d4c34402e812afccb969e8a9324923 + Role: Client + Addr: 0.0.0.0:15151 + PublicKey: 036619f08e0c7f4c311e54cf2462a7b7f984d4eb722b02253108437394038beb3e + Nonce: + a: 5998476 + b: 0 + c: 0 + d: 3636533164 +QPS: 0 +ChainBusPeriod: 0s +BillingBlockCount: 0 +BPPeriod: 0s +BPTick: 0s +SQLChainPeriod: 1m0s +SQLChainTick: 0s +SQLChainTTL: 0 +MinProviderDeposit: 0 diff --git a/conf/testnet/w/private.key b/conf/testnet/w/private.key new file mode 100644 index 000000000..212dd48ee --- /dev/null +++ b/conf/testnet/w/private.key @@ -0,0 +1 @@ +MZPcwtchLg7PamjM8RKgPbBk1PMcv9D5RYARv8un9Zx4be3se8Pwz7s4PqR3kvDMiYrkXYZVWKah1rUGBY91ja1ofRoc7z \ No newline at end of file diff --git a/conf/testnet/testnet-sydney-bp.yaml b/conf/testnet/w/testnet-w-bp.yaml similarity index 100% rename from conf/testnet/testnet-sydney-bp.yaml rename to conf/testnet/w/testnet-w-bp.yaml diff --git a/route/ipv6seed_test.go b/route/ipv6seed_test.go index d3a35af9f..dd370ca7c 100644 --- a/route/ipv6seed_test.go +++ b/route/ipv6seed_test.go @@ -140,11 +140,11 @@ func TestGenTestNetDomain(t *testing.T) { } } }) - Convey("generate testnet sydney domain", t, func() { + Convey("generate testnet w domain", t, func() { log.SetLevel(log.DebugLevel) var ( baseDir = utils.GetProjectSrcDir() - testnetConf = utils.FJ(baseDir, "./conf/testnet/testnet-sydney-bp.yaml") + testnetConf = utils.FJ(baseDir, "./conf/testnet/w/testnet-w-bp.yaml") ) conf, err := conf.LoadConfig(testnetConf) From 3e423b2a858cb643386c995d7ee2232ae72d5bdb Mon Sep 17 00:00:00 2001 From: laodouya Date: Tue, 6 Aug 2019 22:35:41 +0800 Subject: [PATCH 3/4] Print cql generate testnet region. --- cmd/cql/internal/generate.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/cql/internal/generate.go b/cmd/cql/internal/generate.go index 1e09d361c..8feb1b08d 100644 --- a/cmd/cql/internal/generate.go +++ b/cmd/cql/internal/generate.go @@ -58,8 +58,8 @@ or input a passphrase by } const ( - TestnetCN = "cn" - TestnetSydney = "w" + testnetCN = "cn" + testnetSydney = "w" ) var ( @@ -77,7 +77,7 @@ func init() { "Generate config using the specified config template") CmdGenerate.Flag.StringVar(&minerListenAddr, "miner", "", "Generate miner config with specified miner address. Conflict with -source param") - CmdGenerate.Flag.StringVar(&testnetRegion, "testnet", TestnetCN, + CmdGenerate.Flag.StringVar(&testnetRegion, "testnet", testnetCN, "Generate config using the specified testnet region: cn or w. Default cn. Conflict with -source param") addCommonFlags(CmdGenerate) @@ -175,6 +175,8 @@ func runGenerate(cmd *Command, args []string) { var rawConfig *conf.Config if source == "" { + fmt.Printf("Generating testnet %s config\n", testnetRegion) + // Load testnet config rawConfig = testnet.GetTestNetConfig() if minerListenAddr != "" { @@ -182,12 +184,13 @@ func runGenerate(cmd *Command, args []string) { rawConfig.ListenAddr = "0.0.0.0:" + port } - if testnetRegion == TestnetSydney { + if testnetRegion == testnetSydney { rawConfig.DNSSeed.BPCount = 3 rawConfig.DNSSeed.Domain = "testnetw.gridb.io" } } else { // Load from template file + fmt.Printf("Generating config base on %s templete\n", source) sourceConfig, err := ioutil.ReadFile(source) if err != nil { ConsoleLog.WithError(err).Error("read config template failed") From f2ed4da72674744d86fd3b106b461d091fb856c1 Mon Sep 17 00:00:00 2001 From: laodouya Date: Tue, 6 Aug 2019 22:43:51 +0800 Subject: [PATCH 4/4] Rename vars. --- cmd/cql/internal/generate.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cql/internal/generate.go b/cmd/cql/internal/generate.go index 8feb1b08d..a969da01d 100644 --- a/cmd/cql/internal/generate.go +++ b/cmd/cql/internal/generate.go @@ -58,8 +58,8 @@ or input a passphrase by } const ( - testnetCN = "cn" - testnetSydney = "w" + testnetCN = "cn" + testnetW = "w" ) var ( @@ -184,7 +184,7 @@ func runGenerate(cmd *Command, args []string) { rawConfig.ListenAddr = "0.0.0.0:" + port } - if testnetRegion == testnetSydney { + if testnetRegion == testnetW { rawConfig.DNSSeed.BPCount = 3 rawConfig.DNSSeed.Domain = "testnetw.gridb.io" }