diff --git a/Makefile b/Makefile
index 5425a273992bccc5f4b927eb40b00a48c9a00b2f..60f283ab5cc99760ff28cba0546a0095ab1301df 100644
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,16 @@ build:
update_project:
GOFLAGS="" go get -d gitlab.com/elixxir/client@fullyDecentrilizedChannels
GOFLAGS="" go get -d gitlab.com/elixxir/crypto@project/channels
- GOFLAGS="" go get -d gitlab.com/elixxir/primitives@release
- GOFLAGS="" go get -d gitlab.com/xx_network/crypto@release
GOFLAGS="" go get -d gitlab.com/xx_network/primitives@project/channels
update_release:
GOFLAGS="" go get -d gitlab.com/elixxir/client@release
GOFLAGS="" go get -d gitlab.com/elixxir/crypto@release
- GOFLAGS="" go get -d gitlab.com/elixxir/primitives@release
- GOFLAGS="" go get -d gitlab.com/xx_network/crypto@release
GOFLAGS="" go get -d gitlab.com/xx_network/primitives@release
update_master:
GOFLAGS="" go get -d gitlab.com/elixxir/client@master
GOFLAGS="" go get -d gitlab.com/elixxir/crypto@master
- GOFLAGS="" go get -d gitlab.com/elixxir/primitives@master
- GOFLAGS="" go get -d gitlab.com/xx_network/crypto@master
GOFLAGS="" go get -d gitlab.com/xx_network/primitives@master
master: update_master clean build version
diff --git a/client/channels.go b/client/channels.go
index 65e8a86bfb549e589187ca9e5779e51e8e87b3d0..5fdb8b7af866b46303044d962fcf8202b295d5be 100644
--- a/client/channels.go
+++ b/client/channels.go
@@ -57,10 +57,14 @@ func NewChannelManager(net *xxdk.Cmix, nickname string) *Manager {
counter: 0,
}
+ f := func(path string) (channels.EventModel, error) {
+ return m, nil
+ }
+
obj, err := net.GetStorage().GetKV().Get(identityKey, 0)
if err == nil {
m.chanMan, err = channels.LoadManager(string(obj.Data),
- net.GetStorage().GetKV(), net.GetCmix(), net.GetRng(), m)
+ net.GetStorage().GetKV(), net.GetCmix(), net.GetRng(), f)
if err != nil {
jww.FATAL.Panicf("Failed create new manager: %+v", err)
}
@@ -103,7 +107,7 @@ func NewChannelManager(net *xxdk.Cmix, nickname string) *Manager {
m.username = chosenUsername
m.chanMan, err = channels.NewManager(chosenIdentity,
- net.GetStorage().GetKV(), net.GetCmix(), net.GetRng(), m)
+ net.GetStorage().GetKV(), net.GetCmix(), net.GetRng(), f)
if err != nil {
jww.FATAL.Panicf("Failed create new manager: %+v", err)
}
diff --git a/go.mod b/go.mod
index ab73fe9fb6c2c1d868a3a78c5307c63e6169350d..df5c3d9b506de67538f1fe78fe77d10cf1638204 100644
--- a/go.mod
+++ b/go.mod
@@ -10,15 +10,14 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
- gitlab.com/elixxir/client v1.5.1-0.20220924171409-6020be630f0c
- gitlab.com/elixxir/crypto v0.0.7-0.20220923164228-3f5620181081
+ gitlab.com/elixxir/client v1.5.1-0.20220928170652-fe87f3ae67b4
+ gitlab.com/elixxir/crypto v0.0.7-0.20220923233816-0364f1b203c6
gitlab.com/xx_network/primitives v0.0.4-0.20220809193445-9fc0a5209548
golang.design/x/clipboard v0.6.2
)
require (
git.xx.network/elixxir/grpc-web-go-client v0.0.0-20220908170150-ef04339ffe65 // indirect
- github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/badoux/checkmail v1.2.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cloudflare/circl v1.2.0 // indirect
@@ -43,7 +42,6 @@ require (
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
- github.com/pkg/profile v1.6.0 // indirect
github.com/rivo/uniseg v0.1.0 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
@@ -56,14 +54,13 @@ require (
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect
- gitlab.com/elixxir/comms v0.0.4-0.20220913220502-eed192f654bd // indirect
+ gitlab.com/elixxir/comms v0.0.4-0.20220916185715-f1e9a5eda939 // indirect
gitlab.com/elixxir/ekv v0.2.1 // indirect
gitlab.com/elixxir/primitives v0.0.3-0.20220901220638-1acc75fabdc6 // indirect
- gitlab.com/xx_network/comms v0.0.4-0.20220913215811-c4bf83b27de3 // indirect
+ gitlab.com/xx_network/comms v0.0.4-0.20220916185248-8a984b8594de // indirect
gitlab.com/xx_network/crypto v0.0.5-0.20220913213008-98764f5b3287 // indirect
gitlab.com/xx_network/ring v0.0.3-0.20220222211904-da613960ad93 // indirect
go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/ratelimit v0.2.0 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
diff --git a/go.sum b/go.sum
index 0926c0aa2e31d5c8732f44cabc896d14939760c3..c9e8ddd578c803a296d74d54c5af091d17135dea 100644
--- a/go.sum
+++ b/go.sum
@@ -70,7 +70,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -513,7 +512,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
-github.com/pkg/profile v1.6.0 h1:hUDfIISABYI59DyeB3OTay/HxSRwTQ8rB/H83k6r5dM=
github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -647,39 +645,15 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f h1:yXGvNBqzZwAhDYlSnxPRbgor6JWoOt1Z7s3z1O9JR40=
gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k=
-gitlab.com/elixxir/client v1.5.1-0.20220921211744-668751d8da11 h1:9fs45VsRo6iwnY9RvBjW4nowModQJnKkKE2bM/SJNU8=
-gitlab.com/elixxir/client v1.5.1-0.20220921211744-668751d8da11/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922164832-b24613367322 h1:jH/ExqKK/j/EIi4EMKBorkODW7KypSGl+wRPXERuUb8=
-gitlab.com/elixxir/client v1.5.1-0.20220922164832-b24613367322/go.mod h1:pX1uLFS8v6pNVzJEcfbMUrYPTWLPl8p71ghqW2Xm0Ns=
-gitlab.com/elixxir/client v1.5.1-0.20220922165344-1b589a285180 h1:ZB4YuemlNmTpYiK+RMK7WrwvsMHbcF3DehdsoXiumYI=
-gitlab.com/elixxir/client v1.5.1-0.20220922165344-1b589a285180/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922173918-52e66d46ffcb h1:Df4IqVlLTJjHQIpV64On6AFso9TT4YdJs0XjRFrovS8=
-gitlab.com/elixxir/client v1.5.1-0.20220922173918-52e66d46ffcb/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922175751-76d2726aeb23 h1:ihjFZcwOurrXrHdg21w8SFdwU/FIj1eeGGWyYFFFZAM=
-gitlab.com/elixxir/client v1.5.1-0.20220922175751-76d2726aeb23/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922180615-da9af2c54614 h1:ApRjxIrfcdko6We8g/3MAxTkmdIQuPALSQ+WPSPSnVI=
-gitlab.com/elixxir/client v1.5.1-0.20220922180615-da9af2c54614/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922181738-56d9732963c1 h1:VuRMlblYWK024+KZm4+39hi4ZeKk2RqZT469yyLeREA=
-gitlab.com/elixxir/client v1.5.1-0.20220922181738-56d9732963c1/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922181831-a9a02a98e068 h1:Z3NAiaYGztodzAbf9pzi/ya+6QZijwBy8E6NlYlWqJY=
-gitlab.com/elixxir/client v1.5.1-0.20220922181831-a9a02a98e068/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922182248-a037ba8c001c h1:88GaYyNND88y7/Z2CGbL0iWGT52tep9uaC22z/zNM8c=
-gitlab.com/elixxir/client v1.5.1-0.20220922182248-a037ba8c001c/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220922221524-61839c3f5f74 h1:kUlKRhWJPqDUq6srHH3LO+S+JX4IrH2DVwgDT5iL+D8=
-gitlab.com/elixxir/client v1.5.1-0.20220922221524-61839c3f5f74/go.mod h1:iW6LK0+LE8fI+xo6rwHrwLARO8o5rt2I/eFbaUXiqh8=
-gitlab.com/elixxir/client v1.5.1-0.20220924160343-584de98cf29c h1:jNe/remA0URTEa2MiiFTVuOLPuRQteshMOnLrx6lAUM=
-gitlab.com/elixxir/client v1.5.1-0.20220924160343-584de98cf29c/go.mod h1:bgSqHoDoVuoSljqQJICBtgNJI5kxzAM4AocuD5fU88Q=
-gitlab.com/elixxir/client v1.5.1-0.20220924171409-6020be630f0c h1:Lca7F9eKjO8JpDtBBo9NaQTz0gw011/lmYH0YWbZACA=
-gitlab.com/elixxir/client v1.5.1-0.20220924171409-6020be630f0c/go.mod h1:bgSqHoDoVuoSljqQJICBtgNJI5kxzAM4AocuD5fU88Q=
-gitlab.com/elixxir/comms v0.0.4-0.20220913220502-eed192f654bd h1:2nHE7EoptSTBFjCxMeAveKT6urbguCwgg8Jx7XYEVe4=
-gitlab.com/elixxir/comms v0.0.4-0.20220913220502-eed192f654bd/go.mod h1:AO6XkMhaHJW8eXlgL5m3UUcJqsSP8F5Wm1GX+wyq/rw=
+gitlab.com/elixxir/client v1.5.1-0.20220928170652-fe87f3ae67b4 h1:WgpR5CjPDXSRF5lpRhyyexmNsMQq9xiwMJd3HeDOb68=
+gitlab.com/elixxir/client v1.5.1-0.20220928170652-fe87f3ae67b4/go.mod h1:z1Bdlja75CF3UrzifMC0LQwjlEdOcJCfXEX5k9AKQTQ=
+gitlab.com/elixxir/comms v0.0.4-0.20220916185715-f1e9a5eda939 h1:+VRx2ULHKs040bBhDAOKNCZnbcXxUk3jD9JoKQzQpLk=
+gitlab.com/elixxir/comms v0.0.4-0.20220916185715-f1e9a5eda939/go.mod h1:AO6XkMhaHJW8eXlgL5m3UUcJqsSP8F5Wm1GX+wyq/rw=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA=
gitlab.com/elixxir/crypto v0.0.7-0.20220913220142-ab0771bad0af/go.mod h1:QF8SzsrYh9Elip9EUYUDAhPjqO9DGrrrQxYHvn+VXok=
-gitlab.com/elixxir/crypto v0.0.7-0.20220920002307-5541473e9aa7 h1:9IsBtL8zcUG86XcfNUVIKcnlL5tyKlyQt1cJ5nogr1U=
-gitlab.com/elixxir/crypto v0.0.7-0.20220920002307-5541473e9aa7/go.mod h1:QF8SzsrYh9Elip9EUYUDAhPjqO9DGrrrQxYHvn+VXok=
-gitlab.com/elixxir/crypto v0.0.7-0.20220923164228-3f5620181081 h1:xrTNr42Id8rvq6zH+pkoxxCrLhFMpkMC3f34y5mUfQE=
-gitlab.com/elixxir/crypto v0.0.7-0.20220923164228-3f5620181081/go.mod h1:QF8SzsrYh9Elip9EUYUDAhPjqO9DGrrrQxYHvn+VXok=
+gitlab.com/elixxir/crypto v0.0.7-0.20220923233816-0364f1b203c6 h1:ZCMqzKB86nrs9ldIoF2ZHvcExrkXIIIeH2RlNVwZx2A=
+gitlab.com/elixxir/crypto v0.0.7-0.20220923233816-0364f1b203c6/go.mod h1:QF8SzsrYh9Elip9EUYUDAhPjqO9DGrrrQxYHvn+VXok=
gitlab.com/elixxir/ekv v0.2.1 h1:dtwbt6KmAXG2Tik5d60iDz2fLhoFBgWwST03p7T+9Is=
gitlab.com/elixxir/ekv v0.2.1/go.mod h1:USLD7xeDnuZEavygdrgzNEwZXeLQJK/w1a+htpN+JEU=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
@@ -691,8 +665,9 @@ gitlab.com/elixxir/primitives v0.0.3-0.20220810173935-592f34a88326/go.mod h1:9Bb
gitlab.com/elixxir/primitives v0.0.3-0.20220901220638-1acc75fabdc6 h1:/cxxZBP5jTPDpC3zgOx9vV1ojmJyG8pYtkl3IbcewNQ=
gitlab.com/elixxir/primitives v0.0.3-0.20220901220638-1acc75fabdc6/go.mod h1:9Bb2+u+CDSwsEU5Droo6saDAXuBDvLRjexpBhPAYxhA=
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
-gitlab.com/xx_network/comms v0.0.4-0.20220913215811-c4bf83b27de3 h1:7mReTvEUVoI5Qpltcmbodc/j6rdPPHDIvenY4ZmWP7o=
gitlab.com/xx_network/comms v0.0.4-0.20220913215811-c4bf83b27de3/go.mod h1:E2QKOKyPKLRjLUwMxgZpTKueEsHDEqshfqOHJ54ttxU=
+gitlab.com/xx_network/comms v0.0.4-0.20220916185248-8a984b8594de h1:44VKuVgT6X1l+MX8/oNmYORA+pa4nkOWV8hYxi4SCzc=
+gitlab.com/xx_network/comms v0.0.4-0.20220916185248-8a984b8594de/go.mod h1:E2QKOKyPKLRjLUwMxgZpTKueEsHDEqshfqOHJ54ttxU=
gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE=
gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk=
gitlab.com/xx_network/crypto v0.0.5-0.20220913213008-98764f5b3287 h1:Jd71F8f/8rieWybMqkxpKKZVVyGkeCNZWZcviGGnQ9A=
@@ -735,7 +710,6 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/ratelimit v0.2.0 h1:UQE2Bgi7p2B85uP5dC2bbRtig0C+OeNRnNEafLjsLPA=
go.uber.org/ratelimit v0.2.0/go.mod h1:YYBV4e4naJvhpitQrWJu1vCpgB7CboMe0qhltKt6mUg=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=