From bbf633eeca638103787eb24c01f0ce92b38eed94 Mon Sep 17 00:00:00 2001 From: alrevuelta Date: Fri, 14 Jun 2024 10:32:09 +0200 Subject: [PATCH] Move hardcodings from zerokit to gowaku --- go.mod | 2 +- go.sum | 3 +++ waku/v2/protocol/rln/common.go | 3 ++- waku/v2/protocol/rln/waku_rln_relay.go | 9 ++++++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9c7e797c..02f3d0d3 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/jackc/pgx/v5 v5.4.1 github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0 github.com/waku-org/go-noise v0.0.4 - github.com/waku-org/go-zerokit-rln v0.1.14-0.20240531051154-88462cf65458 + github.com/waku-org/go-zerokit-rln v0.1.14-0.20240614081832-cbb253d8910e github.com/wk8/go-ordered-map v1.0.0 ) diff --git a/go.sum b/go.sum index 09356423..8fbdddc2 100644 --- a/go.sum +++ b/go.sum @@ -568,6 +568,7 @@ github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2C github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= @@ -1540,6 +1541,8 @@ github.com/waku-org/go-noise v0.0.4 h1:ZfQDcCw8pazm89EBl5SXY7GGAnzDQb9AHFXlw3Ktb github.com/waku-org/go-noise v0.0.4/go.mod h1:+PWRfs2eSOVwKrPcQlfhwDngSh3faL/1QoxvoqggEKc= github.com/waku-org/go-zerokit-rln v0.1.14-0.20240531051154-88462cf65458 h1:ws4jm3UVUwjkN19i5kVOFnt0nhRe1TKlIB91ShZEn+A= github.com/waku-org/go-zerokit-rln v0.1.14-0.20240531051154-88462cf65458/go.mod h1:CR9oP81b9G5TfZ6VDNKvB3GWS052hhmt36t+C1rcMbo= +github.com/waku-org/go-zerokit-rln v0.1.14-0.20240614081832-cbb253d8910e h1:8uwYIiMFgYPpd7PYsc3YC60+3JM+5awbPv0iW5+M3zs= +github.com/waku-org/go-zerokit-rln v0.1.14-0.20240614081832-cbb253d8910e/go.mod h1:CR9oP81b9G5TfZ6VDNKvB3GWS052hhmt36t+C1rcMbo= github.com/waku-org/go-zerokit-rln-apple v0.0.0-20240529153423-5df5db48b69f h1:CEBW4vu8I60OakKExZUE7G4oY7Z/glQXxPYedpZ4Sq8= github.com/waku-org/go-zerokit-rln-apple v0.0.0-20240529153423-5df5db48b69f/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48= github.com/waku-org/go-zerokit-rln-arm v0.0.0-20240529153432-be2c8ac0a840 h1:DKub+sG+vfKqwOCaKrthhJA/bP7gTZWxbdrFV86Q5Ms= diff --git a/waku/v2/protocol/rln/common.go b/waku/v2/protocol/rln/common.go index 9fa09e54..74fee7b6 100644 --- a/waku/v2/protocol/rln/common.go +++ b/waku/v2/protocol/rln/common.go @@ -21,7 +21,8 @@ const ( const maxClockGapSeconds = 20 // maximum allowed gap between the epochs of messages' RateLimitProofs -const maxEpochGap = int64(maxClockGapSeconds / rln.EPOCH_UNIT_SECONDS) +// TODO: Hardcoded to 1 epoch for now +const maxEpochGap = int64(maxClockGapSeconds / uint64(1)) // acceptable roots for merkle root validation of incoming messages const acceptableRootWindowSize = 5 diff --git a/waku/v2/protocol/rln/waku_rln_relay.go b/waku/v2/protocol/rln/waku_rln_relay.go index 77f1a08e..5f4e4133 100644 --- a/waku/v2/protocol/rln/waku_rln_relay.go +++ b/waku/v2/protocol/rln/waku_rln_relay.go @@ -100,10 +100,12 @@ func (rlnRelay *WakuRLNRelay) ValidateMessage(msg *pb.WakuMessage, optionalTime // it corresponds to the validation of rln external nullifier var epoch rln.Epoch if optionalTime != nil { - epoch = rln.CalcEpoch(*optionalTime) + // TODO: Hardcoded epoch size + epoch = rln.CalcEpoch(*optionalTime, uint64(1)) } else { // get current rln epoch - epoch = rln.CalcEpoch(rlnRelay.timesource.Now()) + // TODO: Hardcoded epoch size + epoch = rln.CalcEpoch(rlnRelay.timesource.Now(), uint64(1)) } _ = epoch @@ -210,7 +212,8 @@ func (rlnRelay *WakuRLNRelay) AppendRLNProof(msg *pb.WakuMessage, senderEpochTim input := toRLNSignal(msg) start := time.Now() - proof, err := rlnRelay.generateProof(input, rln.CalcEpoch(senderEpochTime)) + // TODO: Hardcoded epoch size + proof, err := rlnRelay.generateProof(input, rln.CalcEpoch(senderEpochTime, uint64(1))) if err != nil { return err }