Skip to content

Commit

Permalink
Genesis RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
mikera committed Dec 24, 2024
1 parent eccdc88 commit 0123dab
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Remember to test headless (i.e. no GUI) e.g. with CI server.
First set the version number for the new version to be released

```
mvn versions:set -DnewVersion='0.7.3'
mvn versions:set -DnewVersion='0.8.0' -DartifactId=* -DgroupId=*
```

### Update CHANGELOG
Expand Down
2 changes: 1 addition & 1 deletion convex-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion convex-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion convex-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion convex-core/src/main/java/convex/core/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class Constants {
/**
* Initial timestamp for new States
*/
public static final long INITIAL_TIMESTAMP = Instant.parse("2024-12-20T02:21:42.0200Z").toEpochMilli();
public static final long INITIAL_TIMESTAMP = Instant.parse("2024-12-24T16:00:00.0000Z").toEpochMilli();
// public static final long INITIAL_TIMESTAMP = Instant.parse("2024-12-06T05:08:13.0864Z").toEpochMilli();

/**
Expand Down
6 changes: 3 additions & 3 deletions convex-core/src/main/java/convex/core/cvm/PeerStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,13 @@ protected ARecordGeneric withValues(AVector<ACell> newValues) {
return new PeerStatus(newValues);
}

public PeerStatus distributeBlockReward(State state, long peerFees, long newTime) {
public PeerStatus distributeBlockReward(State state, long peerFees, long newBlockTime) {
PeerStatus ps=addReward(peerFees);
long oldTime=ps.getTimestamp();

// Maybe bump timestamp
if (oldTime<newTime) {
ps=ps.withTimestamp(newTime);
if (oldTime<newBlockTime) {
ps=ps.withTimestamp(newBlockTime);
}

return ps;
Expand Down
2 changes: 1 addition & 1 deletion convex-gui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion convex-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion convex-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<name>Convex Java Client Library</name>
Expand Down
4 changes: 2 additions & 2 deletions convex-observer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<name>Convex Observer</name>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>world.convex</groupId>
<artifactId>convex-java</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion convex-peer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion convex-restapi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion convex-sodium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
</parent>
<artifactId>convex-sodium</artifactId>
<name>Sodium integration for Convex</name>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>world.convex</groupId>
<artifactId>convex</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.8.0</version>
<packaging>pom</packaging>

<name>Convex Parent</name>
Expand Down Expand Up @@ -36,7 +36,7 @@
<hc.version>5.4.1</hc.version>
<convex.version>${project.version}</convex.version>
<!--Freeze this for reproducible builds. -->
<project.build.outputTimestamp>2024-12-06T13:13:13Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-12-24T16:47:11Z</project.build.outputTimestamp>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
</argLine>
Expand Down

0 comments on commit 0123dab

Please sign in to comment.