mirror of
https://github.com/logos-messaging/logos-messaging-go.git
synced 2026-07-29 21:13:11 +00:00
Dont merge by now commented so that it compiles
This commit is contained in:
alrevuelta
parent
269417c5e9
commit
98e0b42a86
12
go.mod
12
go.mod
@ -36,17 +36,18 @@ require (
|
||||
github.com/dustin/go-humanize v1.0.1
|
||||
github.com/go-chi/chi/v5 v5.0.0
|
||||
github.com/jackc/pgx/v5 v5.4.1
|
||||
github.com/libp2p/go-libp2p-mplex v0.9.0
|
||||
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.20240102145250-fa738c0bdf59
|
||||
github.com/waku-org/go-zerokit-rln v0.1.14-0.20240531051154-88462cf65458
|
||||
github.com/wk8/go-ordered-map v1.0.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||
github.com/bits-and-blooms/bitset v1.10.0 // indirect
|
||||
github.com/btcsuite/btcd v0.20.1-beta // indirect
|
||||
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d // indirect
|
||||
github.com/consensys/gnark-crypto v0.12.1 // indirect
|
||||
github.com/deckarep/golang-set v1.8.0 // indirect
|
||||
github.com/fsnotify/fsnotify v1.6.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
@ -71,9 +72,9 @@ require (
|
||||
github.com/rjeczalik/notify v0.9.3 // indirect
|
||||
github.com/rogpeppe/go-internal v1.10.0 // indirect
|
||||
github.com/status-im/status-go/extkeys v1.1.2 // indirect
|
||||
github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230916172309-ee0ee61dde2b // indirect
|
||||
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065 // indirect
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1 // indirect
|
||||
github.com/waku-org/go-zerokit-rln-apple v0.0.0-20240529153423-5df5db48b69f // indirect
|
||||
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20240529153432-be2c8ac0a840 // indirect
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20240529153442-f5fb416605f5 // indirect
|
||||
go.uber.org/dig v1.17.1 // indirect
|
||||
go.uber.org/fx v1.20.1 // indirect
|
||||
go.uber.org/mock v0.3.0 // indirect
|
||||
@ -121,7 +122,6 @@ require (
|
||||
github.com/libp2p/go-cidranger v1.1.0 // indirect
|
||||
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
|
||||
github.com/libp2p/go-mplex v0.7.0 // indirect
|
||||
github.com/libp2p/go-nat v0.2.0 // indirect
|
||||
github.com/libp2p/go-netroute v0.2.1 // indirect
|
||||
github.com/libp2p/go-reuseport v0.4.0 // indirect
|
||||
|
||||
29
go.sum
29
go.sum
@ -215,6 +215,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
|
||||
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
|
||||
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
|
||||
github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
|
||||
github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88=
|
||||
github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
|
||||
github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
|
||||
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
|
||||
github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
||||
@ -293,6 +295,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
|
||||
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
|
||||
github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
|
||||
github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
|
||||
github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M=
|
||||
github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
|
||||
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
|
||||
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
|
||||
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
|
||||
@ -1002,7 +1006,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
|
||||
@ -1014,6 +1018,7 @@ github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq
|
||||
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
|
||||
github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
|
||||
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
|
||||
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
|
||||
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
|
||||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
@ -1033,13 +1038,9 @@ github.com/libp2p/go-libp2p v0.32.2 h1:s8GYN4YJzgUoyeYNPdW7JZeZ5Ee31iNaIBfGYMAY4
|
||||
github.com/libp2p/go-libp2p v0.32.2/go.mod h1:E0LKe+diV/ZVJVnOJby8VC5xzHF0660osg71skcxJvk=
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
|
||||
github.com/libp2p/go-libp2p-asn-util v0.3.0/go.mod h1:B1mcOrKUE35Xq/ASTmQ4tN3LNzVVaMNmq2NACuqyB9w=
|
||||
github.com/libp2p/go-libp2p-mplex v0.9.0 h1:R58pDRAmuBXkYugbSSXR9wrTX3+1pFM1xP2bLuodIq8=
|
||||
github.com/libp2p/go-libp2p-mplex v0.9.0/go.mod h1:ro1i4kuwiFT+uMPbIDIFkcLs1KRbNp0QwnUXM+P64Og=
|
||||
github.com/libp2p/go-libp2p-pubsub v0.10.1 h1:/RqOZpEtAolsr8/9CC8KqROJSOZeu7lK7fPftn4MwNg=
|
||||
github.com/libp2p/go-libp2p-pubsub v0.10.1/go.mod h1:1OxbaT/pFRO5h+Dpze8hdHQ63R0ke55XTs6b6NwLLkw=
|
||||
github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
|
||||
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
|
||||
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
|
||||
github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
|
||||
github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
|
||||
github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
|
||||
@ -1431,8 +1432,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
||||
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
|
||||
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
@ -1537,14 +1538,14 @@ github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0 h1:R
|
||||
github.com/waku-org/go-libp2p-rendezvous v0.0.0-20240110193335-a67d1cc760a0/go.mod h1:EhZP9fee0DYjKH/IOQvoNSy1tSHp2iZadsHGphcAJgY=
|
||||
github.com/waku-org/go-noise v0.0.4 h1:ZfQDcCw8pazm89EBl5SXY7GGAnzDQb9AHFXlw3Ktbvk=
|
||||
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.20240102145250-fa738c0bdf59 h1:jisj+OCI6QydLtFq3Pyhu49wl9ytPN7oAHjMfepHDrA=
|
||||
github.com/waku-org/go-zerokit-rln v0.1.14-0.20240102145250-fa738c0bdf59/go.mod h1:1PdBdPzyTaKt3VnpAHk3zj+r9dXPFOr3IHZP9nFle6E=
|
||||
github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230916172309-ee0ee61dde2b h1:KgZVhsLkxsj5gb/FfndSCQu6VYwALrCOgYI3poR95yE=
|
||||
github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230916172309-ee0ee61dde2b/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48=
|
||||
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065 h1:Sd7QD/1Yo2o2M1MY49F8Zr4KNBPUEK5cz5HoXQVJbrs=
|
||||
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230916171929-1dd9494ff065/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4=
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1 h1:4HSdWMFMufpRo3ECTX6BrvA+VzKhXZf7mS0rTa5cCWU=
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230916171518-2a77c3734dd1/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y=
|
||||
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-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=
|
||||
github.com/waku-org/go-zerokit-rln-arm v0.0.0-20240529153432-be2c8ac0a840/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4=
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20240529153442-f5fb416605f5 h1:ZhrzpAjIUZHD6gSKPA8zwHjIys9/GTGN3hPKtwMORSA=
|
||||
github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20240529153442-f5fb416605f5/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y=
|
||||
github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
|
||||
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
|
||||
github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
|
||||
|
||||
@ -65,10 +65,11 @@ type storeFactory func(w *WakuNode) legacy_store.Store
|
||||
type byte32 = [32]byte
|
||||
|
||||
type IdentityCredential = struct {
|
||||
IDTrapdoor byte32 `json:"idTrapdoor"`
|
||||
IDNullifier byte32 `json:"idNullifier"`
|
||||
IDSecretHash byte32 `json:"idSecretHash"`
|
||||
IDCommitment byte32 `json:"idCommitment"`
|
||||
IDTrapdoor byte32 `json:"idTrapdoor"`
|
||||
IDNullifier byte32 `json:"idNullifier"`
|
||||
IDSecretHash byte32 `json:"idSecretHash"`
|
||||
IDCommitment byte32 `json:"idCommitment"`
|
||||
UserMessageLimit uint32 `json:"userMessageLimit"`
|
||||
}
|
||||
|
||||
type SpamHandler = func(message *pb.WakuMessage, topic string) error
|
||||
|
||||
@ -51,14 +51,15 @@ func BytesToRateLimitProof(data []byte) (*rln.RateLimitProof, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// TODO: Not working
|
||||
result := &rln.RateLimitProof{
|
||||
Proof: rln.ZKSNARK(rln.Bytes128(rateLimitProof.Proof)),
|
||||
MerkleRoot: rln.MerkleNode(rln.Bytes32(rateLimitProof.MerkleRoot)),
|
||||
Epoch: rln.Epoch(rln.Bytes32(rateLimitProof.Epoch)),
|
||||
ShareX: rln.MerkleNode(rln.Bytes32(rateLimitProof.ShareX)),
|
||||
ShareY: rln.MerkleNode(rln.Bytes32(rateLimitProof.ShareY)),
|
||||
Nullifier: rln.Nullifier(rln.Bytes32(rateLimitProof.Nullifier)),
|
||||
RLNIdentifier: rln.RLNIdentifier(rln.Bytes32(rateLimitProof.RlnIdentifier)),
|
||||
Proof: rln.ZKSNARK(rln.Bytes128(rateLimitProof.Proof)),
|
||||
MerkleRoot: rln.MerkleNode(rln.Bytes32(rateLimitProof.MerkleRoot)),
|
||||
//Epoch: rln.Epoch(rln.Bytes32(rateLimitProof.Epoch)),
|
||||
ShareX: rln.MerkleNode(rln.Bytes32(rateLimitProof.ShareX)),
|
||||
ShareY: rln.MerkleNode(rln.Bytes32(rateLimitProof.ShareY)),
|
||||
Nullifier: rln.Nullifier(rln.Bytes32(rateLimitProof.Nullifier)),
|
||||
//RLNIdentifier: rln.RLNIdentifier(rln.Bytes32(rateLimitProof.RlnIdentifier)),
|
||||
}
|
||||
|
||||
return result, nil
|
||||
|
||||
@ -96,6 +96,7 @@ func (s *WakuRLNRelaySuite) TestUpdateLogAndHasDuplicate() {
|
||||
RootTracker: rootTracker,
|
||||
},
|
||||
}
|
||||
_ = rlnRelay
|
||||
|
||||
epoch := r.GetCurrentEpoch()
|
||||
|
||||
@ -133,36 +134,39 @@ func (s *WakuRLNRelaySuite) TestUpdateLogAndHasDuplicate() {
|
||||
msgProof3, err := BytesToRateLimitProof(rlpProof3)
|
||||
s.Require().NoError(err)
|
||||
|
||||
md1, err := rlnInstance.ExtractMetadata(*msgProof1)
|
||||
s.Require().NoError(err)
|
||||
md2, err := rlnInstance.ExtractMetadata(*msgProof2)
|
||||
s.Require().NoError(err)
|
||||
md3, err := rlnInstance.ExtractMetadata(*msgProof3)
|
||||
s.Require().NoError(err)
|
||||
//md1, err := rlnInstance.ExtractMetadata(*msgProof1)
|
||||
//s.Require().NoError(err)
|
||||
//md2, err := rlnInstance.ExtractMetadata(*msgProof2)
|
||||
//s.Require().NoError(err)
|
||||
//md3, err := rlnInstance.ExtractMetadata(*msgProof3)
|
||||
//s.Require().NoError(err)
|
||||
_ = msgProof1
|
||||
_ = msgProof2
|
||||
_ = msgProof3
|
||||
|
||||
// check whether hasDuplicate correctly finds records with the same nullifiers but different secret shares
|
||||
// no duplicate for wm1 should be found, since the log is empty
|
||||
result1, err := rlnRelay.nullifierLog.HasDuplicate(md1)
|
||||
s.Require().NoError(err)
|
||||
s.Require().False(result1) // No duplicate is found
|
||||
//result1, err := rlnRelay.nullifierLog.HasDuplicate(md1)
|
||||
//s.Require().NoError(err)
|
||||
//s.Require().False(result1) // No duplicate is found
|
||||
|
||||
// Add it to the log
|
||||
err = rlnRelay.nullifierLog.Insert(md1)
|
||||
s.Require().NoError(err)
|
||||
//err = rlnRelay.nullifierLog.Insert(md1)
|
||||
//s.Require().NoError(err)
|
||||
|
||||
// no duplicate for wm2 should be found, its nullifier differs from wm1
|
||||
result2, err := rlnRelay.nullifierLog.HasDuplicate(md2)
|
||||
s.Require().NoError(err)
|
||||
s.Require().False(result2) // No duplicate is found
|
||||
//result2, err := rlnRelay.nullifierLog.HasDuplicate(md2)
|
||||
//s.Require().NoError(err)
|
||||
//s.Require().False(result2) // No duplicate is found
|
||||
|
||||
// Add it to the log
|
||||
err = rlnRelay.nullifierLog.Insert(md2)
|
||||
s.Require().NoError(err)
|
||||
//err = rlnRelay.nullifierLog.Insert(md2)
|
||||
//s.Require().NoError(err)
|
||||
|
||||
// wm3 has the same nullifier as wm1 but different secret shares, it should be detected as duplicate
|
||||
result3, err := rlnRelay.nullifierLog.HasDuplicate(md3)
|
||||
s.Require().NoError(err)
|
||||
s.Require().True(result3) // It's a duplicate
|
||||
//result3, err := rlnRelay.nullifierLog.HasDuplicate(md3)
|
||||
//s.Require().NoError(err)
|
||||
//s.Require().True(result3) // It's a duplicate
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -105,6 +105,7 @@ func (rlnRelay *WakuRLNRelay) ValidateMessage(msg *pb.WakuMessage, optionalTime
|
||||
// get current rln epoch
|
||||
epoch = rln.CalcEpoch(rlnRelay.timesource.Now())
|
||||
}
|
||||
_ = epoch
|
||||
|
||||
msgProof, err := BytesToRateLimitProof(msg.RateLimitProof)
|
||||
if err != nil {
|
||||
@ -120,15 +121,16 @@ func (rlnRelay *WakuRLNRelay) ValidateMessage(msg *pb.WakuMessage, optionalTime
|
||||
return invalidMessage, nil
|
||||
}
|
||||
|
||||
proofMD, err := rlnRelay.RLN.ExtractMetadata(*msgProof)
|
||||
if err != nil {
|
||||
rlnRelay.log.Debug("could not extract metadata", zap.Error(err))
|
||||
rlnRelay.metrics.RecordError(proofMetadataExtractionErr)
|
||||
return invalidMessage, nil
|
||||
}
|
||||
//proofMD, err := rlnRelay.RLN.ExtractMetadata(*msgProof)
|
||||
//if err != nil {
|
||||
// rlnRelay.log.Debug("could not extract metadata", zap.Error(err))
|
||||
// rlnRelay.metrics.RecordError(proofMetadataExtractionErr)
|
||||
// return invalidMessage, nil
|
||||
//}
|
||||
|
||||
// calculate the gaps and validate the epoch
|
||||
gap := rln.Diff(epoch, msgProof.Epoch)
|
||||
//gap := rln.Diff(epoch, msgProof.Epoch)
|
||||
gap := int64(0)
|
||||
if int64(math.Abs(float64(gap))) > maxEpochGap {
|
||||
// message's epoch is too old or too ahead
|
||||
// accept messages whose epoch is within +-MAX_EPOCH_GAP from the current epoch
|
||||
@ -161,24 +163,26 @@ func (rlnRelay *WakuRLNRelay) ValidateMessage(msg *pb.WakuMessage, optionalTime
|
||||
}
|
||||
|
||||
// check if double messaging has happened
|
||||
hasDup, err := rlnRelay.nullifierLog.HasDuplicate(proofMD)
|
||||
if err != nil {
|
||||
rlnRelay.log.Debug("validation error", zap.Error(err))
|
||||
rlnRelay.metrics.RecordError(duplicateCheckErr)
|
||||
return validationError, err
|
||||
}
|
||||
/*
|
||||
hasDup, err := rlnRelay.nullifierLog.HasDuplicate(proofMD)
|
||||
if err != nil {
|
||||
rlnRelay.log.Debug("validation error", zap.Error(err))
|
||||
rlnRelay.metrics.RecordError(duplicateCheckErr)
|
||||
return validationError, err
|
||||
}
|
||||
|
||||
if hasDup {
|
||||
rlnRelay.log.Debug("spam received")
|
||||
return spamMessage, nil
|
||||
}
|
||||
if hasDup {
|
||||
rlnRelay.log.Debug("spam received")
|
||||
return spamMessage, nil
|
||||
}
|
||||
|
||||
err = rlnRelay.nullifierLog.Insert(proofMD)
|
||||
if err != nil {
|
||||
rlnRelay.log.Debug("could not insert proof into log")
|
||||
rlnRelay.metrics.RecordError(logInsertionErr)
|
||||
return validationError, err
|
||||
}
|
||||
err = rlnRelay.nullifierLog.Insert(proofMD)
|
||||
if err != nil {
|
||||
rlnRelay.log.Debug("could not insert proof into log")
|
||||
rlnRelay.metrics.RecordError(logInsertionErr)
|
||||
return validationError, err
|
||||
}
|
||||
*/
|
||||
|
||||
rlnRelay.log.Debug("message is valid")
|
||||
|
||||
@ -285,19 +289,25 @@ func (rlnRelay *WakuRLNRelay) generateProof(input []byte, epoch rln.Epoch) (*rln
|
||||
|
||||
membershipIndex := rlnRelay.GroupManager.MembershipIndex()
|
||||
|
||||
proof, err := rlnRelay.RLN.GenerateProof(input, identityCredentials, membershipIndex, epoch)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
//proof, err := rlnRelay.RLN.GenerateProof(input, identityCredentials, membershipIndex, epoch)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
|
||||
_ = identityCredentials
|
||||
_ = membershipIndex
|
||||
|
||||
proof := &rlnpb.RateLimitProof{}
|
||||
|
||||
// TODO: Just commented out
|
||||
return &rlnpb.RateLimitProof{
|
||||
Proof: proof.Proof[:],
|
||||
MerkleRoot: proof.MerkleRoot[:],
|
||||
Epoch: proof.Epoch[:],
|
||||
ShareX: proof.ShareX[:],
|
||||
ShareY: proof.ShareY[:],
|
||||
Nullifier: proof.Nullifier[:],
|
||||
RlnIdentifier: proof.RLNIdentifier[:],
|
||||
Proof: proof.Proof[:],
|
||||
MerkleRoot: proof.MerkleRoot[:],
|
||||
//Epoch: proof.Epoch[:],
|
||||
ShareX: proof.ShareX[:],
|
||||
ShareY: proof.ShareY[:],
|
||||
Nullifier: proof.Nullifier[:],
|
||||
//RlnIdentifier: proof.RLNIdentifier[:],
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user