Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Commit

Permalink
Try using top level changes to avoid env mutations
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wazzymandias
Wazzymandias committed Aug 9, 2023
1 parent fc32a84 commit 2ae7d96
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 33 deletions.
51 changes: 36 additions & 15 deletions miner/algo_common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,19 +367,31 @@ func BuildMultiTxSnapBlock(
buildBlockErrors []error
)

changes, err := newEnvChanges(inputEnvironment)
if err != nil {
return nil, nil, err
}
opMap := map[bool]func() error{
true: changes.env.state.MultiTxSnapshotRevert,
false: changes.env.state.MultiTxSnapshotCommit,
}

for {
order := orders.Peek()
if order == nil {
break
}

orderFailed = false
changes, err := newEnvChanges(inputEnvironment)
// if changes cannot be instantiated, return early
if err != nil {
log.Error("Failed to create changes", "err", err)
if err = changes.env.state.NewMultiTxSnapshot(); err != nil {
return nil, nil, err
}
orderFailed = false
//changes, err := newEnvChanges(inputEnvironment)
// if changes cannot be instantiated, return early
//if err != nil {
// log.Error("Failed to create changes", "err", err)
// return nil, nil, err
//}

if tx := order.Tx(); tx != nil {
_, skip, err := changes.commitTx(tx, chData)
Expand Down Expand Up @@ -423,17 +435,26 @@ func BuildMultiTxSnapBlock(
panic("unsupported order type found")
}

if orderFailed {
if err = changes.discard(); err != nil {
log.Error("Failed to discard changes with multi-transaction snapshot", "err", err)
buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to discard changes: %w", err))
}
} else {
if err = changes.apply(); err != nil {
log.Error("Failed to apply changes with multi-transaction snapshot", "err", err)
buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to apply changes: %w", err))
}
if err = opMap[orderFailed](); err != nil {
log.Error("Failed to apply changes with multi-transaction snapshot", "err", err)
buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to apply changes: %w", err))
}
//if orderFailed {
// if err = changes.discard(); err != nil {
// log.Error("Failed to discard changes with multi-transaction snapshot", "err", err)
// buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to discard changes: %w", err))
// }
//} else {
// if err = changes.apply(); err != nil {
// log.Error("Failed to apply changes with multi-transaction snapshot", "err", err)
// buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to apply changes: %w", err))
// }
//}
}

if err = changes.apply(); err != nil {
log.Error("Failed to apply changes with multi-transaction snapshot", "err", err)
buildBlockErrors = append(buildBlockErrors, fmt.Errorf("failed to apply changes: %w", err))
}

return usedBundles, usedSbundles, errors.Join(buildBlockErrors...)
Expand Down
90 changes: 72 additions & 18 deletions miner/env_changes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,36 +140,90 @@ func (c *envChanges) commitBundle(bundle *types.SimulatedBundle, chData chainDat
break
}
}
if err := c.env.state.NewMultiTxSnapshot(); err != nil {
bundleErr = err
break
}
receipt, _, err := c.commitTx(tx, chData)

if err != nil {
switch err {
case nil:
switch {
case receipt == nil:
panic("receipt is nil")
case receipt.Status == types.ReceiptStatusFailed:
isRevertibleTx := bundle.OriginalBundle.RevertingHash(txHash)
// if drop enabled, and revertible tx has error on commit, we skip the transaction and continue with next one
if algoConf.DropRevertibleTxOnErr && isRevertibleTx {
log.Trace("Found error on commit for revertible tx, but discard on err is enabled so skipping.",
"tx", txHash, "err", err)
if err := c.env.state.MultiTxSnapshotRevert(); err != nil {
panic(err)
}
} else {
bundleErr = errors.New("bundle tx revert")
}
case receipt.Status == types.ReceiptStatusSuccessful:
fallthrough
default:
if err := c.env.state.MultiTxSnapshotCommit(); err != nil {
panic(err)
}
}
default:
isRevertibleTx := bundle.OriginalBundle.RevertingHash(txHash)
// if drop enabled, and revertible tx has error on commit, we skip the transaction and continue with next one
if algoConf.DropRevertibleTxOnErr && isRevertibleTx {
log.Trace("Found error on commit for revertible tx, but discard on err is enabled so skipping.",
"tx", txHash, "err", err)
continue
}
log.Trace("Bundle tx error", "bundle", bundle.OriginalBundle.Hash, "tx", txHash, "err", err)
bundleErr = err
break
}

if receipt != nil {
if receipt.Status == types.ReceiptStatusFailed && !bundle.OriginalBundle.RevertingHash(txHash) {
// if transaction reverted and isn't specified as reverting hash, return error
log.Trace("Bundle tx failed", "bundle", bundle.OriginalBundle.Hash, "tx", txHash, "err", err)
bundleErr = errors.New("bundle tx revert")
if err := c.env.state.MultiTxSnapshotRevert(); err != nil {
panic(err)
}
} else {
bundleErr = err
}
} else {
// NOTE: The expectation is that a receipt is only nil if an error occurred.
// If there is no error but receipt is nil, there is likely a programming error.
bundleErr = errors.New("invalid receipt when no error occurred")
}

if bundleErr != nil {
if err := c.env.state.MultiTxSnapshotRevert(); err != nil {
panic(err)
}
break
}

//if err != nil {
// isRevertibleTx := bundle.OriginalBundle.RevertingHash(txHash)
// // if drop enabled, and revertible tx has error on commit, we skip the transaction and continue with next one
// if algoConf.DropRevertibleTxOnErr && isRevertibleTx {
// log.Trace("Found error on commit for revertible tx, but discard on err is enabled so skipping.",
// "tx", txHash, "err", err)
// if err := c.env.state.MultiTxSnapshotRevert(); err != nil {
// panic(err)
// }
// continue
// }
// log.Trace("Bundle tx error", "bundle", bundle.OriginalBundle.Hash, "tx", txHash, "err", err)
// bundleErr = err
// break
//}
//
//if receipt != nil {
// if receipt.Status == types.ReceiptStatusFailed && !bundle.OriginalBundle.RevertingHash(txHash) {
// // if transaction reverted and isn't specified as reverting hash, return error
// log.Trace("Bundle tx failed", "bundle", bundle.OriginalBundle.Hash, "tx", txHash, "err", err)
// bundleErr = errors.New("bundle tx revert")
// }
//} else {
// // NOTE: The expectation is that a receipt is only nil if an error occurred.
// // If there is no error but receipt is nil, there is likely a programming error.
// bundleErr = errors.New("invalid receipt when no error occurred")
//}
//
//if bundleErr != nil {
// if err := c.env.state.MultiTxSnapshotRevert(); err != nil {
// panic(err)
// }
// break
//}
}

if bundleErr != nil {
Expand Down

0 comments on commit 2ae7d96

Please sign in to comment.