cerc-io/laconicd
18
0
Fork 1
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 11 Wiki Activity

fix app keyring init

Browse Source
This commit is contained in:
Roy Crihfield 2025-01-25 14:23:46 +08:00
parent 2cc9d2749b
commit fa9a7dfbad
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/laconicd/cmd/depinject.go
View File

@ -3,7 +3,6 @@ package cmd
import (
"os"
clientv2keyring "cosmossdk.io/client/v2/autocli/keyring"
"cosmossdk.io/core/address"
runtime "cosmossdk.io/runtime/v2"
serverv2 "cosmossdk.io/server/v2"
@ -61,11 +60,6 @@ func ProvideClientContext(
return clientCtx
}
func ProvideKeyring(clientCtx client.Context, addressCodec address.Codec) (clientv2keyring.Keyring, error) {
kb, err := client.NewKeyringFromBackend(clientCtx, clientCtx.Keyring.Backend())
if err != nil {
return nil, err
}
return keyring.NewAutoCLIKeyring(kb, addressCodec)
func ProvideKeyring(clientCtx client.Context) keyring.Keyring {
return clientCtx.Keyring
}

26
server/nitro/server.go
View File

@ -2,17 +2,13 @@ package nitro
import (
"context"
"encoding/hex"
"errors"
"fmt"
"log/slog"
"path/filepath"
"strings"
"cosmossdk.io/core/server"
"cosmossdk.io/core/transaction"
"cosmossdk.io/log"
serverv2 "cosmossdk.io/server/v2"
"github.com/cosmos/cosmos-sdk/client"
"github.com/ethereum/go-ethereum/common"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
@ -22,6 +18,14 @@ import (
p2pms "github.com/statechannels/go-nitro/node/engine/messageservice/p2p-message-service"
"github.com/statechannels/go-nitro/node/engine/store"
nitrotypes "github.com/statechannels/go-nitro/types"
"cosmossdk.io/core/server"
"cosmossdk.io/core/transaction"
"cosmossdk.io/log"
serverv2 "cosmossdk.io/server/v2"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
"git.vdb.to/cerc-io/laconicd/utils"
)
const (
@ -56,7 +60,7 @@ type Server struct {
ScAddr nitrotypes.PartyAddress
}
func NewServer(logger log.Logger, cfg server.ConfigMap, clientCtx client.Context) (*Server, error) {
func NewServer(logger log.Logger, cfg server.ConfigMap, kr keyring.Keyring) (*Server, error) {
home, _ := cfg[serverv2.FlagHome].(string)
s := &Server{
storeDir: filepath.Join(home, "nitro"),
@ -69,17 +73,13 @@ func NewServer(logger log.Logger, cfg server.ConfigMap, clientCtx client.Context
return nil, fmt.Errorf("failed to unmarshal config: %w", err)
}
}
return s, s.init(clientCtx)
return s, s.init(kr)
}
func (s *Server) init(clientCtx client.Context) error {
func (s *Server) init(kr keyring.Keyring) error {
c := s.config
sckey, err := extractPrivKeyBytes(clientCtx.Keyring, c.Pk)
if err != nil {
return err
}
ethkey, err := extractPrivKeyBytes(clientCtx.Keyring, c.EthPk)
sckey, err := utils.ExtractPrivateKey(kr, c.Pk)
if err != nil {
return err
}