Fix error resolution in publisher

.gitignore

@@ -43,4 +43,7 @@ go.work
 go.work.sum
 TMP*
 tmp.*
-sdk/
+sdk/
+libiota_sdk.so
+libiota_sdk.dylib
+iota_sdk.dll

packages/chain/chain_listener.go

@@ -7,6 +7,7 @@ import (
 	"github.com/iotaledger/wasp/packages/chain/mempool"
 	"github.com/iotaledger/wasp/packages/cryptolib"
 	"github.com/iotaledger/wasp/packages/isc"
+	"github.com/iotaledger/wasp/packages/kv"
 	"github.com/iotaledger/wasp/packages/state"
 )
 
@@ -30,6 +31,7 @@ func NewEmptyChainListener() ChainListener {
 	return &emptyChainListener{}
 }
 
-func (ecl *emptyChainListener) BlockApplied(chainID isc.ChainID, block state.Block)    {}
+func (ecl *emptyChainListener) BlockApplied(chainID isc.ChainID, block state.Block, latestState kv.KVStoreReader) {
+}
 func (ecl *emptyChainListener) AccessNodesUpdated(isc.ChainID, []*cryptolib.PublicKey) {}
 func (ecl *emptyChainListener) ServerNodesUpdated(isc.ChainID, []*cryptolib.PublicKey) {}

packages/chain/mempool/mempool.go

@@ -56,6 +56,7 @@ import (
 	"github.com/iotaledger/wasp/packages/cryptolib"
 	"github.com/iotaledger/wasp/packages/gpa"
 	"github.com/iotaledger/wasp/packages/isc"
+	"github.com/iotaledger/wasp/packages/kv"
 	"github.com/iotaledger/wasp/packages/metrics"
 	"github.com/iotaledger/wasp/packages/peering"
 	"github.com/iotaledger/wasp/packages/state"
@@ -83,7 +84,7 @@ type ChainListener interface {
 	// This function is called by the chain when new block is applied to the
 	// state. This block might be not confirmed yet, but the chain is going
 	// to build the next block on top of this one.
-	BlockApplied(chainID isc.ChainID, block state.Block)
+	BlockApplied(chainID isc.ChainID, block state.Block, latestState kv.KVStoreReader)
 }
 
 type Mempool interface {
@@ -822,7 +823,7 @@ func (mpi *mempoolImpl) handleTrackNewChainHead(req *reqTrackNewChainHead) {
 			panic(fmt.Errorf("cannot extract receipts from block: %w", err))
 		}
 		mpi.metrics.IncBlocksPerChain()
-		mpi.listener.BlockApplied(mpi.chainID, block)
+		mpi.listener.BlockApplied(mpi.chainID, block, mpi.chainHeadState)
 		for _, receipt := range blockReceipts {
 			mpi.metrics.IncRequestsProcessed()
 			mpi.tryRemoveRequest(receipt.Request)

packages/chains/chains_listener.go

@@ -7,6 +7,7 @@ import (
 	"github.com/iotaledger/wasp/packages/chain"
 	"github.com/iotaledger/wasp/packages/cryptolib"
 	"github.com/iotaledger/wasp/packages/isc"
+	"github.com/iotaledger/wasp/packages/kv"
 	"github.com/iotaledger/wasp/packages/state"
 )
 
@@ -19,8 +20,8 @@ func NewChainsListener(parent chain.ChainListener, accessNodesCB func(chainID is
 	return &chainsListener{parent: parent, accessNodesCB: accessNodesCB}
 }
 
-func (cl *chainsListener) BlockApplied(chainID isc.ChainID, block state.Block) {
-	cl.parent.BlockApplied(chainID, block)
+func (cl *chainsListener) BlockApplied(chainID isc.ChainID, block state.Block, latestState kv.KVStoreReader) {
+	cl.parent.BlockApplied(chainID, block, latestState)
 }
 
 func (cl *chainsListener) AccessNodesUpdated(chainID isc.ChainID, accessNodes []*cryptolib.PublicKey) {

packages/publisher/events.go

@@ -97,8 +97,10 @@ func PublishBlockEvents(blockApplied *blockApplied, events *Events, log *logger.
 	if err != nil {
 		log.Errorf("unable to get receipts from a block: %v", err)
 	} else {
+		errorStatePartition := subrealm.NewReadOnly(blockApplied.latestState, kv.Key(errors.Contract.Hname().Bytes()))
+
 		for index, receipt := range receipts {
-			vmError, resolveError := errors.ResolveFromState(blocklogStatePartition, receipt.Error)
+			vmError, resolveError := errors.ResolveFromState(errorStatePartition, receipt.Error)
 			if resolveError != nil {
 				log.Errorf("Could not parse vmerror of receipt [%v]: %v", receipt.Request.ID(), resolveError)
 			}

packages/publisher/publisher.go

@@ -9,6 +9,7 @@ import (
 	"github.com/iotaledger/wasp/packages/chain"
 	"github.com/iotaledger/wasp/packages/cryptolib"
 	"github.com/iotaledger/wasp/packages/isc"
+	"github.com/iotaledger/wasp/packages/kv"
 	"github.com/iotaledger/wasp/packages/state"
 	"github.com/iotaledger/wasp/packages/util/pipe"
 )
@@ -34,8 +35,9 @@ type Publisher struct {
 var _ chain.ChainListener = &Publisher{}
 
 type blockApplied struct {
-	chainID isc.ChainID
-	block   state.Block
+	chainID     isc.ChainID
+	block       state.Block
+	latestState kv.KVStoreReader
 }
 
 func New(log *logger.Logger) *Publisher {
@@ -56,8 +58,8 @@ func New(log *logger.Logger) *Publisher {
 
 // Implements the chain.ChainListener interface.
 // NOTE: Do not block the caller!
-func (p *Publisher) BlockApplied(chainID isc.ChainID, block state.Block) {
-	p.blockAppliedPipe.In() <- &blockApplied{chainID: chainID, block: block}
+func (p *Publisher) BlockApplied(chainID isc.ChainID, block state.Block, latestState kv.KVStoreReader) {
+	p.blockAppliedPipe.In() <- &blockApplied{chainID: chainID, block: block, latestState: latestState}
 }
 
 // Implements the chain.ChainListener interface.

packages/solo/run.go

@@ -11,6 +11,7 @@ import (
 	"go.uber.org/zap"
 
 	iotago "github.com/iotaledger/iota.go/v3"
+	"github.com/iotaledger/wasp/packages/chain"
 	"github.com/iotaledger/wasp/packages/hashing"
 	"github.com/iotaledger/wasp/packages/isc"
 	"github.com/iotaledger/wasp/packages/isc/rotate"
@@ -131,7 +132,10 @@ func (ch *Chain) settleStateTransition(stateTx *iotago.Transaction, stateDraft s
 	if err != nil {
 		panic(err)
 	}
-	ch.Env.Publisher().BlockApplied(ch.ChainID, block)
+
+	latestState, _ := ch.LatestState(chain.ActiveOrCommittedState)
+
+	ch.Env.Publisher().BlockApplied(ch.ChainID, block, latestState)
 
 	blockReceipts, err := blocklog.RequestReceiptsFromBlock(block)
 	if err != nil {

packages/vm/core/testcore/sbtests/misc_call_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/iotaledger/wasp/packages/isc"
 	"github.com/iotaledger/wasp/packages/solo"
 	"github.com/iotaledger/wasp/packages/vm/core/testcore/sbtests/sbtestsc"
 )
@@ -45,3 +46,17 @@ func testSandboxCall(t *testing.T, w bool) {
 	require.NoError(t, err)
 	require.NotNil(t, ret)
 }
+
+func TestCustomError(t *testing.T) { run2(t, testCustomError) }
+func testCustomError(t *testing.T, w bool) {
+	_, chain := setupChain(t, nil)
+	setupTestSandboxSC(t, chain, nil, w)
+
+	req := solo.NewCallParams(ScName, sbtestsc.FuncTestCustomError.Name).
+		WithGasBudget(100_000)
+	ret, err := chain.PostRequestSync(req, nil)
+
+	require.Error(t, err)
+	require.IsType(t, &isc.VMError{}, err)
+	require.Nil(t, ret)
+}

packages/vm/core/testcore/sbtests/sbtestsc/impl.go

@@ -7,9 +7,12 @@ import (
 	"github.com/iotaledger/wasp/packages/vm/core/governance"
 )
 
+var testError *isc.VMErrorTemplate
+
 func initialize(ctx isc.Sandbox) dict.Dict {
 	p := ctx.Params().Get(ParamFail)
 	ctx.Requiref(p == nil, "failing on purpose")
+	testError = ctx.RegisterError("ERROR_TEST")
 	return nil
 }
 
@@ -52,6 +55,11 @@ func testPanicFullEP(ctx isc.Sandbox) dict.Dict {
 	return nil
 }
 
+func testCustomError(_ isc.Sandbox) dict.Dict {
+	panic(testError.Create("CUSTOM_ERROR"))
+	return nil
+}
+
 func testPanicViewEP(ctx isc.SandboxView) dict.Dict {
 	ctx.Log().Panicf(MsgViewPanic)
 	return nil

packages/vm/core/testcore/sbtests/sbtestsc/interface.go

@@ -16,6 +16,7 @@ var Processor = Contract.Processor(initialize,
 	FuncEventLogDeploy.WithHandler(testEventLogDeploy),
 	FuncSandboxCall.WithHandler(testSandboxCall),
 
+	FuncTestCustomError.WithHandler(testCustomError),
 	FuncPanicFullEP.WithHandler(testPanicFullEP),
 	FuncPanicViewEP.WithHandler(testPanicViewEP),
 	FuncCallPanicFullEP.WithHandler(testCallPanicFullEP),
@@ -71,6 +72,7 @@ var (
 	FuncCheckContextFromFullEP = coreutil.Func("checkContextFromFullEP")
 	FuncCheckContextFromViewEP = coreutil.ViewFunc("checkContextFromViewEP")
 
+	FuncTestCustomError         = coreutil.Func("testCustomError")
 	FuncPanicFullEP             = coreutil.Func("testPanicFullEP")
 	FuncPanicViewEP             = coreutil.ViewFunc("testPanicViewEP")
 	FuncCallPanicFullEP         = coreutil.Func("testCallPanicFullEP")