Skip to content

Commit

Permalink
Merge pull request #145 from Layr-Labs/jb/fix-verbose
Browse files Browse the repository at this point in the history 
Guard logs by verbose
  • Loading branch information
@jbrower95
jbrower95 authored Aug 30, 2024
2 parents d7a76a2 + 03fc465 commit 568591c
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 23 deletions.
4 changes: 2 additions & 2 deletions cli/commands/checkpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ func CheckpointCommand(args TCheckpointCommandArgs) error {
color.Green("pod has active checkpoint! checkpoint timestamp: %d", currentCheckpoint)
}

proof, err := core.GenerateCheckpointProof(ctx, args.EigenpodAddress, eth, chainId, beaconClient)
proof, err := core.GenerateCheckpointProof(ctx, args.EigenpodAddress, eth, chainId, beaconClient, isVerbose)
core.PanicOnError("failed to generate checkpoint proof", err)

txns, err := core.SubmitCheckpointProof(ctx, args.Sender, args.EigenpodAddress, chainId, proof, eth, args.BatchSize, args.NoPrompt, args.SimulateTransaction)
txns, err := core.SubmitCheckpointProof(ctx, args.Sender, args.EigenpodAddress, chainId, proof, eth, args.BatchSize, args.NoPrompt, args.SimulateTransaction, args.Verbose)
if args.SimulateTransaction {
printableTxns := utils.Map(txns, func(txn *types.Transaction, _ uint64) Transaction {
return Transaction{
Expand Down
15 changes: 10 additions & 5 deletions cli/commands/staleBalance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ type TFixStaleBalanceArgs struct {
NoPrompt bool
}

type TransactionDescription struct {
Hash string
Type string
}

// another fun cast brought to you by golang!
func proofCast(proof []eigenpodproofs.Bytes32) [][32]byte {
res := make([][32]byte, len(proof))
Expand All @@ -36,7 +41,7 @@ func proofCast(proof []eigenpodproofs.Bytes32) [][32]byte {
func FixStaleBalance(args TFixStaleBalanceArgs) error {
ctx := context.Background()

sentTxns := []string{}
sentTxns := []TransactionDescription{}

eth, beacon, chainId, err := core.GetClients(ctx, args.EthNode, args.BeaconNode, args.Verbose)
core.PanicOnError("failed to get clients", err)
Expand All @@ -63,18 +68,18 @@ func FixStaleBalance(args TFixStaleBalanceArgs) error {
core.PanicIfNoConsent(fmt.Sprintf("This eigenpod has an outstanding checkpoint (since %d). You must complete it before continuing. This will invoke `EigenPod.verifyCheckpointProofs()`, which will end the checkpoint. This may be expensive.", currentCheckpointTimestamp))
}

proofs, err := core.GenerateCheckpointProof(ctx, args.EigenpodAddress, eth, chainId, beacon)
proofs, err := core.GenerateCheckpointProof(ctx, args.EigenpodAddress, eth, chainId, beacon, args.Verbose)
core.PanicOnError("failed to generate checkpoint proofs", err)

txns, err := core.SubmitCheckpointProof(ctx, args.Sender, args.EigenpodAddress, chainId, proofs, eth, args.CheckpointBatchSize, args.NoPrompt /* noSend */, false)
txns, err := core.SubmitCheckpointProof(ctx, args.Sender, args.EigenpodAddress, chainId, proofs, eth, args.CheckpointBatchSize, args.NoPrompt, false /* noSend */, args.Verbose)
core.PanicOnError("failed to submit checkpoint proofs", err)

for i, txn := range txns {
if args.Verbose {
fmt.Printf("sending txn[%d/%d]: %s (waiting)...", i, len(txns), txn.Hash())
}
bind.WaitMined(ctx, eth, txn)
sentTxns = append(sentTxns, txn.Hash().Hex())
sentTxns = append(sentTxns, TransactionDescription{Type: "complete_existing_checkpoint", Hash: txn.Hash().Hex()})
}
}

Expand Down Expand Up @@ -102,7 +107,7 @@ func FixStaleBalance(args TFixStaleBalanceArgs) error {
},
)
core.PanicOnError("failed to call verifyStaleBalance()", err)
sentTxns = append(sentTxns, txn.Hash().Hex())
sentTxns = append(sentTxns, TransactionDescription{Type: "verify_stale_balance", Hash: txn.Hash().Hex()})

printAsJSON(sentTxns)
return nil
Expand Down
46 changes: 30 additions & 16 deletions cli/core/checkpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,30 @@ import (
"github.com/fatih/color"
)

func SubmitCheckpointProof(ctx context.Context, owner, eigenpodAddress string, chainId *big.Int, proof *eigenpodproofs.VerifyCheckpointProofsCallParams, eth *ethclient.Client, batchSize uint64, noPrompt bool, noSend bool) ([]*types.Transaction, error) {
func SubmitCheckpointProof(ctx context.Context, owner, eigenpodAddress string, chainId *big.Int, proof *eigenpodproofs.VerifyCheckpointProofsCallParams, eth *ethclient.Client, batchSize uint64, noPrompt bool, noSend bool, verbose bool) ([]*types.Transaction, error) {
tracing := GetContextTracingCallbacks(ctx)

allProofChunks := chunk(proof.BalanceProofs, batchSize)
transactions := []*types.Transaction{}
color.Green("calling EigenPod.VerifyCheckpointProofs() (using %d txn(s), max(%d) proofs per txn)", len(allProofChunks), batchSize)
if verbose {
color.Green("calling EigenPod.VerifyCheckpointProofs() (using %d txn(s), max(%d) proofs per txn)", len(allProofChunks), batchSize)
}

for i := 0; i < len(allProofChunks); i++ {
balanceProofs := allProofChunks[i]
tracing.OnStartSection("pepe::proof::checkpoint::batch::submit", map[string]string{
"chunk": fmt.Sprintf("%d", i),
})
txn, err := SubmitCheckpointProofBatch(ctx, owner, eigenpodAddress, chainId, proof.ValidatorBalancesRootProof, balanceProofs, eth, noSend)
txn, err := SubmitCheckpointProofBatch(ctx, owner, eigenpodAddress, chainId, proof.ValidatorBalancesRootProof, balanceProofs, eth, noSend, verbose)
tracing.OnEndSection()
if err != nil {
// failed to submit batch.
return transactions, err
}
transactions = append(transactions, txn)
fmt.Printf("Submitted chunk %d/%d -- waiting for transaction...: ", i+1, len(allProofChunks))
if verbose {
fmt.Printf("Submitted chunk %d/%d -- waiting for transaction...: ", i+1, len(allProofChunks))
}
tracing.OnStartSection("pepe::proof::checkpoint::batch::wait", map[string]string{
"chunk": fmt.Sprintf("%d", i),
})
Expand All @@ -48,26 +52,32 @@ func SubmitCheckpointProof(ctx context.Context, owner, eigenpodAddress string, c
bind.WaitMined(ctx, eth, txn)
}
tracing.OnEndSection()
color.Green("OK")
if verbose {
color.Green("OK")
}
}

if !noSend {
color.Green("Complete! re-run with `status` to see the updated Eigenpod state.")
} else {
color.Yellow("Submit these proofs to network and re-run with `status` to see the updated Eigenpod state.")
if verbose {
if !noSend {
color.Green("Complete! re-run with `status` to see the updated Eigenpod state.")
} else {
color.Yellow("Submit these proofs to network and re-run with `status` to see the updated Eigenpod state.")
}
}
return transactions, nil
}

func SubmitCheckpointProofBatch(ctx context.Context, owner, eigenpodAddress string, chainId *big.Int, proof *eigenpodproofs.ValidatorBalancesRootProof, balanceProofs []*eigenpodproofs.BalanceProof, eth *ethclient.Client, noSend bool) (*types.Transaction, error) {
func SubmitCheckpointProofBatch(ctx context.Context, owner, eigenpodAddress string, chainId *big.Int, proof *eigenpodproofs.ValidatorBalancesRootProof, balanceProofs []*eigenpodproofs.BalanceProof, eth *ethclient.Client, noSend bool, verbose bool) (*types.Transaction, error) {
tracing := GetContextTracingCallbacks(ctx)

ownerAccount, err := PrepareAccount(&owner, chainId, noSend)
if err != nil {
return nil, err
}

fmt.Printf("Using account(0x%s) to submit onchain\n", common.Bytes2Hex(ownerAccount.FromAddress[:]))
if verbose {
fmt.Printf("Using account(0x%s) to submit onchain\n", common.Bytes2Hex(ownerAccount.FromAddress[:]))
}

eigenPod, err := onchain.NewEigenPod(common.HexToAddress(eigenpodAddress), eth)
if err != nil {
Expand Down Expand Up @@ -114,7 +124,7 @@ func asJSON(obj interface{}) string {
return string(bytes)
}

func GenerateCheckpointProof(ctx context.Context, eigenpodAddress string, eth *ethclient.Client, chainId *big.Int, beaconClient BeaconClient) (*eigenpodproofs.VerifyCheckpointProofsCallParams, error) {
func GenerateCheckpointProof(ctx context.Context, eigenpodAddress string, eth *ethclient.Client, chainId *big.Int, beaconClient BeaconClient, verbose bool) (*eigenpodproofs.VerifyCheckpointProofsCallParams, error) {
tracing := GetContextTracingCallbacks(ctx)

tracing.OnStartSection("GetCurrentCheckpoint", map[string]string{})
Expand Down Expand Up @@ -159,10 +169,10 @@ func GenerateCheckpointProof(ctx context.Context, eigenpodAddress string, eth *e
return nil, fmt.Errorf("failed to initialize prover: %w", err)
}

return GenerateCheckpointProofForState(ctx, eigenpodAddress, beaconState, header, eth, currentCheckpoint, proofs)
return GenerateCheckpointProofForState(ctx, eigenpodAddress, beaconState, header, eth, currentCheckpoint, proofs, verbose)
}

func GenerateCheckpointProofForState(ctx context.Context, eigenpodAddress string, beaconState *spec.VersionedBeaconState, header *v1.BeaconBlockHeader, eth *ethclient.Client, currentCheckpointTimestamp uint64, proofs *eigenpodproofs.EigenPodProofs) (*eigenpodproofs.VerifyCheckpointProofsCallParams, error) {
func GenerateCheckpointProofForState(ctx context.Context, eigenpodAddress string, beaconState *spec.VersionedBeaconState, header *v1.BeaconBlockHeader, eth *ethclient.Client, currentCheckpointTimestamp uint64, proofs *eigenpodproofs.EigenPodProofs, verbose bool) (*eigenpodproofs.VerifyCheckpointProofsCallParams, error) {
tracing := GetContextTracingCallbacks(ctx)

// filter through the beaconState's validators, and select only ones that have withdrawal address set to `eigenpod`.
Expand All @@ -173,7 +183,9 @@ func GenerateCheckpointProofForState(ctx context.Context, eigenpodAddress string
}
tracing.OnEndSection()

color.Yellow("You have a total of %d validators pointed to this pod.", len(allValidators))
if verbose {
color.Yellow("You have a total of %d validators pointed to this pod.", len(allValidators))
}

tracing.OnStartSection("SelectCheckpointableValidators", map[string]string{})
checkpointValidators, err := SelectCheckpointableValidators(eth, eigenpodAddress, allValidators, currentCheckpointTimestamp)
Expand All @@ -187,7 +199,9 @@ func GenerateCheckpointProofForState(ctx context.Context, eigenpodAddress string
validatorIndices[i] = v.Index
}

color.Yellow("Proving validators at indices: %s", asJSON(validatorIndices))
if verbose {
color.Yellow("Proving validators at indices: %s", asJSON(validatorIndices))
}

tracing.OnStartSection("ProveCheckpointProofs", map[string]string{})
proof, err := proofs.ProveCheckpointProofs(header.Header.Message, beaconState, validatorIndices)
Expand Down

0 comments on commit 568591c

Please sign in to comment.