feat(rln-relay): use atomic operations API

flake.nix

@@ -28,7 +28,7 @@
           ];
           doCheck = false;
           # FIXME: This needs to be manually changed when updating modules.
-          vendorSha256 = "sha256-TU/jog0MZNC4g13gaGm88gsKTRvmlcKkMeXZbaVf3fc=";
+          vendorSha256 = "sha256-qfCqFbzCorpk0bLm1XEKpZCjPhbAQ+OXnpqdDSPf/KI=";
           # Fix for 'nix run' trying to execute 'go-waku'.
           meta = { mainProgram = "waku"; };
         };

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/jackc/pgx/v5 v5.4.1
 	github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7
 	github.com/waku-org/go-noise v0.0.4
-	github.com/waku-org/go-zerokit-rln v0.1.12
+	github.com/waku-org/go-zerokit-rln v0.1.13-0.20230801155627-0cefd6373447
 	github.com/wk8/go-ordered-map v1.0.0
 )
 
@@ -71,9 +71,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-20230331231302-258cacb91327 // indirect
-	github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230331223149-f90e66aebb0d // indirect
-	github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230331181847-cba74520bae9 // indirect
+	github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230801143206-7859920c65ec // indirect
+	github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230801152407-8101ff87ee0a // indirect
+	github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230801140722-0a4e68d0b8f5 // indirect
 	go.uber.org/dig v1.17.0 // indirect
 	go.uber.org/fx v1.19.2 // indirect
 	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect

go.sum

@@ -1554,14 +1554,14 @@ github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7 h1:0
 github.com/waku-org/go-libp2p-rendezvous v0.0.0-20230628220917-7b4e5ae4c0e7/go.mod h1:pFvOZ9YTFsW0o5zJW7a0B5tr1owAijRWJctXJ2toL04=
 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.12 h1:66+tU6sTlmUpuUlEv7kCFOGZ37MwZYFJBXHcm8QquwU=
-github.com/waku-org/go-zerokit-rln v0.1.12/go.mod h1:MUW+wB6Yj7UBMdZrhko7oHfUZeY2wchggXYjpUiMoac=
-github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230331231302-258cacb91327 h1:Q5XQqo+PEmvrybT8D7BEsKCwIYDi80s+00Q49cfm9Gs=
-github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230331231302-258cacb91327/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48=
-github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230331223149-f90e66aebb0d h1:Kcg85Y2xGU6hqZ/kMfkLQF2jAog8vt+tw1/VNidzNtE=
-github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230331223149-f90e66aebb0d/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4=
-github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230331181847-cba74520bae9 h1:u+YUlWDltHiK5upSb7M6mStc84zdc4vTCNNOz7R5RaY=
-github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230331181847-cba74520bae9/go.mod h1:+LeEYoW5/uBUTVjtBGLEVCUe9mOYAlu5ZPkIxLOSr5Y=
+github.com/waku-org/go-zerokit-rln v0.1.13-0.20230801155627-0cefd6373447 h1:+GzxqUPbhCyhKIyrDDDFlC2iBjzZQt7/KDQsJgyY1/E=
+github.com/waku-org/go-zerokit-rln v0.1.13-0.20230801155627-0cefd6373447/go.mod h1:sy/H4p2wFDY70KbnZduL38DDcJ0xuqsozN46+mhjGw8=
+github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230801143206-7859920c65ec h1:CYLH5FirJVwkKtYB0+8KqjZMCnd5OILuDzZ7Hk2vnGA=
+github.com/waku-org/go-zerokit-rln-apple v0.0.0-20230801143206-7859920c65ec/go.mod h1:KYykqtdApHVYZ3G0spwMnoxc5jH5eI3jyO9SwsSfi48=
+github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230801152407-8101ff87ee0a h1:10cre+P76QvnLeyeCVAM8WDbUCri/y5xY3LtwI9Y5DE=
+github.com/waku-org/go-zerokit-rln-arm v0.0.0-20230801152407-8101ff87ee0a/go.mod h1:7cSGUoGVIla1IpnChrLbkVjkYgdOcr7rcifEfh4ReR4=
+github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230801140722-0a4e68d0b8f5 h1:GseAHwGMixJ2zlY1kFYr3z1Ts0dREIYbgW4yIji9Ksw=
+github.com/waku-org/go-zerokit-rln-x86_64 v0.0.0-20230801140722-0a4e68d0b8f5/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=

waku/v2/protocol/rln/group_manager/dynamic/dynamic.go

@@ -270,17 +270,28 @@ func (gm *DynamicGroupManager) persistCredentials() error {
 func (gm *DynamicGroupManager) InsertMembers(toInsert *om.OrderedMap) error {
 	for pair := toInsert.Oldest(); pair != nil; pair = pair.Next() {
 		events := pair.Value.([]*contracts.RLNMemberRegistered) // TODO: should these be sortered by index? we assume all members arrive in order
+		var idCommitments []rln.IDCommitment
+		var oldestIndexInBlock *big.Int
 		for _, evt := range events {
-			pubkey := rln.Bytes32(evt.Pubkey.Bytes())
-			// TODO: should we track indexes to identify missing?
-			err := gm.rln.InsertMember(pubkey)
-			if err != nil {
-				gm.log.Error("inserting member into merkletree", zap.Error(err))
-				return err
+			if oldestIndexInBlock == nil {
+				oldestIndexInBlock = evt.Index
 			}
+			idCommitments = append(idCommitments, rln.Bytes32(evt.Pubkey.Bytes()))
 		}
 
-		_, err := gm.rootTracker.UpdateLatestRoot(pair.Key.(uint64))
+		if len(idCommitments) == 0 {
+			continue
+		}
+
+		// TODO: should we track indexes to identify missing?
+		startIndex := rln.MembershipIndex(uint(oldestIndexInBlock.Int64()))
+		err := gm.rln.InsertMembers(startIndex, idCommitments)
+		if err != nil {
+			gm.log.Error("inserting members into merkletree", zap.Error(err))
+			return err
+		}
+
+		_, err = gm.rootTracker.UpdateLatestRoot(pair.Key.(uint64))
 		if err != nil {
 			return err
 		}
@@ -290,13 +301,11 @@ func (gm *DynamicGroupManager) InsertMembers(toInsert *om.OrderedMap) error {
 
 func (gm *DynamicGroupManager) RemoveMembers(toRemove *om.OrderedMap) error {
 	for pair := toRemove.Newest(); pair != nil; pair = pair.Prev() {
-		memberIndexes := pair.Value.([]uint64)
-		for _, index := range memberIndexes {
-			err := gm.rln.DeleteMember(uint(index))
-			if err != nil {
-				gm.log.Error("deleting member", zap.Error(err))
-				return err
-			}
+		memberIndexes := pair.Value.([]uint)
+		err := gm.rln.DeleteMembers(memberIndexes)
+		if err != nil {
+			gm.log.Error("deleting members", zap.Error(err))
+			return err
 		}
 		gm.rootTracker.Backfill(pair.Key.(uint64))
 	}

waku/v2/protocol/rln/group_manager/static/static.go

@@ -18,6 +18,7 @@ type StaticGroupManager struct {
 
 	group       []rln.IDCommitment
 	rootTracker *group_manager.MerkleRootTracker
+	nextIndex   uint64
 }
 
 func NewStaticGroupManager(
@@ -46,33 +47,33 @@ func (gm *StaticGroupManager) Start(ctx context.Context, rlnInstance *rln.RLN, r
 	gm.rootTracker = rootTracker
 
 	// add members to the Merkle tree
-	for i, member := range gm.group {
-		err := gm.insertMember(member, uint64(i+1))
-		if err != nil {
-			return err
-		}
+
+	err := gm.insertMembers(gm.group)
+	if err != nil {
+		return err
 	}
 
 	gm.group = nil // Deleting group to release memory
 
 	return nil
 }
 
-func (gm *StaticGroupManager) insertMember(pubkey rln.IDCommitment, index uint64) error {
-	gm.log.Debug("a new key is added", zap.Binary("pubkey", pubkey[:]), zap.Uint64("index", index))
-
-	// assuming all the members arrive in order
-	err := gm.rln.InsertMember(pubkey)
+func (gm *StaticGroupManager) insertMembers(idCommitments []rln.IDCommitment) error {
+	err := gm.rln.InsertMembers(rln.MembershipIndex(gm.nextIndex), idCommitments)
 	if err != nil {
-		gm.log.Error("inserting member into merkletree", zap.Error(err))
+		gm.log.Error("inserting members into merkletree", zap.Error(err))
 		return err
 	}
 
-	_, err = gm.rootTracker.UpdateLatestRoot(index)
+	latestIndex := gm.nextIndex + uint64(len(idCommitments))
+
+	_, err = gm.rootTracker.UpdateLatestRoot(latestIndex)
 	if err != nil {
 		return err
 	}
 
+	gm.nextIndex = latestIndex + 1
+
 	return nil
 }