Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean: rm unused columns #1835

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ public final class AccountFragment

@Getter private final AccountSnapshot oldState;
@Getter private final AccountSnapshot newState;
@Setter private int deploymentNumberInfinity = 0; // retconned on conflation end
@Setter private boolean existsInfinity = false; // retconned on conflation end
@Setter private boolean requiresRomlex;
private int codeFragmentIndex;
private final Optional<Bytes> addressToTrim;
Expand Down Expand Up @@ -157,8 +155,6 @@ public Trace trace(Trace trace) {
.pAccountDeploymentStatus(oldState.deploymentStatus())
.pAccountDeploymentNumberNew(newState.deploymentNumber())
.pAccountDeploymentStatusNew(newState.deploymentStatus())
.pAccountDeploymentNumberInfty(deploymentNumberInfinity)
.pAccountDeploymentStatusInfty(existsInfinity)
.pAccountTrmFlag(addressToTrim.isPresent())
.pAccountTrmRawAddressHi(addressToTrim.map(a -> EWord.of(a).hi()).orElse(Bytes.EMPTY))
.pAccountIsPrecompile(isPrecompile(oldState.address()));
Expand All @@ -184,8 +180,8 @@ public void resolveAtEndTransaction(

@Override
public void resolvePostConflation(Hub hub, WorldView world) {
deploymentNumberInfinity = hub.deploymentNumberOf(newState.address());
existsInfinity = world.get(newState.address()) != null;
// Note: we DO need the CFI, even if we don't have the romlex flag on, for CFI consistency
// argument.
try {
codeFragmentIndex =
hub.getCodeFragmentIndexByMetaData(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public long effectiveChildContextGasAllowance() {
public Trace trace(Trace trace) {
return trace
.pMiscStpFlag(true)
.pMiscStpInstruction(opCode.byteValue() & 0xff)
.pMiscStpInstruction(opCode.unsignedByteValue())
.pMiscStpGasHi(gas.hi())
.pMiscStpGasLo(gas.lo())
.pMiscStpValueHi(value.hi())
Expand Down
Loading