Reorg files and update imports, and fix some tests

cmd/horcrux/cmd/shards.go

@@ -116,7 +116,7 @@ func createCosignerEd25519ShardsCmd() *cobra.Command {
 
 			csKeys, err := tss.CreatePersistentEd25519ThresholdSignShardsFromFile(keyFile, threshold, shards)
 			if err != nil {
-				return err
+				return fmt.Errorf("error creating CreatePersistentEd25519ThresholdSignShardsFromFile (%s): %d, %d, %w", keyFile, threshold, shards, err)
 			}
 
 			out, _ := cmd.Flags().GetString(flagOutputDir)

cmd/horcrux/cmd/single_signer.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/strangelove-ventures/horcrux/node"
+	"github.com/strangelove-ventures/horcrux/src/node"
 )
 
 const (

cmd/horcrux/cmd/start.go

@@ -9,8 +9,8 @@ import (
 	cometlog "github.com/cometbft/cometbft/libs/log"
 	"github.com/cometbft/cometbft/libs/service"
 	"github.com/spf13/cobra"
-	"github.com/strangelove-ventures/horcrux/node"
 	cconfig "github.com/strangelove-ventures/horcrux/src/config"
+	"github.com/strangelove-ventures/horcrux/src/node"
 )
 
 func startCmd() *cobra.Command {

cmd/horcrux/cmd/state.go

@@ -13,7 +13,7 @@ import (
 	"github.com/strangelove-ventures/horcrux/src/types"
 
 	"github.com/spf13/cobra"
-	"github.com/strangelove-ventures/horcrux/node"
+	"github.com/strangelove-ventures/horcrux/src/node"
 
 	cometjson "github.com/cometbft/cometbft/libs/json"
 	cometlog "github.com/cometbft/cometbft/libs/log"

cmd/horcrux/cmd/threshold.go

@@ -9,10 +9,10 @@ import (
 
 	cometlog "github.com/cometbft/cometbft/libs/log"
 	cometservice "github.com/cometbft/cometbft/libs/service"
-	"github.com/strangelove-ventures/horcrux/node"
 	cconfig "github.com/strangelove-ventures/horcrux/src/config"
 	"github.com/strangelove-ventures/horcrux/src/cosigner"
 	"github.com/strangelove-ventures/horcrux/src/cosigner/nodesecurity"
+	"github.com/strangelove-ventures/horcrux/src/node"
 )
 
 const maxWaitForSameBlockAttempts = 3

src/connector/sentry_signer_grpc_server.go

@@ -2,6 +2,7 @@ package connector
 
 import (
 	"context"
+	"errors"
 	"net"
 	"time"
 
@@ -109,8 +110,9 @@ func signAndTrack(
 ) ([]byte, time.Time, error) {
 	signature, timestamp, err := validator.Sign(ctx, chainID, block)
 	if err != nil {
-		switch typedErr := err.(type) {
-		case *metrics.BeyondBlockError:
+		var typedErr *metrics.BeyondBlockError
+		switch {
+		case errors.As(err, &typedErr):
 			logger.Debug(
 				"Rejecting sign request",
 				"type", types.SignType(block.Step),

src/cosigner/cosigner.go

@@ -87,12 +87,13 @@ func (mpc *MPC) Stop(ctx context.Context) error {
 }
 
 func (mpc *MPC) Start(ctx context.Context) error {
-	//mpc.logger.Info("Starting ThresholdValidator services")
-
+	// mpc.logger.Info("Starting serverHealth services")
 	go mpc.serverHealth.Start(ctx)
 
+	// mpc.logger.Info("Starting serverHealth services")
 	go mpc.nonceCache.Start(ctx)
 
+	// mpc.logger.Info("Starting noncePruner services")
 	go mpc.noncePruner.Start(ctx)
 
 	// Should start the servers/clients?

src/cosigner/ithresholdsigner.go

@@ -16,7 +16,7 @@ type IThresholdSigner interface {
 }
 
 type IThresholdDealer interface {
-	KeyGenerator(threshold, total uint8) (types.Nonces, error)
+	GenerateNonces(threshold, total uint8) (types.Nonces, error)
 }
 
 type IThreshold interface {

src/cosigner/local_cosigner_test.go

@@ -201,7 +201,7 @@ func testLocalCosignerSign(t *testing.T, threshold, total uint8, security []cosi
 
 	sigs := make([]types.PartialSignature, threshold)
 
-	for i, local_cosigner := range thresholdCosigners {
+	for i, localCosigner := range thresholdCosigners {
 		cosignerNonces := make([]cosigner.Nonce, 0, threshold-1)
 
 		for j, nonce := range nonces {
@@ -210,13 +210,13 @@ func testLocalCosignerSign(t *testing.T, threshold, total uint8, security []cosi
 			}
 
 			for _, n := range nonce {
-				if n.DestinationID == local_cosigner.GetIndex() {
+				if n.DestinationID == localCosigner.GetIndex() {
 					cosignerNonces = append(cosignerNonces, n)
 				}
 			}
 		}
 
-		sigRes, err := local_cosigner.SetNoncesAndSign(ctx, cosigner.CosignerSetNoncesAndSignRequest{
+		sigRes, err := localCosigner.SetNoncesAndSign(ctx, cosigner.CosignerSetNoncesAndSignRequest{
 			Nonces: &cosigner.CosignerUUIDNonces{
 				UUID:   u,
 				Nonces: cosignerNonces,
@@ -228,7 +228,7 @@ func testLocalCosignerSign(t *testing.T, threshold, total uint8, security []cosi
 		require.NoError(t, err)
 
 		sigs[i] = types.PartialSignature{
-			Index:     local_cosigner.GetIndex(),
+			Index:     localCosigner.GetIndex(),
 			Signature: sigRes.Signature,
 		}
 	}

src/cosigner/server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/strangelove-ventures/horcrux/src/config"
 	"github.com/strangelove-ventures/horcrux/src/metrics"
 	"github.com/strangelove-ventures/horcrux/src/tss"
+	"github.com/strangelove-ventures/horcrux/src/tss/ted25519"
 
 	"github.com/strangelove-ventures/horcrux/src/types"
 
@@ -59,7 +60,7 @@ func NewLocalCosigner(
 		security: security,
 		address:  address,
 		nonces:   make(map[uuid.UUID]*types.NoncesWithExpiration),
-		//dealer:   tss.NewThresholdEd25519DealerSoft(config),
+		dealer:   &ted25519.NonceGenerator{},
 	}
 }
 
@@ -275,7 +276,8 @@ func (cosigner *LocalCosigner) sign(req SignatureRequest) (SignatureResponse, er
 	}, &cosigner.pendingDiskWG)
 
 	if err != nil {
-		if _, isSameHRSError := err.(*types.SameHRSError); !isSameHRSError {
+		var sameHRSError *types.SameHRSError
+		if !errors.As(err, &sameHRSError) {
 			return res, err
 		}
 	}
@@ -300,8 +302,9 @@ func (cosigner *LocalCosigner) generateNonces() ([]types.Nonces, error) {
 	// 		 although it might doesnt matter if we arent doing DKG
 	// Should call an interface: dealnonce or something
 	threshold := uint8(cosigner.config.Config.ThresholdModeConfig.Threshold)
-	nonces, err := cosigner.dealer.KeyGenerator(uint8(threshold), uint8(total))
+	nonces, err := cosigner.dealer.GenerateNonces(uint8(threshold), uint8(total))
 	if err != nil {
+		fmt.Println("Error is: ", err)
 		return nil, err
 	}
 
@@ -421,6 +424,7 @@ func (cosigner *LocalCosigner) generateNoncesIfNecessary(uuid uuid.UUID) (*types
 
 	newNonces, err := cosigner.generateNonces()
 	if err != nil {
+		fmt.Println(err)
 		return nil, err
 	}
 

src/multiresolver/multi_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	grpcretry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
-	"github.com/strangelove-ventures/horcrux/node"
 	"github.com/strangelove-ventures/horcrux/src/multiresolver"
+	"github.com/strangelove-ventures/horcrux/src/node"
 	"github.com/strangelove-ventures/horcrux/src/proto"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"

node/leader_mock_test.go → src/node/leader_mock_test.go

@@ -3,8 +3,8 @@ package node_test
 import (
 	"sync"
 
-	"github.com/strangelove-ventures/horcrux/node"
 	"github.com/strangelove-ventures/horcrux/src/cosigner"
+	"github.com/strangelove-ventures/horcrux/src/node"
 	"github.com/strangelove-ventures/horcrux/src/types"
 )
 

node/raft_store_test.go → src/node/raft_store_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/strangelove-ventures/horcrux/node"
 	"github.com/strangelove-ventures/horcrux/src/config"
 	"github.com/strangelove-ventures/horcrux/src/cosigner"
 	"github.com/strangelove-ventures/horcrux/src/cosigner/nodesecurity"
+	"github.com/strangelove-ventures/horcrux/src/node"
 	tss "github.com/strangelove-ventures/horcrux/src/tss"
 
 	cometcryptoed25519 "github.com/cometbft/cometbft/crypto/ed25519"

node/services.go → src/node/services.go

@@ -61,7 +61,8 @@ func RequireNotRunning(log cometlog.Logger, pidFilePath string) error {
 		return nil
 	}
 
-	errno, ok := err.(syscall.Errno)
+	var errno syscall.Errno
+	ok := errors.As(err, &errno)
 	if !ok {
 		return fmt.Errorf("unexpected error type from signaling horcrux PID: %d", pid)
 	}

node/services_test.go → src/node/services_test.go

@@ -14,7 +14,7 @@ import (
 
 	cometlog "github.com/cometbft/cometbft/libs/log"
 	cometservice "github.com/cometbft/cometbft/libs/service"
-	"github.com/strangelove-ventures/horcrux/node"
+	"github.com/strangelove-ventures/horcrux/src/node"
 
 	fork "github.com/kraken-hpc/go-fork"
 	"github.com/stretchr/testify/require"
@@ -33,6 +33,7 @@ func mockHorcruxChildProcess(pidFilePath string) {
 	)
 }
 
+// waitForFileToExist waits for a file to exist, returning an error if it does not exist after timeout.
 func waitForFileToExist(file string, timeout time.Duration) error {
 	exp := time.After(timeout)
 	tick := time.Tick(20 * time.Millisecond)

node/single_signer_validator_test.go → src/node/single_signer_validator_test.go

@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/strangelove-ventures/horcrux/node"
 	"github.com/strangelove-ventures/horcrux/src/config"
+	"github.com/strangelove-ventures/horcrux/src/node"
 	"github.com/strangelove-ventures/horcrux/src/types"
 
 	"os"

node/threshold_validator.go → src/node/threshold_validator.go

@@ -289,7 +289,8 @@ func (pv *ThresholdValidator) saveLastSignedStateInitiated(
 		if sameBlockErr == nil {
 			return existingSignature, existingTimestamp, nil
 		}
-		if _, ok := sameBlockErr.(*StillWaitingForBlockError); !ok {
+		var stillWaitingForBlockError *StillWaitingForBlockError
+		if !errors.As(sameBlockErr, &stillWaitingForBlockError) {
 			return nil, existingTimestamp, fmt.Errorf(
 				"same block error in loop, but we are not still waiting for signature: %w",
 				sameBlockErr,
@@ -413,7 +414,8 @@ func (pv *ThresholdValidator) compareBlockSignatureAgainstSSC(
 	stamp, signBytes := block.Timestamp, block.SignBytes
 
 	if err := compareBlockSignatureAgainstHRS(pv, chainID, block, existingSignature.HRSKey()); err != nil {
-		if _, ok := err.(*metrics.SameBlockError); !ok {
+		var sameBlockError *metrics.SameBlockError
+		if !errors.As(err, &sameBlockError) {
 			return nil, stamp, err
 		}
 	}
@@ -589,8 +591,11 @@ func (pv *ThresholdValidator) proxyIfNecessary(
 		Block:   &block,
 	})
 	if err != nil {
-		if _, ok := err.(*cometrpcjsontypes.RPCError); ok {
-			rpcErrUnwrapped := err.(*cometrpcjsontypes.RPCError).Data
+		var RPCError *cometrpcjsontypes.RPCError
+		if errors.As(err, &RPCError) {
+			var RPCError *cometrpcjsontypes.RPCError
+			errors.As(err, &RPCError)
+			rpcErrUnwrapped := RPCError.Data
 			// Need to return BeyondBlockError after proxy since the error type will be lost over RPC
 			if len(rpcErrUnwrapped) > 33 && rpcErrUnwrapped[:33] == "Progress already started on block" {
 				return true, nil, stamp, &metrics.BeyondBlockError{Msg: rpcErrUnwrapped}
@@ -660,7 +665,9 @@ func (pv *ThresholdValidator) Sign(ctx context.Context, chainID string, block ty
 	peerStartTime := time.Now()
 
 	cosignersOrderedByFastest := pv.cosignerHealth.GetFastest()
+	fmt.Println("cosignersOrderedByFastest", len(cosignersOrderedByFastest))
 	cosignersForThisBlock := make([]ICosigner, pv.threshold)
+	fmt.Println("cosignersForThisBlock", len(cosignersForThisBlock), pv.threshold)
 	cosignersForThisBlock[0] = pv.MyCosigner
 	copy(cosignersForThisBlock[1:], cosignersOrderedByFastest[:pv.threshold-1])
 
@@ -832,7 +839,8 @@ func (pv *ThresholdValidator) Sign(ctx context.Context, chainID string, block ty
 	err = css.lastSignState.Save(newLss.SignStateConsensus, &pv.pendingDiskWG)
 	css.lastSignStateMutex.Unlock()
 	if err != nil {
-		if _, isSameHRSError := err.(*types.SameHRSError); !isSameHRSError {
+		var sameHRSError *types.SameHRSError
+		if !errors.As(err, &sameHRSError) {
 
 			pv.notifyBlockSignError(chainID, block.GetHRS(), signBytes)
 			return nil, stamp, fmt.Errorf("error saving last sign state: %w", err)

node/threshold_validator_test.go → src/node/threshold_validator_test.go

@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/strangelove-ventures/horcrux/node"
 	"github.com/strangelove-ventures/horcrux/src/config"
 	"github.com/strangelove-ventures/horcrux/src/cosigner"
 	"github.com/strangelove-ventures/horcrux/src/cosigner/nodesecurity"
+	"github.com/strangelove-ventures/horcrux/src/node"
 	"github.com/strangelove-ventures/horcrux/src/tss"
 
 	"github.com/strangelove-ventures/horcrux/src/types"
@@ -139,7 +139,10 @@ func loadKeyForLocalCosigner(
 func testThresholdValidator(t *testing.T, threshold, total uint8, configuration *config.RuntimeConfig) {
 	cosigners, pubKey := getTestLocalCosigners(t, threshold, total)
 
+	fmt.Println("cosigners", threshold, total, len(cosigners))
+
 	thresholdCosigners := make([]node.ICosigner, 0, threshold-1)
+	fmt.Println("thresholdCosigners", threshold, total, len(thresholdCosigners))
 
 	for i, cosigner := range cosigners {
 		require.Equal(t, i+1, cosigner.GetIndex())

src/tss/threshold_signer.go

@@ -56,8 +56,6 @@ func LoadVaultKeyFromFile(file string) (Ed25519Key, error) {
 		return pvKey, err
 	}
 
-	fmt.Printf("keyJsonBytes is: %s", keyJSONBytes)
-
 	err = json.Unmarshal(keyJSONBytes, &pvKey)
 	if err != nil {
 		fmt.Printf("Could not unmarshal key from file %s", file)
@@ -111,8 +109,11 @@ func generatePersistentThresholdSignShards(privateKey []byte, publicKey PubKey,
 	keys := function(privateKey, threshold, shards)
 	// Transform ed25519Keys to VaultKey type
 	vaultKeys := make([]VaultKey, len(keys))
+
+	fmt.Printf("Number of keys to create: %d\n", len(keys))
 	for id, key := range keys {
-		vaultKeys[id] = VaultKey{
+		fmt.Printf("VaultKey: %d\n", id)
+		vaultKeys[id-1] = VaultKey{
 			PubKey:       publicKey,
 			PrivateShard: key,
 			ID:           int(id),