Simplify auth in examples (#1105)

* embed auth into hypersdk/chain/auth Signed-off-by: Containerman17 <[email protected]> * move auth to it's own package Signed-off-by: Containerman17 <[email protected]> --------- Signed-off-by: Containerman17 <[email protected]>
ava-labs · Jul 13, 2024 · f275152 · f275152
1 parent 7d5659d
commit f275152
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 220 deletions.
diff --git a/examples/morpheusvm/auth/bls.go → auth/bls.go b/examples/morpheusvm/auth/bls.go → auth/bls.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto"
 	"github.com/ava-labs/hypersdk/crypto/bls"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
@@ -36,7 +35,7 @@ func (b *BLS) address() codec.Address {
 }
 
 func (*BLS) GetTypeID() uint8 {
-	return consts.BLSID
+	return BLSID
 }
 
 func (*BLS) ComputeUnits(chain.Rules) uint64 {
@@ -113,5 +112,5 @@ func (*BLSFactory) MaxUnits() (uint64, uint64) {
 }
 
 func NewBLSAddress(pk *bls.PublicKey) codec.Address {
-	return codec.CreateAddress(consts.BLSID, utils.ToID(bls.PublicKeyToBytes(pk)))
+	return codec.CreateAddress(BLSID, utils.ToID(bls.PublicKeyToBytes(pk)))
 }
diff --git a/examples/tokenvm/auth/consts.go → auth/consts.go b/examples/tokenvm/auth/consts.go → auth/consts.go
@@ -3,15 +3,20 @@
 
 package auth
 
-import "github.com/ava-labs/hypersdk/vm"
+import (
+	"github.com/ava-labs/hypersdk/vm"
+)
 
 // Note: Registry will error during initialization if a duplicate ID is assigned. We explicitly assign IDs to avoid accidental remapping.
 const (
-	ed25519ID uint8 = 0
+	// Auth TypeIDs
+	ED25519ID   uint8 = 0
+	SECP256R1ID uint8 = 1
+	BLSID       uint8 = 2
 )
 
 func Engines() map[uint8]vm.AuthEngine {
 	return map[uint8]vm.AuthEngine{
-		ed25519ID: &ED25519AuthEngine{},
+		ED25519ID: &ED25519AuthEngine{},
 	}
 }
diff --git a/examples/tokenvm/auth/ed25519.go → auth/ed25519.go b/examples/tokenvm/auth/ed25519.go → auth/ed25519.go
@@ -35,7 +35,7 @@ func (d *ED25519) address() codec.Address {
 }
 
 func (*ED25519) GetTypeID() uint8 {
-	return ed25519ID
+	return ED25519ID
 }
 
 func (*ED25519) ComputeUnits(chain.Rules) uint64 {
@@ -149,5 +149,5 @@ func (b *ED25519Batch) Done() []func() error {
 }
 
 func NewED25519Address(pk ed25519.PublicKey) codec.Address {
-	return codec.CreateAddress(ed25519ID, utils.ToID(pk[:]))
+	return codec.CreateAddress(ED25519ID, utils.ToID(pk[:]))
 }
diff --git a/examples/morpheusvm/auth/secp256r1.go → auth/secp256r1.go b/examples/morpheusvm/auth/secp256r1.go → auth/secp256r1.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
@@ -36,7 +35,7 @@ func (d *SECP256R1) address() codec.Address {
 }
 
 func (*SECP256R1) GetTypeID() uint8 {
-	return consts.SECP256R1ID
+	return SECP256R1ID
 }
 
 func (*SECP256R1) ComputeUnits(chain.Rules) uint64 {
@@ -103,5 +102,5 @@ func (*SECP256R1Factory) MaxUnits() (uint64, uint64) {
 }
 
 func NewSECP256R1Address(pk secp256r1.PublicKey) codec.Address {
-	return codec.CreateAddress(consts.SECP256R1ID, utils.ToID(pk[:]))
+	return codec.CreateAddress(SECP256R1ID, utils.ToID(pk[:]))
 }
diff --git a/examples/morpheusvm/auth/consts.go b/examples/morpheusvm/auth/consts.go
diff --git a/examples/morpheusvm/auth/ed25519.go b/examples/morpheusvm/auth/ed25519.go
diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/handler.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/bls"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
@@ -47,11 +47,11 @@ func (h *Handler) DefaultActor() (
 	}
 	var factory chain.AuthFactory
 	switch addr[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		factory = auth.NewED25519Factory(ed25519.PrivateKey(priv))
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		factory = auth.NewSECP256R1Factory(secp256r1.PrivateKey(priv))
-	case consts.BLSID:
+	case auth.BLSID:
 		p, err := bls.PrivateKeyFromBytes(priv)
 		if err != nil {
 			return ids.Empty, nil, nil, nil, nil, nil, err

diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/key.go
@@ -10,12 +10,12 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/bls"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/utils"
 
@@ -39,11 +39,11 @@ func checkKeyType(k string) error {
 
 func getKeyType(addr codec.Address) (string, error) {
 	switch addr[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		return ed25519Key, nil
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		return secp256r1Key, nil
-	case consts.BLSID:
+	case auth.BLSID:
 		return blsKey, nil
 	default:
 		return "", ErrInvalidKeyType

diff --git a/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go b/examples/morpheusvm/cmd/morpheus-cli/cmd/spam.go
@@ -9,14 +9,14 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/spf13/cobra"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/cli"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/bls"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/crypto/secp256r1"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/pubsub"
 	"github.com/ava-labs/hypersdk/rpc"
@@ -27,11 +27,11 @@ import (
 
 func getFactory(priv *cli.PrivateKey) (chain.AuthFactory, error) {
 	switch priv.Address[0] {
-	case consts.ED25519ID:
+	case auth.ED25519ID:
 		return auth.NewED25519Factory(ed25519.PrivateKey(priv.Bytes)), nil
-	case consts.SECP256R1ID:
+	case auth.SECP256R1ID:
 		return auth.NewSECP256R1Factory(secp256r1.PrivateKey(priv.Bytes)), nil
-	case consts.BLSID:
+	case auth.BLSID:
 		p, err := bls.PrivateKeyFromBytes(priv.Bytes)
 		if err != nil {
 			return nil, err

diff --git a/examples/morpheusvm/consts/types.go b/examples/morpheusvm/consts/types.go
@@ -6,9 +6,4 @@ package consts
 const (
 	// Action TypeIDs
 	TransferID uint8 = 0
-
-	// Auth TypeIDs
-	ED25519ID   uint8 = 0
-	SECP256R1ID uint8 = 1
-	BLSID       uint8 = 2
 )
diff --git a/examples/morpheusvm/controller/controller.go b/examples/morpheusvm/controller/controller.go
@@ -12,10 +12,10 @@ import (
 	"github.com/ava-labs/avalanchego/snow"
 	"go.uber.org/zap"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/builder"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/config"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/genesis"

diff --git a/examples/morpheusvm/registry/registry.go b/examples/morpheusvm/registry/registry.go
@@ -6,10 +6,10 @@ package registry
 import (
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 )
 

diff --git a/examples/morpheusvm/tests/e2e/e2e_test.go b/examples/morpheusvm/tests/e2e/e2e_test.go
@@ -18,11 +18,11 @@ import (
 	"github.com/fatih/color"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ava-labs/hypersdk/auth"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/crypto/ed25519"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/actions"
-	"github.com/ava-labs/hypersdk/examples/morpheusvm/auth"
 	"github.com/ava-labs/hypersdk/examples/morpheusvm/consts"
 	"github.com/ava-labs/hypersdk/rpc"
 	"github.com/ava-labs/hypersdk/utils"