Athena: Initial POC integration

.gitignore

@@ -18,6 +18,7 @@ temp.js
 
 *.out
 *.test
+*.tar.gz
 *.zip
 
 /go-spacemesh

Makefile-libs.Inc

@@ -56,7 +56,7 @@ POSTRS_PROFILER_URL ?= https://github.com/spacemeshos/post-rs/releases/download/
 POSTRS_SERVICE_ZIP = post-service-$(platform)-v$(POSTRS_SETUP_REV).zip
 POSTRS_SERVICE_URL ?= https://github.com/spacemeshos/post-rs/releases/download/v$(POSTRS_SETUP_REV)/$(POSTRS_SERVICE_ZIP)
 
-ATHENA_SETUP_REV = 0.4.1
+ATHENA_SETUP_REV = 0.5.0
 ATHENA_SETUP_ARTIFACT = athena_vmlib_v$(ATHENA_SETUP_REV)_$(GOOS)_$(GOARCH).tar.gz
 ATHENA_SETUP_ARTIFACT_URL ?= https://github.com/athenavm/athena/releases/download/v$(ATHENA_SETUP_REV)/$(ATHENA_SETUP_ARTIFACT)
 

common/types/account_storage.go

@@ -5,5 +5,5 @@ package types
 // StorageItem represents a single item of account storage.
 type StorageItem struct {
 	Key   [32]byte
-	Value Hash32
+	Value [32]byte
 }

common/types/transaction_header.go

@@ -1,20 +1,31 @@
 package types
 
-import "go.uber.org/zap/zapcore"
+import (
+	"encoding/hex"
+	"fmt"
+
+	"go.uber.org/zap/zapcore"
+)
 
 //go:generate scalegen
 
 // TxHeader is a transaction header, with some of the fields defined directly in the tx
 // and the rest is computed by the template based on immutable state and method arguments.
 type TxHeader struct {
-	Principal       Address
+	Principal Address
+
+	// TODO(lane): TemplateAddress and Method are unused by the Athena VM, and should be removed.
 	TemplateAddress Address
 	Method          uint8
-	Nonce           Nonce
-	LayerLimits     LayerLimits
-	MaxGas          uint64
-	GasPrice        uint64
-	MaxSpend        uint64
+
+	Nonce       Nonce
+	LayerLimits LayerLimits
+	MaxGas      uint64
+	GasPrice    uint64
+	MaxSpend    uint64
+
+	// Payload is opaque to the host (go-spacemesh), and is passed into and interpreted by the VM.
+	Payload []byte
 }
 
 // Fee is a MaxGas multiplied by a GasPrice.
@@ -26,16 +37,25 @@ func (h *TxHeader) Fee() uint64 {
 func (h *TxHeader) Spending() uint64 {
 	return h.Fee() + h.MaxSpend
 }
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
 
 // MarshalLogObject implements encoding for the tx header.
 func (h *TxHeader) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
+	payloadHash := hex.EncodeToString(h.Payload)
 	encoder.AddString("principal", h.Principal.String())
 	encoder.AddUint64("nonce_counter", h.Nonce)
 	encoder.AddUint32("layer_min", h.LayerLimits.Min)
 	encoder.AddUint32("layer_max", h.LayerLimits.Max)
 	encoder.AddUint64("max_gas", h.MaxGas)
 	encoder.AddUint64("gas_price", h.GasPrice)
 	encoder.AddUint64("max_spend", h.MaxSpend)
+	encoder.AddString("payload",
+		fmt.Sprintf("%s... (len %d)", payloadHash[:min(len(payloadHash), 5)], len(h.Payload)))
 	return nil
 }
 

go.mod

@@ -5,7 +5,8 @@ go 1.23.2
 require (
 	cloud.google.com/go/storage v1.44.0
 	github.com/ALTree/bigfloat v0.2.0
-	github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.1
+	github.com/ChainSafe/gossamer v0.9.0
+	github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.2-0.20241021224807-578f0f40e8a7
 	github.com/chaos-mesh/chaos-mesh/api v0.0.0-20240930092556-24ddcc087ee2
 	github.com/cosmos/btcutil v1.0.5
 	github.com/go-llsqlite/crawshaw v0.5.5
@@ -119,7 +120,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
@@ -240,7 +241,7 @@ require (
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/term v0.24.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/tools v0.25.0 // indirect

go.sum

@@ -32,6 +32,8 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy
 github.com/ALTree/bigfloat v0.2.0 h1:AwNzawrpFuw55/YDVlcPw0F0cmmXrmngBHhVrvdXPvM=
 github.com/ALTree/bigfloat v0.2.0/go.mod h1:+NaH2gLeY6RPBPPQf4aRotPPStg+eXc8f9ZaE4vRfD4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/ChainSafe/gossamer v0.9.0 h1:Xj2oRO+5JFIpE3qkC9L8pyR1fxTPv5fTGwvvD2BnmQQ=
+github.com/ChainSafe/gossamer v0.9.0/go.mod h1:V/ePNNEpATpoP8IS65suyVT05waGwQT/EtyhMhqOTKk=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s=
@@ -57,8 +59,8 @@ github.com/anacrolix/sync v0.3.0 h1:ZPjTrkqQWEfnYVGTQHh5qNjokWaXnjsyXTJSMsKY0TA=
 github.com/anacrolix/sync v0.3.0/go.mod h1:BbecHL6jDSExojhNtgTFSBcdGerzNc64tz3DCOj/I0g=
 github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.1 h1:ASBAzSJJZIzcfzsG1hjxI6L6Rt5TohIR8Fd6Yf5hRZQ=
-github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.1/go.mod h1:Vc27TBhU0XvcksDXiPgl5hJCswkUS3V9tG0sGh2jAhg=
+github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.2-0.20241021224807-578f0f40e8a7 h1:MqHp+mDnvT9A5NnDIxufYX4uobkoO43obiAmk0YAPLQ=
+github.com/athenavm/athena/ffi/athcon/bindings/go v0.4.2-0.20241021224807-578f0f40e8a7/go.mod h1:dgoxFG6b5kBESS03ZC4WSi3vzLcmTTchqwPOVFYiFTc=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
@@ -213,8 +215,9 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
+github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -624,8 +627,9 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/slok/go-http-metrics v0.13.0 h1:lQDyJJx9wKhmbliyUsZ2l6peGnXRHjsjoqPt5VYzcP8=
 github.com/slok/go-http-metrics v0.13.0/go.mod h1:HIr7t/HbN2sJaunvnt9wKP9xoBBVZFo1/KiHU3b0w+4=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
 github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs=
+github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
 github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
@@ -866,8 +870,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

node/node.go

@@ -50,7 +50,6 @@ import (
 	"github.com/spacemeshos/go-spacemesh/datastore"
 	"github.com/spacemeshos/go-spacemesh/events"
 	"github.com/spacemeshos/go-spacemesh/fetch"
-	vm "github.com/spacemeshos/go-spacemesh/genvm"
 	"github.com/spacemeshos/go-spacemesh/hare3"
 	"github.com/spacemeshos/go-spacemesh/hare3/compat"
 	"github.com/spacemeshos/go-spacemesh/hare3/eligibility"
@@ -90,6 +89,7 @@ import (
 	"github.com/spacemeshos/go-spacemesh/timesync/peersync"
 	"github.com/spacemeshos/go-spacemesh/tortoise"
 	"github.com/spacemeshos/go-spacemesh/txs"
+	"github.com/spacemeshos/go-spacemesh/vm"
 )
 
 const (

vm/core/context.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Context serves 2 purposes:
-// - maintains changes to the system state, that will be applied only after successful execution
+// - maintains changes to the system state, that will be applied only after succesful execution
 // - accumulates set of reusable objects and data.
 type Context struct {
 	Registry HandlerRegistry
@@ -85,14 +85,14 @@ func (c *Context) Spawn(args scale.Encodable) error {
 		return fmt.Errorf("%w: spawn is called with unknown handler", ErrInternal)
 	}
 	buf := bytes.NewBuffer(nil)
-	instance, err := handler.New(args)
-	if err != nil {
-		return fmt.Errorf("%w: %w", ErrMalformed, err)
-	}
-	_, err = instance.EncodeScale(scale.NewEncoder(buf))
-	if err != nil {
-		return fmt.Errorf("%w: %w", ErrInternal, err)
-	}
+	// instance, err := handler.New(args)
+	// if err != nil {
+	// 	return fmt.Errorf("%w: %w", ErrMalformed, err)
+	// }
+	// _, err = instance.EncodeScale(scale.NewEncoder(buf))
+	// if err != nil {
+	// 	return fmt.Errorf("%w: %w", ErrInternal, err)
+	// }
 	account.State = buf.Bytes()
 	account.TemplateAddress = &c.Header.TemplateAddress
 	c.change(account)
@@ -127,54 +127,6 @@ func (c *Context) transfer(from *Account, to Address, amount, max uint64) error
 	return nil
 }
 
-// Relay call to the remote account.
-func (c *Context) Relay(remoteTemplate, address Address, call func(Host) error) error {
-	account, err := c.load(address)
-	if err != nil {
-		return err
-	}
-	if account.TemplateAddress == nil {
-		return ErrNotSpawned
-	}
-	if *account.TemplateAddress != remoteTemplate {
-		return fmt.Errorf(
-			"%w: %s != %s",
-			ErrTemplateMismatch,
-			remoteTemplate.String(),
-			account.TemplateAddress.String(),
-		)
-	}
-	handler := c.Registry.Get(remoteTemplate)
-	if handler == nil {
-		panic("template of the spawned account should exist in the registry")
-	}
-	template, err := handler.Load(account.State)
-	if err != nil {
-		return err
-	}
-
-	remote := &RemoteContext{
-		Context:  c,
-		remote:   account,
-		handler:  handler,
-		template: template,
-	}
-	if err := call(remote); err != nil {
-		return err
-	}
-	// ideally such changes would be serialized once for the whole block execution
-	// but it requires more changes in the cache, so can be done as an optimization
-	// if it proves meaningful (most likely wont)
-	buf := bytes.NewBuffer(nil)
-	encoder := scale.NewEncoder(buf)
-	if _, err := template.EncodeScale(encoder); err != nil {
-		return fmt.Errorf("%w: %w", ErrInternal, err)
-	}
-	account.State = buf.Bytes()
-	c.change(account)
-	return nil
-}
-
 // Consume gas from the account after validation passes.
 func (c *Context) Consume(gas uint64) (err error) {
 	amount := gas * c.Header.GasPrice
@@ -253,34 +205,3 @@ func (c *Context) change(account *Account) {
 	}
 	c.changed[account.Address] = account
 }
-
-// RemoteContext ...
-type RemoteContext struct {
-	*Context
-	remote   *Account
-	handler  Handler
-	template Template
-}
-
-// Balance returns the remote account balance.
-func (r *RemoteContext) Balance() uint64 {
-	return r.remote.Balance
-}
-
-// Template ...
-func (r *RemoteContext) Template() Template {
-	return r.template
-}
-
-// Handler ...
-func (r *RemoteContext) Handler() Handler {
-	return r.handler
-}
-
-// Transfer ...
-func (r *RemoteContext) Transfer(to Address, amount uint64) error {
-	if err := r.transfer(r.remote, to, amount, amount); err != nil {
-		return err
-	}
-	return nil
-}