mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-15 04:11:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Script, ScriptBuilder: don't use current time as a default for creationTime

Browse source 
Rather, leave it `null`.
This commit is contained in:
Andreas Schildbach 2024-10-17 23:18:50 +02:00
parent f70182cbfa
commit 2589c0d7fc
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/org/bitcoinj/script/Script.java
View file

@ -240,7 +240,7 @@ public class Script {
* @return script that wraps the chunks * @return script that wraps the chunks
*/ */
public static Script of(List<ScriptChunk> chunks) { public static Script of(List<ScriptChunk> chunks) {
return of(chunks, TimeUtils.currentTime()); return of(chunks, null);
} }
/** /**
@ -263,7 +263,7 @@ public class Script {
* @throws ScriptException if the program could not be parsed * @throws ScriptException if the program could not be parsed
*/ */
public static Script parse(byte[] program) throws ScriptException { public static Script parse(byte[] program) throws ScriptException {
return parse(program, TimeUtils.currentTime()); return parse(program, null);
} }
/** /**
@ -343,7 +343,7 @@ public class Script {
*/ */
@Deprecated @Deprecated
public Script(byte[] program) { public Script(byte[] program) {
this(program, TimeUtils.currentTime()); this(program, null);
} }
/** /**
@ -351,22 +351,20 @@ public class Script {
*/ */
@Deprecated @Deprecated
public Script(byte[] program, long creationTimeInSeconds) { public Script(byte[] program, long creationTimeInSeconds) {
this(program, Instant.ofEpochSecond(creationTimeInSeconds)); this(program, creationTimeInSeconds != 0 ? Instant.ofEpochSecond(creationTimeInSeconds) : null);
} }
// When constructing from a program, we store both program and chunks // When constructing from a program, we store both program and chunks
private Script(byte[] program, Instant creationTime) { private Script(byte[] program, @Nullable Instant creationTime) {
Objects.requireNonNull(program); Objects.requireNonNull(program);
Objects.requireNonNull(creationTime);
this.program = Arrays.copyOf(program, program.length); // defensive copy; this.program = Arrays.copyOf(program, program.length); // defensive copy;
this.chunks = parseIntoChunks(this.program); this.chunks = parseIntoChunks(this.program);
this.creationTime = creationTime; this.creationTime = creationTime;
} }
// When constructing from chunks, we store only chunks, and generate program when getter is called // When constructing from chunks, we store only chunks, and generate program when getter is called
private Script(List<ScriptChunk> chunks, Instant creationTime) { private Script(List<ScriptChunk> chunks, @Nullable Instant creationTime) {
Objects.requireNonNull(chunks); Objects.requireNonNull(chunks);
Objects.requireNonNull(creationTime);
this.program = null; this.program = null;
this.chunks = Collections.unmodifiableList(new ArrayList<>(chunks)); // defensive copy this.chunks = Collections.unmodifiableList(new ArrayList<>(chunks)); // defensive copy
this.creationTime = creationTime; this.creationTime = creationTime;

11
core/src/main/java/org/bitcoinj/script/ScriptBuilder.java
View file

@ -67,7 +67,7 @@ public class ScriptBuilder {
* their addresses. * their addresses.
*/ */
@Nullable @Nullable
private Instant creationTime = TimeUtils.currentTime(); private Instant creationTime = null;
/** Creates a fresh ScriptBuilder with an empty program. */ /** Creates a fresh ScriptBuilder with an empty program. */
public ScriptBuilder() { public ScriptBuilder() {
@ -82,8 +82,6 @@ public class ScriptBuilder {
/** /**
* Associates this script to be built with a given creation time. This is currently used in the context of * Associates this script to be built with a given creation time. This is currently used in the context of
* watching wallets only, where the scriptPubKeys being watched actually represent public keys and their addresses. * watching wallets only, where the scriptPubKeys being watched actually represent public keys and their addresses.
* <p>
* If this is not set, the current time is used by the builder.
* *
* @param creationTime creation time to associate the script with * @param creationTime creation time to associate the script with
* @return this builder * @return this builder
@ -286,7 +284,10 @@ public class ScriptBuilder {
/** Creates a new immutable Script based on the state of the builder. */ /** Creates a new immutable Script based on the state of the builder. */
public Script build() { public Script build() {
return Script.of(chunks, creationTime); if (creationTime != null)
return Script.of(chunks, creationTime);
else
return Script.of(chunks);
} }
/** Creates an empty script. */ /** Creates an empty script. */
@ -306,7 +307,7 @@ public class ScriptBuilder {
} }
/** /**
* Creates a scriptPubKey that encodes payment to the given address. The creation time will be the current time. * Creates a scriptPubKey that encodes payment to the given address.
* *
* @param to address to send payment to * @param to address to send payment to
* @return scriptPubKey * @return scriptPubKey