diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e70cb4d21fa2ee45a87e8269ee5e3fdaea7a54e5..5952ed98a6f941f4cc09d2dff71fda75b00cb7fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,7 @@ build: except: - tags script: + - make version - mkdir -p release # - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' ./... - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-w -s' -o release/client.linux64 main.go diff --git a/bindings/version.go b/bindings/version.go new file mode 100644 index 0000000000000000000000000000000000000000..ec517de07f5d262e8e761e85e39bcd68d83914b9 --- /dev/null +++ b/bindings/version.go @@ -0,0 +1,18 @@ +package bindings + +import "gitlab.com/elixxir/client/api" + +// GetVersion returns the api SEMVER +func GetVersion() string { + return api.SEMVER +} + +// GetGitVersion rturns the api GITVERSION +func GetGitVersion() string { + return api.GITVERSION +} + +// GetDependencies returns the api DEPENDENCIES +func GetDependencies() string { + return api.DEPENDENCIES +} diff --git a/interfaces/params/network.go b/interfaces/params/network.go index 4860eaefb91b1261a88f6222ce369c8127ab7093..42d0e7ec45141cc105ab5e33a1b3ba2b77d6ae1e 100644 --- a/interfaces/params/network.go +++ b/interfaces/params/network.go @@ -49,7 +49,7 @@ func GetDefaultNetwork() Network { RegNodesBufferLen: 500, NetworkHealthTimeout: 30 * time.Second, E2EParams: GetDefaultE2ESessionParams(), - ParallelNodeRegistrations: 8, + ParallelNodeRegistrations: 20, KnownRoundsThreshold: 1500, //5 rounds/sec * 60 sec/min * 5 min FastPolling: true, BlacklistedNodes: make([]string, 0), diff --git a/single/reception.go b/single/reception.go index 23ca6f8bef891b8ae4426fe24172d4a88c2510c5..eca3bca2d2d5b093b0774d8e51b06ec9a763f4ed 100644 --- a/single/reception.go +++ b/single/reception.go @@ -108,5 +108,11 @@ func (m *Manager) processTransmission(msg format.Message, c := NewContact(payload.GetRID(transmitMsg.GetPubKey(grp)), transmitMsg.GetPubKey(grp), dhKey, payload.GetTagFP(), payload.GetMaxParts()) + jww.INFO.Printf("generated by singe use receiver reception id for single use: %s, "+ + "ephId: %v, pubkey: %x, msg: %s", + c.partner, "unknown:", + transmitMsg.GetPubKey(grp).Bytes(), + msg) + return payload.GetContents(), c, nil } diff --git a/single/transmission.go b/single/transmission.go index 25cd73276fb76eb2226ce7f44d1140cc0b9134b7..b5375a2e1272d032de531662466322601b6c3b56 100644 --- a/single/transmission.go +++ b/single/transmission.go @@ -289,5 +289,8 @@ func makeIDs(msg *transmitMessagePayload, publicKey *cyclic.Int, jww.DEBUG.Printf("ephemeral.GetId(%s, %d, %d) = %d", rid, addressSize, timeNow.UnixNano(), ephID.Int64()) } + jww.INFO.Printf("generated by singe use sender reception id for single use: %s, " + + "ephId: %d, pubkey: %x, msg: %s", rid, ephID.Int64(), publicKey.Bytes(), msg) + return rid, ephID, nil } diff --git a/single/transmitMessage.go b/single/transmitMessage.go index 768c47e2697dfe38c731ae0fbd2ffb7759442755..da7f88d9458363ed5e5bc4ea4a89e84a4874af12 100644 --- a/single/transmitMessage.go +++ b/single/transmitMessage.go @@ -9,6 +9,7 @@ package single import ( "encoding/binary" + "fmt" "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" "gitlab.com/elixxir/crypto/cyclic" @@ -246,3 +247,12 @@ func (mp transmitMessagePayload) SetContents(contents []byte) { copy(mp.contents, contents) } + + +// String returns the contents for printing adhering to the stringer interface. +func (mp transmitMessagePayload) String()string { + return fmt.Sprintf("Data: %x [tagFP: %x, nonce: %x, " + + "maxParts: %x, size: %x, content: %x]", mp.data, mp.tagFP, + mp.nonce, mp.maxParts, mp.size, mp.contents) + +}