diff --git a/api/connect.go b/api/connect.go
index 578ee3e05f6250bf69fc5d40ad8085317eb7131a..90a64cca5b2fc1076355521ea9c8afb3db996c5d 100644
--- a/api/connect.go
+++ b/api/connect.go
@@ -196,7 +196,12 @@ func addHost(rm *io.ReceptionManager, id *id.ID, address, cert string, disableTi
if cert != "" && rm.Tls {
creds = []byte(cert)
}
- _, err := rm.Comms.AddHost(id, address, creds, disableTimeout, enableAuth)
+ params := connect.GetDefaultHostParams()
+ if disableTimeout {
+ params.MaxRetries = 0
+ }
+ params.AuthEnabled = enableAuth
+ _, err := rm.Comms.AddHost(id, address, creds, params)
if err != nil {
return err
}
diff --git a/api/mockserver.go b/api/mockserver.go
index ca0d86e8e580d6c0890331111940f2e68bfea0df..0bcfe43566dc9124567c8ce03b9e3ad0943d04fe 100644
--- a/api/mockserver.go
+++ b/api/mockserver.go
@@ -142,7 +142,7 @@ type MockRegistration struct {
//LastReceivedMessage pb.CmixMessage
}
-func (s *MockRegistration) RegisterNode(ID *id.ID,
+func (s *MockRegistration) RegisterNode(salt []byte,
NodeTLSCert, GatewayTLSCert, RegistrationCode, Addr, Addr2 string) error {
return nil
}
diff --git a/bindings/client_test.go b/bindings/client_test.go
index f59ee64034c0b680752c0133cd9adf84eb00eca0..016c4f99ac0371e1c7aa88f3e948017a01aa1f9e 100644
--- a/bindings/client_test.go
+++ b/bindings/client_test.go
@@ -52,7 +52,7 @@ func (i *MockRegistration) RegisterUser(registrationCode, test string) (hash []b
return nil, nil
}
-func (i *MockRegistration) RegisterNode(ID *id.ID, ServerAddr, ServerTlsCert,
+func (i *MockRegistration) RegisterNode(salt []byte, ServerAddr, ServerTlsCert,
GatewayAddr, GatewayTlsCert, RegistrationCode string) error {
return nil
}
diff --git a/cmd/version.go b/cmd/version.go
index 364bd0f0856c10212984bac2abdc64d38f57cd84..9cf6e3164e71315a0f180773f68d0f8b84f53860 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -16,7 +16,7 @@ import (
)
// Change this value to set the version for this build
-const currentVersion = "1.4.0"
+const currentVersion = "1.5.0"
func printVersion() {
fmt.Printf("Elixxir Client v%s -- %s\n\n", globals.SEMVER, globals.GITVERSION)
diff --git a/globals/version_vars.go b/globals/version_vars.go
index adb16b83a9a4d441e85e282929bd7d9d59a0409e..515d73091b0bb8be7d2f6fceecb4d456689ae81f 100644
--- a/globals/version_vars.go
+++ b/globals/version_vars.go
@@ -1,10 +1,10 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
-// 2020-07-30 15:27:18.7064291 -0700 PDT m=+0.065083001
+// 2020-09-17 15:15:34.009207648 -0700 PDT m=+0.006867337
package globals
-const GITVERSION = `4ef845a Merge branch 'hotfix/integrateekv' into 'release'`
-const SEMVER = "1.4.0"
+const GITVERSION = `4edecf1 Update minor version number`
+const SEMVER = "1.5.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
go 1.13
@@ -22,11 +22,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94
- gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
+ gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a
+ gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842
- gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d
+ gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6
+ gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.mod b/go.mod
index f483175c4086c6414c15f9cd2f863fc10c680e0e..f09582005d3f13c4f7bd1648403dba085cf99263 100644
--- a/go.mod
+++ b/go.mod
@@ -15,11 +15,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94
- gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
+ gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a
+ gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842
- gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d
+ gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6
+ gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)
diff --git a/go.sum b/go.sum
index 0222d5381d5434a6707b9200622d02e3c7197de4..190067e18ca7432bdcd981a1d87fefc33e36e04a 100644
--- a/go.sum
+++ b/go.sum
@@ -161,16 +161,20 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
gitlab.com/elixxir/comms v0.0.0-20200707210150-b8ebd0951d23/go.mod h1:OsWMZ1O/R9fOkm+PoHnR3rkXfFtipGoPs73FuKuurHY=
-gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94 h1:AY3Nm9QXAh8jRUyKdX0jsay4A4j4z7/ofJgJKbvIFmc=
-gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94/go.mod h1:rlB+AA0mNMRq9GIR587cNw5RX4Cr8VOiVpZkFTTcukQ=
+gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a h1:WsrvOH/UUkOImFg79R6O93b/ZR40KiyHNXKf2rSRXGk=
+gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a/go.mod h1:L2Va13j2AbQkpkveOQmNzrQD37uI5NKeBhYH+LWMOx0=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930 h1:9qzfwyR12OYgn3j30qcHZHHVfWshWnH54lcAHppEROQ=
gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
+gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a h1:peZpulfSqLSceA5ovtzQ5MPgQt4YbJY8FzpV2S2Nrhc=
+gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a/go.mod h1:LHBAaEf48a0/AjU118rjoworH0LgXifhAqmNX3ZRvME=
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 h1:m1zDQ6UadpuMnV7nvnyR+DUXE3AisRnVjajTb1xZE4c=
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s=
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3 h1:GTfflZBNLeBq3UApYog0J3+hytdkoRsDduGQji2wyEU=
gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
-gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d h1:P4ceawldsxuwQ6LZHnUnemtiOJI9/QquYi8QkFuUbtI=
-gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d/go.mod h1:76OCijGBxYOBV5Kt7z6K7vNg3n9I57aCQMmI8GTpoEM=
+gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6 h1:7xLD8w5qAKN1YqG2UiMiN3rODUACyQME83uDlVhvWLo=
+gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
+gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820 h1:vdozJQgrnznmHJLS38aOXprLKZXClnHJ9ljY/70aWuI=
+gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820/go.mod h1:J+GJ6fn71a4xnYVvbcrhtvWSOQIqqhaGcaej5xB3/JY=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
diff --git a/version_vars.go.bak b/version_vars.go.bak
index 67620a0b3f330cea5051e878a2c07ceea175125d..069542095c787bc95ef023a7b59798f4df78e9b9 100644
--- a/version_vars.go.bak
+++ b/version_vars.go.bak
@@ -1,10 +1,10 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
-// 2020-07-30 15:27:18.7064291 -0700 PDT m=+0.065083001
+// 2020-09-17 15:15:34.009207648 -0700 PDT m=+0.006867337
package cmd
-const GITVERSION = `4ef845a Merge branch 'hotfix/integrateekv' into 'release'`
-const SEMVER = "1.4.0"
+const GITVERSION = `4edecf1 Update minor version number`
+const SEMVER = "1.5.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
go 1.13
@@ -22,11 +22,11 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
- gitlab.com/elixxir/comms v0.0.0-20200730220537-60dbe58afe94
- gitlab.com/elixxir/crypto v0.0.0-20200707005343-97f868cbd930
+ gitlab.com/elixxir/comms v0.0.0-20200917221445-8a509560122a
+ gitlab.com/elixxir/crypto v0.0.0-20200731174640-0503cf80524a
gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842
- gitlab.com/elixxir/primitives v0.0.0-20200706165052-9fe7a4fb99a3
- gitlab.com/xx_network/comms v0.0.0-20200730220144-eea32e8b696d
+ gitlab.com/elixxir/primitives v0.0.0-20200708185800-a06e961280e6
+ gitlab.com/xx_network/comms v0.0.0-20200916172635-6ab807c3c820
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
gopkg.in/ini.v1 v1.52.0 // indirect
)