Merge branch 'main' into olshansky_iteration16_blocker

pokt-network · Jun 4, 2024 · 65d48c1 · 65d48c1
2 parents 9a623b7 + d64670f
commit 65d48c1
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -42,6 +42,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
 	github.com/hashicorp/go-metrics v0.5.2
 	github.com/noot/ring-go v0.0.0-20231019173746-6c4b33bcf03f
+	github.com/pokt-network/ring-go v0.1.0
 	github.com/pokt-network/smt v0.10.2
 	github.com/pokt-network/smt/kvstore/badger v0.0.0-20240109205447-868237978c0b
 	github.com/prometheus/client_golang v1.18.0

diff --git a/go.sum b/go.sum
@@ -978,6 +978,8 @@ github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDj
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pokt-network/ring-go v0.1.0 h1:hF7mDR4VVCIqqDAsrloP8azM9y1mprc99YgnTjKSSwk=
+github.com/pokt-network/ring-go v0.1.0/go.mod h1:8NHPH7H3EwrPX3XHfpyRI6bz4gApkE3+fd0XZRbMWP0=
 github.com/pokt-network/smt v0.10.2 h1:7OCimi2qN9kPwv+UDbUqaFYLaVMed3DYO8AbY8R0rNo=
 github.com/pokt-network/smt v0.10.2/go.mod h1:S4Ho4OPkK2v2vUCHNtA49XDjqUC/OFYpBbynRVYmxvA=
 github.com/pokt-network/smt/kvstore/badger v0.0.0-20240109205447-868237978c0b h1:TjfgV3vgW0zW47Br/OgUXD4M8iyR74EYanbFfN4ed8o=

diff --git a/pkg/crypto/interface.go b/pkg/crypto/interface.go
@@ -5,7 +5,7 @@ import (
 	"context"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	ring "github.com/noot/ring-go"
+	ring "github.com/pokt-network/ring-go"
 
 	"github.com/pokt-network/poktroll/x/service/types"
 )

diff --git a/pkg/crypto/rings/cache.go b/pkg/crypto/rings/cache.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"cosmossdk.io/depinject"
-	ring "github.com/noot/ring-go"
+	ring "github.com/pokt-network/ring-go"
 
 	"github.com/pokt-network/poktroll/pkg/client"
 	"github.com/pokt-network/poktroll/pkg/crypto"

diff --git a/pkg/crypto/rings/client.go b/pkg/crypto/rings/client.go
@@ -9,7 +9,7 @@ import (
 	ring_secp256k1 "github.com/athanorlabs/go-dleq/secp256k1"
 	ringtypes "github.com/athanorlabs/go-dleq/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/noot/ring-go"
+	ring "github.com/pokt-network/ring-go"
 
 	"github.com/pokt-network/poktroll/pkg/client"
 	"github.com/pokt-network/poktroll/pkg/crypto"

diff --git a/pkg/crypto/rings/ring.go b/pkg/crypto/rings/ring.go
@@ -5,7 +5,7 @@ import (
 	ringtypes "github.com/athanorlabs/go-dleq/types"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	ring "github.com/noot/ring-go"
+	ring "github.com/pokt-network/ring-go"
 )
 
 // newRingFromPoints creates a new ring from points (i.e. public keys) on the secp256k1 curve

diff --git a/pkg/signer/ring_signer.go b/pkg/signer/ring_signer.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	ringtypes "github.com/athanorlabs/go-dleq/types"
-	ring "github.com/noot/ring-go"
+	ring "github.com/pokt-network/ring-go"
 )
 
 var _ Signer = (*RingSigner)(nil)

diff --git a/testutil/testproxy/relayerproxy.go b/testutil/testproxy/relayerproxy.go
@@ -18,7 +18,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
-	"github.com/noot/ring-go"
+	"github.com/pokt-network/ring-go"
 	"github.com/stretchr/testify/require"
 
 	"github.com/pokt-network/poktroll/pkg/client"

diff --git a/x/proof/keeper/msg_server_submit_proof_test.go b/x/proof/keeper/msg_server_submit_proof_test.go
@@ -17,7 +17,7 @@ import (
 	cosmostypes "github.com/cosmos/cosmos-sdk/types"
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/noot/ring-go"
+	"github.com/pokt-network/ring-go"
 	"github.com/pokt-network/smt"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"