Merge branch 'main' into morpheusvm-tutorial-update

abi/testdata/transfer.json

@@ -1,5 +1,5 @@
 {
-    "to": "0x0102030405060708090a0b0c0d0e0f101112131400000000000000000000000000",
+    "to": "0x0102030405060708090a0b0c0d0e0f10111213140000000000000000000000000020db0e6c",
     "value": 1000,
     "memo": "aGk="
 }

abi/testdata/transferField.json

@@ -1,6 +1,6 @@
 {
     "transfer": {
-        "to": "0x0102030405060708090a0b0c0d0e0f101112131400000000000000000000000000",
+        "to": "0x0102030405060708090a0b0c0d0e0f10111213140000000000000000000000000020db0e6c",
         "value": 1000,
         "memo": "aGk="
     }

abi/testdata/transfersArray.json

@@ -1,12 +1,12 @@
 {
     "transfers": [
         {
-            "to": "0x0102030405060708090a0b0c0d0e0f101112131400000000000000000000000000",
+            "to": "0x0102030405060708090a0b0c0d0e0f10111213140000000000000000000000000020db0e6c",
             "value": 1000,
             "memo": "aGk="
         },
         {
-            "to": "0x0102030405060708090a0b0c0d0e0f101112131400000000000000000000000000",
+            "to": "0x0102030405060708090a0b0c0d0e0f10111213140000000000000000000000000020db0e6c",
             "value": 1000,
             "memo": "aGk="
         }

api/dependencies.go

@@ -19,6 +19,8 @@ import (
 )
 
 type VM interface {
+	GetDataDir() string
+	GetGenesisBytes() []byte
 	Genesis() genesis.Genesis
 	ChainID() ids.ID
 	NetworkID() uint32
@@ -34,6 +36,8 @@ type VM interface {
 		verifySig bool,
 		txs []*chain.Transaction,
 	) (errs []error)
+	// LastAcceptedBlock provides the most recent block that the VM has accepted.
+	// The value returned is guaranteed to be non-nil.
 	LastAcceptedBlock() *chain.StatefulBlock
 	UnitPrices(context.Context) (fees.Dimensions, error)
 	CurrentValidators(

api/indexer/option.go

@@ -6,6 +6,7 @@ package indexer
 import (
 	"path/filepath"
 
+	"github.com/ava-labs/hypersdk/api"
 	"github.com/ava-labs/hypersdk/chain"
 	"github.com/ava-labs/hypersdk/event"
 	"github.com/ava-labs/hypersdk/vm"
@@ -34,14 +35,14 @@ func With() vm.Option {
 	return vm.NewOption(Namespace, NewDefaultConfig(), OptionFunc)
 }
 
-func OptionFunc(v *vm.VM, config Config) error {
+func OptionFunc(v api.VM, config Config) (vm.Opt, error) {
 	if !config.Enabled {
-		return nil
+		return vm.NewOpt(), nil
 	}
-	indexerPath := filepath.Join(v.DataDir, Namespace)
+	indexerPath := filepath.Join(v.GetDataDir(), Namespace)
 	indexer, err := NewIndexer(indexerPath, v, config.BlockWindow)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	subscriptionFactory := &subscriptionFactory{
@@ -54,10 +55,10 @@ func OptionFunc(v *vm.VM, config Config) error {
 		indexer: indexer,
 	}
 
-	vm.WithBlockSubscriptions(subscriptionFactory)(v)
-	vm.WithVMAPIs(apiFactory)(v)
-
-	return nil
+	return vm.NewOpt(
+		vm.WithBlockSubscriptions(subscriptionFactory),
+		vm.WithVMAPIs(apiFactory),
+	), nil
 }
 
 type subscriptionFactory struct {

api/jsonrpc/client.go

@@ -169,9 +169,8 @@ func (cli *JSONRPCClient) GenerateTransactionManual(
 	}
 
 	// Build transaction
-	actionCodec, authCodec := parser.ActionCodec(), parser.AuthCodec()
 	unsignedTx := chain.NewTxData(base, actions)
-	tx, err := unsignedTx.Sign(authFactory, actionCodec, authCodec)
+	tx, err := unsignedTx.Sign(authFactory)
 	if err != nil {
 		return nil, nil, fmt.Errorf("%w: failed to sign transaction", err)
 	}

api/jsonrpc/option.go

@@ -3,7 +3,10 @@
 
 package jsonrpc
 
-import "github.com/ava-labs/hypersdk/vm"
+import (
+	"github.com/ava-labs/hypersdk/api"
+	"github.com/ava-labs/hypersdk/vm"
+)
 
 const Namespace = "core"
 
@@ -18,11 +21,10 @@ func NewDefaultConfig() Config {
 }
 
 func With() vm.Option {
-	return vm.NewOption(Namespace, NewDefaultConfig(), func(v *vm.VM, config Config) error {
+	return vm.NewOption(Namespace, NewDefaultConfig(), func(_ api.VM, config Config) (vm.Opt, error) {
 		if !config.Enabled {
-			return nil
+			return vm.NewOpt(), nil
 		}
-		vm.WithVMAPIs(JSONRPCServerFactory{})(v)
-		return nil
+		return vm.WithVMAPIs(JSONRPCServerFactory{}), nil
 	})
 }

api/state/option.go

@@ -3,7 +3,10 @@
 
 package state
 
-import "github.com/ava-labs/hypersdk/vm"
+import (
+	"github.com/ava-labs/hypersdk/api"
+	"github.com/ava-labs/hypersdk/vm"
+)
 
 const Namespace = "corestate"
 
@@ -18,11 +21,10 @@ func NewDefaultConfig() Config {
 }
 
 func With() vm.Option {
-	return vm.NewOption(Namespace, NewDefaultConfig(), func(v *vm.VM, config Config) error {
+	return vm.NewOption(Namespace, NewDefaultConfig(), func(_ api.VM, config Config) (vm.Opt, error) {
 		if !config.Enabled {
-			return nil
+			return vm.NewOpt(), nil
 		}
-		vm.WithVMAPIs(JSONRPCStateServerFactory{})(v)
-		return nil
+		return vm.WithVMAPIs(JSONRPCStateServerFactory{}), nil
 	})
 }

api/ws/server.go

@@ -50,9 +50,9 @@ func With() vm.Option {
 	return vm.NewOption(Namespace, NewDefaultConfig(), OptionFunc)
 }
 
-func OptionFunc(v *vm.VM, config Config) error {
+func OptionFunc(v api.VM, config Config) (vm.Opt, error) {
 	if !config.Enabled {
-		return nil
+		return vm.NewOpt(), nil
 	}
 
 	actionCodec, authCodec := v.ActionCodec(), v.AuthCodec()
@@ -78,11 +78,11 @@ func OptionFunc(v *vm.VM, config Config) error {
 		},
 	}
 
-	vm.WithBlockSubscriptions(blockSubscription)(v)
-	vm.WithTxRemovedSubscriptions(txRemovedSubscription)(v)
-	vm.WithVMAPIs(webSocketFactory)(v)
-
-	return nil
+	return vm.NewOpt(
+		vm.WithBlockSubscriptions(blockSubscription),
+		vm.WithTxRemovedSubscriptions(txRemovedSubscription),
+		vm.WithVMAPIs(webSocketFactory),
+	), nil
 }
 
 func NewWebSocketServerFactory(server *pubsub.Server) *WebSocketServerFactory {

chain/assembler.go

@@ -0,0 +1,74 @@
+// Copyright (C) 2024, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package chain
+
+import (
+	"context"
+	"time"
+
+	"github.com/ava-labs/hypersdk/utils"
+)
+
+type Assembler struct {
+	vm VM
+}
+
+func (a *Assembler) AssembleBlock(
+	ctx context.Context,
+	parent *StatefulBlock,
+	timestamp int64,
+	blockHeight uint64,
+	txs []*Transaction,
+) (*StatefulBlock, error) {
+	ctx, span := a.vm.Tracer().Start(ctx, "chain.AssembleBlock")
+	defer span.End()
+
+	parentView, err := parent.View(ctx, true)
+	if err != nil {
+		return nil, err
+	}
+	parentStateRoot, err := parentView.GetMerkleRoot(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	blk := &StatelessBlock{
+		Prnt:      parent.ID(),
+		Tmstmp:    timestamp,
+		Hght:      blockHeight,
+		Txs:       txs,
+		StateRoot: parentStateRoot,
+	}
+	for _, tx := range txs {
+		blk.authCounts[tx.Auth.GetTypeID()]++
+	}
+
+	blkBytes, err := blk.Marshal()
+	if err != nil {
+		return nil, err
+	}
+	b := &StatefulBlock{
+		StatelessBlock: blk,
+		t:              time.UnixMilli(blk.Tmstmp),
+		bytes:          blkBytes,
+		accepted:       false,
+		vm:             a.vm,
+		id:             utils.ToID(blkBytes),
+	}
+	return b, b.populateTxs(ctx) // TODO: simplify since txs are guaranteed to already be de-duplicated here
+}
+
+func (a *Assembler) ExecuteBlock(
+	ctx context.Context,
+	b *StatefulBlock,
+) (*ExecutedBlock, error) {
+	ctx, span := a.vm.Tracer().Start(ctx, "chain.ExecuteBlock")
+	defer span.End()
+
+	if err := b.Verify(ctx); err != nil {
+		return nil, err
+	}
+
+	return NewExecutedBlockFromStateful(b), nil
+}

chain/base.go

@@ -55,6 +55,8 @@ func (b *Base) Marshal(p *codec.Packer) {
 	p.PackUint64(b.MaxFee)
 }
 
+// UnmarshalBase unmarshals a Base from packer.
+// Caller can assume packer errors are returned from the function.
 func UnmarshalBase(p *codec.Packer) (*Base, error) {
 	var base Base
 	base.Timestamp = p.UnpackInt64(true)