From e0ebce7c29ebdd8441b1d10f6a6c3c4de9027b26 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 14 Sep 2023 19:38:16 -0400 Subject: [PATCH] feat: upgrade to zerokit 0.3.4 --- go.mod | 6 +++--- go.sum | 6 ++++++ rln/link/apple.go | 4 ++++ rln/link/arm.go | 4 ++++ rln/link/x86_64.go | 4 ++++ rln/rln.go | 5 +++++ rln/rln_test.go | 13 ++++++++++--- 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 409e653..85f15fe 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.7.2 - github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230905213302-1d6d18a03e7c - github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230905183322-05f4cda61468 - github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230905182930-2b11e72ef866 + github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230914230757-87caaeb9e6c9 + github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230914230828-f14923ed4dac + github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230914230901-6057b9728a32 ) require ( diff --git a/go.sum b/go.sum index 6a324ad..eadde59 100644 --- a/go.sum +++ b/go.sum @@ -15,10 +15,16 @@ github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230905213302-1d6d18a03e7c h1:aDn17iEMrdXeQ6dp+Cv3ywJYStkomkvKWv8I00iy79c= github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230905213302-1d6d18a03e7c/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48= +github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230914230757-87caaeb9e6c9 h1:bYnGf+NdSDOoxpGmGSiJsaiiDCPcZPMFYwcxMfONUE0= +github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230914230757-87caaeb9e6c9/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48= github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230905183322-05f4cda61468 h1:yNRDUyWJu/wHEPLps5D/Zce24mu/5ax2u1pXsMwRPbg= github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230905183322-05f4cda61468/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4= +github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230914230828-f14923ed4dac h1:50Us7F8/2V0qIpEenexZ7gNRHIPakyYG6GSlpb+MqkY= +github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230914230828-f14923ed4dac/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4= github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230905182930-2b11e72ef866 h1:dURzhyGtPrpmBJcnY4hpY83dW81cZimkZ8U+S89ANd0= github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230905182930-2b11e72ef866/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y= +github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230914230901-6057b9728a32 h1:JAQUiPcH26rgkNAPEhLPtRxvPaYiPoLbtbZnmz5ALeI= +github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230914230901-6057b9728a32/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/rln/link/apple.go b/rln/link/apple.go index 2f34873..bd3f694 100644 --- a/rln/link/apple.go +++ b/rln/link/apple.go @@ -114,3 +114,7 @@ func (i RLNWrapper) GetMetadata() ([]byte, error) { func (i RLNWrapper) Flush() bool { return i.ffi.Flush() } + +func (i RLNWrapper) LeavesSet() uint { + return i.ffi.LeavesSet() +} diff --git a/rln/link/arm.go b/rln/link/arm.go index d398862..ec78c45 100644 --- a/rln/link/arm.go +++ b/rln/link/arm.go @@ -113,3 +113,7 @@ func (i RLNWrapper) GetMetadata() ([]byte, error) { func (i RLNWrapper) Flush() bool { return i.ffi.Flush() } + +func (i RLNWrapper) LeavesSet() uint { + return i.ffi.LeavesSet() +} diff --git a/rln/link/x86_64.go b/rln/link/x86_64.go index e430306..9c73af3 100644 --- a/rln/link/x86_64.go +++ b/rln/link/x86_64.go @@ -114,3 +114,7 @@ func (i RLNWrapper) GetMetadata() ([]byte, error) { func (i RLNWrapper) Flush() bool { return i.ffi.Flush() } + +func (i RLNWrapper) LeavesSet() uint { + return i.ffi.LeavesSet() +} diff --git a/rln/rln.go b/rln/rln.go index 8efaa63..a4ff145 100644 --- a/rln/rln.go +++ b/rln/rln.go @@ -484,3 +484,8 @@ func (r *RLN) Flush() error { } return nil } + +// LeavesSet indicates how many elements have been inserted in the merkle tree +func (r *RLN) LeavesSet() uint { + return r.w.LeavesSet() +} diff --git a/rln/rln_test.go b/rln/rln_test.go index 6aff84a..bf60a33 100644 --- a/rln/rln_test.go +++ b/rln/rln_test.go @@ -84,11 +84,18 @@ func (s *RLNSuite) TestInsertMembers() { rln, err := NewRLN() s.NoError(err) - keypair, err := rln.MembershipKeyGen() + var commitments []IDCommitment + for i := 0; i < 10; i++ { + keypair, err := rln.MembershipKeyGen() + s.NoError(err) + commitments = append(commitments, keypair.IDCommitment) + } + + err = rln.InsertMembers(0, commitments) s.NoError(err) - err = rln.InsertMembers(0, []IDCommitment{keypair.IDCommitment}) - s.NoError(err) + numLeaves := rln.LeavesSet() + s.Equal(uint(10), numLeaves) } func (s *RLNSuite) TestRemoveMember() {