chore: upstream stf to main (#20286)
Co-authored-by: testinginprod <98415576+testinginprod@users.noreply.github.com>
This commit is contained in:
Marko
testinginprod
@@ -0,0 +1,66 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
appmodulev2 "cosmossdk.io/core/appmodule/v2"
|
||||
"cosmossdk.io/core/event"
|
||||
"cosmossdk.io/core/transaction"
|
||||
)
|
||||
|
||||
type QueryRequest struct {
|
||||
Height int64
|
||||
Path string
|
||||
Data []byte
|
||||
}
|
||||
|
||||
type QueryResponse struct {
|
||||
Height int64
|
||||
Value []byte
|
||||
}
|
||||
|
||||
type BlockRequest[T any] struct {
|
||||
Height uint64
|
||||
Time time.Time
|
||||
Hash []byte
|
||||
ChainId string
|
||||
AppHash []byte
|
||||
Txs []T
|
||||
ConsensusMessages []transaction.Type
|
||||
}
|
||||
|
||||
type BlockResponse struct {
|
||||
Apphash []byte
|
||||
ConsensusMessagesResponse []transaction.Type
|
||||
ValidatorUpdates []appmodulev2.ValidatorUpdate
|
||||
PreBlockEvents []event.Event
|
||||
BeginBlockEvents []event.Event
|
||||
TxResults []TxResult
|
||||
EndBlockEvents []event.Event
|
||||
}
|
||||
|
||||
type RequestInitChain struct {
|
||||
Time time.Time
|
||||
ChainId string
|
||||
Validators []appmodulev2.ValidatorUpdate
|
||||
AppStateBytes []byte
|
||||
InitialHeight int64
|
||||
}
|
||||
|
||||
type ResponseInitChain struct {
|
||||
Validators []appmodulev2.ValidatorUpdate
|
||||
AppHash []byte
|
||||
}
|
||||
|
||||
type TxResult struct {
|
||||
Events []event.Event
|
||||
Resp []transaction.Type
|
||||
Error error
|
||||
Code uint32
|
||||
Data []byte
|
||||
Log string
|
||||
Info string
|
||||
GasWanted uint64
|
||||
GasUsed uint64
|
||||
Codespace string
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"github.com/cosmos/gogoproto/jsonpb"
|
||||
gogoproto "github.com/cosmos/gogoproto/proto"
|
||||
)
|
||||
|
||||
// MsgInterfaceProtoName defines the protobuf name of the cosmos Msg interface
|
||||
const MsgInterfaceProtoName = "cosmos.base.v1beta1.Msg"
|
||||
|
||||
type ProtoCodec interface {
|
||||
Marshal(v gogoproto.Message) ([]byte, error)
|
||||
Unmarshal(data []byte, v gogoproto.Message) error
|
||||
Name() string
|
||||
}
|
||||
|
||||
type InterfaceRegistry interface {
|
||||
jsonpb.AnyResolver
|
||||
ListImplementations(ifaceTypeURL string) []string
|
||||
ListAllInterfaces() []string
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package app
|
||||
|
||||
var (
|
||||
RuntimeIdentity = []byte("runtime")
|
||||
ConsensusIdentity = []byte("consensus")
|
||||
)
|
||||
@@ -0,0 +1,16 @@
|
||||
package appmodule
|
||||
|
||||
// ExecMode defines the execution mode which can be set on a Context.
|
||||
type ExecMode uint8
|
||||
|
||||
// All possible execution modes.
|
||||
const (
|
||||
ExecModeCheck ExecMode = iota
|
||||
ExecModeReCheck
|
||||
ExecModeSimulate
|
||||
ExecModePrepareProposal
|
||||
ExecModeProcessProposal
|
||||
ExecModeVoteExtension
|
||||
ExecModeVerifyVoteExtension
|
||||
ExecModeFinalize
|
||||
)
|
||||
+2
-2
@@ -46,8 +46,8 @@ type Service interface {
|
||||
|
||||
// Meter represents a gas meter for modules consumption
|
||||
type Meter interface {
|
||||
Consume(amount Gas, descriptor string)
|
||||
Refund(amount Gas, descriptor string)
|
||||
Consume(amount Gas, descriptor string) error
|
||||
Refund(amount Gas, descriptor string) error
|
||||
Remaining() Gas
|
||||
Limit() Gas
|
||||
}
|
||||
|
||||
+72
-1
@@ -2,6 +2,9 @@ package header
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/sha256"
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -15,6 +18,74 @@ type Info struct {
|
||||
Height int64 // Height returns the height of the block
|
||||
Hash []byte // Hash returns the hash of the block header
|
||||
Time time.Time // Time returns the time of the block
|
||||
ChainID string // ChainId returns the chain ID of the block
|
||||
AppHash []byte // AppHash used in the current block header
|
||||
ChainID string // ChainId returns the chain ID of the block
|
||||
}
|
||||
|
||||
const hashSize = sha256.Size
|
||||
|
||||
// Bytes encodes the Info struct into a byte slice using little-endian encoding
|
||||
func (i *Info) Bytes() ([]byte, error) {
|
||||
buf := make([]byte, 0)
|
||||
|
||||
// Encode Height
|
||||
heightBytes := make([]byte, 8)
|
||||
binary.LittleEndian.PutUint64(heightBytes, uint64(i.Height))
|
||||
buf = append(buf, heightBytes...)
|
||||
|
||||
// Encode Hash
|
||||
if len(i.Hash) != hashSize {
|
||||
return nil, errors.New("invalid hash size")
|
||||
}
|
||||
buf = append(buf, i.Hash...)
|
||||
|
||||
// Encode Time
|
||||
timeBytes := make([]byte, 8)
|
||||
binary.LittleEndian.PutUint64(timeBytes, uint64(i.Time.Unix()))
|
||||
buf = append(buf, timeBytes...)
|
||||
|
||||
// Encode AppHash
|
||||
if len(i.Hash) != hashSize {
|
||||
return nil, errors.New("invalid hash size")
|
||||
}
|
||||
buf = append(buf, i.AppHash...)
|
||||
|
||||
// Encode ChainID
|
||||
chainIDLen := len(i.ChainID)
|
||||
buf = append(buf, byte(chainIDLen))
|
||||
buf = append(buf, []byte(i.ChainID)...)
|
||||
|
||||
return buf, nil
|
||||
}
|
||||
|
||||
// FromBytes decodes the byte slice into an Info struct using little-endian encoding
|
||||
func (i *Info) FromBytes(bytes []byte) error {
|
||||
// Decode Height
|
||||
i.Height = int64(binary.LittleEndian.Uint64(bytes[:8]))
|
||||
bytes = bytes[8:]
|
||||
|
||||
// Decode Hash
|
||||
i.Hash = make([]byte, hashSize)
|
||||
copy(i.Hash, bytes[:hashSize])
|
||||
bytes = bytes[hashSize:]
|
||||
|
||||
// Decode Time
|
||||
unixTime := int64(binary.LittleEndian.Uint64(bytes[:8]))
|
||||
i.Time = time.Unix(unixTime, 0).UTC()
|
||||
bytes = bytes[8:]
|
||||
|
||||
// Decode AppHash
|
||||
i.AppHash = make([]byte, hashSize)
|
||||
copy(i.AppHash, bytes[:hashSize])
|
||||
bytes = bytes[hashSize:]
|
||||
|
||||
// Decode ChainID
|
||||
chainIDLen := int(bytes[0])
|
||||
bytes = bytes[1:]
|
||||
if len(bytes) < chainIDLen {
|
||||
return errors.New("invalid byte slice length")
|
||||
}
|
||||
i.ChainID = string(bytes[:chainIDLen])
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
package header
|
||||
|
||||
import (
|
||||
"crypto/sha256"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestInfo_Bytes(t *testing.T) {
|
||||
sum := sha256.Sum256([]byte("test-chain"))
|
||||
info := Info{
|
||||
Height: 12345,
|
||||
Hash: sum[:],
|
||||
Time: time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC),
|
||||
AppHash: sum[:],
|
||||
ChainID: "test-chain",
|
||||
}
|
||||
|
||||
expectedBytes := []byte{
|
||||
0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Height (little-endian)
|
||||
0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e, // Hash
|
||||
0x80, 0x0, 0x92, 0x65, 0x0, 0x0, 0x0, 0x0, // Time (little-endian)
|
||||
0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e, // Apphash
|
||||
0x0A, // ChainID length
|
||||
0x74, 0x65, 0x73, 0x74, 0x2d, 0x63, 0x68, 0x61, 0x69, 0x6e, // ChainID
|
||||
}
|
||||
|
||||
bytes, err := info.Bytes()
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, expectedBytes, bytes)
|
||||
}
|
||||
|
||||
func TestInfo_FromBytes(t *testing.T) {
|
||||
info := Info{}
|
||||
|
||||
// Test case 1: Valid byte slice
|
||||
bytes := []byte{
|
||||
0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Height (little-endian)
|
||||
0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e, // Hash
|
||||
0x80, 0x0, 0x92, 0x65, 0x0, 0x0, 0x0, 0x0, // Time (little-endian)
|
||||
0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e, // Apphash
|
||||
0x0A, // ChainID length
|
||||
0x74, 0x65, 0x73, 0x74, 0x2d, 0x63, 0x68, 0x61, 0x69, 0x6e, // ChainID
|
||||
}
|
||||
|
||||
err := info.FromBytes(bytes)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, int64(12345), info.Height)
|
||||
require.Equal(t, []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.Hash)
|
||||
require.Equal(t, time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC), info.Time)
|
||||
require.Equal(t, []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.AppHash)
|
||||
require.Equal(t, "test-chain", info.ChainID)
|
||||
|
||||
}
|
||||
@@ -20,12 +20,12 @@ type Tx interface {
|
||||
// Hash returns the unique identifier for the Tx.
|
||||
Hash() [32]byte // TODO evaluate if 32 bytes is the right size & benchmark overhead of hashing instead of using identifier
|
||||
// GetMessages returns the list of state transitions of the Tx.
|
||||
GetMessages() []Type
|
||||
GetMessages() ([]Type, error)
|
||||
// GetSenders returns the tx state transition sender.
|
||||
GetSenders() []Identity // TODO reduce this to a single identity if accepted
|
||||
GetSenders() ([]Identity, error) // TODO reduce this to a single identity if accepted
|
||||
// GetGasLimit returns the gas limit of the tx. Must return math.MaxUint64 for infinite gas
|
||||
// txs.
|
||||
GetGasLimit() uint64
|
||||
GetGasLimit() (uint64, error)
|
||||
// Bytes returns the encoded version of this tx. Note: this is ideally cached
|
||||
// from the first instance of the decoding of the tx.
|
||||
Bytes() []byte
|
||||
|
||||
Reference in New Issue
Block a user