From c912ee39e83fc9f373b8e54a03a1e115d5660cc1 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 3 Sep 2024 01:59:17 +0200 Subject: [PATCH] NetworkParameters: migrate constant `BIP16_ENFORCE_TIME` to Instant --- core/src/main/java/org/bitcoinj/core/NetworkParameters.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java index b5a448554a4..d4f1ff02375 100644 --- a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java +++ b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java @@ -35,6 +35,7 @@ import javax.annotation.Nullable; import java.math.BigInteger; +import java.time.Instant; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -117,7 +118,7 @@ protected NetworkParameters(Network network) { * network rules in a soft-forking manner, that is, blocks that don't follow the rules are accepted but not * mined upon and thus will be quickly re-orged out as long as the majority are enforcing the rule. */ - public static final int BIP16_ENFORCE_TIME = 1333238400; + public static final Instant BIP16_ENFORCE_TIME = Instant.ofEpochSecond(1333238400); /** * The maximum number of coins to be generated @@ -524,7 +525,7 @@ public EnumSet getBlockVerificationFlags(final Block block, public EnumSet getTransactionVerificationFlags(final Block block, final Transaction transaction, final VersionTally tally, final Integer height) { final EnumSet verifyFlags = EnumSet.noneOf(Script.VerifyFlag.class); - if (block.time().getEpochSecond() >= NetworkParameters.BIP16_ENFORCE_TIME) + if (!block.time().isBefore(NetworkParameters.BIP16_ENFORCE_TIME)) verifyFlags.add(Script.VerifyFlag.P2SH); // Start enforcing CHECKLOCKTIMEVERIFY, (BIP65) for block.nVersion=4