Merge branch 'defaults' into cascade

genesis/genesis.go

@@ -42,15 +42,15 @@ import (
 
 // Hardcoded network IDs
 const (
-	MainnetID  uint32 = 1
-	TestnetID  uint32 = 2
-	BorealisID uint32 = 2
-	LocalID    uint32 = 12345
+	MainnetID uint32 = 1
+	TestnetID uint32 = 2
+	CascadeID uint32 = 2
+	LocalID   uint32 = 12345
 
-	MainnetName  = "mainnet"
-	TestnetName  = "testnet"
-	BorealisName = "borealis"
-	LocalName    = "local"
+	MainnetName = "mainnet"
+	TestnetName = "testnet"
+	CascadeName = "cascade"
+	LocalName   = "local"
 )
 
 var (
@@ -62,14 +62,14 @@ var (
 	// Give special names to the mainnet and testnet
 	NetworkIDToNetworkName = map[uint32]string{
 		MainnetID: MainnetName,
-		TestnetID: BorealisName,
+		TestnetID: CascadeName,
 		LocalID:   LocalName,
 	}
 	NetworkNameToNetworkID = map[string]uint32{
-		MainnetName:  MainnetID,
-		TestnetName:  TestnetID,
-		BorealisName: BorealisID,
-		LocalName:    LocalID,
+		MainnetName: MainnetID,
+		TestnetName: TestnetID,
+		CascadeName: CascadeID,
+		LocalName:   LocalID,
 	}
 	MintAddresses = []string{
 		"95YUFjhDG892VePMzpwKF9JzewGKvGRi3",

genesis/genesis_test.go

@@ -17,11 +17,11 @@ func TestNetworkName(t *testing.T) {
 	if name := NetworkName(MainnetID); name != MainnetName {
 		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, MainnetName)
 	}
-	if name := NetworkName(TestnetID); name != BorealisName {
-		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, BorealisName)
+	if name := NetworkName(TestnetID); name != CascadeName {
+		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, CascadeName)
 	}
-	if name := NetworkName(BorealisID); name != BorealisName {
-		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, BorealisName)
+	if name := NetworkName(CascadeID); name != CascadeName {
+		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, CascadeName)
 	}
 	if name := NetworkName(4294967295); name != "network-4294967295" {
 		t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, "network-4294967295")
@@ -45,7 +45,7 @@ func TestNetworkID(t *testing.T) {
 		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", TestnetID, id)
 	}
 
-	id, err = NetworkID(BorealisName)
+	id, err = NetworkID(CascadeName)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -53,7 +53,7 @@ func TestNetworkID(t *testing.T) {
 		t.Fatalf("Returned wrong network. Expected: %d ; Returned %d", TestnetID, id)
 	}
 
-	id, err = NetworkID("bOrEaLiS")
+	id, err = NetworkID("cAsCaDe")
 	if err != nil {
 		t.Fatal(err)
 	}

main/params.go

@@ -33,6 +33,17 @@ var (
 	Err    error
 )
 
+// Bootstrap configs
+var (
+	BootstrapIPs = []string{
+		"3.227.207.132:21001",
+		"34.207.133.167:21001",
+		"107.23.241.199:21001",
+		"54.197.215.186:21001",
+		"18.234.153.22:21001",
+	}
+)
+
 var (
 	errBootstrapMismatch = errors.New("more bootstrap IDs provided than bootstrap IPs")
 )
@@ -48,7 +59,7 @@ func init() {
 	fs := flag.NewFlagSet("gecko", flag.ContinueOnError)
 
 	// NetworkID:
-	networkName := fs.String("network-id", genesis.LocalName, "Network ID this node will connect to")
+	networkName := fs.String("network-id", genesis.CascadeName, "Network ID this node will connect to")
 
 	// Ava fees:
 	fs.Uint64Var(&Config.AvaTxFee, "ava-tx-fee", 0, "Ava transaction fee, in $nAva")
@@ -73,8 +84,8 @@ func init() {
 	fs.StringVar(&Config.HTTPSCertFile, "http-tls-cert-file", "", "TLS certificate file for the HTTPs server")
 
 	// Bootstrapping:
-	bootstrapIPs := fs.String("bootstrap-ips", "", "Comma separated list of bootstrap peer ips to connect to. Example: 127.0.0.1:9630,127.0.0.1:9631")
-	bootstrapIDs := fs.String("bootstrap-ids", "", "Comma separated list of bootstrap peer ids to connect to. Example: JR4dVmy6ffUGAKCBDkyCbeZbyHQBeDsET,8CrVPQZ4VSqgL8zTdvL14G8HqAfrBr4z")
+	bootstrapIPs := fs.String("bootstrap-ips", strings.Join(BootstrapIPs, ","), "Comma separated list of bootstrap peer ips to connect to. Example: 127.0.0.1:9630,127.0.0.1:9631")
+	bootstrapIDs := fs.String("bootstrap-ids", strings.Join(genesis.StakerIDs, ","), "Comma separated list of bootstrap peer ids to connect to. Example: JR4dVmy6ffUGAKCBDkyCbeZbyHQBeDsET,8CrVPQZ4VSqgL8zTdvL14G8HqAfrBr4z")
 
 	// Staking:
 	consensusPort := fs.Uint("staking-port", 9651, "Port of the consensus server")

scripts/ansible/inventory.yml

@@ -11,7 +11,7 @@ borealis_bootstrap:
     ansible_connection: ssh
     ansible_user: ubuntu
 
-    network_id: "borealis"
+    network_id: "cascade"
     api_admin_enabled: true
     api_keystore_enabled: true
     api_metrics_enabled: true
@@ -62,7 +62,7 @@ borealis_node:
     ansible_connection: ssh
     ansible_user: ubuntu
 
-    network_id: "borealis"
+    network_id: "cascade"
     api_admin_enabled: true
     api_keystore_enabled: true
     api_metrics_enabled: true

scripts/ansible/restart_playbook.yml

@@ -8,6 +8,7 @@
     ava_binary: ~/go/src/github.com/ava-labs/gecko/build/ava
     repo_folder: ~/go/src/github.com/ava-labs/gecko
     repo_name: ava-labs/gecko
+    repo_branch: master
   tasks:
     - name: Kill Node
       command: killall ava
@@ -15,6 +16,7 @@
     - git:
         repo: ssh://git@github.com/{{ repo_name }}.git
         dest: "{{ repo_folder }}"
+        version: "{{ repo_branch }}"
         update: yes
     - name: Build project
       command: ./scripts/build.sh

scripts/ansible/update_playbook.yml

@@ -8,6 +8,7 @@
     ava_binary: ~/go/src/github.com/ava-labs/gecko/build/ava
     repo_folder: ~/go/src/github.com/ava-labs/gecko
     repo_name: ava-labs/gecko
+    repo_branch: master
   tasks:
     - name: Kill Node
       command: killall ava
@@ -15,6 +16,7 @@
     - git:
         repo: ssh://git@github.com/{{ repo_name }}.git
         dest: "{{ repo_folder }}"
+        version: "{{ repo_branch }}"
         update: yes
     - name: Build project
       command: ./scripts/build.sh