mirror of
https://github.com/sonr-io/sonr.git
synced 2026-08-03 09:51:39 +00:00
feature/1114 implement account interface (#1167)
- **refactor: move session-related code to middleware package** - **refactor: update PKL build process and adjust related configurations** - **feat: integrate base.cosmos.v1 Genesis module** - **refactor: pass session context to modal rendering functions** - **refactor: move nebula package to app directory and update templ version** - **refactor: Move home section video view to dedicated directory** - **refactor: remove unused views file** - **refactor: move styles and UI components to global scope** - **refactor: Rename images.go to cdn.go** - **feat: Add Empty State Illustrations** - **refactor: Consolidate Vault Index Logic** - **fix: References to App.wasm and remove Vault Directory embedded CDN files** - **refactor: Move CDN types to Models** - **fix: Correct line numbers in templ error messages for arch_templ.go** - **refactor: use common types for peer roles** - **refactor: move common types and ORM to a shared package** - **fix: Config import dwn** - **refactor: move nebula directory to app** - **feat: Rebuild nebula** - **fix: correct file paths in panels templates** - **feat: Remove duplicate types** - **refactor: Move dwn to pkg/core** - **refactor: Binary Structure** - **feat: Introduce Crypto Pkg** - **fix: Broken Process Start** - **feat: Update pkg/* structure** - **feat: Refactor PKL Structure** - **build: update pkl build process** - **chore: Remove Empty Files** - **refactor: remove unused macaroon package** - **feat: Add WebAwesome Components** - **refactor: consolidate build and generation tasks into a single taskfile, remove redundant makefile targets** - **refactor: refactor server and move components to pkg/core/dwn** - **build: update go modules** - **refactor: move gateway logic into dedicated hway command** - **feat: Add KSS (Krawczyk-Song-Song) MPC cryptography module** - **feat: Implement MPC-based JWT signing and UCAN token generation** - **feat: add support for MPC-based JWT signing** - **feat: Implement MPC-based UCAN capabilities for smart accounts** - **feat: add address field to keyshareSource** - **feat: Add comprehensive MPC test suite for keyshares, UCAN tokens, and token attenuations** - **refactor: improve MPC keyshare management and signing process** - **feat: enhance MPC capability hierarchy documentation** - **refactor: rename GenerateKeyshares function to NewKeyshareSource for clarity** - **refactor: remove unused Ethereum address computation** - **feat: Add HasHandle and IsAuthenticated methods to HTTPContext** - **refactor: Add context.Context support to session HTTPContext** - **refactor: Resolve context interface conflicts in HTTPContext** - **feat: Add session ID context key and helper functions** - **feat: Update WebApp Page Rendering** - **refactor: Simplify context management by using single HTTPContext key** - **refactor: Simplify HTTPContext creation and context management in session middleware** - **refactor: refactor session middleware to use a single data structure** - **refactor: Simplify HTTPContext implementation and session data handling** - **refactor: Improve session context handling and prevent nil pointer errors** - **refactor: Improve session context handling with nil safety and type support** - **refactor: improve session data injection** - **feat: add full-screen modal component and update registration flow** - **chore: add .air.toml to .gitignore** - **feat: add Air to devbox and update dependencies**
This commit is contained in:
+20
-39
@@ -1,44 +1,28 @@
|
||||
package controller
|
||||
|
||||
import (
|
||||
"github.com/onsonr/crypto/mpc"
|
||||
|
||||
commonv1 "github.com/onsonr/sonr/pkg/common/types"
|
||||
"github.com/onsonr/sonr/x/did/types"
|
||||
"github.com/onsonr/sonr/pkg/crypto/mpc"
|
||||
)
|
||||
|
||||
type ControllerI interface {
|
||||
ChainID() string
|
||||
GetPubKey() *commonv1.PubKey
|
||||
// GetPubKey() *commonv1.PubKey
|
||||
SonrAddress() string
|
||||
RawPublicKey() []byte
|
||||
}
|
||||
|
||||
func New(shares []mpc.Share) (ControllerI, error) {
|
||||
var (
|
||||
valKs = shares[0]
|
||||
userKs = shares[1]
|
||||
)
|
||||
pb, err := valKs.PublicKey()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
sonrAddr, err := types.ComputeSonrAddr(pb)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
func New(src mpc.KeyshareSource) (ControllerI, error) {
|
||||
return &controller{
|
||||
valKs: valKs,
|
||||
userKs: userKs,
|
||||
address: sonrAddr,
|
||||
publicKey: pb,
|
||||
src: src,
|
||||
address: src.Address(),
|
||||
publicKey: src.PublicKey(),
|
||||
did: src.Issuer(),
|
||||
chainID: "sonr-testnet-1",
|
||||
}, nil
|
||||
}
|
||||
|
||||
type controller struct {
|
||||
userKs mpc.Share
|
||||
valKs mpc.Share
|
||||
src mpc.KeyshareSource
|
||||
address string
|
||||
chainID string
|
||||
publicKey []byte
|
||||
@@ -49,25 +33,22 @@ func (c *controller) ChainID() string {
|
||||
return c.chainID
|
||||
}
|
||||
|
||||
func (c *controller) GetPubKey() *commonv1.PubKey {
|
||||
return &commonv1.PubKey{
|
||||
KeyType: "ecdsa",
|
||||
RawKey: &commonv1.RawKey{
|
||||
Algorithm: "secp256k1",
|
||||
Key: c.publicKey,
|
||||
},
|
||||
Role: "authentication",
|
||||
}
|
||||
}
|
||||
//
|
||||
// func (c *controller) GetPubKey() *commonv1.PubKey {
|
||||
// return &commonv1.PubKey{
|
||||
// KeyType: "ecdsa",
|
||||
// RawKey: &commonv1.RawKey{
|
||||
// Algorithm: "secp256k1",
|
||||
// Key: c.publicKey,
|
||||
// },
|
||||
// Role: "authentication",
|
||||
// }
|
||||
// }
|
||||
|
||||
func (c *controller) RawPublicKey() []byte {
|
||||
return c.publicKey
|
||||
}
|
||||
|
||||
// func (c *controller) StdPublicKey() cryptotypes.PubKey {
|
||||
// return c.stdPubKey
|
||||
// }
|
||||
|
||||
func (c *controller) SonrAddress() string {
|
||||
return c.address
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
package signer
|
||||
@@ -1 +0,0 @@
|
||||
package signer
|
||||
@@ -1,29 +0,0 @@
|
||||
package signer
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
signingv1beta1 "cosmossdk.io/api/cosmos/tx/signing/v1beta1"
|
||||
"cosmossdk.io/x/tx/signing"
|
||||
"github.com/cosmos/cosmos-sdk/types/tx"
|
||||
)
|
||||
|
||||
type directHandler struct{}
|
||||
|
||||
func (s directHandler) Mode() signingv1beta1.SignMode {
|
||||
return signingv1beta1.SignMode_SIGN_MODE_DIRECT_AUX
|
||||
}
|
||||
|
||||
func (s directHandler) GetSignBytes(
|
||||
_ context.Context,
|
||||
signerData signing.SignerData,
|
||||
txData signing.TxData,
|
||||
) ([]byte, error) {
|
||||
txDoc := tx.SignDoc{
|
||||
BodyBytes: txData.BodyBytes,
|
||||
AuthInfoBytes: txData.AuthInfoBytes,
|
||||
ChainId: signerData.ChainID,
|
||||
AccountNumber: signerData.AccountNumber,
|
||||
}
|
||||
return txDoc.Marshal()
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
package wallet
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/crypto/types"
|
||||
"google.golang.org/protobuf/proto"
|
||||
|
||||
commonv1 "github.com/onsonr/sonr/pkg/common/types"
|
||||
)
|
||||
|
||||
type PubKeyI interface {
|
||||
GetRole() string
|
||||
GetKeyType() string
|
||||
GetRawKey() *commonv1.RawKey
|
||||
GetJwk() *commonv1.JSONWebKey
|
||||
}
|
||||
|
||||
// PubKey defines a generic pubkey.
|
||||
type PublicKey interface {
|
||||
VerifySignature(msg, sig []byte) bool
|
||||
}
|
||||
|
||||
type PubKeyG[T any] interface {
|
||||
*T
|
||||
PublicKey
|
||||
}
|
||||
|
||||
type pubKeyImpl struct {
|
||||
decode func(b []byte) (PublicKey, error)
|
||||
validate func(key PublicKey) error
|
||||
}
|
||||
|
||||
// func WithSecp256K1PubKey() Option {
|
||||
// return WithPubKeyWithValidationFunc(func(pt *secp256k1.PubKey) error {
|
||||
// _, err := dcrd_secp256k1.ParsePubKey(pt.Key)
|
||||
// return err
|
||||
// })
|
||||
// }
|
||||
//
|
||||
// func WithPubKey[T any, PT PubKeyG[T]]() Option {
|
||||
// return WithPubKeyWithValidationFunc[T, PT](func(_ PT) error {
|
||||
// return nil
|
||||
// })
|
||||
// }
|
||||
//
|
||||
// func WithPubKeyWithValidationFunc[T any, PT PubKeyG[T]](validateFn func(PT) error) Option {
|
||||
// pkImpl := pubKeyImpl{
|
||||
// decode: func(b []byte) (PublicKey, error) {
|
||||
// key := PT(new(T))
|
||||
// err := gogoproto.Unmarshal(b, key)
|
||||
// if err != nil {
|
||||
// return nil, err
|
||||
// }
|
||||
// return key, nil
|
||||
// },
|
||||
// validate: func(k PublicKey) error {
|
||||
// concrete, ok := k.(PT)
|
||||
// if !ok {
|
||||
// return fmt.Errorf(
|
||||
// "invalid pubkey type passed for validation, wanted: %T, got: %T",
|
||||
// concrete,
|
||||
// k,
|
||||
// )
|
||||
// }
|
||||
// return validateFn(concrete)
|
||||
// },
|
||||
// }
|
||||
// return func(a *Account) {
|
||||
// a.supportedPubKeys[gogoproto.MessageName(PT(new(T)))] = pkImpl
|
||||
// }
|
||||
// }
|
||||
func nameFromTypeURL(url string) string {
|
||||
name := url
|
||||
if i := strings.LastIndexByte(url, '/'); i >= 0 {
|
||||
name = name[i+len("/"):]
|
||||
}
|
||||
return name
|
||||
}
|
||||
|
||||
// CustomPubKey represents a custom secp256k1 public key.
|
||||
type CustomPubKey struct {
|
||||
proto.Message
|
||||
|
||||
Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
|
||||
}
|
||||
|
||||
// NewCustomPubKeyFromRawBytes creates a new CustomPubKey from raw bytes.
|
||||
func NewCustomPubKeyFromRawBytes(key []byte) (*CustomPubKey, error) {
|
||||
// Validate the key length and format
|
||||
if len(key) != 33 {
|
||||
return nil, fmt.Errorf("invalid key length; expected 33 bytes, got %d", len(key))
|
||||
}
|
||||
if key[0] != 0x02 && key[0] != 0x03 {
|
||||
return nil, fmt.Errorf("invalid key format; expected 0x02 or 0x03 as the first byte, got 0x%02x", key[0])
|
||||
}
|
||||
|
||||
return &CustomPubKey{Key: key}, nil
|
||||
}
|
||||
|
||||
// Bytes returns the byte representation of the public key.
|
||||
func (pk *CustomPubKey) Bytes() []byte {
|
||||
return pk.Key
|
||||
}
|
||||
|
||||
// Equals checks if two public keys are equal.
|
||||
func (pk *CustomPubKey) Equals(other sdk.PubKey) bool {
|
||||
return bytes.EqualFold(pk.Bytes(), other.Bytes())
|
||||
}
|
||||
|
||||
// Type returns the type of the public key.
|
||||
func (pk *CustomPubKey) Type() string {
|
||||
return "custom-secp256k1"
|
||||
}
|
||||
|
||||
// Marshal implements the proto.Message interface.
|
||||
func (pk *CustomPubKey) Marshal() ([]byte, error) {
|
||||
return proto.Marshal(pk)
|
||||
}
|
||||
|
||||
// Unmarshal implements the proto.Message interface.
|
||||
func (pk *CustomPubKey) Unmarshal(data []byte) error {
|
||||
return proto.Unmarshal(data, pk)
|
||||
}
|
||||
|
||||
// Address returns the address derived from the public key.
|
||||
func (pk *CustomPubKey) Address() []byte {
|
||||
// Implement address derivation logic here
|
||||
// For simplicity, this example uses a placeholder
|
||||
return []byte("derived-address")
|
||||
}
|
||||
|
||||
// VerifySignature verifies a signature using the public key.
|
||||
func (pk *CustomPubKey) VerifySignature(msg []byte, sig []byte) bool {
|
||||
// Implement signature verification logic here
|
||||
// For simplicity, this example uses a placeholder
|
||||
return true
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package wallet
|
||||
@@ -1 +0,0 @@
|
||||
package wallet
|
||||
Reference in New Issue
Block a user