lux/chains
2
0
Fork 0
mirror of https://github.com/luxfi/chains.git synced 2026-09-24 00:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

chains: gofmt the files this pass touched

Browse Source
This commit is contained in:
zeekay
2026-08-28 08:59:56 -07:00
parent 6d786b8104
commit eaf8e8258b
6 changed files with 70 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridgevm/vm.go
+3 -3
View File
@@ -441,7 +441,7 @@ func (vm *VM) parseBlock(raw []byte) (*Block, error) {
// BuildBlock implements the chain.ChainVM interface
func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
built, err := vm.chain.Propose(func(parentID ids.ID, parentHeight uint64) (*Block, error) {
built, err := vm.chain.Propose(func(parent *Block) (*Block, error) {
// The transfers in flight are the bridge's state, so they are read under
// the bridge's lock — taken here, inside the chain's, which is the one
// order these are ever taken in.
@@ -481,8 +481,8 @@ func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
// Create new block
blk := &Block{
ParentID_: parentID,
BlockHeight: parentHeight + 1,
ParentID_: parent.ID(),
BlockHeight: parent.Height() + 1,
BlockTimestamp: time.Now().Unix(),
BridgeRequests: requests,
vm: vm,
identityvm/vm.go
+4 -4
View File
@@ -153,7 +153,7 @@ type VM struct {
// pending holds the credentials waiting for a block, and tells consensus
// there is one to build. LOCK ORDER: the chain's lock, then the pool's.
pending *chain.Pool[*Credential]
pending *chain.Pool[*Credential, ids.ID]
// fee is what this chain charges to admit a mutating RPC. I-Chain accepts
// user-submitted DID and credential calls that produce on-chain effects,
@@ -350,15 +350,15 @@ func (vm *VM) Disconnected(ctx context.Context, nodeID ids.NodeID) error {
// block on it happen in one step, so nothing can be accepted in between and
// leave the proposal hanging off a parent that is no longer the tip.
func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
built, err := vm.chain.Propose(func(parent ids.ID, height uint64) (*Block, error) {
built, err := vm.chain.Propose(func(parent *Block) (*Block, error) {
// A block with nothing in it says nothing and still has to be voted on.
creds := vm.pending.Take(0)
if len(creds) == 0 {
return nil, errNothingToBuild
}
return &Block{
ParentID_: parent,
BlockHeight: height + 1,
ParentID_: parent.ID(),
BlockHeight: parent.Height() + 1,
BlockTimestamp: time.Now().Unix(),
Credentials: creds,
vm: vm,
identityvm/vm_test.go
+8 -8
View File
@@ -42,10 +42,10 @@ func TestVMInitialize(t *testing.T) {
require := require.New(t)
vm := &VM{
identities: make(map[ids.ID]*Identity),
credentials: make(map[ids.ID]*Credential),
issuers: make(map[ids.ID]*Issuer),
revocations: make(map[ids.ID]*RevocationEntry),
identities: make(map[ids.ID]*Identity),
credentials: make(map[ids.ID]*Credential),
issuers: make(map[ids.ID]*Issuer),
revocations: make(map[ids.ID]*RevocationEntry),
}
genesis := &Genesis{
@@ -625,10 +625,10 @@ func setupTestVM(t *testing.T) *VM {
t.Helper()
vm := &VM{
identities: make(map[ids.ID]*Identity),
credentials: make(map[ids.ID]*Credential),
issuers: make(map[ids.ID]*Issuer),
revocations: make(map[ids.ID]*RevocationEntry),
identities: make(map[ids.ID]*Identity),
credentials: make(map[ids.ID]*Credential),
issuers: make(map[ids.ID]*Issuer),
revocations: make(map[ids.ID]*RevocationEntry),
}
genesis := &Genesis{
mpcvm/state.go
+2 -2
View File
@@ -64,7 +64,7 @@ var (
prefixKeyRecord = []byte("c/key/") // replicated: custody key registry
prefixCeremony = []byte("c/ceremony/") // replicated: ceremony log
keyRoot = []byte("c/root") // replicated: current state root
prefixShare = []byte("n/share/") // NODE-PRIVATE: this party's key share
prefixShare = []byte("n/share/") // NODE-PRIVATE: this party's key share
)
// Domain separation tags. Every hash M-Chain computes is tagged, so a digest
@@ -531,4 +531,4 @@ func sortedUnique(ps []party.ID) bool {
}
}
return true
}
}
zkvm/dag_vertex.go
+16 -16
View File
@@ -21,23 +21,23 @@ var _ vertex.DAGVM = (*VM)(nil)
// Conflict key: set of nullifiers spent in the vertex.
// Two vertices conflict iff their nullifier sets intersect.
type Vertex struct {
id ids.ID
bytes []byte
height uint64
epoch uint32
parents []ids.ID
txIDs []ids.ID
status choices.Status
txs []*Transaction
vm *VM
id ids.ID
bytes []byte
height uint64
epoch uint32
parents []ids.ID
txIDs []ids.ID
status choices.Status
txs []*Transaction
vm *VM
}
func (v *Vertex) ID() ids.ID { return v.id }
func (v *Vertex) Bytes() []byte { return v.bytes }
func (v *Vertex) Height() uint64 { return v.height }
func (v *Vertex) Epoch() uint32 { return v.epoch }
func (v *Vertex) Parents() []ids.ID { return v.parents }
func (v *Vertex) Txs() []ids.ID { return v.txIDs }
func (v *Vertex) ID() ids.ID { return v.id }
func (v *Vertex) Bytes() []byte { return v.bytes }
func (v *Vertex) Height() uint64 { return v.height }
func (v *Vertex) Epoch() uint32 { return v.epoch }
func (v *Vertex) Parents() []ids.ID { return v.parents }
func (v *Vertex) Txs() []ids.ID { return v.txIDs }
func (v *Vertex) Status() choices.Status { return v.status }
func (v *Vertex) Verify(ctx context.Context) error {
@@ -316,7 +316,7 @@ func deserializeVertex(data []byte, vm *VM) (*Vertex, error) {
if pos+int(txLen) > len(data) {
return nil, errInvalidBlock
}
tx, err := parseTransaction(data[pos:pos+int(txLen)])
tx, err := parseTransaction(data[pos : pos+int(txLen)])
if err != nil {
return nil, err
}
zkvm/vm.go
+37 -17
View File
@@ -28,7 +28,7 @@ import (
var (
_ vmchain.ChainVM = (*VM)(nil)
_ vertex.DAGVM = (*VM)(nil)
_ vertex.DAGVM = (*VM)(nil)
Version = &version.Semantic{
Major: 1,
@@ -87,9 +87,13 @@ type VM struct {
// chain is the durable state, the blocks in flight and the tip — and the
// one lock over all of it. The three stores below write through its view,
// so their records commit with the block that made them and are discarded
// with a block that fails.
chain *chain.Store[*Block]
// so their records commit with the decision that made them and are
// discarded with one that fails.
//
// It holds chain.Block rather than *Block because Z-Chain decides in two
// shapes: a linear block and a DAG vertex. Both change state the same way,
// which is the whole of what the store needs to know about either.
chain *chain.Store[chain.Block]
utxoDB *UTXODB
nullifierDB *NullifierDB
stateTree *StateTree
@@ -149,7 +153,7 @@ func (vm *VM) Initialize(
return errors.New("invalid logger type")
}
}
vm.chain = chain.New[*Block](init.DB, vm.reload)
vm.chain = chain.New[chain.Block](init.DB, vm.reload)
// Parse configuration or use defaults
if len(init.Config) > 0 {
@@ -307,7 +311,7 @@ func (vm *VM) StrictPQ() bool { return vm.config.StrictPQ }
// it happen in one step, so nothing can be accepted in between and leave the
// proposal hanging off a parent that is no longer the tip.
func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
built, err := vm.chain.Propose(func(parent ids.ID, height uint64) (*Block, error) {
built, err := vm.chain.Propose(func(parent chain.Block) (chain.Block, error) {
// Get transactions from mempool
txs := vm.mempool.GetPendingTransactions(int(vm.config.MaxUTXOsPerBlock))
if len(txs) == 0 {
@@ -332,8 +336,8 @@ func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
}
block := &Block{
ParentID_: parent,
BlockHeight: height + 1,
ParentID_: parent.ID(),
BlockHeight: parent.Height() + 1,
BlockTimestamp: time.Now().Unix(),
Txs: validTxs,
vm: vm,
@@ -351,17 +355,22 @@ func (vm *VM) BuildBlock(ctx context.Context) (vmchain.Block, error) {
if err != nil {
return nil, err
}
return built, nil
return built.(*Block), nil
}
// ParseBlock parses a block from bytes
func (vm *VM) ParseBlock(ctx context.Context, blockBytes []byte) (vmchain.Block, error) {
return vm.parseBlock(blockBytes)
block := &Block{vm: vm}
if err := parseBlockBytes(blockBytes, block); err != nil {
return nil, err
}
block.ID_ = block.computeID()
return block, nil
}
// parseBlock decodes a block belonging to this VM. The store reads accepted
// blocks back through it, so there is one decoder rather than one per caller.
func (vm *VM) parseBlock(raw []byte) (*Block, error) {
func (vm *VM) parseBlock(raw []byte) (chain.Block, error) {
block := &Block{vm: vm}
if err := parseBlockBytes(raw, block); err != nil {
return nil, err
@@ -375,7 +384,18 @@ func (vm *VM) GetBlock(ctx context.Context, blkID ids.ID) (vmchain.Block, error)
if blkID == vm.genesisBlock.ID() {
return vm.genesisBlock, nil
}
return vm.chain.Block(blkID, vm.parseBlock)
decided, err := vm.chain.Block(blkID, vm.parseBlock)
if err != nil {
return nil, err
}
// A vertex is a decision this chain makes but not a block the engine can
// take, so asking for one by block id is answered as a miss rather than
// with something the caller cannot use.
blk, ok := decided.(*Block)
if !ok {
return nil, fmt.Errorf("%w: %s is not a block", chain.ErrNoBlock, blkID)
}
return blk, nil
}
// reload rebuilds the caches the three stores keep beside the database. It runs
@@ -435,11 +455,11 @@ func (vm *VM) HealthCheck(ctx context.Context) (vmchain.HealthResult, error) {
return vmchain.HealthResult{
Healthy: true,
Details: map[string]string{
"utxoCount": fmt.Sprintf("%d", vm.utxoDB.GetUTXOCount()),
"nullifierCount": fmt.Sprintf("%d", vm.nullifierDB.GetNullifierCount()),
"lastBlockHeight": fmt.Sprintf("%d", height),
"mempoolSize": fmt.Sprintf("%d", vm.mempool.Size()),
"proofCacheSize": fmt.Sprintf("%d", vm.proofVerifier.GetCacheSize()),
"utxoCount": fmt.Sprintf("%d", vm.utxoDB.GetUTXOCount()),
"nullifierCount": fmt.Sprintf("%d", vm.nullifierDB.GetNullifierCount()),
"lastBlockHeight": fmt.Sprintf("%d", height),
"mempoolSize": fmt.Sprintf("%d", vm.mempool.Size()),
"proofCacheSize": fmt.Sprintf("%d", vm.proofVerifier.GetCacheSize()),
},
}, nil
}