Merge branch 'hotfix/fixModelMessage' into 'release'

Add DmToken to channels.ModelMessage

See merge request !492

channels/eventModel.go

@@ -198,6 +198,7 @@ type ModelMessage struct {
 	Round           id.Round          `json:"round"`
 	PubKey          ed25519.PublicKey `json:"pubKey"`
 	CodesetVersion  uint8             `json:"codesetVersion"`
+	DmToken         uint32            `json:"dmToken"`
 }
 
 // MessageTypeReceiveMessage defines handlers for messages of various message

channels/lease_test.go

@@ -1137,7 +1137,7 @@ func TestActionLeaseList_RemoveChannel(t *testing.T) {
 
 	select {
 	case <-done:
-	case <-time.After(200 * time.Millisecond):
+	case <-time.After(500 * time.Millisecond):
 		t.Error("Timed out waiting for message to be removed from message map.")
 	}
 

cmd/version.go

@@ -18,7 +18,7 @@ import (
 )
 
 // Change this value to set the version for this build
-const currentVersion = "4.4.1"
+const currentVersion = "4.4.2"
 
 func Version() string {
 	out := fmt.Sprintf("Elixxir Client v%s -- %s\n\n", xxdk.SEMVER,

xxdk/version_vars.go

 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
-// 2023-01-04 11:57:05.92173254 -0800 PST m=+0.279085507
+// 2023-01-04 14:29:07.79478227 -0800 PST m=+0.290821809
 
 package xxdk
 
-const GITVERSION = `ab34dc99 Fix SetTrackNetworkPeriod to be bindings compatible`
-const SEMVER = "4.4.1"
+const GITVERSION = `6774fe71 Add DmToken to ModelMessage`
+const SEMVER = "4.4.2"
 const DEPENDENCIES = `module gitlab.com/elixxir/client/v4
 
 go 1.19
 
 require (
 	github.com/cloudflare/circl v1.2.0
+	github.com/forPelevin/gomoji v1.1.8
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/protobuf v1.5.2
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
@@ -60,6 +61,7 @@ require (
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rivo/uniseg v0.4.3 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/sethvargo/go-diceware v0.3.0 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect