diff --git a/chain/block.go b/chain/block.go index 1a062b7f1e..c78e01ebdc 100644 --- a/chain/block.go +++ b/chain/block.go @@ -13,7 +13,6 @@ import ( "github.com/ava-labs/avalanchego/snow/choices" "github.com/ava-labs/avalanchego/snow/consensus/snowman" "github.com/ava-labs/avalanchego/snow/engine/snowman/block" - "github.com/ava-labs/avalanchego/snow/validators" "github.com/ava-labs/avalanchego/utils/set" "github.com/ava-labs/avalanchego/x/merkledb" "go.opentelemetry.io/otel/attribute" @@ -100,8 +99,7 @@ type StatelessBlock struct { bytes []byte txsSet set.Set[ids.ID] - bctx *block.Context - vdrState validators.State + bctx *block.Context results []*Result feeManager *fees.Manager @@ -257,7 +255,7 @@ func (b *StatelessBlock) initializeBuilt( func (b *StatelessBlock) ID() ids.ID { return b.id } // implements "block.WithVerifyContext" -func (b *StatelessBlock) ShouldVerifyWithContext(context.Context) (bool, error) { +func (*StatelessBlock) ShouldVerifyWithContext(context.Context) (bool, error) { return false, nil } @@ -451,7 +449,7 @@ func (b *StatelessBlock) innerVerify(ctx context.Context, vctx VerifyContext) er feeKey := FeeKey(b.vm.StateManager().FeeKey()) feeRaw, err := parentView.GetValue(ctx, feeKey) if err != nil { - return err //nolint:spancheck + return err } parentFeeManager := fees.NewManager(feeRaw) feeManager, err := parentFeeManager.ComputeNext(parentTimestamp, b.Tmstmp, r) diff --git a/examples/tokenvm/cmd/token-cli/cmd/action.go b/examples/tokenvm/cmd/token-cli/cmd/action.go index 1bacc811c5..d8cf34fa2c 100644 --- a/examples/tokenvm/cmd/token-cli/cmd/action.go +++ b/examples/tokenvm/cmd/token-cli/cmd/action.go @@ -69,7 +69,7 @@ var fundFaucetCmd = &cobra.Command{ if err != nil { return err } - if _, err = sendAndWait(ctx, &actions.Transfer{ + if err = sendAndWait(ctx, &actions.Transfer{ To: addr, Asset: ids.Empty, Value: amount, @@ -119,7 +119,7 @@ var transferCmd = &cobra.Command{ } // Generate transaction - _, err = sendAndWait(ctx, &actions.Transfer{ + err = sendAndWait(ctx, &actions.Transfer{ To: recipient, Asset: assetID, Value: amount, @@ -162,7 +162,7 @@ var createAssetCmd = &cobra.Command{ } // Generate transaction - _, err = sendAndWait(ctx, &actions.CreateAsset{ + err = sendAndWait(ctx, &actions.CreateAsset{ Symbol: []byte(symbol), Decimals: uint8(decimals), // already constrain above to prevent overflow Metadata: []byte(metadata), @@ -226,7 +226,7 @@ var mintAssetCmd = &cobra.Command{ } // Generate transaction - _, err = sendAndWait(ctx, &actions.MintAsset{ + err = sendAndWait(ctx, &actions.MintAsset{ Asset: assetID, To: recipient, Value: amount, @@ -263,7 +263,7 @@ var closeOrderCmd = &cobra.Command{ } // Generate transaction - _, err = sendAndWait(ctx, &actions.CloseOrder{ + err = sendAndWait(ctx, &actions.CloseOrder{ Order: orderID, Out: outAssetID, }, cli, scli, tcli, factory, true) @@ -349,7 +349,7 @@ var createOrderCmd = &cobra.Command{ } // Generate transaction - _, err = sendAndWait(ctx, &actions.CreateOrder{ + err = sendAndWait(ctx, &actions.CreateOrder{ In: inAssetID, InTick: inTick, Out: outAssetID, @@ -466,7 +466,7 @@ var fillOrderCmd = &cobra.Command{ if err != nil { return err } - _, err = sendAndWait(ctx, &actions.FillOrder{ + err = sendAndWait(ctx, &actions.FillOrder{ Order: order.ID, Owner: owner, In: inAssetID, diff --git a/examples/tokenvm/cmd/token-cli/cmd/resolutions.go b/examples/tokenvm/cmd/token-cli/cmd/resolutions.go index c3939a3d24..598151c7c9 100644 --- a/examples/tokenvm/cmd/token-cli/cmd/resolutions.go +++ b/examples/tokenvm/cmd/token-cli/cmd/resolutions.go @@ -8,7 +8,6 @@ import ( "fmt" "reflect" - "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/hypersdk/chain" "github.com/ava-labs/hypersdk/cli" "github.com/ava-labs/hypersdk/codec" @@ -23,27 +22,27 @@ import ( func sendAndWait( ctx context.Context, action chain.Action, cli *rpc.JSONRPCClient, scli *rpc.WebSocketClient, tcli *trpc.JSONRPCClient, factory chain.AuthFactory, printStatus bool, -) (ids.ID, error) { +) error { parser, err := tcli.Parser(ctx) if err != nil { - return ids.Empty, err + return err } _, tx, _, err := cli.GenerateTransaction(ctx, parser, action, factory) if err != nil { - return ids.Empty, err + return err } if err := scli.RegisterTx(tx); err != nil { - return ids.Empty, err + return err } var res *chain.Result for { txID, dErr, result, err := scli.ListenTx(ctx) if dErr != nil { - return ids.Empty, dErr + return dErr } if err != nil { - return ids.Empty, err + return err } if txID == tx.ID() { res = result @@ -54,7 +53,7 @@ func sendAndWait( if printStatus { handler.Root().PrintStatus(tx.ID(), res.Success) } - return tx.ID(), nil + return nil } func handleTx(c *trpc.JSONRPCClient, tx *chain.Transaction, result *chain.Result) { diff --git a/examples/tokenvm/cmd/token-cli/cmd/spam.go b/examples/tokenvm/cmd/token-cli/cmd/spam.go index 647c22118f..f3bf3b6660 100644 --- a/examples/tokenvm/cmd/token-cli/cmd/spam.go +++ b/examples/tokenvm/cmd/token-cli/cmd/spam.go @@ -87,11 +87,10 @@ var runSpamCmd = &cobra.Command{ }, func(cli *rpc.JSONRPCClient, priv *cli.PrivateKey) func(context.Context, uint64) error { // submitDummy return func(ictx context.Context, count uint64) error { - _, err := sendAndWait(ictx, &actions.Transfer{ + return sendAndWait(ictx, &actions.Transfer{ To: priv.Address, Value: count, // prevent duplicate txs }, cli, sclient, tclient, auth.NewED25519Factory(ed25519.PrivateKey(priv.Bytes)), false) - return err } }, ) diff --git a/vm/resolutions.go b/vm/resolutions.go index b566f0a91e..0b8ec49a3d 100644 --- a/vm/resolutions.go +++ b/vm/resolutions.go @@ -417,14 +417,6 @@ func (vm *VM) GetAuthBatchVerifier(authTypeID uint8, cores int, count int) (chai return bv.GetBatchVerifier(cores, count), ok } -func (vm *VM) cacheAuth(auth chain.Auth) { - bv, ok := vm.authEngine[auth.GetTypeID()] - if !ok { - return - } - bv.Cache(auth) -} - func (vm *VM) RecordBlockVerify(t time.Duration) { vm.metrics.blockVerify.Observe(float64(t)) }