diff --git a/globals/version_vars.go b/globals/version_vars.go index 732e39a6daee62e43cd49872ef647e55cf115a54..98a9d1f78773a069962857f5dc84c1cb06d13f22 100644 --- a/globals/version_vars.go +++ b/globals/version_vars.go @@ -1,9 +1,9 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2021-01-28 22:23:27.98267073 +0000 UTC m=+0.009712900 +// 2021-02-12 12:07:33.934225 -0600 CST m=+0.026526230 package globals -const GITVERSION = `c38a960 Merge branch 'XX-3071/knownRoundsImpliesBug' into 'release'` +const GITVERSION = `a5bd14fb fix pipeline` const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client @@ -24,13 +24,13 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/viper v1.7.1 gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 - gitlab.com/elixxir/comms v0.0.4-0.20210125231706-c782d1f645ea - gitlab.com/elixxir/crypto v0.0.7-0.20210125231257-b52a556be893 + gitlab.com/elixxir/comms v0.0.4-0.20210210215855-f8a4b9751c59 + gitlab.com/elixxir/crypto v0.0.7-0.20210210215733-951b4e717763 gitlab.com/elixxir/ekv v0.1.4 - gitlab.com/elixxir/primitives v0.0.3-0.20210126180712-bfbfb725c75a - gitlab.com/xx_network/comms v0.0.4-0.20210121204701-7a1eb0542424 - gitlab.com/xx_network/crypto v0.0.5-0.20210121204626-b251b926e4f7 - gitlab.com/xx_network/primitives v0.0.4-0.20210121203635-8a771fc14f8a + gitlab.com/elixxir/primitives v0.0.3-0.20210210215643-bf48247248e5 + gitlab.com/xx_network/comms v0.0.4-0.20210210215624-622913c0a215 + gitlab.com/xx_network/crypto v0.0.5-0.20210210215543-446333e9022e + gitlab.com/xx_network/primitives v0.0.4-0.20210212180522-50ec526a6c12 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect golang.org/x/sys v0.0.0-20210105210732-16f7687f5001 // indirect diff --git a/go.mod b/go.mod index cb20c5099496c548f944b1e722142e5c758daee2..e58ac4e4ccfcca08039b608828468af02646ceff 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( gitlab.com/elixxir/primitives v0.0.3-0.20210210215643-bf48247248e5 gitlab.com/xx_network/comms v0.0.4-0.20210210215624-622913c0a215 gitlab.com/xx_network/crypto v0.0.5-0.20210210215543-446333e9022e - gitlab.com/xx_network/primitives v0.0.4-0.20210210215152-e4534abf3ae5 + gitlab.com/xx_network/primitives v0.0.4-0.20210212180522-50ec526a6c12 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect golang.org/x/sys v0.0.0-20210105210732-16f7687f5001 // indirect diff --git a/go.sum b/go.sum index cac346f28e1aca06585418648986f34b61018faa..f8ab9a03cc6843049c10344955f9f335f7f18fac 100644 --- a/go.sum +++ b/go.sum @@ -251,38 +251,12 @@ github.com/zeebo/pcg v1.0.0 h1:dt+dx+HvX8g7Un32rY9XWoYnd0NmKmrIzpHF7qiTDj0= github.com/zeebo/pcg v1.0.0/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 h1:Gi6rj4mAlK0BJIk1HIzBVMjWNjIUfstrsXC2VqLYPcA= gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k= -gitlab.com/elixxir/bloomfilter v0.0.0-20210120224144-ac046983a17a h1:0vLmGrqRDlaru89aKQPk3MyRPUInFujpqnVspBA6QTQ= -gitlab.com/elixxir/bloomfilter v0.0.0-20210120224144-ac046983a17a/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k= -gitlab.com/elixxir/comms v0.0.4-0.20210125231706-c782d1f645ea h1:hpK8M9wSAAhzaA03+1FOniNxgowPm1uTylcpAOa47DQ= -gitlab.com/elixxir/comms v0.0.4-0.20210125231706-c782d1f645ea/go.mod h1:5hxGwa/8BEpo4cZrbxhxyXPpXmwzMPunKE/H141+rPU= -gitlab.com/elixxir/comms v0.0.4-0.20210128232810-8f2ffd6ed805 h1:czoy+y4wbng8weZP9viWj6G41EySfsFszJuSk011G6Y= -gitlab.com/elixxir/comms v0.0.4-0.20210128232810-8f2ffd6ed805/go.mod h1:+7fs54+YYHbC6ljvobl5RgrtgOjt3UBfs5SRNvQFtM4= -gitlab.com/elixxir/comms v0.0.4-0.20210129201143-e9ffafea7e19 h1:3+xu3Tlval4quKSHLxf+y59/iSYKn3gPCUgistRkEgY= -gitlab.com/elixxir/comms v0.0.4-0.20210129201143-e9ffafea7e19/go.mod h1:+7fs54+YYHbC6ljvobl5RgrtgOjt3UBfs5SRNvQFtM4= -gitlab.com/elixxir/comms v0.0.4-0.20210202030342-3e0a43736d5b h1:PrVAexgFtvB7gt8LxhnglY2zQKwDDm+Zai4IkeaixFI= -gitlab.com/elixxir/comms v0.0.4-0.20210202030342-3e0a43736d5b/go.mod h1:+7fs54+YYHbC6ljvobl5RgrtgOjt3UBfs5SRNvQFtM4= -gitlab.com/elixxir/comms v0.0.4-0.20210208204309-844eb1e8e386 h1:aGWLCpMBOGKB+TtRZKwyT5Qu/wYnNLRPXNPBMIVqBJU= -gitlab.com/elixxir/comms v0.0.4-0.20210208204309-844eb1e8e386/go.mod h1:5pYZQf1GWX8JkJAbOK1m0pKX9cSrLPgv6adoQ7Qdw7I= -gitlab.com/elixxir/comms v0.0.4-0.20210208211644-f8cba66944b3 h1:tkgq566GOe6Iu+Ck4fkOzxboOJY2vd8/s5yQMeVAZ/c= -gitlab.com/elixxir/comms v0.0.4-0.20210208211644-f8cba66944b3/go.mod h1:hreHd6lSTQLMebGJH5frrAhcpsXSIhBFyZDJm4cRo2c= -gitlab.com/elixxir/comms v0.0.4-0.20210209203849-4550368d6bc9 h1:1WYHhdrSyuWPaWbHAftP8nwWCfVH6n0XKHk5lKISOGk= -gitlab.com/elixxir/comms v0.0.4-0.20210209203849-4550368d6bc9/go.mod h1:MLhI915GjPDGHSROXsYC8K79820Z7PKu/KJGyuF33vA= gitlab.com/elixxir/comms v0.0.4-0.20210210215855-f8a4b9751c59 h1:/MSWVvLFV8Z2H37l+9fC3z5aO/fXktwd3RKFT21dvcM= gitlab.com/elixxir/comms v0.0.4-0.20210210215855-f8a4b9751c59/go.mod h1:ZXv+fpI/kRCzxxX6p4JXlonJVDl49t4+v71kEkBipgM= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 h1:28ftZDeYEko7xptCZzeFWS1Iam95dj46TWFVVlKmw6A= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= gitlab.com/elixxir/crypto v0.0.3 h1:znCt/x2bL4y8czTPaaFkwzdgSgW3BJc/1+dxyf1jqVw= gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA= -gitlab.com/elixxir/crypto v0.0.6 h1:c94CGzBTV7LgInGHfmeJHrqq9nIc/WEOLUd9OeQBN74= -gitlab.com/elixxir/crypto v0.0.7-0.20210114172156-b576829ba7d8/go.mod h1:4AumkGNppiEaMo6bIpFBrV6wZtaIjpbvkpA5+FBisA8= -gitlab.com/elixxir/crypto v0.0.7-0.20210125231257-b52a556be893 h1:0NjQOwdGO/xBvgBMzRLSFXpSpnluzjT16obl5AcGfmI= -gitlab.com/elixxir/crypto v0.0.7-0.20210125231257-b52a556be893/go.mod h1:BoYrgHnTJPvvd4f/f4A+y22wwgZ7IxkYtGC8x9WiwxA= -gitlab.com/elixxir/crypto v0.0.7-0.20210128232700-0d547d16aff5 h1:jNik2VPt/GCzrlNZsjfR+Kdro71td91H4jAmaa4pvA4= -gitlab.com/elixxir/crypto v0.0.7-0.20210128232700-0d547d16aff5/go.mod h1:XfpfHnG+bTq+GjuMI5Ncamnd5zED+1ao4xpxVS2a9Uo= -gitlab.com/elixxir/crypto v0.0.7-0.20210208204158-9b9a7df7b25c h1:YkK3Yq4ZR5Lfl4CpinX75Xm5z8Gm0H1M8jSy3ge0I1o= -gitlab.com/elixxir/crypto v0.0.7-0.20210208204158-9b9a7df7b25c/go.mod h1:4gECHeK0Mv2VlttgNWSxgT+bzG7VpWXLbQXTV4YK/io= -gitlab.com/elixxir/crypto v0.0.7-0.20210208211519-5f5b427b29d7 h1:+yH/QDDNaBKqQJuh2qNpnRLKeFay8W5VFJZ9cHF3GsU= -gitlab.com/elixxir/crypto v0.0.7-0.20210208211519-5f5b427b29d7/go.mod h1:9YmLo0/XmQ7m5NcXCKirXrPosd1txc9ukonQsMgbAkM= gitlab.com/elixxir/crypto v0.0.7-0.20210210215733-951b4e717763 h1:MUFs4H4kTdPm/fsagl8vm2yGF6JR+/6fKSg1Y68XAQI= gitlab.com/elixxir/crypto v0.0.7-0.20210210215733-951b4e717763/go.mod h1:ucX9BoKoDlE6e3yjnTuVD2mc72nQUket44DxISyivUw= gitlab.com/elixxir/ekv v0.1.4 h1:NLVMwsFEKArWcsDHu2DbXlm9374iSgn7oIA3rVSsvjc= @@ -292,34 +266,14 @@ gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0Vel gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= gitlab.com/elixxir/primitives v0.0.1 h1:q61anawANlNAExfkeQEE1NCsNih6vNV1FFLoUQX6txQ= gitlab.com/elixxir/primitives v0.0.1/go.mod h1:kNp47yPqja2lHSiS4DddTvFpB/4D9dB2YKnw5c+LJCE= -gitlab.com/elixxir/primitives v0.0.3-0.20210107183456-9cf6fe2de1e5/go.mod h1:Ph6isHUDVjmRUd9DioyKpd8W9J52gKBiDeue4DCygXA= -gitlab.com/elixxir/primitives v0.0.3-0.20210125225949-9469ce6b08fc h1:V+E0pUqqpu7u6epgR3e73D+Og7dQBV3y7dQA9AUZzuA= -gitlab.com/elixxir/primitives v0.0.3-0.20210125225949-9469ce6b08fc/go.mod h1:bGYfAGerVVZhNzh+PxOMZVG7iYAUfInYvtdAkAqgiY8= -gitlab.com/elixxir/primitives v0.0.3-0.20210126180712-bfbfb725c75a h1:3jq90Nmn8Ew9vfUuizV4mvj6py5LOmX3wkuBc+ywJ0w= -gitlab.com/elixxir/primitives v0.0.3-0.20210126180712-bfbfb725c75a/go.mod h1:bGYfAGerVVZhNzh+PxOMZVG7iYAUfInYvtdAkAqgiY8= -gitlab.com/elixxir/primitives v0.0.3-0.20210208201252-90d9333ed6ea h1:btj6Gnv/07WJ/rDqtQyE4OFuSMey+Knv9FY0FIQ4EC4= -gitlab.com/elixxir/primitives v0.0.3-0.20210208201252-90d9333ed6ea/go.mod h1:bGYfAGerVVZhNzh+PxOMZVG7iYAUfInYvtdAkAqgiY8= -gitlab.com/elixxir/primitives v0.0.3-0.20210208211427-8140bdd93b0b h1:HljBUbfGiQ712ywC8PfYKUQpEtV/RaeEc7ITeT49yMU= -gitlab.com/elixxir/primitives v0.0.3-0.20210208211427-8140bdd93b0b/go.mod h1:4OkMfgU5Z2s763+Zb5VVPAQ6tPsGnbLnAy9sljPIx0A= gitlab.com/elixxir/primitives v0.0.3-0.20210210215643-bf48247248e5 h1:ExAOci0J5i53G+pA+oQ9ushG4WE0GQSiaO6JidHGEuw= gitlab.com/elixxir/primitives v0.0.3-0.20210210215643-bf48247248e5/go.mod h1:Cz0fCtgUKnVdo2rJgiJ/h3N8a2SPW8tP9tn6cV/+t1s= gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= -gitlab.com/xx_network/comms v0.0.4-0.20210121204701-7a1eb0542424 h1:zhfkbutYEY7PQuC1kcugCt4am/oRAyla6u4xDc5PqWs= -gitlab.com/xx_network/comms v0.0.4-0.20210121204701-7a1eb0542424/go.mod h1:MNkja6iUsM2yjBQicwLUGYctZmAU/D4AMpDD04vfBg8= -gitlab.com/xx_network/comms v0.0.4-0.20210208211407-3c1bed8b616f h1:vj7FQEBYIvlinFgFC1KHz67p3BBCV8aR2FR13eazoeA= -gitlab.com/xx_network/comms v0.0.4-0.20210208211407-3c1bed8b616f/go.mod h1:iw4oIGagTrQ1rn43koqGOhAFy6xcp1ggMh9zvnLKIO8= -gitlab.com/xx_network/comms v0.0.4-0.20210208222850-a4426ef99e37 h1:8bzmtlZJWv8oPcTYgkq5aG7aouLvqvu1nNA9TOTq8fg= -gitlab.com/xx_network/comms v0.0.4-0.20210208222850-a4426ef99e37/go.mod h1:iw4oIGagTrQ1rn43koqGOhAFy6xcp1ggMh9zvnLKIO8= gitlab.com/xx_network/comms v0.0.4-0.20210210215624-622913c0a215 h1:f+cobRegYJH2x6cFkf1RfJEGFnX/vq2hGLltFC+g4Bk= gitlab.com/xx_network/comms v0.0.4-0.20210210215624-622913c0a215/go.mod h1:P81n1Rv0so+uIWGkGDEUt/bEvpksM6yfB0iB22rbFx4= gitlab.com/xx_network/crypto v0.0.3/go.mod h1:DF2HYvvCw9wkBybXcXAgQMzX+MiGbFPjwt3t17VRqRE= gitlab.com/xx_network/crypto v0.0.4 h1:lpKOL5mTJ2awWMfgBy30oD/UvJVrWZzUimSHlOdZZxo= gitlab.com/xx_network/crypto v0.0.4/go.mod h1:+lcQEy+Th4eswFgQDwT0EXKp4AXrlubxalwQFH5O0Mk= -gitlab.com/xx_network/crypto v0.0.5-0.20210107183440-804e0f8b7d22/go.mod h1:tTYlvAZNUFMtndcijM37iujkM4gP8kUwGiS9n7NA5Ck= -gitlab.com/xx_network/crypto v0.0.5-0.20210121204626-b251b926e4f7 h1:eraxUmI0EFDtfqTV4Ojndoh8Bv8PBUbZaT27VLU1yhc= -gitlab.com/xx_network/crypto v0.0.5-0.20210121204626-b251b926e4f7/go.mod h1:61fEAGI2+JD6CbT5PMzxy1SBMvgiFxE4MyiQghzoOVg= -gitlab.com/xx_network/crypto v0.0.5-0.20210208211326-ba22f885317c h1:j9rUB6jzqD8BL5kHLuWFH8zGvVbeqvMzFxmHT8ShWE4= -gitlab.com/xx_network/crypto v0.0.5-0.20210208211326-ba22f885317c/go.mod h1:wWEWKJXrS7MwPmj3VLyccjnbPLXB8McBkR9QUcqMDH4= gitlab.com/xx_network/crypto v0.0.5-0.20210210215543-446333e9022e h1:wRRIu5sB+5t2NgbLXCJsyqA3DK7a8rRUwPza2Vy5Rdc= gitlab.com/xx_network/crypto v0.0.5-0.20210210215543-446333e9022e/go.mod h1:NiPI62thPru+eYlBucjl2/OLUND3wKLOhPrIHvK/nCA= gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA= @@ -327,13 +281,10 @@ gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da h1:CCVslUwNC gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug= gitlab.com/xx_network/primitives v0.0.2 h1:r45yKenJ9e7PylI1ZXJ1Es09oYNaYXjxVy9+uYlwo7Y= gitlab.com/xx_network/primitives v0.0.2/go.mod h1:cs0QlFpdMDI6lAo61lDRH2JZz+3aVkHy+QogOB6F/qc= -gitlab.com/xx_network/primitives v0.0.4-0.20210106014326-691ebfca3b07/go.mod h1:cs0QlFpdMDI6lAo61lDRH2JZz+3aVkHy+QogOB6F/qc= -gitlab.com/xx_network/primitives v0.0.4-0.20210121203635-8a771fc14f8a h1:ZDv8RHUsl9pjIkgqd8u6y00P+6TXEASwBg9dpvHSsT0= -gitlab.com/xx_network/primitives v0.0.4-0.20210121203635-8a771fc14f8a/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE= -gitlab.com/xx_network/primitives v0.0.4-0.20210208204253-ed1a9ef0c75e h1:JW2QXZSaipTEyCbMcjvc9cbIwFqt9/12toYPyAzI7Go= -gitlab.com/xx_network/primitives v0.0.4-0.20210208204253-ed1a9ef0c75e/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE= gitlab.com/xx_network/primitives v0.0.4-0.20210210215152-e4534abf3ae5 h1:skLonqleopw1osf3xBQTNX9NjTV/OQP6AM4HKpLNUdc= gitlab.com/xx_network/primitives v0.0.4-0.20210210215152-e4534abf3ae5/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE= +gitlab.com/xx_network/primitives v0.0.4-0.20210212180522-50ec526a6c12 h1:dOQS9tzT4fllDhU37pbJhAAW8qlB0HDjuf74rvzOZQQ= +gitlab.com/xx_network/primitives v0.0.4-0.20210212180522-50ec526a6c12/go.mod h1:9imZHvYwNFobxueSvVtHneZLk9wTK7HQTzxPm+zhFhE= gitlab.com/xx_network/ring v0.0.2 h1:TlPjlbFdhtJrwvRgIg4ScdngMTaynx/ByHBRZiXCoL0= gitlab.com/xx_network/ring v0.0.2/go.mod h1:aLzpP2TiZTQut/PVHR40EJAomzugDdHXetbieRClXIM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= diff --git a/network/ephemeral/tracker.go b/network/ephemeral/tracker.go index 4ebc5b9d24d9993e8d9f8c5d36e000857f46e169..07985b841fbf4a06e901b4a9b911020300e54399 100644 --- a/network/ephemeral/tracker.go +++ b/network/ephemeral/tracker.go @@ -62,7 +62,7 @@ func track(session *storage.Session, ourId *id.ID, stop *stoppable.Single) { now := time.Now() // Generates the IDs since the last track protoIds, err := ephemeral.GetIdsByRange(ourId, receptionStore.GetIDSize(), - now.UnixNano(), now.Sub(lastCheck)) + now, now.Sub(lastCheck)) jww.INFO.Printf("Now: %d, LastCheck: %v (%v), Different: %v (%v)", now.UnixNano(), lastCheck, lastCheck, now.Sub(lastCheck), now.Sub(lastCheck))