AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Removed onlineAccountsMemPoWEnabled setting as it's no longer needed.

Browse Source
This commit is contained in:
CalDescent 2022-10-22 19:34:24 +01:00
parent e45ad37eb5
commit b37aa749c6
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/controller/OnlineAccountsManager.java
View File

@ -600,7 +600,7 @@ public class OnlineAccountsManager {
// MemoryPoW // MemoryPoW
private boolean isMemoryPoWActive(Long timestamp) { private boolean isMemoryPoWActive(Long timestamp) {
if (timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp() || Settings.getInstance().isOnlineAccountsMemPoWEnabled()) { if (timestamp >= BlockChain.getInstance().getOnlineAccountsMemoryPoWTimestamp()) {
return true; return true;
} }
return false; return false;
@ -617,7 +617,7 @@ public class OnlineAccountsManager {
private Integer computeMemoryPoW(byte[] bytes, byte[] publicKey, long onlineAccountsTimestamp) throws TimeoutException { private Integer computeMemoryPoW(byte[] bytes, byte[] publicKey, long onlineAccountsTimestamp) throws TimeoutException {
if (!isMemoryPoWActive(NTP.getTime())) { if (!isMemoryPoWActive(NTP.getTime())) {
LOGGER.info("Mempow start timestamp not yet reached, and onlineAccountsMemPoWEnabled not enabled in settings"); LOGGER.info("Mempow start timestamp not yet reached");
return null; return null;
} }

8
src/main/java/org/qortal/settings/Settings.java
View File

@ -290,10 +290,6 @@ public class Settings {
/** Additional offset added to values returned by NTP.getTime() */ /** Additional offset added to values returned by NTP.getTime() */
private Long testNtpOffset = null; private Long testNtpOffset = null;
// Online accounts
/** Whether to opt-in to mempow computations for online accounts, ahead of general release */
private boolean onlineAccountsMemPoWEnabled = false;
/* Foreign chains */ /* Foreign chains */
@ -800,10 +796,6 @@ public class Settings {
return this.testNtpOffset; return this.testNtpOffset;
} }
public boolean isOnlineAccountsMemPoWEnabled() {
return this.onlineAccountsMemPoWEnabled;
}
public long getRepositoryBackupInterval() { public long getRepositoryBackupInterval() {
return this.repositoryBackupInterval; return this.repositoryBackupInterval;
} }