From cb553ebd9b1d163afa3a35b97cf09617c278f0c3 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 22 Jul 2025 13:58:20 +0200
Subject: [PATCH 001/297] log message when initializing SC state at
construction
---
src/qubic.cpp | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 9f4babb9a..64324b317 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -5336,19 +5336,22 @@ static bool loadComputer(CHAR16* directory, bool forceLoadFromFile)
logToConsole(L"Loading contract files ...");
for (unsigned int contractIndex = 0; contractIndex < contractCount; contractIndex++)
{
+ CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 9] = contractIndex / 1000 + L'0';
+ CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 8] = (contractIndex % 1000) / 100 + L'0';
+ CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 7] = (contractIndex % 100) / 10 + L'0';
+ CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 6] = contractIndex % 10 + L'0';
+ setText(message, L" -> ");
+ appendText(message, CONTRACT_FILE_NAME);
if (contractDescriptions[contractIndex].constructionEpoch == system.epoch && !forceLoadFromFile)
{
setMem(contractStates[contractIndex], contractDescriptions[contractIndex].stateSize, 0);
+ appendText(message, L" not loaded but initialized with zeros for construction");
+ logToConsole(message);
}
else
{
- CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 9] = contractIndex / 1000 + L'0';
- CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 8] = (contractIndex % 1000) / 100 + L'0';
- CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 7] = (contractIndex % 100) / 10 + L'0';
- CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 6] = contractIndex % 10 + L'0';
long long loadedSize = load(CONTRACT_FILE_NAME, contractDescriptions[contractIndex].stateSize, contractStates[contractIndex], directory);
- setText(message, L" -> ");
- appendText(message, CONTRACT_FILE_NAME);
+
if (loadedSize != contractDescriptions[contractIndex].stateSize)
{
if (system.epoch < contractDescriptions[contractIndex].constructionEpoch && contractDescriptions[contractIndex].stateSize >= sizeof(IPO))
From 6d2af78fc4d6e0a78d34c3918a1201020ef8b337 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 22 Jul 2025 14:28:42 +0200
Subject: [PATCH 002/297] fix output in loadComputer for files where load()
failed
---
src/qubic.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 64324b317..6084c9bdd 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -5340,10 +5340,10 @@ static bool loadComputer(CHAR16* directory, bool forceLoadFromFile)
CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 8] = (contractIndex % 1000) / 100 + L'0';
CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 7] = (contractIndex % 100) / 10 + L'0';
CONTRACT_FILE_NAME[sizeof(CONTRACT_FILE_NAME) / sizeof(CONTRACT_FILE_NAME[0]) - 6] = contractIndex % 10 + L'0';
- setText(message, L" -> ");
- appendText(message, CONTRACT_FILE_NAME);
if (contractDescriptions[contractIndex].constructionEpoch == system.epoch && !forceLoadFromFile)
{
+ setText(message, L" -> ");
+ appendText(message, CONTRACT_FILE_NAME);
setMem(contractStates[contractIndex], contractDescriptions[contractIndex].stateSize, 0);
appendText(message, L" not loaded but initialized with zeros for construction");
logToConsole(message);
@@ -5351,7 +5351,8 @@ static bool loadComputer(CHAR16* directory, bool forceLoadFromFile)
else
{
long long loadedSize = load(CONTRACT_FILE_NAME, contractDescriptions[contractIndex].stateSize, contractStates[contractIndex], directory);
-
+ setText(message, L" -> "); // set the message after loading otherwise `message` will contain potential messages from load()
+ appendText(message, CONTRACT_FILE_NAME);
if (loadedSize != contractDescriptions[contractIndex].stateSize)
{
if (system.epoch < contractDescriptions[contractIndex].constructionEpoch && contractDescriptions[contractIndex].stateSize >= sizeof(IPO))
From 3f076eec253613726737bfa6b308824f354818d8 Mon Sep 17 00:00:00 2001
From: wm <162594684+small-debug@users.noreply.github.com>
Date: Thu, 24 Jul 2025 15:56:53 +0900
Subject: [PATCH 003/297] NOST: Return the amount for user who invest in
non-investment period (#482)
---
src/contracts/Nostromo.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/contracts/Nostromo.h b/src/contracts/Nostromo.h
index 2fe184712..2d6edab48 100644
--- a/src/contracts/Nostromo.h
+++ b/src/contracts/Nostromo.h
@@ -923,6 +923,14 @@ struct NOST : public ContractBase
}
locals.tmpFundraising.raisedFunds += qpi.invocationReward();
}
+ else
+ {
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ return ;
+ }
if (locals.minCap <= locals.tmpFundraising.raisedFunds && locals.tmpFundraising.isCreatedToken == 0)
{
locals.input.assetName = state.projects.get(locals.tmpFundraising.indexOfProject).tokenName;
From a0c174ee8d00b4e18680f961a976ff7e9c483666 Mon Sep 17 00:00:00 2001
From: wm <162594684+small-debug@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:14:46 +0900
Subject: [PATCH 004/297] NOST: Checking valid time to create the fundraising
(#484)
---
src/contracts/Nostromo.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/contracts/Nostromo.h b/src/contracts/Nostromo.h
index 2d6edab48..0ac00b390 100644
--- a/src/contracts/Nostromo.h
+++ b/src/contracts/Nostromo.h
@@ -572,6 +572,14 @@ struct NOST : public ContractBase
}
return ;
}
+ if (QUOTTERY::checkValidQtryDateTime(locals.firstPhaseStartDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.firstPhaseEndDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.secondPhaseStartDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.secondPhaseEndDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.thirdPhaseStartDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.thirdPhaseEndDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.listingStartDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.cliffEndDate) == 0 || QUOTTERY::checkValidQtryDateTime(locals.vestingEndDate) == 0)
+ {
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ return ;
+ }
if (input.stepOfVesting == 0 || input.stepOfVesting > 12 || input.TGE > 50 || input.threshold > 50 || input.indexOfProject >= state.numberOfCreatedProject)
{
From 7c75362e371571bb29fda7ec2184ed96cbc4c640 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:41:50 +0200
Subject: [PATCH 005/297] update params for epoch 172 / v1.253.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 4d058020c..65d5d7302 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -56,12 +56,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 252
+#define VERSION_B 253
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 171
-#define TICK 30220000
+#define EPOCH 172
+#define TICK 30655000
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
#define DISPATCHER "XPXYKFLGSWRHRGAUKWFWVXCDVEYAPCPCNUTMUDWFGDYQCWZNJMWFZEEGCFFO"
From 6fcdd63014b353f646a880f3988264d62c4a25ce Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 29 Jul 2025 10:17:41 +0200
Subject: [PATCH 006/297] Revert "add NO_NOST toggle"
This reverts commit fc473bd121f05f64095b7a9fdebebd6f56c4ef84.
---
src/contract_core/contract_def.h | 8 --------
src/qubic.cpp | 2 --
2 files changed, 10 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 9d4c41d94..c31ec9074 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -194,8 +194,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QSWAP2
#include "contracts/Qswap.h"
-#ifndef NO_NOST
-
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
@@ -206,8 +204,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
-#endif
-
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -304,9 +300,7 @@ constexpr struct ContractDescription
{"MSVAULT", 149, 10000, sizeof(MSVAULT)}, // proposal in epoch 147, IPO in 148, construction and first use in 149
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
-#ifndef NO_NOST
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -409,9 +403,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(MSVAULT);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
-#ifndef NO_NOST
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 6084c9bdd..e79b8af42 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,7 +1,5 @@
#define SINGLE_COMPILE_UNIT
-// #define NO_NOST
-
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From 101e43b8013034bd1682c2e911feef36570d9657 Mon Sep 17 00:00:00 2001
From: wm <162594684+small-debug@users.noreply.github.com>
Date: Tue, 29 Jul 2025 19:22:37 +0900
Subject: [PATCH 007/297] fix bug due to change nost contract index 13 ~ 14
(#486)
---
test/contract_nostromo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/contract_nostromo.cpp b/test/contract_nostromo.cpp
index a1148e20f..c102cd5e3 100644
--- a/test/contract_nostromo.cpp
+++ b/test/contract_nostromo.cpp
@@ -227,7 +227,7 @@ class NostromoChecker : public NOST
assetInfo.assetName = assetName;
assetInfo.issuer = id(NOST_CONTRACT_INDEX, 0, 0, 0);
EXPECT_EQ(numberOfShares(assetInfo), projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).supplyOfToken);
- EXPECT_EQ(numberOfPossessedShares(assetName, id(NOST_CONTRACT_INDEX, 0, 0, 0), projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).creator, projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).creator, 13, 13), projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).supplyOfToken - fundaraisings.get(indexOfFundraising).soldAmount);
+ EXPECT_EQ(numberOfPossessedShares(assetName, id(NOST_CONTRACT_INDEX, 0, 0, 0), projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).creator, projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).creator, NOST_CONTRACT_INDEX, NOST_CONTRACT_INDEX), projects.get(fundaraisings.get(indexOfFundraising).indexOfProject).supplyOfToken - fundaraisings.get(indexOfFundraising).soldAmount);
}
}
void endEpochSucceedFundraisingChecker(id creator, uint32 indexOfFundraising, uint64 totalInvestedFund, uint64 originalCreatorBalance, uint64 assetName)
From 052683b6372ef4a573f81d35394466a893191608 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Sat, 19 Jul 2025 12:00:10 +0700
Subject: [PATCH 008/297] qutil: add an delay func
---
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 5 +++-
src/contract_core/qpi_mining_impl.h | 19 ++++++++++++
src/contract_core/qpi_ticking_impl.h | 15 ++++++++++
src/contracts/QUtil.h | 31 ++++++++++++++------
src/contracts/qpi.h | 12 ++++++++
src/qubic.cpp | 7 +++++
src/score.h | 43 ++++++++++++++++++++++++++++
8 files changed, 123 insertions(+), 10 deletions(-)
create mode 100644 src/contract_core/qpi_mining_impl.h
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 9dd7a3aa6..52456c8af 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -50,6 +50,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 3d0f9ab18..2bec405fb 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -270,6 +270,9 @@
platform
+
+ contract_core
+
@@ -317,4 +320,4 @@
platform
-
+
\ No newline at end of file
diff --git a/src/contract_core/qpi_mining_impl.h b/src/contract_core/qpi_mining_impl.h
new file mode 100644
index 000000000..4a300e554
--- /dev/null
+++ b/src/contract_core/qpi_mining_impl.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "contracts/qpi.h"
+
+static ScoreFunction<
+ NUMBER_OF_INPUT_NEURONS,
+ NUMBER_OF_OUTPUT_NEURONS,
+ NUMBER_OF_TICKS*2,
+ NUMBER_OF_NEIGHBORS,
+ POPULATION_THRESHOLD,
+ NUMBER_OF_MUTATIONS,
+ SOLUTION_THRESHOLD_DEFAULT,
+ 1
+>* score_qpi = nullptr; // NOTE: SC is single-threaded
+
+m256i QPI::QpiContextFunctionCall::computeMiningFunction(const m256i miningSeed, const m256i publicKey, const m256i nonce) const
+{
+ (*score_qpi)(0, publicKey, miningSeed, nonce);
+ return score_qpi->getLastOutput(0);
+}
diff --git a/src/contract_core/qpi_ticking_impl.h b/src/contract_core/qpi_ticking_impl.h
index d64f043c1..d1c2f7f95 100644
--- a/src/contract_core/qpi_ticking_impl.h
+++ b/src/contract_core/qpi_ticking_impl.h
@@ -55,4 +55,19 @@ QPI::DateAndTime QPI::QpiContextFunctionCall::now() const
result.second = etalonTick.second;
result.millisecond = etalonTick.millisecond;
return result;
+}
+
+m256i QPI::QpiContextFunctionCall::getPrevSpectrumDigest() const
+{
+ return etalonTick.prevSpectrumDigest;
+}
+
+m256i QPI::QpiContextFunctionCall::getPrevUniverseDigest() const
+{
+ return etalonTick.prevUniverseDigest;
+}
+
+m256i QPI::QpiContextFunctionCall::getPrevComputerDigest() const
+{
+ return etalonTick.prevComputerDigest;
}
\ No newline at end of file
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index d9e957bb0..9bf79b63e 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -368,15 +368,6 @@ struct QUTIL : public ContractBase
QUtilPoll current_poll;
};
- struct BEGIN_EPOCH_locals
- {
- uint64 i;
- uint64 j;
- QUtilPoll default_poll;
- QUtilVoter default_voter;
- Array zero_link;
- };
-
/**************************************/
/***********HELPER FUNCTIONS***********/
/**************************************/
@@ -1171,6 +1162,28 @@ struct QUTIL : public ContractBase
state.new_polls_this_epoch = 0;
}
+ // DF function variables
+ m256i dfMiningSeed;
+ m256i dfCurrentState;
+ BEGIN_EPOCH()
+ {
+ state.dfMiningSeed = qpi.getPrevSpectrumDigest();
+ }
+
+ struct BEGIN_TICK_locals
+ {
+ m256i dfPubkey, dfNonce;
+ };
+ /*
+ * A deterministic delay function
+ */
+ BEGIN_TICK_WITH_LOCALS()
+ {
+ locals.dfPubkey = qpi.getPrevSpectrumDigest();
+ locals.dfNonce = qpi.getPrevComputerDigest();
+ state.dfCurrentState = qpi.computeMiningFunction(state.dfMiningSeed, locals.dfPubkey, locals.dfNonce);
+ }
+
/*
* @return Return total number of shares that currently exist of the asset given as input
*/
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 652ba9cfd..acebd8a7d 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -1768,6 +1768,18 @@ namespace QPI
// return current datetime (year, month, day, hour, minute, second, millisec)
inline DateAndTime now() const;
+ // return last spectrum digest on etalonTick
+ inline m256i getPrevSpectrumDigest() const;
+
+ // return last universe digest on etalonTick
+ inline m256i getPrevUniverseDigest() const;
+
+ // return last computer digest on etalonTick
+ inline m256i getPrevComputerDigest() const;
+
+ // run the score function (in qubic mining) and return first 256 bit of output
+ inline m256i computeMiningFunction(const m256i miningSeed, const m256i publicKey, const m256i nonce) const;
+
inline bit signatureValidity(
const id& entity,
const id& digest,
diff --git a/src/qubic.cpp b/src/qubic.cpp
index e79b8af42..593b45d87 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -68,6 +68,7 @@
#include "mining/mining.h"
#include "oracles/oracle_machines.h"
+#include "contract_core/qpi_mining_impl.h"
#include "revenue.h"
////////// Qubic \\\\\\\\\\
@@ -5529,6 +5530,12 @@ static bool initialize()
}
setMem(score, sizeof(*score), 0);
+ if (!allocPoolWithErrorLog(L"score", sizeof(*score_qpi), (void**)&score_qpi, __LINE__))
+ {
+ return false;
+ }
+ setMem(score_qpi, sizeof(*score_qpi), 0);
+
setMem(solutionThreshold, sizeof(int) * MAX_NUMBER_EPOCH, 0);
if (!allocPoolWithErrorLog(L"minserSolutionFlag", NUMBER_OF_MINER_SOLUTION_FLAGS / 8, (void**)&minerSolutionFlags, __LINE__))
{
diff --git a/src/score.h b/src/score.h
index 0b027cff9..b2babb638 100644
--- a/src/score.h
+++ b/src/score.h
@@ -1282,6 +1282,40 @@ struct ScoreFunction
return score;
}
+ // return last 256 output neuron as bit
+ m256i getLastOutput()
+ {
+ unsigned long long population = bestANN.population;
+ Neuron* neurons = bestANN.neurons;
+ NeuronType* neuronTypes = bestANN.neuronTypes;
+ int count = 0;
+ int byteCount = 0;
+ uint8_t A = 0;
+ m256i result;
+ result = m256i::zero();
+
+ for (unsigned long long i = 0; i < population; i++)
+ {
+ if (neuronTypes[i] == OUTPUT_NEURON_TYPE)
+ {
+ if (neurons[i])
+ {
+ uint8_t v = (neurons[i] > 0);
+ v = v << (7 - count);
+ A |= v;
+ if (++count == 8)
+ {
+ result.m256i_u8[byteCount++] = A;
+ A = 0;
+ count = 0;
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
} _computeBuffer[solutionBufferCount];
m256i currentRandomSeed;
@@ -1378,6 +1412,15 @@ struct ScoreFunction
return _computeBuffer[solutionBufIdx].computeScore(publicKey.m256i_u8, nonce.m256i_u8, poolVec);
}
+ m256i getLastOutput(const unsigned long long processor_Number)
+ {
+ ACQUIRE(solutionEngineLock[processor_Number]);
+
+ m256i result = _computeBuffer[processor_Number].getLastOutput();
+
+ RELEASE(solutionEngineLock[processor_Number]);
+ return result;
+ }
// main score function
unsigned int operator()(const unsigned long long processor_Number, const m256i& publicKey, const m256i& miningSeed, const m256i& nonce)
{
From 486c5fa711dbf17cf031f19c8669a9ec3ae46e9b Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 30 Jul 2025 09:09:52 +0200
Subject: [PATCH 009/297] increase target tick duration to 3s
---
src/public_settings.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 65d5d7302..6f853cb09 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -23,7 +23,7 @@
// Number of ticks from prior epoch that are kept after seamless epoch transition. These can be requested after transition.
#define TICKS_TO_KEEP_FROM_PRIOR_EPOCH 100
-#define TARGET_TICK_DURATION 1500
+#define TARGET_TICK_DURATION 3000
#define TRANSACTION_SPARSENESS 1
// Below are 2 variables that are used for auto-F5 feature:
From 2a7fc3423ea1ea66db983dc5fe3d48497bf28370 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:45:06 +0700
Subject: [PATCH 010/297] Remove never called piece of code.
---
src/qubic.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 593b45d87..434c3d61b 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1886,14 +1886,6 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
}
else // Not in the full external time, just behavior like normal.
{
- // Switch back to qubic mining phase if neccessary
- if (fullExternalTimeBegin)
- {
- if (getTickInMiningPhaseCycle() <= INTERNAL_COMPUTATIONS_INTERVAL)
- {
- setNewMiningSeed();
- }
- }
fullExternalTimeBegin = false;
}
}
From 6f4c959da0783e42220ed39393cdb6d64b234f83 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 29 Jul 2025 12:13:30 +0700
Subject: [PATCH 011/297] Merge checkAndSwitchMiningPhase with
customMiningPhase.
---
src/qubic.cpp | 77 +++++++++++++++------------------------------------
1 file changed, 23 insertions(+), 54 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 434c3d61b..aa5e4c6d6 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1864,11 +1864,26 @@ static bool isFullExternalComputationTime(TimeDate tickDate)
return false;
}
+// Clean up before custom mining phase. Thread-safe function
+static void beginCustomMiningPhase()
+{
+ for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
+ {
+ gSystemCustomMiningSolutionCache[i].reset();
+ }
+
+ gSystemCustomMiningSolutionV2Cache.reset();
+ gCustomMiningStorage.reset();
+ gCustomMiningStats.phaseResetAndEpochAccumulate();
+}
+
static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
{
// Check if current time is for full custom mining period
static bool fullExternalTimeBegin = false;
- bool restartTheMiningPhase = false;
+
+ bool isBeginOfCustomMiningPhase = false;
+ char isInCustomMiningPhase = 0;
// Make sure the tick is valid
if (tickEpoch == system.epoch)
@@ -1882,9 +1897,13 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
// Turn off the qubic mining phase
score->initMiningData(m256i::zero());
+
+ // Start the custom mining phase
+ isBeginOfCustomMiningPhase = true;
}
+ isInCustomMiningPhase = 1;
}
- else // Not in the full external time, just behavior like normal.
+ else // Not in the full external time.
{
fullExternalTimeBegin = false;
}
@@ -1905,52 +1924,9 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
score->initMiningData(m256i::zero());
}
}
- }
-}
-
-// Clean up before custom mining phase. Thread-safe function
-static void beginCustomMiningPhase()
-{
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- gSystemCustomMiningSolutionCache[i].reset();
- }
-
- gSystemCustomMiningSolutionV2Cache.reset();
- gCustomMiningStorage.reset();
- gCustomMiningStats.phaseResetAndEpochAccumulate();
-}
-static void checkAndSwitchCustomMiningPhase(short tickEpoch, TimeDate tickDate)
-{
- bool isBeginOfCustomMiningPhase = false;
- char isInCustomMiningPhase = 0;
-
- // Check if current time is for full custom mining period
- static bool fullExternalTimeBegin = false;
-
- // Make sure the tick is valid
- if (tickEpoch == system.epoch)
- {
- if (isFullExternalComputationTime(tickDate))
- {
- // Trigger time
- if (!fullExternalTimeBegin)
- {
- fullExternalTimeBegin = true;
- isBeginOfCustomMiningPhase = true;
- }
- isInCustomMiningPhase = 1;
- }
- else // Not in the full external time, just behavior like normal.
- {
- fullExternalTimeBegin = false;
- }
- }
-
- if (!fullExternalTimeBegin)
- {
- const unsigned int r = getTickInMiningPhaseCycle();
+ // Setting for custom mining phase
+ isInCustomMiningPhase = 0;
if (r >= INTERNAL_COMPUTATIONS_INTERVAL)
{
isInCustomMiningPhase = 1;
@@ -1959,10 +1935,6 @@ static void checkAndSwitchCustomMiningPhase(short tickEpoch, TimeDate tickDate)
isBeginOfCustomMiningPhase = true;
}
}
- else
- {
- isInCustomMiningPhase = 0;
- }
}
// Variables need to be reset in the beginning of custom mining phase
@@ -1975,7 +1947,6 @@ static void checkAndSwitchCustomMiningPhase(short tickEpoch, TimeDate tickDate)
ACQUIRE(gIsInCustomMiningStateLock);
gIsInCustomMiningState = isInCustomMiningPhase;
RELEASE(gIsInCustomMiningStateLock);
-
}
// a function to check and switch mining phase especially for begin/end epoch event
@@ -5214,8 +5185,6 @@ static void tickProcessor(void*)
checkAndSwitchMiningPhase(tickEpoch, currentTickDate);
- checkAndSwitchCustomMiningPhase(tickEpoch, currentTickDate);
-
if (epochTransitionState == 1)
{
From 5edd494f322a65bbf12033bd12c2b2d5c608c0a4 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 29 Jul 2025 12:38:11 +0700
Subject: [PATCH 012/297] Handle begin/end of epoch in checkAndSwitchMining
function.
---
src/qubic.cpp | 161 ++++++++++++++++++++++++++------------------------
1 file changed, 83 insertions(+), 78 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index aa5e4c6d6..323978eee 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1877,62 +1877,85 @@ static void beginCustomMiningPhase()
gCustomMiningStats.phaseResetAndEpochAccumulate();
}
-static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
+// resetPhase: mining seed and beginOfCustomMiningPhase flag are only set once in the current phase, by setting this flag become true, we allow
+// set them if is in the middle of the phase.
+static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate, bool resetPhase)
{
- // Check if current time is for full custom mining period
- static bool fullExternalTimeBegin = false;
-
bool isBeginOfCustomMiningPhase = false;
char isInCustomMiningPhase = 0;
- // Make sure the tick is valid
- if (tickEpoch == system.epoch)
+ // In case of reset phase,
+ // - for internal mining phase (no matter beginning or in the middle) = > reset mining seed to new spectrum of the new epoch
+ // - for external mining phase => reset all counters are needed
+ if (resetPhase)
{
- if (isFullExternalComputationTime(tickDate))
+ const unsigned int r = getTickInMiningPhaseCycle();
+ if (r < INTERNAL_COMPUTATIONS_INTERVAL)
{
- // Trigger time
- if (!fullExternalTimeBegin)
- {
- fullExternalTimeBegin = true;
-
- // Turn off the qubic mining phase
- score->initMiningData(m256i::zero());
-
- // Start the custom mining phase
- isBeginOfCustomMiningPhase = true;
- }
- isInCustomMiningPhase = 1;
+ setNewMiningSeed();
}
- else // Not in the full external time.
+ else
{
- fullExternalTimeBegin = false;
+ score->initMiningData(m256i::zero());
+ isBeginOfCustomMiningPhase = true;
+ isInCustomMiningPhase = 1;
}
}
-
- // Incase of the full custom mining is just end. The setNewMiningSeed() will wait for next period of qubic mining phase
- if (!fullExternalTimeBegin)
+ else
{
- const unsigned int r = getTickInMiningPhaseCycle();
- if (!r)
- {
- setNewMiningSeed();
- }
- else
+ // Check if current time is for full custom mining period
+ static bool isInFullExternalTime = false;
+
+ // Make sure the tick is valid and not in the reset phase state
+ if (tickEpoch == system.epoch)
{
- if (r == INTERNAL_COMPUTATIONS_INTERVAL + 3) // 3 is added because of 3-tick shift for transaction confirmation
+ if (isFullExternalComputationTime(tickDate))
{
- score->initMiningData(m256i::zero());
+ // Trigger time
+ if (!isInFullExternalTime)
+ {
+ isInFullExternalTime = true;
+
+ // Turn off the qubic mining phase
+ score->initMiningData(m256i::zero());
+
+ // Start the custom mining phase
+ isBeginOfCustomMiningPhase = true;
+ }
+ isInCustomMiningPhase = 1;
+ }
+ else // Not in the full external time.
+ {
+ isInFullExternalTime = false;
}
}
- // Setting for custom mining phase
- isInCustomMiningPhase = 0;
- if (r >= INTERNAL_COMPUTATIONS_INTERVAL)
+ // Incase of the full custom mining is just end. The setNewMiningSeed() will wait for next period of qubic mining phase
+ if (!isInFullExternalTime)
{
- isInCustomMiningPhase = 1;
- if (r == INTERNAL_COMPUTATIONS_INTERVAL)
+ const unsigned int r = getTickInMiningPhaseCycle();
+ if (!r)
+ {
+ setNewMiningSeed();
+ }
+ else
{
- isBeginOfCustomMiningPhase = true;
+ if (r == INTERNAL_COMPUTATIONS_INTERVAL + 3) // 3 is added because of 3-tick shift for transaction confirmation
+ {
+ score->initMiningData(m256i::zero());
+ }
+
+ // Setting for custom mining phase
+ isInCustomMiningPhase = 0;
+ if (r >= INTERNAL_COMPUTATIONS_INTERVAL)
+ {
+ isInCustomMiningPhase = 1;
+ // Begin of custom mining phase. Turn the flag on so we can reset some state variables
+ if (r == INTERNAL_COMPUTATIONS_INTERVAL)
+ {
+ isBeginOfCustomMiningPhase = true;
+ }
+ }
}
}
}
@@ -1949,28 +1972,6 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate)
RELEASE(gIsInCustomMiningStateLock);
}
-// a function to check and switch mining phase especially for begin/end epoch event
-// if we are in internal mining phase (no matter beginning or in the middle) => reset mining seed to new spectrum of the new epoch
-// same for external mining phase => reset all counters are needed
-// this function should be called after beginEpoch procedure
-// TODO: merge checkMiningPhaseBeginAndEndEpoch + checkAndSwitchCustomMiningPhase + checkAndSwitchMiningPhase
-static void checkMiningPhaseBeginAndEndEpoch()
-{
- const unsigned int r = getTickInMiningPhaseCycle();
- if (r < INTERNAL_COMPUTATIONS_INTERVAL)
- {
- setNewMiningSeed();
- }
- else
- {
- score->initMiningData(m256i::zero());
- beginCustomMiningPhase();
- ACQUIRE(gIsInCustomMiningStateLock);
- gIsInCustomMiningState = 1;
- RELEASE(gIsInCustomMiningStateLock);
- }
-}
-
// Updates the global numberTickTransactions based on the tick data in the tick storage.
static void updateNumberOfTickTransactions()
{
@@ -5169,22 +5170,7 @@ static void tickProcessor(void*)
updateNumberOfTickTransactions();
- short tickEpoch = 0;
- TimeDate currentTickDate;
- ts.tickData.acquireLock();
- const TickData& td = ts.tickData[currentTickIndex];
- currentTickDate.millisecond = td.millisecond;
- currentTickDate.second = td.second;
- currentTickDate.minute = td.minute;
- currentTickDate.hour = td.hour;
- currentTickDate.day = td.day;
- currentTickDate.month = td.month;
- currentTickDate.year = td.year;
- tickEpoch = td.epoch == system.epoch ? system.epoch : 0;
- ts.tickData.releaseLock();
-
- checkAndSwitchMiningPhase(tickEpoch, currentTickDate);
-
+ bool isBeginEpoch = false;
if (epochTransitionState == 1)
{
@@ -5203,7 +5189,7 @@ static void tickProcessor(void*)
epochTransitionState = 2;
beginEpoch();
- checkMiningPhaseBeginAndEndEpoch();
+ isBeginEpoch = true;
// Some debug checks that we are ready for the next epoch
ASSERT(system.numberOfSolutions == 0);
@@ -5235,6 +5221,22 @@ static void tickProcessor(void*)
}
ASSERT(epochTransitionWaitingRequestProcessors >= 0 && epochTransitionWaitingRequestProcessors <= nRequestProcessorIDs);
+ short tickEpoch = 0;
+ TimeDate currentTickDate;
+ ts.tickData.acquireLock();
+ const TickData& td = ts.tickData[currentTickIndex];
+ currentTickDate.millisecond = td.millisecond;
+ currentTickDate.second = td.second;
+ currentTickDate.minute = td.minute;
+ currentTickDate.hour = td.hour;
+ currentTickDate.day = td.day;
+ currentTickDate.month = td.month;
+ currentTickDate.year = td.year;
+ tickEpoch = td.epoch == system.epoch ? system.epoch : 0;
+ ts.tickData.releaseLock();
+
+ checkAndSwitchMiningPhase(tickEpoch, currentTickDate, isBeginEpoch);
+
gTickNumberOfComputors = 0;
gTickTotalNumberOfComputors = 0;
targetNextTickDataDigestIsKnown = false;
@@ -5652,7 +5654,10 @@ static bool initialize()
}
else
{
- checkMiningPhaseBeginAndEndEpoch();
+ short tickEpoch = -1;
+ TimeDate tickDate;
+ setMem((void*)&tickDate, sizeof(TimeDate), 0);
+ checkAndSwitchMiningPhase(tickEpoch, tickDate, true);
}
score->loadScoreCache(system.epoch);
From 7845e5763c1e2d2a7a56f5943d79438141ba4670 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 30 Jul 2025 09:53:32 +0200
Subject: [PATCH 013/297] group all QUtil state vars together, fix linker error
in test project
---
src/contract_core/qpi_mining_impl.h | 2 ++
src/contracts/QUtil.h | 7 ++++---
src/score.h | 4 ++--
test/contract_testing.h | 1 +
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/contract_core/qpi_mining_impl.h b/src/contract_core/qpi_mining_impl.h
index 4a300e554..229550b0d 100644
--- a/src/contract_core/qpi_mining_impl.h
+++ b/src/contract_core/qpi_mining_impl.h
@@ -1,5 +1,7 @@
#pragma once
+
#include "contracts/qpi.h"
+#include "score.h"
static ScoreFunction<
NUMBER_OF_INPUT_NEURONS,
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 9bf79b63e..fc56be116 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -106,6 +106,10 @@ struct QUTIL : public ContractBase
uint64 current_poll_id;
uint64 new_polls_this_epoch;
+ // DF function variables
+ m256i dfMiningSeed;
+ m256i dfCurrentState;
+
// Get Qubic Balance
struct get_qubic_balance_input {
id address;
@@ -1162,9 +1166,6 @@ struct QUTIL : public ContractBase
state.new_polls_this_epoch = 0;
}
- // DF function variables
- m256i dfMiningSeed;
- m256i dfCurrentState;
BEGIN_EPOCH()
{
state.dfMiningSeed = qpi.getPrevSpectrumDigest();
diff --git a/src/score.h b/src/score.h
index b2babb638..cdc096308 100644
--- a/src/score.h
+++ b/src/score.h
@@ -340,7 +340,7 @@ static void packNegPosWithPadding(const char* data,
}
}
-void unpackNegPosBits(const unsigned char* negMask,
+static void unpackNegPosBits(const unsigned char* negMask,
const unsigned char* posMask,
unsigned long long dataSize,
unsigned long long paddedSize,
@@ -1282,7 +1282,7 @@ struct ScoreFunction
return score;
}
- // return last 256 output neuron as bit
+ // returns last computed output neurons, only returns 256 non-zero neurons, neuron values are compressed to bit
m256i getLastOutput()
{
unsigned long long population = bestANN.population;
diff --git a/test/contract_testing.h b/test/contract_testing.h
index 2e92a267b..6e56c8c89 100644
--- a/test/contract_testing.h
+++ b/test/contract_testing.h
@@ -19,6 +19,7 @@
#include "contract_core/qpi_system_impl.h"
#include "contract_core/qpi_ticking_impl.h"
#include "contract_core/qpi_ipo_impl.h"
+#include "contract_core/qpi_mining_impl.h"
#include "test_util.h"
From 778c1e7cc1c3e334bdcce995dbe0ef86162eafda Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Thu, 31 Jul 2025 17:38:45 +0200
Subject: [PATCH 014/297] Adjust TARGET_TICK_DURATION (#490)
---
src/public_settings.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 6f853cb09..67918bd7e 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -23,7 +23,7 @@
// Number of ticks from prior epoch that are kept after seamless epoch transition. These can be requested after transition.
#define TICKS_TO_KEEP_FROM_PRIOR_EPOCH 100
-#define TARGET_TICK_DURATION 3000
+#define TARGET_TICK_DURATION 1000
#define TRANSACTION_SPARSENESS 1
// Below are 2 variables that are used for auto-F5 feature:
@@ -57,7 +57,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define VERSION_A 1
#define VERSION_B 253
-#define VERSION_C 0
+#define VERSION_C 1
// Epoch and initial tick for node startup
#define EPOCH 172
From f1ec55955054b44d08dfbcfe6fd2fea6ba071c58 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Fri, 1 Aug 2025 17:40:36 +0200
Subject: [PATCH 015/297] Add VottunBridge smart contract for cross-chain
bridge functionality
---
src/contracts/VottunBridge.h | 1384 ++++++++++++++++++++++++++++++++++
1 file changed, 1384 insertions(+)
create mode 100644 src/contracts/VottunBridge.h
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
new file mode 100644
index 000000000..102d032b8
--- /dev/null
+++ b/src/contracts/VottunBridge.h
@@ -0,0 +1,1384 @@
+#pragma once
+#include "qpi.h"
+
+using namespace QPI;
+
+struct VOTTUNBRIDGE2
+{
+};
+
+struct VOTTUNBRIDGE : public ContractBase
+{
+public:
+ // Bridge Order Structure
+ struct BridgeOrder
+ {
+ id qubicSender; // Sender address on Qubic
+ id qubicDestination; // Destination address on Qubic
+ Array ethAddress; // Destination Ethereum address
+ uint64 orderId; // Unique ID for the order
+ uint64 amount; // Amount to transfer
+ uint8 orderType; // Type of order (e.g., mint, transfer)
+ uint8 status; // Order status (e.g., Created, Pending, Refunded)
+ bit fromQubicToEthereum; // Direction of transfer
+ };
+
+ // Input and Output Structs
+ struct createOrder_input
+ {
+ Array ethAddress;
+ uint64 amount;
+ bit fromQubicToEthereum;
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
+ };
+
+ struct createOrder_output
+ {
+ uint8 status;
+ uint64 orderId;
+ };
+
+ struct setAdmin_input
+ {
+ id address;
+ };
+
+ struct setAdmin_output
+ {
+ uint8 status;
+ };
+
+ struct addManager_input
+ {
+ id address;
+ };
+
+ struct addManager_output
+ {
+ uint8 status;
+ };
+
+ struct removeManager_input
+ {
+ id address;
+ };
+
+ struct removeManager_output
+ {
+ uint8 status;
+ };
+
+ struct getTotalReceivedTokens_input
+ {
+ uint64 amount;
+ };
+
+ struct getTotalReceivedTokens_output
+ {
+ uint64 totalTokens;
+ };
+
+ struct completeOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct completeOrder_output
+ {
+ uint8 status;
+ };
+
+ struct refundOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct refundOrder_output
+ {
+ uint8 status;
+ };
+
+ struct transferToContract_input
+ {
+ uint64 amount;
+ };
+
+ struct transferToContract_output
+ {
+ uint8 status;
+ };
+
+ // NUEVA: Withdraw Fees structures
+ struct withdrawFees_input
+ {
+ uint64 amount;
+ };
+
+ struct withdrawFees_output
+ {
+ uint8 status;
+ };
+
+ // NUEVA: Get Available Fees structures
+ struct getAvailableFees_input
+ {
+ // Sin parámetros
+ };
+
+ struct getAvailableFees_output
+ {
+ uint64 availableFees;
+ uint64 totalEarnedFees;
+ uint64 totalDistributedFees;
+ };
+
+ // Order Response Structure
+ struct OrderResponse
+ {
+ id originAccount; // Origin account
+ Array destinationAccount; // Destination account
+ uint64 orderId; // Order ID as uint64
+ uint64 amount; // Amount as uint64
+ Array memo; // Notes or metadata
+ uint32 sourceChain; // Source chain identifier
+ id qubicDestination;
+ };
+
+ struct getOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct getOrder_output
+ {
+ uint8 status;
+ OrderResponse order; // Updated response format
+ Array message;
+ };
+
+ struct getAdminID_input
+ {
+ uint8 idInput;
+ };
+
+ struct getAdminID_output
+ {
+ id adminId;
+ };
+
+ struct getContractInfo_input
+ {
+ // Sin parámetros
+ };
+
+ struct getContractInfo_output
+ {
+ id admin;
+ Array managers;
+ uint64 nextOrderId;
+ uint64 lockedTokens;
+ uint64 totalReceivedTokens;
+ uint64 earnedFees;
+ uint32 tradeFeeBillionths;
+ uint32 sourceChain;
+ // NUEVO: Debug info
+ Array firstOrders; // Primeras 10 órdenes
+ uint64 totalOrdersFound; // Cuántas órdenes no vacías hay
+ uint64 emptySlots;
+ };
+
+ // Logger structures
+ struct EthBridgeLogger
+ {
+ uint32 _contractIndex; // Index of the contract
+ uint32 _errorCode; // Error code
+ uint64 _orderId; // Order ID if applicable
+ uint64 _amount; // Amount involved in the operation
+ char _terminator; // Marks the end of the logged data
+ };
+
+ struct AddressChangeLogger
+ {
+ id _newAdminAddress; // New admin address
+ uint32 _contractIndex;
+ uint8 _eventCode; // Event code 'adminchanged'
+ char _terminator;
+ };
+
+ struct TokensLogger
+ {
+ uint32 _contractIndex;
+ uint64 _lockedTokens; // Balance tokens locked
+ uint64 _totalReceivedTokens; // Balance total receivedTokens
+ char _terminator;
+ };
+
+ struct getTotalLockedTokens_locals
+ {
+ EthBridgeLogger log;
+ };
+
+ struct getTotalLockedTokens_input
+ {
+ // No input parameters
+ };
+
+ struct getTotalLockedTokens_output
+ {
+ uint64 totalLockedTokens;
+ };
+
+ // Enum for error codes
+ enum EthBridgeError
+ {
+ onlyManagersCanCompleteOrders = 1,
+ invalidAmount = 2,
+ insufficientTransactionFee = 3,
+ orderNotFound = 4,
+ invalidOrderState = 5,
+ insufficientLockedTokens = 6,
+ transferFailed = 7,
+ maxManagersReached = 8,
+ notAuthorized = 9,
+ onlyManagersCanRefundOrders = 10
+ };
+
+public:
+ // Contract State
+ Array orders; // Increased from 256 to 1024
+ id admin; // Primary admin address
+ id feeRecipient; // NUEVA: Wallet específica para recibir las fees
+ Array managers; // Managers list
+ uint64 nextOrderId; // Counter for order IDs
+ uint64 lockedTokens; // Total locked tokens in the contract (balance)
+ uint64 totalReceivedTokens; // Total tokens received
+ uint32 sourceChain; // Source chain identifier (e.g., Ethereum=1, Qubic=0)
+ uint32 _tradeFeeBillionths; // Trade fee in billionths (e.g., 0.5% = 5,000,000)
+ uint64 _earnedFees; // Accumulated fees from trades
+ uint64 _distributedFees; // Fees already distributed to shareholders
+ uint64 _earnedFeesQubic; // Accumulated fees from Qubic trades
+ uint64 _distributedFeesQubic; // Fees already distributed to Qubic shareholders
+
+ // Internal methods for admin/manager permissions
+ typedef id isAdmin_input;
+ typedef bit isAdmin_output;
+
+ PRIVATE_FUNCTION(isAdmin)
+ {
+ output = (qpi.invocator() == state.admin);
+ }
+
+ typedef id isManager_input;
+ typedef bit isManager_output;
+
+ PRIVATE_FUNCTION(isManager)
+ {
+ for (uint64 i = 0; i < state.managers.capacity(); ++i)
+ {
+ if (state.managers.get(i) == input)
+ {
+ output = true;
+ return;
+ }
+ }
+ output = false;
+ }
+
+public:
+ // Create a new order and lock tokens
+ struct createOrder_locals
+ {
+ BridgeOrder newOrder;
+ EthBridgeLogger log;
+ uint64 i;
+ bit slotFound;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
+ {
+ // Validate the input
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 1; // Error
+ return;
+ }
+
+ // Calculate fees as percentage of amount (0.5% each, 1% total)
+ uint64 requiredFeeEth = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
+ uint64 requiredFeeQubic = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
+ uint64 totalRequiredFee = requiredFeeEth + requiredFeeQubic;
+
+ // Verify that the fee paid is sufficient for both fees
+ if (qpi.invocationReward() < static_cast(totalRequiredFee))
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientTransactionFee,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 2; // Error
+ return;
+ }
+
+ // Accumulate fees in their respective variables
+ state._earnedFees += requiredFeeEth;
+ state._earnedFeesQubic += requiredFeeQubic;
+
+ // Create the order
+ locals.newOrder.orderId = state.nextOrderId++;
+ locals.newOrder.qubicSender = qpi.invocator();
+
+ // Set qubicDestination according to the direction
+ if (!input.fromQubicToEthereum)
+ {
+ // EVM TO QUBIC
+ locals.newOrder.qubicDestination = input.qubicDestination;
+
+ // Verify that there are enough locked tokens for EVM to Qubic orders
+ if (state.lockedTokens < input.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+ }
+ else
+ {
+ // QUBIC TO EVM
+ locals.newOrder.qubicDestination = qpi.invocator();
+ }
+
+ for (uint64 i = 0; i < 42; ++i)
+ {
+ locals.newOrder.ethAddress.set(i, input.ethAddress.get(i));
+ }
+ locals.newOrder.amount = input.amount;
+ locals.newOrder.orderType = 0; // Default order type
+ locals.newOrder.status = 0; // Created
+ locals.newOrder.fromQubicToEthereum = input.fromQubicToEthereum;
+
+ // Store the order
+ locals.slotFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).status == 255)
+ { // Empty slot
+ state.orders.set(locals.i, locals.newOrder);
+ locals.slotFound = true;
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.newOrder.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ output.orderId = locals.newOrder.orderId;
+ return;
+ }
+ }
+
+ // No available slots - attempt cleanup of completed orders
+ if (!locals.slotFound)
+ {
+ // Clean up completed and refunded orders to free slots
+ locals.cleanedSlots = 0;
+ for (uint64 j = 0; j < state.orders.capacity(); ++j)
+ {
+ if (state.orders.get(j).status == 2) // Completed or Refunded
+ {
+ // Create empty order to overwrite
+ locals.emptyOrder.status = 255; // Mark as empty
+ locals.emptyOrder.orderId = 0;
+ locals.emptyOrder.amount = 0;
+ // Clear other fields as needed
+ state.orders.set(j, locals.emptyOrder);
+ locals.cleanedSlots++;
+ }
+ }
+
+ // If we cleaned some slots, try to find a slot again
+ if (locals.cleanedSlots > 0)
+ {
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).status == 255)
+ { // Empty slot
+ state.orders.set(locals.i, locals.newOrder);
+ locals.slotFound = true;
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.newOrder.orderId,
+ input.amount,
+ locals.cleanedSlots }; // Log number of cleaned slots
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ output.orderId = locals.newOrder.orderId;
+ return;
+ }
+ }
+ }
+
+ // If still no slots available after cleanup
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 99, // Custom error code for "no available slots"
+ 0, // No orderId
+ locals.cleanedSlots, // Number of slots cleaned
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 3; // Error: no available slots
+ return;
+ }
+ }
+
+ // Retrieve an order
+ struct getOrder_locals
+ {
+ EthBridgeLogger log;
+ BridgeOrder order;
+ OrderResponse orderResp;
+ uint64 i;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getOrder)
+ {
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ locals.order = state.orders.get(locals.i);
+ if (locals.order.orderId == input.orderId && locals.order.status != 255)
+ {
+ // Populate OrderResponse with BridgeOrder data
+ locals.orderResp.orderId = locals.order.orderId;
+ locals.orderResp.originAccount = locals.order.qubicSender;
+ locals.orderResp.destinationAccount = locals.order.ethAddress;
+ locals.orderResp.amount = locals.order.amount;
+ locals.orderResp.sourceChain = state.sourceChain;
+ locals.orderResp.qubicDestination = locals.order.qubicDestination; // <-- Añade esta línea
+
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.order.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+
+ output.status = 0; // Success
+ output.order = locals.orderResp;
+ return;
+ }
+ }
+
+ // If order not found
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 1; // Error
+ }
+
+ // Admin Functions
+ struct setAdmin_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger adminLog;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized; // Error
+ return;
+ }
+
+ state.admin = input.address;
+
+ // Logging the admin address has changed
+ locals.adminLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 1, // Event code "Admin Changed"
+ 0 };
+ LOG_INFO(locals.adminLog);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ struct addManager_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger managerLog;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(addManager)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == NULL_ID)
+ {
+ state.managers.set(locals.i, input.address);
+
+ locals.managerLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 2, // Manager added
+ 0 };
+ LOG_INFO(locals.managerLog);
+ output.status = 0; // Success
+ return;
+ }
+ }
+
+ // No empty slot found
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::maxManagersReached,
+ 0, // No orderId
+ 0, // No amount
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::maxManagersReached;
+ return;
+ }
+
+ struct removeManager_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger managerLog;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(removeManager)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized; // Error
+ return;
+ }
+
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == input.address)
+ {
+ state.managers.set(locals.i, NULL_ID);
+
+ locals.managerLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 3, // Manager removed
+ 0 };
+ LOG_INFO(locals.managerLog);
+ output.status = 0; // Success
+ return;
+ }
+ }
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ struct getTotalReceivedTokens_locals
+ {
+ EthBridgeLogger log;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getTotalReceivedTokens)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ state.totalReceivedTokens, // Amount of total tokens
+ 0 };
+ LOG_INFO(locals.log);
+ output.totalTokens = state.totalReceivedTokens;
+ }
+
+ struct completeOrder_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ bit orderFound;
+ BridgeOrder order;
+ TokensLogger logTokens;
+ uint64 i;
+ };
+
+ // Complete an order and release tokens
+ PUBLIC_PROCEDURE_WITH_LOCALS(completeOrder)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Verify that the invocator is a manager
+ if (!locals.isManagerOperating)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::onlyManagersCanCompleteOrders,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::onlyManagersCanCompleteOrders; // Error: not a manager
+ return;
+ }
+
+ // Check if the order exists
+ locals.orderFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).orderId == input.orderId)
+ {
+ locals.order = state.orders.get(locals.i);
+ locals.orderFound = true;
+ break;
+ }
+ }
+
+ // Order not found
+ if (!locals.orderFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::orderNotFound; // Error
+ return;
+ }
+
+ // Check order status
+ if (locals.order.status != 0)
+ { // Check it is not completed or refunded already
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState; // Error
+ return;
+ }
+
+ // Use full amount without deducting commission (commission was already charged in createOrder)
+ uint64 netAmount = locals.order.amount;
+
+ // Handle order based on transfer direction
+ if (locals.order.fromQubicToEthereum)
+ {
+ // Ensure sufficient tokens were transferred to the contract
+ if (state.totalReceivedTokens - state.lockedTokens < locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+
+ state.lockedTokens += netAmount; // increase the amount of locked tokens by net amount
+ state.totalReceivedTokens -= locals.order.amount; // decrease the amount of no-locked (received) tokens by gross amount
+ locals.logTokens = TokensLogger{
+ CONTRACT_INDEX,
+ state.lockedTokens,
+ state.totalReceivedTokens,
+ 0 };
+ LOG_INFO(locals.logTokens);
+ }
+ else
+ {
+ // Ensure sufficient tokens are locked for the order
+ if (state.lockedTokens < locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+
+ // Transfer tokens back to the user
+ if (qpi.transfer(locals.order.qubicDestination, netAmount) < 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::transferFailed; // Error
+ return;
+ }
+
+ state.lockedTokens -= locals.order.amount;
+ locals.logTokens = TokensLogger{
+ CONTRACT_INDEX,
+ state.lockedTokens,
+ state.totalReceivedTokens,
+ 0 };
+ LOG_INFO(locals.logTokens);
+ }
+
+ // Mark the order as completed
+ locals.order.status = 1; // Completed
+ state.orders.set(locals.i, locals.order); // Use the loop index
+
+ output.status = 0; // Success
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ }
+
+ // Refund an order and unlock tokens
+ struct refundOrder_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ bit orderFound;
+ BridgeOrder order;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(refundOrder)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Check if the order is handled by a manager
+ if (!locals.isManagerOperating)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::onlyManagersCanRefundOrders,
+ input.orderId,
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::onlyManagersCanRefundOrders; // Error
+ return;
+ }
+
+ // Retrieve the order
+ locals.orderFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).orderId == input.orderId)
+ {
+ locals.order = state.orders.get(locals.i);
+ locals.orderFound = true;
+ break;
+ }
+ }
+
+ // Order not found
+ if (!locals.orderFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::orderNotFound; // Error
+ return;
+ }
+
+ // Check order status
+ if (locals.order.status != 0)
+ { // Check it is not completed or refunded already
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState; // Error
+ return;
+ }
+
+ // Verify if there are enough locked tokens for the refund
+ if (locals.order.fromQubicToEthereum && state.lockedTokens < locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+
+ // Update the status and refund tokens
+ qpi.transfer(locals.order.qubicSender, locals.order.amount);
+
+ // Only decrease locked tokens for Qubic-to-Ethereum orders
+ if (locals.order.fromQubicToEthereum)
+ {
+ state.lockedTokens -= locals.order.amount;
+ }
+
+ locals.order.status = 2; // Refunded
+ state.orders.set(locals.i, locals.order); // Use the loop index instead of orderId
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ // Transfer tokens to the contract
+ struct transferToContract_locals
+ {
+ EthBridgeLogger log;
+ TokensLogger logTokens;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(transferToContract)
+ {
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount; // Error
+ return;
+ }
+
+ if (qpi.transfer(SELF, input.amount) < 0)
+ {
+ output.status = EthBridgeError::transferFailed; // Error
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ return;
+ }
+
+ // Update the total received tokens
+ state.totalReceivedTokens += input.amount;
+ locals.logTokens = TokensLogger{
+ CONTRACT_INDEX,
+ state.lockedTokens,
+ state.totalReceivedTokens,
+ 0 };
+ LOG_INFO(locals.logTokens);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ // NUEVA: Withdraw Fees function
+ struct withdrawFees_locals
+ {
+ EthBridgeLogger log;
+ uint64 availableFees;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(withdrawFees)
+ {
+ // Verificar que solo el admin puede retirar fees
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ // Calcular fees disponibles
+ locals.availableFees = state._earnedFees - state._distributedFees;
+
+ // Verificar que hay suficientes fees disponibles
+ if (input.amount > locals.availableFees)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens, // Reutilizamos este error
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens;
+ return;
+ }
+
+ // Verificar que el amount es válido
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Transferir las fees al wallet designado
+ if (qpi.transfer(state.feeRecipient, input.amount) < 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::transferFailed;
+ return;
+ }
+
+ // Actualizar el contador de fees distribuidas
+ state._distributedFees += input.amount;
+
+ // Log exitoso
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+
+ output.status = 0; // Success
+ }
+
+ struct getAdminID_locals
+ { /* Empty, for consistency */
+ };
+ PUBLIC_FUNCTION_WITH_LOCALS(getAdminID)
+ {
+ output.adminId = state.admin;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getTotalLockedTokens)
+ {
+ // Log for debugging
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ state.lockedTokens, // Amount of locked tokens
+ 0 };
+ LOG_INFO(locals.log);
+
+ // Assign the value of lockedTokens to the output
+ output.totalLockedTokens = state.lockedTokens;
+ }
+
+ // Structure for the input of the getOrderByDetails function
+ struct getOrderByDetails_input
+ {
+ Array ethAddress; // Ethereum address
+ uint64 amount; // Transaction amount
+ uint8 status; // Order status (0 = created, 1 = completed, 2 = refunded)
+ };
+
+ // Structure for the output of the getOrderByDetails function
+ struct getOrderByDetails_output
+ {
+ uint8 status; // Operation status (0 = success, other = error)
+ uint64 orderId; // ID of the found order
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
+ };
+
+ // Function to search for an order by details
+ struct getOrderByDetails_locals
+ {
+ uint64 i;
+ uint64 j;
+ bit addressMatch; // Flag to check if addresses match
+ BridgeOrder order;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getOrderByDetails)
+ {
+ // Validate input parameters
+ if (input.amount == 0)
+ {
+ output.status = 2; // Error: invalid amount
+ output.orderId = 0;
+ return;
+ }
+
+ // Iterate through all orders
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ locals.order = state.orders.get(locals.i);
+
+ // Check if the order matches the criteria
+ if (locals.order.status == 255) // Empty slot
+ continue;
+
+ // Compare ethAddress arrays element by element
+ locals.addressMatch = true;
+ for (locals.j = 0; locals.j < 42; ++locals.j)
+ {
+ if (locals.order.ethAddress.get(locals.j) != input.ethAddress.get(locals.j))
+ {
+ locals.addressMatch = false;
+ break;
+ }
+ }
+
+ // Verify exact match
+ if (locals.addressMatch &&
+ locals.order.amount == input.amount &&
+ locals.order.status == input.status)
+ {
+ // Found an exact match
+ output.status = 0; // Success
+ output.orderId = locals.order.orderId;
+ return;
+ }
+ }
+
+ // If no matching order was found
+ output.status = 1; // Not found
+ output.orderId = 0;
+ }
+
+ // Add Liquidity structures
+ struct addLiquidity_input
+ {
+ // No input parameters - amount comes from qpi.invocationReward()
+ };
+
+ struct addLiquidity_output
+ {
+ uint8 status; // Operation status (0 = success, other = error)
+ uint64 addedAmount; // Amount of tokens added to liquidity
+ uint64 totalLocked; // Total locked tokens after addition
+ };
+
+ struct addLiquidity_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ uint64 depositAmount;
+ };
+
+ // Add liquidity to the bridge (for managers to provide initial/additional liquidity)
+ PUBLIC_PROCEDURE_WITH_LOCALS(addLiquidity)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Verify that the invocator is a manager or admin
+ if (!locals.isManagerOperating && locals.invocatorAddress != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0
+ };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ // Get the amount of tokens sent with this call
+ locals.depositAmount = qpi.invocationReward();
+
+ // Validate that some tokens were sent
+ if (locals.depositAmount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0
+ };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Add the deposited tokens to the locked tokens pool
+ state.lockedTokens += locals.depositAmount;
+ state.totalReceivedTokens += locals.depositAmount;
+
+ // Log the successful liquidity addition
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ locals.depositAmount, // Amount added
+ state.lockedTokens // New total locked tokens
+ };
+ LOG_INFO(locals.log);
+
+ // Set output values
+ output.status = 0; // Success
+ output.addedAmount = locals.depositAmount;
+ output.totalLocked = state.lockedTokens;
+ }
+
+ // NUEVA: Get Available Fees function
+ PUBLIC_FUNCTION(getAvailableFees)
+ {
+ output.availableFees = state._earnedFees - state._distributedFees;
+ output.totalEarnedFees = state._earnedFees;
+ output.totalDistributedFees = state._distributedFees;
+ }
+
+ // NEW: Enhanced contract info function
+ PUBLIC_FUNCTION(getContractInfo)
+ {
+ output.admin = state.admin;
+ output.managers = state.managers;
+ output.nextOrderId = state.nextOrderId;
+ output.lockedTokens = state.lockedTokens;
+ output.totalReceivedTokens = state.totalReceivedTokens;
+ output.earnedFees = state._earnedFees;
+ output.tradeFeeBillionths = state._tradeFeeBillionths;
+ output.sourceChain = state.sourceChain;
+
+ // NUEVO: Debug - copiar primeras 10 órdenes
+ output.totalOrdersFound = 0;
+ output.emptySlots = 0;
+
+ for (uint64 i = 0; i < 10 && i < state.orders.capacity(); ++i)
+ {
+ output.firstOrders.set(i, state.orders.get(i));
+ }
+
+ // Contar órdenes reales vs vacías
+ for (uint64 i = 0; i < state.orders.capacity(); ++i)
+ {
+ if (state.orders.get(i).status == 255)
+ {
+ output.emptySlots++;
+ }
+ else
+ {
+ output.totalOrdersFound++;
+ }
+ }
+ }
+
+ // Called at the end of every tick to distribute earned fees
+ // COMENTADO: Para evitar distribución automática y permitir withdrawFees
+
+ END_TICK()
+ {
+ uint64 feesToDistributeInThisTick = state._earnedFeesQubic - state._distributedFeesQubic;
+
+ if (feesToDistributeInThisTick > 0)
+ {
+ // Distribute fees to computors holding shares of this contract.
+ // NUMBER_OF_COMPUTORS is a Qubic global constant (typically 676).
+ uint64 amountPerComputor = div(feesToDistributeInThisTick, (uint64)NUMBER_OF_COMPUTORS);
+
+ if (amountPerComputor > 0)
+ {
+ if (qpi.distributeDividends(amountPerComputor))
+ {
+ state._distributedFeesQubic += amountPerComputor * NUMBER_OF_COMPUTORS;
+ }
+ }
+ }
+
+ // Distribución de tarifas de Vottun al feeRecipient
+ uint64 vottunFeesToDistribute = state._earnedFees - state._distributedFees;
+
+ if (vottunFeesToDistribute > 0 && state.feeRecipient != 0)
+ {
+ if (qpi.transfer(state.feeRecipient, vottunFeesToDistribute))
+ {
+ state._distributedFees += vottunFeesToDistribute;
+ }
+ }
+ }
+
+
+ // Register Functions and Procedures
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ REGISTER_USER_FUNCTION(getOrder, 1);
+ REGISTER_USER_FUNCTION(isAdmin, 2);
+ REGISTER_USER_FUNCTION(isManager, 3);
+ REGISTER_USER_FUNCTION(getTotalReceivedTokens, 4);
+ REGISTER_USER_FUNCTION(getAdminID, 5);
+ REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
+ REGISTER_USER_FUNCTION(getOrderByDetails, 7);
+ REGISTER_USER_FUNCTION(getContractInfo, 8);
+ REGISTER_USER_FUNCTION(getAvailableFees, 9); // NUEVA función
+
+ REGISTER_USER_PROCEDURE(createOrder, 1);
+ REGISTER_USER_PROCEDURE(setAdmin, 2);
+ REGISTER_USER_PROCEDURE(addManager, 3);
+ REGISTER_USER_PROCEDURE(removeManager, 4);
+ REGISTER_USER_PROCEDURE(completeOrder, 5);
+ REGISTER_USER_PROCEDURE(refundOrder, 6);
+ REGISTER_USER_PROCEDURE(transferToContract, 7);
+ REGISTER_USER_PROCEDURE(withdrawFees, 8); // NUEVA función
+ REGISTER_USER_PROCEDURE(addLiquidity, 9); // NUEVA función para liquidez inicial
+ }
+
+ // Initialize the contract with SECURE ADMIN CONFIGURATION
+ struct INITIALIZE_locals
+ {
+ uint64 i;
+ BridgeOrder emptyOrder;
+ };
+
+ INITIALIZE_WITH_LOCALS()
+ {
+ state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
+
+ // NUEVA: Inicializar el wallet que recibe las fees (REEMPLAZAR CON VUESTRA WALLET)
+ // state.feeRecipient = ID(_TU, _WALLET, _AQUI, _PLACEHOLDER, _HASTA, _QUE, _PONGAS, _LA, _REAL, _WALLET, _ADDRESS, _DE, _VOTTUN, _PARA, _RECIBIR, _LAS, _FEES, _DEL, _BRIDGE, _ENTRE, _QUBIC, _Y, _ETHEREUM, _CON, _COMISION, _DEL, _MEDIO, _PORCIENTO, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
+
+ // Initialize the orders array. Good practice to zero first.
+ locals.emptyOrder = {}; // Sets all fields to 0 (including orderId and status).
+ locals.emptyOrder.status = 255; // Then set your status for empty.
+
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ state.orders.set(locals.i, locals.emptyOrder);
+ }
+
+ // Initialize the managers array with NULL_ID to mark slots as empty
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ state.managers.set(locals.i, NULL_ID);
+ }
+
+ // Add the initial manager
+ state.managers.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B));
+
+ // Initialize the rest of the state variables
+ state.nextOrderId = 1; // Start from 1 to avoid ID 0
+ state.lockedTokens = 0;
+ state.totalReceivedTokens = 0;
+ state.sourceChain = 0; // Arbitrary number. No-EVM chain
+
+ // Initialize fee variables
+ state._tradeFeeBillionths = 5000000; // 0.5% == 5,000,000 / 1,000,000,000
+ state._earnedFees = 0;
+ state._distributedFees = 0;
+
+ state._earnedFeesQubic = 0;
+ state._distributedFeesQubic = 0;
+ }
+};
From 7f25278c114809af1600100427a4edd165f86fc7 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Sat, 2 Aug 2025 10:45:26 +0700
Subject: [PATCH 016/297] Support multiple events for custom mining.
---
src/public_settings.h | 11 ++++++---
src/qubic.cpp | 56 +++++++++++++++++++++++++++++++++----------
2 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 6f853cb09..9f9f8487a 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -100,10 +100,15 @@ static constexpr unsigned int SOLUTION_THRESHOLD_DEFAULT = 321;
#define EXTERNAL_COMPUTATIONS_INTERVAL (676 + 1)
static_assert(INTERNAL_COMPUTATIONS_INTERVAL >= NUMBER_OF_COMPUTORS, "Internal computation phase needs to be at least equal NUMBER_OF_COMPUTORS");
-// Format is DoW-hh-mm-ss in hex format, total 4bytes, each use 1 bytes
+// List of start-end for full external computation times. The event must not be overlap.
+// Format is DoW-hh-mm-ss in hex format, total 4 bytes, each use 1 bytes
// DoW: Day of the week 0: Sunday, 1 = Monday ...
-#define FULL_EXTERNAL_COMPUTATIONS_TIME_START_TIME 0x060C0000 // Sat 12:00:00
-#define FULL_EXTERNAL_COMPUTATIONS_TIME_STOP_TIME 0x000C0000 // Sun 12:00:00
+static unsigned long long gFullExternalComputationTimes[][2] =
+{
+ {0x040C0000ULL, 0x050C0000ULL}, // Thu 12:00:00 - Fri 12:00:00
+ {0x060C0000ULL, 0x000C0000ULL}, // Sat 12:00:00 - Sun 12:00:00
+ {0x010C0000ULL, 0x020C0000ULL}, // Mon 12:00:00 - Tue 12:00:00
+};
#define STACK_SIZE 4194304
#define TRACK_MAX_STACK_BUFFER_SIZE
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 323978eee..cad5b7d05 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1815,13 +1815,27 @@ static void setNewMiningSeed()
score->initMiningData(spectrumDigests[(SPECTRUM_CAPACITY * 2 - 1) - 1]);
}
-WeekDay gFullExternalStartTime;
-WeekDay gFullExternalEndTime;
+// Total number of external mining event.
+// Can set to zero to disable event
+static constexpr int gNumberOfFullExternalMiningEvents = sizeof(gFullExternalComputationTimes) > 0 ? sizeof(gFullExternalComputationTimes) / sizeof(gFullExternalComputationTimes[0]) : 0;
+struct FullExternallEvent
+{
+ WeekDay startTime;
+ WeekDay endTime;
+};
+FullExternallEvent* gFullExternalEventTime = NULL;
static bool gSpecialEventFullExternalComputationPeriod = false; // a flag indicates a special event (period) that the network running 100% external computation
+static WeekDay currentEventEndTime;
static bool isFullExternalComputationTime(TimeDate tickDate)
{
+ // No event
+ if (gNumberOfFullExternalMiningEvents <= 0)
+ {
+ return false;
+ }
+
// Get current day of the week
WeekDay tickWeekDay;
tickWeekDay.hour = tickDate.hour;
@@ -1830,12 +1844,16 @@ static bool isFullExternalComputationTime(TimeDate tickDate)
tickWeekDay.millisecond = tickDate.millisecond;
tickWeekDay.dayOfWeek = getDayOfWeek(tickDate.day, tickDate.month, 2000 + tickDate.year);
-
- // Check if the day is in range.
- if (isWeekDayInRange(tickWeekDay, gFullExternalStartTime, gFullExternalEndTime))
+ // Check if the day is in range. Expect the time is not overlap.
+ for (int i = 0; i < gNumberOfFullExternalMiningEvents; ++i)
{
- gSpecialEventFullExternalComputationPeriod = true;
- return true;
+ if (isWeekDayInRange(tickWeekDay, gFullExternalEventTime[i].startTime, gFullExternalEventTime[i].endTime))
+ {
+ gSpecialEventFullExternalComputationPeriod = true;
+
+ currentEventEndTime = gFullExternalEventTime[i].endTime;
+ return true;
+ }
}
// When not in range, and the time pass the gFullExternalEndTime. We need to make sure the ending happen
@@ -1844,9 +1862,9 @@ static bool isFullExternalComputationTime(TimeDate tickDate)
{
// Check time pass the end time
TimeDate endTimeDate = tickDate;
- endTimeDate.hour = gFullExternalEndTime.hour;
- endTimeDate.minute = gFullExternalEndTime.minute;
- endTimeDate.second = gFullExternalEndTime.second;
+ endTimeDate.hour = currentEventEndTime.hour;
+ endTimeDate.minute = currentEventEndTime.minute;
+ endTimeDate.second = currentEventEndTime.second;
if (compareTimeDate(tickDate, endTimeDate) == 1)
{
@@ -1859,7 +1877,7 @@ static bool isFullExternalComputationTime(TimeDate tickDate)
}
}
- // The event only happen once
+ // Event is marked as end
gSpecialEventFullExternalComputationPeriod = false;
return false;
}
@@ -3604,6 +3622,7 @@ static void beginEpoch()
#endif
logger.reset(system.initialTick);
+
}
@@ -5759,8 +5778,19 @@ static bool initialize()
emptyTickResolver.lastTryClock = 0;
// Convert time parameters for full custom mining time
- gFullExternalStartTime = convertWeekTimeFromPackedData(FULL_EXTERNAL_COMPUTATIONS_TIME_START_TIME);
- gFullExternalEndTime = convertWeekTimeFromPackedData(FULL_EXTERNAL_COMPUTATIONS_TIME_STOP_TIME);
+ if (gNumberOfFullExternalMiningEvents > 0)
+ {
+ if ((!allocPoolWithErrorLog(L"gFullExternalEventTime", gNumberOfFullExternalMiningEvents * sizeof(FullExternallEvent), (void**)&gFullExternalEventTime, __LINE__)))
+ {
+ logToConsole(L"Can not initialize buffer for full external mining events.");
+ return false;
+ }
+ for (int i = 0; i < gNumberOfFullExternalMiningEvents; i++)
+ {
+ gFullExternalEventTime[i].startTime = convertWeekTimeFromPackedData(gFullExternalComputationTimes[i][0]);
+ gFullExternalEventTime[i].endTime = convertWeekTimeFromPackedData(gFullExternalComputationTimes[i][1]);
+ }
+ }
return true;
}
From 368207f6384a78aaae5b20566bda290e76c89671 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Sun, 3 Aug 2025 15:13:57 +0200
Subject: [PATCH 017/297] Compilation fixes
---
out/build/x64-Debug/_deps/googletest-src | 1 +
src/contracts/VottunBridge.h | 2 ++
2 files changed, 3 insertions(+)
create mode 160000 out/build/x64-Debug/_deps/googletest-src
diff --git a/out/build/x64-Debug/_deps/googletest-src b/out/build/x64-Debug/_deps/googletest-src
new file mode 160000
index 000000000..6910c9d91
--- /dev/null
+++ b/out/build/x64-Debug/_deps/googletest-src
@@ -0,0 +1 @@
+Subproject commit 6910c9d9165801d8827d628cb72eb7ea9dd538c5
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 102d032b8..58fac4708 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -292,6 +292,8 @@ struct VOTTUNBRIDGE : public ContractBase
EthBridgeLogger log;
uint64 i;
bit slotFound;
+ uint64 cleanedSlots; // NUEVA: Contador de slots limpiados
+ BridgeOrder emptyOrder; // NUEVA: Orden vacía para limpiar slots
};
PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
From faf3f0cad63515f34bbc3a66cd86462169caf75c Mon Sep 17 00:00:00 2001
From: Sergi Mias Martinez <25818384+sergimima@users.noreply.github.com>
Date: Sun, 3 Aug 2025 15:19:09 +0200
Subject: [PATCH 018/297] Fixed compilation errors
---
src/contracts/VottunBridge.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 102d032b8..58fac4708 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -292,6 +292,8 @@ struct VOTTUNBRIDGE : public ContractBase
EthBridgeLogger log;
uint64 i;
bit slotFound;
+ uint64 cleanedSlots; // NUEVA: Contador de slots limpiados
+ BridgeOrder emptyOrder; // NUEVA: Orden vacía para limpiar slots
};
PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
From a550856b5b600431c9105f7d7810dbb7b5d51cf2 Mon Sep 17 00:00:00 2001
From: Sergi Mias Martinez <25818384+sergimima@users.noreply.github.com>
Date: Mon, 4 Aug 2025 12:21:36 +0200
Subject: [PATCH 019/297] Update VottunBridge.h
---
src/contracts/VottunBridge.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 58fac4708..c55e82593 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -445,7 +445,7 @@ struct VOTTUNBRIDGE : public ContractBase
99, // Custom error code for "no available slots"
0, // No orderId
locals.cleanedSlots, // Number of slots cleaned
- 0 };
+ '\0' }; // Terminator (char)
LOG_INFO(locals.log);
output.status = 3; // Error: no available slots
return;
@@ -1225,7 +1225,7 @@ struct VOTTUNBRIDGE : public ContractBase
0, // No error
0, // No order ID involved
locals.depositAmount, // Amount added
- state.lockedTokens // New total locked tokens
+ 0 // Terminator (char)
};
LOG_INFO(locals.log);
From ec72605adb7777ded38425a7c25a5dfee7092d4f Mon Sep 17 00:00:00 2001
From: Sergi Mias Martinez <25818384+sergimima@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:11:00 +0200
Subject: [PATCH 020/297] Compilation working
---
src/contracts/VottunBridge.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index c55e82593..6f31d03ea 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -430,7 +430,7 @@ struct VOTTUNBRIDGE : public ContractBase
0, // No error
locals.newOrder.orderId,
input.amount,
- locals.cleanedSlots }; // Log number of cleaned slots
+ 0 }; // Terminator (char)
LOG_INFO(locals.log);
output.status = 0; // Success
output.orderId = locals.newOrder.orderId;
From fdfb3a9b648703752ac5e16678b3b3366dadf46b Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Mon, 4 Aug 2025 21:32:47 +0700
Subject: [PATCH 021/297] Add save/load for custom mining v2.
---
src/mining/mining.h | 11 +++++++++++
src/public_settings.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/src/mining/mining.h b/src/mining/mining.h
index bef2fe872..df5f59b3d 100644
--- a/src/mining/mining.h
+++ b/src/mining/mining.h
@@ -1483,6 +1483,11 @@ void saveCustomMiningCache(int epoch, CHAR16* directory = NULL)
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 6] = i % 10 + L'0';
gSystemCustomMiningSolutionCache[i].save(CUSTOM_MINING_CACHE_FILE_NAME, directory);
}
+
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
+ gSystemCustomMiningSolutionV2Cache.save(CUSTOM_MINING_V2_CACHE_FILE_NAME, directory);
}
// Update score cache filename with epoch and try to load file
@@ -1501,6 +1506,12 @@ bool loadCustomMiningCache(int epoch)
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 6] = i % 10 + L'0';
success &= gSystemCustomMiningSolutionCache[i].load(CUSTOM_MINING_CACHE_FILE_NAME);
}
+
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
+ CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
+ success &= gSystemCustomMiningSolutionV2Cache.load(CUSTOM_MINING_V2_CACHE_FILE_NAME);
+
return success;
}
#endif
diff --git a/src/public_settings.h b/src/public_settings.h
index 9f9f8487a..0e3404af3 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -74,6 +74,7 @@ static unsigned short SCORE_CACHE_FILE_NAME[] = L"score.???";
static unsigned short CONTRACT_FILE_NAME[] = L"contract????.???";
static unsigned short CUSTOM_MINING_REVENUE_END_OF_EPOCH_FILE_NAME[] = L"custom_revenue.eoe";
static unsigned short CUSTOM_MINING_CACHE_FILE_NAME[] = L"custom_mining_cache???.???";
+static unsigned short CUSTOM_MINING_V2_CACHE_FILE_NAME[] = L"custom_mining_v2_cache.???";
static constexpr unsigned long long NUMBER_OF_INPUT_NEURONS = 512; // K
static constexpr unsigned long long NUMBER_OF_OUTPUT_NEURONS = 512; // L
From a2867eb868cd4a10bc10adbbd3eb60899499cbf7 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 5 Aug 2025 08:58:43 +0700
Subject: [PATCH 022/297] Add more comments and remove redundant log.
---
src/qubic.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index cad5b7d05..3c6687054 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1895,16 +1895,17 @@ static void beginCustomMiningPhase()
gCustomMiningStats.phaseResetAndEpochAccumulate();
}
-// resetPhase: mining seed and beginOfCustomMiningPhase flag are only set once in the current phase, by setting this flag become true, we allow
-// set them if is in the middle of the phase.
+// resetPhase: If true, allows reinitializing mining seed and the custom mining phase flag
+// even when already inside the current phase. These values are normally set only once
+// at the beginning of a phase.
static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate, bool resetPhase)
{
bool isBeginOfCustomMiningPhase = false;
char isInCustomMiningPhase = 0;
- // In case of reset phase,
- // - for internal mining phase (no matter beginning or in the middle) = > reset mining seed to new spectrum of the new epoch
- // - for external mining phase => reset all counters are needed
+ // When resetting the phase:
+ // - If in the internal mining phase => reset the mining seed for the new epoch
+ // - If in the external (custom) mining phase => reset mining data (counters, etc.)
if (resetPhase)
{
const unsigned int r = getTickInMiningPhaseCycle();
@@ -1921,7 +1922,7 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate, bool r
}
else
{
- // Check if current time is for full custom mining period
+ // Track whether we’re currently in a full external computation window
static bool isInFullExternalTime = false;
// Make sure the tick is valid and not in the reset phase state
@@ -1942,8 +1943,9 @@ static void checkAndSwitchMiningPhase(short tickEpoch, TimeDate tickDate, bool r
}
isInCustomMiningPhase = 1;
}
- else // Not in the full external time.
+ else
{
+ // Not in the full external phase anymore
isInFullExternalTime = false;
}
}
@@ -5782,7 +5784,6 @@ static bool initialize()
{
if ((!allocPoolWithErrorLog(L"gFullExternalEventTime", gNumberOfFullExternalMiningEvents * sizeof(FullExternallEvent), (void**)&gFullExternalEventTime, __LINE__)))
{
- logToConsole(L"Can not initialize buffer for full external mining events.");
return false;
}
for (int i = 0; i < gNumberOfFullExternalMiningEvents; i++)
From a3b83d11ba291eb26b8b69039cbb423eedb6dee4 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:39:20 +0700
Subject: [PATCH 023/297] score df: fix a bug
---
src/score.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/score.h b/src/score.h
index cdc096308..41eb95aa2 100644
--- a/src/score.h
+++ b/src/score.h
@@ -1308,6 +1308,10 @@ struct ScoreFunction
result.m256i_u8[byteCount++] = A;
A = 0;
count = 0;
+ if (byteCount >= 32)
+ {
+ break;
+ }
}
}
}
From aec6a3c71a423cb21762951cf2cf059501183142 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:41:11 +0200
Subject: [PATCH 024/297] update params for epoch 173 / v1.254.0
---
src/public_settings.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 52e965e75..0fabb51fe 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -56,12 +56,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 253
-#define VERSION_C 1
+#define VERSION_B 254
+#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 172
-#define TICK 30655000
+#define EPOCH 173
+#define TICK 30940000
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
#define DISPATCHER "XPXYKFLGSWRHRGAUKWFWVXCDVEYAPCPCNUTMUDWFGDYQCWZNJMWFZEEGCFFO"
From 89a033b699d0a0a6de162fd993b7189f40577285 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 6 Aug 2025 13:19:16 +0200
Subject: [PATCH 025/297] feat: Add VottunBridge smart contract with
comprehensive test suite
- Implement bidirectional bridge between Qubic and Ethereum
- Add 27 comprehensive tests covering core functionality
- Support for order management, admin functions, and fee handling
- Include input validation and error handling
- Ready for deployment and IPO process
---
.../x64-Debug/Testing/Temporary/LastTest.log | 3 +
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 5 +-
src/contract_core/contract_def.h | 12 +
src/contracts/VottunBridge.h | 174 ++--
test/contract_vottunbridge.cpp | 867 ++++++++++++++++++
test/test.vcxproj | 1 +
7 files changed, 986 insertions(+), 77 deletions(-)
create mode 100644 out/build/x64-Debug/Testing/Temporary/LastTest.log
create mode 100644 test/contract_vottunbridge.cpp
diff --git a/out/build/x64-Debug/Testing/Temporary/LastTest.log b/out/build/x64-Debug/Testing/Temporary/LastTest.log
new file mode 100644
index 000000000..317710252
--- /dev/null
+++ b/out/build/x64-Debug/Testing/Temporary/LastTest.log
@@ -0,0 +1,3 @@
+Start testing: Aug 06 12:46 Hora de verano romance
+----------------------------------------------------------
+End testing: Aug 06 12:46 Hora de verano romance
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 52456c8af..84a8bf274 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -39,6 +39,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 2bec405fb..677c1d51a 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -243,6 +243,9 @@
contracts
+
+ contracts
+
platform
@@ -272,7 +275,7 @@
contract_core
-
+
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index c31ec9074..98e05c9d0 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,6 +204,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define VOTTUNBRIDGE_CONTRACT_INDEX 15 // CORREGIDO: nombre correcto
+#define CONTRACT_INDEX VOTTUNBRIDGE_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE VOTTUNBRIDGE
+#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
+#include "contracts/VottunBridge.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -301,6 +311,7 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
+ {"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -404,6 +415,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 58fac4708..b478c6dd5 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1,6 +1,3 @@
-#pragma once
-#include "qpi.h"
-
using namespace QPI;
struct VOTTUNBRIDGE2
@@ -108,7 +105,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint8 status;
};
- // NUEVA: Withdraw Fees structures
+ // NEW: Withdraw Fees structures
struct withdrawFees_input
{
uint64 amount;
@@ -119,10 +116,10 @@ struct VOTTUNBRIDGE : public ContractBase
uint8 status;
};
- // NUEVA: Get Available Fees structures
+ // NEW: Get Available Fees structures
struct getAvailableFees_input
{
- // Sin parámetros
+ // No parameters
};
struct getAvailableFees_output
@@ -168,7 +165,7 @@ struct VOTTUNBRIDGE : public ContractBase
struct getContractInfo_input
{
- // Sin parámetros
+ // No parameters
};
struct getContractInfo_output
@@ -181,9 +178,9 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 earnedFees;
uint32 tradeFeeBillionths;
uint32 sourceChain;
- // NUEVO: Debug info
- Array firstOrders; // Primeras 10 órdenes
- uint64 totalOrdersFound; // Cuántas órdenes no vacías hay
+ // NEW: Debug info
+ Array firstOrders; // First 16 orders
+ uint64 totalOrdersFound; // How many non-empty orders exist
uint64 emptySlots;
};
@@ -194,7 +191,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint32 _errorCode; // Error code
uint64 _orderId; // Order ID if applicable
uint64 _amount; // Amount involved in the operation
- char _terminator; // Marks the end of the logged data
+ sint8 _terminator; // Marks the end of the logged data
};
struct AddressChangeLogger
@@ -202,7 +199,7 @@ struct VOTTUNBRIDGE : public ContractBase
id _newAdminAddress; // New admin address
uint32 _contractIndex;
uint8 _eventCode; // Event code 'adminchanged'
- char _terminator;
+ sint8 _terminator;
};
struct TokensLogger
@@ -210,7 +207,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint32 _contractIndex;
uint64 _lockedTokens; // Balance tokens locked
uint64 _totalReceivedTokens; // Balance total receivedTokens
- char _terminator;
+ sint8 _terminator;
};
struct getTotalLockedTokens_locals
@@ -247,7 +244,7 @@ struct VOTTUNBRIDGE : public ContractBase
// Contract State
Array orders; // Increased from 256 to 1024
id admin; // Primary admin address
- id feeRecipient; // NUEVA: Wallet específica para recibir las fees
+ id feeRecipient; // NEW: Specific wallet to receive fees
Array managers; // Managers list
uint64 nextOrderId; // Counter for order IDs
uint64 lockedTokens; // Total locked tokens in the contract (balance)
@@ -263,7 +260,12 @@ struct VOTTUNBRIDGE : public ContractBase
typedef id isAdmin_input;
typedef bit isAdmin_output;
- PRIVATE_FUNCTION(isAdmin)
+ struct isAdmin_locals
+ {
+ // No locals needed for this simple function
+ };
+
+ PRIVATE_FUNCTION_WITH_LOCALS(isAdmin)
{
output = (qpi.invocator() == state.admin);
}
@@ -271,11 +273,16 @@ struct VOTTUNBRIDGE : public ContractBase
typedef id isManager_input;
typedef bit isManager_output;
- PRIVATE_FUNCTION(isManager)
+ struct isManager_locals
{
- for (uint64 i = 0; i < state.managers.capacity(); ++i)
+ uint64 i;
+ };
+
+ PRIVATE_FUNCTION_WITH_LOCALS(isManager)
+ {
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
{
- if (state.managers.get(i) == input)
+ if (state.managers.get(locals.i) == input)
{
output = true;
return;
@@ -291,9 +298,13 @@ struct VOTTUNBRIDGE : public ContractBase
BridgeOrder newOrder;
EthBridgeLogger log;
uint64 i;
+ uint64 j;
bit slotFound;
- uint64 cleanedSlots; // NUEVA: Contador de slots limpiados
- BridgeOrder emptyOrder; // NUEVA: Orden vacía para limpiar slots
+ uint64 cleanedSlots; // NEW: Counter for cleaned slots
+ BridgeOrder emptyOrder; // NEW: Empty order to clean slots
+ uint64 requiredFeeEth;
+ uint64 requiredFeeQubic;
+ uint64 totalRequiredFee;
};
PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
@@ -313,12 +324,12 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Calculate fees as percentage of amount (0.5% each, 1% total)
- uint64 requiredFeeEth = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
- uint64 requiredFeeQubic = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
- uint64 totalRequiredFee = requiredFeeEth + requiredFeeQubic;
+ locals.requiredFeeEth = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
+ locals.requiredFeeQubic = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
+ locals.totalRequiredFee = locals.requiredFeeEth + locals.requiredFeeQubic;
// Verify that the fee paid is sufficient for both fees
- if (qpi.invocationReward() < static_cast(totalRequiredFee))
+ if (qpi.invocationReward() < static_cast(locals.totalRequiredFee))
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
@@ -332,8 +343,8 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Accumulate fees in their respective variables
- state._earnedFees += requiredFeeEth;
- state._earnedFeesQubic += requiredFeeQubic;
+ state._earnedFees += locals.requiredFeeEth;
+ state._earnedFeesQubic += locals.requiredFeeQubic;
// Create the order
locals.newOrder.orderId = state.nextOrderId++;
@@ -365,9 +376,9 @@ struct VOTTUNBRIDGE : public ContractBase
locals.newOrder.qubicDestination = qpi.invocator();
}
- for (uint64 i = 0; i < 42; ++i)
+ for (locals.i = 0; locals.i < 42; ++locals.i)
{
- locals.newOrder.ethAddress.set(i, input.ethAddress.get(i));
+ locals.newOrder.ethAddress.set(locals.i, input.ethAddress.get(locals.i));
}
locals.newOrder.amount = input.amount;
locals.newOrder.orderType = 0; // Default order type
@@ -401,16 +412,16 @@ struct VOTTUNBRIDGE : public ContractBase
{
// Clean up completed and refunded orders to free slots
locals.cleanedSlots = 0;
- for (uint64 j = 0; j < state.orders.capacity(); ++j)
+ for (locals.j = 0; locals.j < state.orders.capacity(); ++locals.j)
{
- if (state.orders.get(j).status == 2) // Completed or Refunded
+ if (state.orders.get(locals.j).status == 2) // Completed or Refunded
{
// Create empty order to overwrite
locals.emptyOrder.status = 255; // Mark as empty
locals.emptyOrder.orderId = 0;
locals.emptyOrder.amount = 0;
// Clear other fields as needed
- state.orders.set(j, locals.emptyOrder);
+ state.orders.set(locals.j, locals.emptyOrder);
locals.cleanedSlots++;
}
}
@@ -430,7 +441,7 @@ struct VOTTUNBRIDGE : public ContractBase
0, // No error
locals.newOrder.orderId,
input.amount,
- locals.cleanedSlots }; // Log number of cleaned slots
+ 0 };
LOG_INFO(locals.log);
output.status = 0; // Success
output.orderId = locals.newOrder.orderId;
@@ -474,8 +485,7 @@ struct VOTTUNBRIDGE : public ContractBase
locals.orderResp.destinationAccount = locals.order.ethAddress;
locals.orderResp.amount = locals.order.amount;
locals.orderResp.sourceChain = state.sourceChain;
- locals.orderResp.qubicDestination = locals.order.qubicDestination; // <-- Añade esta línea
-
+ locals.orderResp.qubicDestination = locals.order.qubicDestination;
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
@@ -670,6 +680,7 @@ struct VOTTUNBRIDGE : public ContractBase
BridgeOrder order;
TokensLogger logTokens;
uint64 i;
+ uint64 netAmount;
};
// Complete an order and release tokens
@@ -734,7 +745,7 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Use full amount without deducting commission (commission was already charged in createOrder)
- uint64 netAmount = locals.order.amount;
+ locals.netAmount = locals.order.amount;
// Handle order based on transfer direction
if (locals.order.fromQubicToEthereum)
@@ -753,7 +764,7 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- state.lockedTokens += netAmount; // increase the amount of locked tokens by net amount
+ state.lockedTokens += locals.netAmount; // increase the amount of locked tokens by net amount
state.totalReceivedTokens -= locals.order.amount; // decrease the amount of no-locked (received) tokens by gross amount
locals.logTokens = TokensLogger{
CONTRACT_INDEX,
@@ -779,7 +790,7 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Transfer tokens back to the user
- if (qpi.transfer(locals.order.qubicDestination, netAmount) < 0)
+ if (qpi.transfer(locals.order.qubicDestination, locals.netAmount) < 0)
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
@@ -976,7 +987,7 @@ struct VOTTUNBRIDGE : public ContractBase
output.status = 0; // Success
}
- // NUEVA: Withdraw Fees function
+ // NEW: Withdraw Fees function
struct withdrawFees_locals
{
EthBridgeLogger log;
@@ -985,7 +996,7 @@ struct VOTTUNBRIDGE : public ContractBase
PUBLIC_PROCEDURE_WITH_LOCALS(withdrawFees)
{
- // Verificar que solo el admin puede retirar fees
+ // Verify that only admin can withdraw fees
if (qpi.invocator() != state.admin)
{
locals.log = EthBridgeLogger{
@@ -999,15 +1010,15 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- // Calcular fees disponibles
+ // Calculate available fees
locals.availableFees = state._earnedFees - state._distributedFees;
- // Verificar que hay suficientes fees disponibles
+ // Verify that there are sufficient available fees
if (input.amount > locals.availableFees)
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens, // Reutilizamos este error
+ EthBridgeError::insufficientLockedTokens, // Reusing this error
0, // No order ID
input.amount,
0 };
@@ -1016,7 +1027,7 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- // Verificar que el amount es válido
+ // Verify that amount is valid
if (input.amount == 0)
{
locals.log = EthBridgeLogger{
@@ -1030,7 +1041,7 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- // Transferir las fees al wallet designado
+ // Transfer fees to the designated wallet
if (qpi.transfer(state.feeRecipient, input.amount) < 0)
{
locals.log = EthBridgeLogger{
@@ -1044,10 +1055,10 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- // Actualizar el contador de fees distribuidas
+ // Update distributed fees counter
state._distributedFees += input.amount;
- // Log exitoso
+ // Successful log
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
0, // No error
@@ -1060,8 +1071,10 @@ struct VOTTUNBRIDGE : public ContractBase
}
struct getAdminID_locals
- { /* Empty, for consistency */
+ {
+ // Empty, for consistency
};
+
PUBLIC_FUNCTION_WITH_LOCALS(getAdminID)
{
output.adminId = state.admin;
@@ -1225,7 +1238,7 @@ struct VOTTUNBRIDGE : public ContractBase
0, // No error
0, // No order ID involved
locals.depositAmount, // Amount added
- state.lockedTokens // New total locked tokens
+ 0
};
LOG_INFO(locals.log);
@@ -1235,7 +1248,7 @@ struct VOTTUNBRIDGE : public ContractBase
output.totalLocked = state.lockedTokens;
}
- // NUEVA: Get Available Fees function
+ // NEW: Get Available Fees function
PUBLIC_FUNCTION(getAvailableFees)
{
output.availableFees = state._earnedFees - state._distributedFees;
@@ -1244,7 +1257,12 @@ struct VOTTUNBRIDGE : public ContractBase
}
// NEW: Enhanced contract info function
- PUBLIC_FUNCTION(getContractInfo)
+ struct getContractInfo_locals
+ {
+ uint64 i;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getContractInfo)
{
output.admin = state.admin;
output.managers = state.managers;
@@ -1255,19 +1273,19 @@ struct VOTTUNBRIDGE : public ContractBase
output.tradeFeeBillionths = state._tradeFeeBillionths;
output.sourceChain = state.sourceChain;
- // NUEVO: Debug - copiar primeras 10 órdenes
+ // NEW: Debug - copy first 16 orders
output.totalOrdersFound = 0;
output.emptySlots = 0;
- for (uint64 i = 0; i < 10 && i < state.orders.capacity(); ++i)
+ for (locals.i = 0; locals.i < 16 && locals.i < state.orders.capacity(); ++locals.i)
{
- output.firstOrders.set(i, state.orders.get(i));
+ output.firstOrders.set(locals.i, state.orders.get(locals.i));
}
- // Contar órdenes reales vs vacías
- for (uint64 i = 0; i < state.orders.capacity(); ++i)
+ // Count real orders vs empty ones
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
{
- if (state.orders.get(i).status == 255)
+ if (state.orders.get(locals.i).status == 255)
{
output.emptySlots++;
}
@@ -1279,40 +1297,44 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Called at the end of every tick to distribute earned fees
- // COMENTADO: Para evitar distribución automática y permitir withdrawFees
+ struct END_TICK_locals
+ {
+ uint64 feesToDistributeInThisTick;
+ uint64 amountPerComputor;
+ uint64 vottunFeesToDistribute;
+ };
- END_TICK()
+ END_TICK_WITH_LOCALS()
{
- uint64 feesToDistributeInThisTick = state._earnedFeesQubic - state._distributedFeesQubic;
+ locals.feesToDistributeInThisTick = state._earnedFeesQubic - state._distributedFeesQubic;
- if (feesToDistributeInThisTick > 0)
+ if (locals.feesToDistributeInThisTick > 0)
{
// Distribute fees to computors holding shares of this contract.
// NUMBER_OF_COMPUTORS is a Qubic global constant (typically 676).
- uint64 amountPerComputor = div(feesToDistributeInThisTick, (uint64)NUMBER_OF_COMPUTORS);
+ locals.amountPerComputor = div(locals.feesToDistributeInThisTick, (uint64)NUMBER_OF_COMPUTORS);
- if (amountPerComputor > 0)
+ if (locals.amountPerComputor > 0)
{
- if (qpi.distributeDividends(amountPerComputor))
+ if (qpi.distributeDividends(locals.amountPerComputor))
{
- state._distributedFeesQubic += amountPerComputor * NUMBER_OF_COMPUTORS;
+ state._distributedFeesQubic += locals.amountPerComputor * NUMBER_OF_COMPUTORS;
}
}
}
- // Distribución de tarifas de Vottun al feeRecipient
- uint64 vottunFeesToDistribute = state._earnedFees - state._distributedFees;
+ // Distribution of Vottun fees to feeRecipient
+ locals.vottunFeesToDistribute = state._earnedFees - state._distributedFees;
- if (vottunFeesToDistribute > 0 && state.feeRecipient != 0)
+ if (locals.vottunFeesToDistribute > 0 && state.feeRecipient != 0)
{
- if (qpi.transfer(state.feeRecipient, vottunFeesToDistribute))
+ if (qpi.transfer(state.feeRecipient, locals.vottunFeesToDistribute))
{
- state._distributedFees += vottunFeesToDistribute;
+ state._distributedFees += locals.vottunFeesToDistribute;
}
}
}
-
// Register Functions and Procedures
REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
{
@@ -1324,7 +1346,7 @@ struct VOTTUNBRIDGE : public ContractBase
REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
REGISTER_USER_FUNCTION(getOrderByDetails, 7);
REGISTER_USER_FUNCTION(getContractInfo, 8);
- REGISTER_USER_FUNCTION(getAvailableFees, 9); // NUEVA función
+ REGISTER_USER_FUNCTION(getAvailableFees, 9); // NEW function
REGISTER_USER_PROCEDURE(createOrder, 1);
REGISTER_USER_PROCEDURE(setAdmin, 2);
@@ -1333,8 +1355,8 @@ struct VOTTUNBRIDGE : public ContractBase
REGISTER_USER_PROCEDURE(completeOrder, 5);
REGISTER_USER_PROCEDURE(refundOrder, 6);
REGISTER_USER_PROCEDURE(transferToContract, 7);
- REGISTER_USER_PROCEDURE(withdrawFees, 8); // NUEVA función
- REGISTER_USER_PROCEDURE(addLiquidity, 9); // NUEVA función para liquidez inicial
+ REGISTER_USER_PROCEDURE(withdrawFees, 8); // NEW function
+ REGISTER_USER_PROCEDURE(addLiquidity, 9); // NEW function for initial liquidity
}
// Initialize the contract with SECURE ADMIN CONFIGURATION
@@ -1348,8 +1370,8 @@ struct VOTTUNBRIDGE : public ContractBase
{
state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
- // NUEVA: Inicializar el wallet que recibe las fees (REEMPLAZAR CON VUESTRA WALLET)
- // state.feeRecipient = ID(_TU, _WALLET, _AQUI, _PLACEHOLDER, _HASTA, _QUE, _PONGAS, _LA, _REAL, _WALLET, _ADDRESS, _DE, _VOTTUN, _PARA, _RECIBIR, _LAS, _FEES, _DEL, _BRIDGE, _ENTRE, _QUBIC, _Y, _ETHEREUM, _CON, _COMISION, _DEL, _MEDIO, _PORCIENTO, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
+ // NEW: Initialize the wallet that receives fees (REPLACE WITH YOUR WALLET)
+ // state.feeRecipient = ID(_YOUR, _WALLET, _HERE, _PLACEHOLDER, _UNTIL, _YOU, _PUT, _THE, _REAL, _WALLET, _ADDRESS, _FROM, _VOTTUN, _TO, _RECEIVE, _THE, _BRIDGE, _FEES, _BETWEEN, _QUBIC, _AND, _ETHEREUM, _WITH, _HALF, _PERCENT, _COMMISSION, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
// Initialize the orders array. Good practice to zero first.
locals.emptyOrder = {}; // Sets all fields to 0 (including orderId and status).
@@ -1383,4 +1405,4 @@ struct VOTTUNBRIDGE : public ContractBase
state._earnedFeesQubic = 0;
state._distributedFeesQubic = 0;
}
-};
+};
\ No newline at end of file
diff --git a/test/contract_vottunbridge.cpp b/test/contract_vottunbridge.cpp
new file mode 100644
index 000000000..7e095fc2d
--- /dev/null
+++ b/test/contract_vottunbridge.cpp
@@ -0,0 +1,867 @@
+#define NO_UEFI
+
+#include
+#include
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 98e05c9d0..ff13cd6d5 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -208,7 +208,7 @@ struct __FunctionOrProcedureBeginEndGuard
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
-#define VOTTUNBRIDGE_CONTRACT_INDEX 15 // CORREGIDO: nombre correcto
+#define VOTTUNBRIDGE_CONTRACT_INDEX 15
#define CONTRACT_INDEX VOTTUNBRIDGE_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE VOTTUNBRIDGE
#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 040174f7f..53b225260 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -105,7 +105,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint8 status;
};
- // NEW: Withdraw Fees structures
+ // Withdraw Fees structures
struct withdrawFees_input
{
uint64 amount;
@@ -116,7 +116,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint8 status;
};
- // NEW: Get Available Fees structures
+ // Get Available Fees structures
struct getAvailableFees_input
{
// No parameters
@@ -178,7 +178,7 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 earnedFees;
uint32 tradeFeeBillionths;
uint32 sourceChain;
- // NEW: Debug info
+ // Debug info
Array firstOrders; // First 16 orders
uint64 totalOrdersFound; // How many non-empty orders exist
uint64 emptySlots;
@@ -244,7 +244,7 @@ struct VOTTUNBRIDGE : public ContractBase
// Contract State
Array orders; // Increased from 256 to 1024
id admin; // Primary admin address
- id feeRecipient; // NEW: Specific wallet to receive fees
+ id feeRecipient; // Specific wallet to receive fees
Array managers; // Managers list
uint64 nextOrderId; // Counter for order IDs
uint64 lockedTokens; // Total locked tokens in the contract (balance)
@@ -260,12 +260,7 @@ struct VOTTUNBRIDGE : public ContractBase
typedef id isAdmin_input;
typedef bit isAdmin_output;
- struct isAdmin_locals
- {
- // No locals needed for this simple function
- };
-
- PRIVATE_FUNCTION_WITH_LOCALS(isAdmin)
+ PRIVATE_FUNCTION(isAdmin)
{
output = (qpi.invocator() == state.admin);
}
@@ -273,16 +268,11 @@ struct VOTTUNBRIDGE : public ContractBase
typedef id isManager_input;
typedef bit isManager_output;
- struct isManager_locals
- {
- uint64 i;
- };
-
- PRIVATE_FUNCTION_WITH_LOCALS(isManager)
+ PRIVATE_FUNCTION(isManager)
{
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ for (uint64 i = 0; i < state.managers.capacity(); ++i)
{
- if (state.managers.get(locals.i) == input)
+ if (state.managers.get(i) == input)
{
output = true;
return;
@@ -300,13 +290,11 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 i;
uint64 j;
bit slotFound;
- uint64 cleanedSlots; // NEW: Counter for cleaned slots
- BridgeOrder emptyOrder; // NEW: Empty order to clean slots
+ uint64 cleanedSlots; // Counter for cleaned slots
+ BridgeOrder emptyOrder; // Empty order to clean slots
uint64 requiredFeeEth;
uint64 requiredFeeQubic;
uint64 totalRequiredFee;
- uint64 cleanedSlots; // NUEVA: Contador de slots limpiados
- BridgeOrder emptyOrder; // NUEVA: Orden vacía para limpiar slots
};
PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
@@ -326,8 +314,8 @@ struct VOTTUNBRIDGE : public ContractBase
}
// Calculate fees as percentage of amount (0.5% each, 1% total)
- locals.requiredFeeEth = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
- locals.requiredFeeQubic = (input.amount * state._tradeFeeBillionths) / 1000000000ULL;
+ locals.requiredFeeEth = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
+ locals.requiredFeeQubic = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
locals.totalRequiredFee = locals.requiredFeeEth + locals.requiredFeeQubic;
// Verify that the fee paid is sufficient for both fees
From 995047794c91648cb412c4cc47a0ad34216d3a30 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Tue, 12 Aug 2025 14:11:57 +0200
Subject: [PATCH 030/297] Address additional reviewer feedback: optimize
getAdminID function and clean up build artifacts
- Remove empty getAdminID_locals struct and use PUBLIC_FUNCTION macro
- Remove versioned build/test artifacts from repository
- Clean up remaining comments and code optimizations
- Fix division operators to use div() function consistently
---
out/build/x64-Debug/Testing/Temporary/LastTest.log | 3 ---
out/build/x64-Debug/_deps/googletest-src | 1 -
src/contracts/VottunBridge.h | 7 +------
test/contract_vottunbridge.cpp | 11 +++++++----
4 files changed, 8 insertions(+), 14 deletions(-)
delete mode 100644 out/build/x64-Debug/Testing/Temporary/LastTest.log
delete mode 160000 out/build/x64-Debug/_deps/googletest-src
diff --git a/out/build/x64-Debug/Testing/Temporary/LastTest.log b/out/build/x64-Debug/Testing/Temporary/LastTest.log
deleted file mode 100644
index 317710252..000000000
--- a/out/build/x64-Debug/Testing/Temporary/LastTest.log
+++ /dev/null
@@ -1,3 +0,0 @@
-Start testing: Aug 06 12:46 Hora de verano romance
-----------------------------------------------------------
-End testing: Aug 06 12:46 Hora de verano romance
diff --git a/out/build/x64-Debug/_deps/googletest-src b/out/build/x64-Debug/_deps/googletest-src
deleted file mode 160000
index 6910c9d91..000000000
--- a/out/build/x64-Debug/_deps/googletest-src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6910c9d9165801d8827d628cb72eb7ea9dd538c5
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 53b225260..e7c500d04 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1060,12 +1060,7 @@ struct VOTTUNBRIDGE : public ContractBase
output.status = 0; // Success
}
- struct getAdminID_locals
- {
- // Empty, for consistency
- };
-
- PUBLIC_FUNCTION_WITH_LOCALS(getAdminID)
+ PUBLIC_FUNCTION(getAdminID)
{
output.adminId = state.admin;
}
diff --git a/test/contract_vottunbridge.cpp b/test/contract_vottunbridge.cpp
index 7e095fc2d..374c13c0d 100644
--- a/test/contract_vottunbridge.cpp
+++ b/test/contract_vottunbridge.cpp
@@ -1,4 +1,4 @@
-#define NO_UEFI
+#define NO_UEFI
#include
#include
diff --git a/test/utils.h b/test/utils.h
index a48cc9995..734d88933 100644
--- a/test/utils.h
+++ b/test/utils.h
@@ -9,7 +9,7 @@
namespace test_utils
{
-std::string byteToHex(const unsigned char* byteArray, size_t sizeInByte)
+static std::string byteToHex(const unsigned char* byteArray, size_t sizeInByte)
{
std::ostringstream oss;
for (size_t i = 0; i < sizeInByte; ++i)
@@ -19,7 +19,7 @@ std::string byteToHex(const unsigned char* byteArray, size_t sizeInByte)
return oss.str();
}
-m256i hexToByte(const std::string& hex, const int sizeInByte)
+static m256i hexTo32Bytes(const std::string& hex, const int sizeInByte)
{
if (hex.length() != sizeInByte * 2) {
throw std::invalid_argument("Hex string length does not match the expected size");
@@ -34,8 +34,21 @@ m256i hexToByte(const std::string& hex, const int sizeInByte)
return byteArray;
}
+static void hexToByte(const std::string& hex, const int sizeInByte, unsigned char* out)
+{
+ if (hex.length() != sizeInByte * 2)
+ {
+ throw std::invalid_argument("Hex string length does not match the expected size");
+ }
+
+ for (size_t i = 0; i < sizeInByte; ++i)
+ {
+ out[i] = std::stoi(hex.substr(i * 2, 2), nullptr, 16);
+ }
+}
+
// Function to read and parse the CSV file
-std::vector> readCSV(const std::string& filename)
+static std::vector> readCSV(const std::string& filename)
{
std::vector> data;
std::ifstream file(filename);
@@ -61,7 +74,7 @@ std::vector> readCSV(const std::string& filename)
return data;
}
-m256i convertFromString(std::string& rStr)
+static m256i convertFromString(std::string& rStr)
{
m256i value;
std::stringstream ss(rStr);
@@ -74,7 +87,7 @@ m256i convertFromString(std::string& rStr)
return value;
}
-std::vector convertULLFromString(std::string& rStr)
+static std::vector convertULLFromString(std::string& rStr)
{
std::vector values;
std::stringstream ss(rStr);
From e13ac4c5bb02fa05fcdfe00a1ed59414057f9065 Mon Sep 17 00:00:00 2001
From: dkat <39078779+krypdkat@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:20:52 +0700
Subject: [PATCH 053/297] networking: support private IPs (#513)
* nw: support private IPs
* remove redundant code
* fix warning
* add checking boundary when accessing publicPeers
---
src/network_core/peers.h | 17 +++++++++++++++++
src/private_settings.h | 3 +++
src/qubic.cpp | 19 ++++++++++++++-----
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/network_core/peers.h b/src/network_core/peers.h
index 0150fb7b8..e483d58f2 100644
--- a/src/network_core/peers.h
+++ b/src/network_core/peers.h
@@ -182,6 +182,23 @@ static bool isWhiteListPeer(unsigned char address[4])
}
*/
+static bool isPrivateIp(const unsigned char address[4])
+{
+ int total = min(int(sizeof(knownPublicPeers)/sizeof(knownPublicPeers[0])), NUMBER_OF_PRIVATE_IP);
+ for (int i = 0; i < total; i++)
+ {
+ const auto& privateIp = knownPublicPeers[i];
+ if (address[0] == privateIp[0]
+ && address[1] == privateIp[1]
+ && address[2] == privateIp[2]
+ && address[3] == privateIp[3])
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
static void closePeer(Peer* peer)
{
PROFILE_SCOPE();
diff --git a/src/private_settings.h b/src/private_settings.h
index dc5e68c4a..eef01252c 100644
--- a/src/private_settings.h
+++ b/src/private_settings.h
@@ -10,6 +10,9 @@ static unsigned char computorSeeds[][55 + 1] = {
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
};
+// number of private ips for computor's internal services
+// these are the first N ip in knownPublicPeers, these IPs will never be shared or deleted
+#define NUMBER_OF_PRIVATE_IP 2
// Enter static IPs of peers (ideally at least 4 including your own IP) to disseminate them to other peers.
// You can find current peer IPs at https://app.qubic.li/network/live
static const unsigned char knownPublicPeers[][4] = {
diff --git a/src/qubic.cpp b/src/qubic.cpp
index c73fab54d..8a3365edd 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -6962,15 +6962,24 @@ EFI_STATUS efi_main(EFI_HANDLE imageHandle, EFI_SYSTEM_TABLE* systemTable)
}
else
{
- // randomly select verified public peers
- const unsigned int publicPeerIndex = random(numberOfPublicPeers);
- if (publicPeers[publicPeerIndex].isHandshaked /*&& publicPeers[publicPeerIndex].isFullnode*/)
+ if (NUMBER_OF_PRIVATE_IP < numberOfPublicPeers)
{
- request->peers[j] = publicPeers[publicPeerIndex].address;
+ // randomly select verified public peers and discard private IPs
+ // first NUMBER_OF_PRIVATE_IP ips are same on both array publicPeers and knownPublicPeers
+ const unsigned int publicPeerIndex = NUMBER_OF_PRIVATE_IP + random(numberOfPublicPeers - NUMBER_OF_PRIVATE_IP);
+ // share the peer if it's not our private IPs and is handshaked
+ if (publicPeers[publicPeerIndex].isHandshaked)
+ {
+ request->peers[j] = publicPeers[publicPeerIndex].address;
+ }
+ else
+ {
+ j--;
+ }
}
else
{
- j--;
+ request->peers[j].u32 = 0;
}
}
}
From e22081902131a211393cdfab625cb743bdc6b09b Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 26 Aug 2025 15:04:19 +0700
Subject: [PATCH 054/297] Fix bug relate to invalid mining seed of qpi mining.
(#518)
---
src/contract_core/qpi_mining_impl.h | 5 +++++
src/contracts/QUtil.h | 1 +
src/contracts/qpi.h | 3 +++
3 files changed, 9 insertions(+)
diff --git a/src/contract_core/qpi_mining_impl.h b/src/contract_core/qpi_mining_impl.h
index 229550b0d..953612b8c 100644
--- a/src/contract_core/qpi_mining_impl.h
+++ b/src/contract_core/qpi_mining_impl.h
@@ -19,3 +19,8 @@ m256i QPI::QpiContextFunctionCall::computeMiningFunction(const m256i miningSeed,
(*score_qpi)(0, publicKey, miningSeed, nonce);
return score_qpi->getLastOutput(0);
}
+
+void QPI::QpiContextFunctionCall::initMiningSeed(const m256i miningSeed) const
+{
+ score_qpi->initMiningData(miningSeed);
+}
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index c82344d10..616e67e0f 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -1169,6 +1169,7 @@ struct QUTIL : public ContractBase
BEGIN_EPOCH()
{
state.dfMiningSeed = qpi.getPrevSpectrumDigest();
+ qpi.initMiningSeed(state.dfMiningSeed);
}
struct BEGIN_TICK_locals
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 28c3ebc4c..7596845bd 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -1782,6 +1782,9 @@ namespace QPI
// run the score function (in qubic mining) and return first 256 bit of output
inline m256i computeMiningFunction(const m256i miningSeed, const m256i publicKey, const m256i nonce) const;
+ // init mining seed for the score function (in qubic mining)
+ inline void initMiningSeed(const m256i miningSeed) const;
+
inline bit signatureValidity(
const id& entity,
const id& digest,
From 5b34b01963a5ba88bb364b1600a0aa3e9f836422 Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Tue, 26 Aug 2025 09:53:57 +0200
Subject: [PATCH 055/297] update params for epoch 176 / v1.257.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 9a5567afb..f78029dad 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -56,12 +56,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 256
+#define VERSION_B 257
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 175
-#define TICK 31500000
+#define EPOCH 176
+#define TICK 31910000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From e9aaf1d538e73888ebbed8cf615fa4f3fdbf0043 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 26 Aug 2025 16:40:23 +0700
Subject: [PATCH 056/297] Remove mining seed set function in qpi.
---
src/contract_core/qpi_mining_impl.h | 11 ++++++-----
src/contracts/QUtil.h | 1 -
src/contracts/qpi.h | 3 ---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/contract_core/qpi_mining_impl.h b/src/contract_core/qpi_mining_impl.h
index 953612b8c..be4cf796c 100644
--- a/src/contract_core/qpi_mining_impl.h
+++ b/src/contract_core/qpi_mining_impl.h
@@ -16,11 +16,12 @@ static ScoreFunction<
m256i QPI::QpiContextFunctionCall::computeMiningFunction(const m256i miningSeed, const m256i publicKey, const m256i nonce) const
{
+ // Score's currentRandomSeed is initialized to zero by setMem(score_qpi, sizeof(*score_qpi), 0)
+ // If the mining seed changes, we must reinitialize it
+ if (miningSeed != score_qpi->currentRandomSeed)
+ {
+ score_qpi->initMiningData(miningSeed);
+ }
(*score_qpi)(0, publicKey, miningSeed, nonce);
return score_qpi->getLastOutput(0);
}
-
-void QPI::QpiContextFunctionCall::initMiningSeed(const m256i miningSeed) const
-{
- score_qpi->initMiningData(miningSeed);
-}
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 616e67e0f..c82344d10 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -1169,7 +1169,6 @@ struct QUTIL : public ContractBase
BEGIN_EPOCH()
{
state.dfMiningSeed = qpi.getPrevSpectrumDigest();
- qpi.initMiningSeed(state.dfMiningSeed);
}
struct BEGIN_TICK_locals
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 7596845bd..28c3ebc4c 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -1782,9 +1782,6 @@ namespace QPI
// run the score function (in qubic mining) and return first 256 bit of output
inline m256i computeMiningFunction(const m256i miningSeed, const m256i publicKey, const m256i nonce) const;
- // init mining seed for the score function (in qubic mining)
- inline void initMiningSeed(const m256i miningSeed) const;
-
inline bit signatureValidity(
const id& entity,
const id& digest,
From 0499e91d54f64cb049e3614f35bb7f038f4e482b Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Wed, 27 Aug 2025 02:22:11 +0200
Subject: [PATCH 057/297] Increase target tick duration
The delay function did not work due to bugs. Now the delay function
works and tick time should decrease.
---
src/public_settings.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index f78029dad..f913ce526 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -23,7 +23,7 @@
// Number of ticks from prior epoch that are kept after seamless epoch transition. These can be requested after transition.
#define TICKS_TO_KEEP_FROM_PRIOR_EPOCH 100
-#define TARGET_TICK_DURATION 1000
+#define TARGET_TICK_DURATION 3000
#define TRANSACTION_SPARSENESS 1
// Below are 2 variables that are used for auto-F5 feature:
From 73e3ba2e28a5997d5f3a855f32a56d008a9ffe32 Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Wed, 27 Aug 2025 16:28:44 +0200
Subject: [PATCH 058/297] Fix bug in PRIVATE_PEER_IP logic
---
src/qubic.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 8a3365edd..fdf2ae444 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -6944,7 +6944,8 @@ EFI_STATUS efi_main(EFI_HANDLE imageHandle, EFI_SYSTEM_TABLE* systemTable)
// prepare and send ExchangePublicPeers message
ExchangePublicPeers* request = (ExchangePublicPeers*)&peers[i].dataToTransmit[sizeof(RequestResponseHeader)];
bool noVerifiedPublicPeers = true;
- for (unsigned int k = 0; k < numberOfPublicPeers; k++)
+ // Only check non-private peers for handshake status
+ for (unsigned int k = NUMBER_OF_PRIVATE_IP; k < numberOfPublicPeers; k++)
{
if (publicPeers[k].isHandshaked /*&& publicPeers[k].isFullnode*/)
{
From 7089a6fb4ef8cbfe40c891ab404de6c48a353687 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 27 Aug 2025 17:12:55 +0200
Subject: [PATCH 059/297] last fix
---
src/contracts/VottunBridge.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index d984ecbbb..a17f3e2bb 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -25,10 +25,10 @@ struct VOTTUNBRIDGE : public ContractBase
// Input and Output Structs
struct createOrder_input
{
- Array ethAddress;
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
uint64 amount;
+ Array ethAddress;
bit fromQubicToEthereum;
- id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
};
struct createOrder_output
From f4cba864a826f716b09fcd5a4aa97a0d4cb62e23 Mon Sep 17 00:00:00 2001
From: Sergi Mias Martinez <25818384+sergimima@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:15:02 +0200
Subject: [PATCH 060/297] Fixed order in createOrder_input
---
src/contracts/VottunBridge.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index d984ecbbb..38d9fb86b 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -25,10 +25,10 @@ struct VOTTUNBRIDGE : public ContractBase
// Input and Output Structs
struct createOrder_input
{
- Array ethAddress;
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
uint64 amount;
+ Array ethAddress;
bit fromQubicToEthereum;
- id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
};
struct createOrder_output
@@ -1532,4 +1532,4 @@ struct VOTTUNBRIDGE : public ContractBase
state._earnedFeesQubic = 0;
state._distributedFeesQubic = 0;
}
-};
\ No newline at end of file
+};
From 2a94576fffed773dff76cad4302b249934677a84 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:59:24 +0700
Subject: [PATCH 061/297] update params for epoch 176 / v1.257.1
---
src/public_settings.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index f913ce526..c534339cb 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -47,7 +47,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// If this flag is 1, it indicates that the whole network (all 676 IDs) will start from scratch and agree that the very first tick time will be set at (2022-04-13 Wed 12:00:00.000UTC).
// If this flag is 0, the node will try to fetch data of the initial tick of the epoch from other nodes, because the tick's timestamp may differ from (2022-04-13 Wed 12:00:00.000UTC).
// If you restart your node after seamless epoch transition, make sure EPOCH and TICK are set correctly for the currently running epoch.
-#define START_NETWORK_FROM_SCRATCH 1
+#define START_NETWORK_FROM_SCRATCH 0
// Addons: If you don't know it, leave it 0.
#define ADDON_TX_STATUS_REQUEST 0
@@ -57,7 +57,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define VERSION_A 1
#define VERSION_B 257
-#define VERSION_C 0
+#define VERSION_C 1
// Epoch and initial tick for node startup
#define EPOCH 176
From 8f10cb1260f830c4d77443187da169bc8383f00e Mon Sep 17 00:00:00 2001
From: Sergi Mias Martinez <25818384+sergimima@users.noreply.github.com>
Date: Tue, 2 Sep 2025 09:57:40 +0200
Subject: [PATCH 062/297] Add VottunBridge Smart Contract (#497)
* Add VottunBridge smart contract for cross-chain bridge functionality
* Compilation fixes
* Fixed compilation errors
* Update VottunBridge.h
* Compilation working
* feat: Add VottunBridge smart contract with comprehensive test suite
- Implement bidirectional bridge between Qubic and Ethereum
- Add 27 comprehensive tests covering core functionality
- Support for order management, admin functions, and fee handling
- Include input validation and error handling
- Ready for deployment and IPO process
* Address reviewer feedback: clean up comments, optimize functions, fix division operators
- Remove duplicate and Spanish comments from VottunBridge.h
- Clean up 'NEW'/'NUEVA' comments throughout the code
- Optimize isAdmin and isManager functions (remove unnecessary locals structs)
- Replace division operators with div() function for fee calculations
- Add build artifacts to .gitignore
- Fix syntax errors and improve code consistency
* Address additional reviewer feedback: optimize getAdminID function and clean up build artifacts
- Remove empty getAdminID_locals struct and use PUBLIC_FUNCTION macro
- Remove versioned build/test artifacts from repository
- Clean up remaining comments and code optimizations
- Fix division operators to use div() function consistently
* Fix isManager function: use WITH_LOCALS for loop variable
- Refactor isManager to use PRIVATE_FUNCTION_WITH_LOCALS
- Move loop variable 'i' to isManager_locals struct
- Comply with Qubic rule: no local variables allowed in functions
- Address Franziska's feedback on loop variable requirements
* Fix VottunBridge refund security vulnerability KS-VB-F-01
- Add tokensReceived and tokensLocked flags to BridgeOrder struct
- Update transferToContract to accept orderId and set per-order flags
- Modify refundOrder to check tokensReceived/tokensLocked before refund
- Update completeOrder to verify token flags for consistency
- Add comprehensive security tests validating the fix
- Prevent exploit where users could refund tokens they never deposited
Tests added:
- SecurityRefundValidation: Validates new token tracking flags
- ExploitPreventionTest: Confirms original vulnerability is blocked
- TransferFlowValidation: Tests complete transfer flow security
- StateConsistencyTests: Verifies state counter consistency
All 24 tests pass successfully.
* Fix code style formatting for security tests
- Update TEST_F declarations to use braces on new lines
- Fix struct declarations formatting
- Fix if statement brace formatting
- Comply with project code style guidelines
* Fix VottunBridge code style and PR review issues
- Remove all 'NEW' comments from functions and procedures
- Fix char literal '\0' to numeric 0 in EthBridgeLogger
- Keep underscore variables (_tradeFeeBillionths, _earnedFees, etc.) as they follow Qubic standard pattern
- All opening braces { are now on new lines per Qubic style guidelines
* Removed coment
* last fix
* Fixed order in createOrder_input
---
.gitignore | 5 +
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contract_core/contract_def.h | 12 +
src/contracts/VottunBridge.h | 1535 ++++++++++++++++++++++++++++++
test/contract_vottunbridge.cpp | 1085 +++++++++++++++++++++
test/test.vcxproj | 1 +
7 files changed, 2642 insertions(+)
create mode 100644 src/contracts/VottunBridge.h
create mode 100644 test/contract_vottunbridge.cpp
diff --git a/.gitignore b/.gitignore
index bf4f57667..64abeb17c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,8 @@ x64/
.DS_Store
.clang-format
tmp
+
+# Build directories and temporary files
+out/build/
+**/Testing/Temporary/
+**/_deps/googletest-src
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 52456c8af..db45e55c0 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -39,6 +39,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 2bec405fb..2b6ed1c5a 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -243,6 +243,9 @@
contracts
+
+ contracts
+
platform
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index c31ec9074..ff13cd6d5 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,6 +204,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define VOTTUNBRIDGE_CONTRACT_INDEX 15
+#define CONTRACT_INDEX VOTTUNBRIDGE_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE VOTTUNBRIDGE
+#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
+#include "contracts/VottunBridge.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -301,6 +311,7 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
+ {"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -404,6 +415,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
new file mode 100644
index 000000000..38d9fb86b
--- /dev/null
+++ b/src/contracts/VottunBridge.h
@@ -0,0 +1,1535 @@
+using namespace QPI;
+
+struct VOTTUNBRIDGE2
+{
+};
+
+struct VOTTUNBRIDGE : public ContractBase
+{
+public:
+ // Bridge Order Structure
+ struct BridgeOrder
+ {
+ id qubicSender; // Sender address on Qubic
+ id qubicDestination; // Destination address on Qubic
+ Array ethAddress; // Destination Ethereum address
+ uint64 orderId; // Unique ID for the order
+ uint64 amount; // Amount to transfer
+ uint8 orderType; // Type of order (e.g., mint, transfer)
+ uint8 status; // Order status (e.g., Created, Pending, Refunded)
+ bit fromQubicToEthereum; // Direction of transfer
+ bit tokensReceived; // Flag to indicate if tokens have been received
+ bit tokensLocked; // Flag to indicate if tokens are in locked state
+ };
+
+ // Input and Output Structs
+ struct createOrder_input
+ {
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
+ uint64 amount;
+ Array ethAddress;
+ bit fromQubicToEthereum;
+ };
+
+ struct createOrder_output
+ {
+ uint8 status;
+ uint64 orderId;
+ };
+
+ struct setAdmin_input
+ {
+ id address;
+ };
+
+ struct setAdmin_output
+ {
+ uint8 status;
+ };
+
+ struct addManager_input
+ {
+ id address;
+ };
+
+ struct addManager_output
+ {
+ uint8 status;
+ };
+
+ struct removeManager_input
+ {
+ id address;
+ };
+
+ struct removeManager_output
+ {
+ uint8 status;
+ };
+
+ struct getTotalReceivedTokens_input
+ {
+ uint64 amount;
+ };
+
+ struct getTotalReceivedTokens_output
+ {
+ uint64 totalTokens;
+ };
+
+ struct completeOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct completeOrder_output
+ {
+ uint8 status;
+ };
+
+ struct refundOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct refundOrder_output
+ {
+ uint8 status;
+ };
+
+ struct transferToContract_input
+ {
+ uint64 amount;
+ uint64 orderId;
+ };
+
+ struct transferToContract_output
+ {
+ uint8 status;
+ };
+
+ // Withdraw Fees structures
+ struct withdrawFees_input
+ {
+ uint64 amount;
+ };
+
+ struct withdrawFees_output
+ {
+ uint8 status;
+ };
+
+ // Get Available Fees structures
+ struct getAvailableFees_input
+ {
+ // No parameters
+ };
+
+ struct getAvailableFees_output
+ {
+ uint64 availableFees;
+ uint64 totalEarnedFees;
+ uint64 totalDistributedFees;
+ };
+
+ // Order Response Structure
+ struct OrderResponse
+ {
+ id originAccount; // Origin account
+ Array destinationAccount; // Destination account
+ uint64 orderId; // Order ID as uint64
+ uint64 amount; // Amount as uint64
+ Array memo; // Notes or metadata
+ uint32 sourceChain; // Source chain identifier
+ id qubicDestination;
+ };
+
+ struct getOrder_input
+ {
+ uint64 orderId;
+ };
+
+ struct getOrder_output
+ {
+ uint8 status;
+ OrderResponse order; // Updated response format
+ Array message;
+ };
+
+ struct getAdminID_input
+ {
+ uint8 idInput;
+ };
+
+ struct getAdminID_output
+ {
+ id adminId;
+ };
+
+ struct getContractInfo_input
+ {
+ // No parameters
+ };
+
+ struct getContractInfo_output
+ {
+ id admin;
+ Array managers;
+ uint64 nextOrderId;
+ uint64 lockedTokens;
+ uint64 totalReceivedTokens;
+ uint64 earnedFees;
+ uint32 tradeFeeBillionths;
+ uint32 sourceChain;
+ // Debug info
+ Array firstOrders; // First 16 orders
+ uint64 totalOrdersFound; // How many non-empty orders exist
+ uint64 emptySlots;
+ };
+
+ // Logger structures
+ struct EthBridgeLogger
+ {
+ uint32 _contractIndex; // Index of the contract
+ uint32 _errorCode; // Error code
+ uint64 _orderId; // Order ID if applicable
+ uint64 _amount; // Amount involved in the operation
+ sint8 _terminator; // Marks the end of the logged data
+ };
+
+ struct AddressChangeLogger
+ {
+ id _newAdminAddress;
+ uint32 _contractIndex;
+ uint8 _eventCode; // Event code 'adminchanged'
+ sint8 _terminator;
+ };
+
+ struct TokensLogger
+ {
+ uint32 _contractIndex;
+ uint64 _lockedTokens; // Balance tokens locked
+ uint64 _totalReceivedTokens; // Balance total receivedTokens
+ sint8 _terminator;
+ };
+
+ struct getTotalLockedTokens_locals
+ {
+ EthBridgeLogger log;
+ };
+
+ struct getTotalLockedTokens_input
+ {
+ // No input parameters
+ };
+
+ struct getTotalLockedTokens_output
+ {
+ uint64 totalLockedTokens;
+ };
+
+ // Enum for error codes
+ enum EthBridgeError
+ {
+ onlyManagersCanCompleteOrders = 1,
+ invalidAmount = 2,
+ insufficientTransactionFee = 3,
+ orderNotFound = 4,
+ invalidOrderState = 5,
+ insufficientLockedTokens = 6,
+ transferFailed = 7,
+ maxManagersReached = 8,
+ notAuthorized = 9,
+ onlyManagersCanRefundOrders = 10
+ };
+
+public:
+ // Contract State
+ Array orders;
+ id admin; // Primary admin address
+ id feeRecipient; // Specific wallet to receive fees
+ Array managers; // Managers list
+ uint64 nextOrderId; // Counter for order IDs
+ uint64 lockedTokens; // Total locked tokens in the contract (balance)
+ uint64 totalReceivedTokens; // Total tokens received
+ uint32 sourceChain; // Source chain identifier (e.g., Ethereum=1, Qubic=0)
+ uint32 _tradeFeeBillionths; // Trade fee in billionths (e.g., 0.5% = 5,000,000)
+ uint64 _earnedFees; // Accumulated fees from trades
+ uint64 _distributedFees; // Fees already distributed to shareholders
+ uint64 _earnedFeesQubic; // Accumulated fees from Qubic trades
+ uint64 _distributedFeesQubic; // Fees already distributed to Qubic shareholders
+
+ // Internal methods for admin/manager permissions
+ typedef id isAdmin_input;
+ typedef bit isAdmin_output;
+
+ PRIVATE_FUNCTION(isAdmin)
+ {
+ output = (qpi.invocator() == state.admin);
+ }
+
+ typedef id isManager_input;
+ typedef bit isManager_output;
+
+ struct isManager_locals
+ {
+ uint64 i;
+ };
+
+ PRIVATE_FUNCTION_WITH_LOCALS(isManager)
+ {
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == input)
+ {
+ output = true;
+ return;
+ }
+ }
+ output = false;
+ }
+
+public:
+ // Create a new order and lock tokens
+ struct createOrder_locals
+ {
+ BridgeOrder newOrder;
+ EthBridgeLogger log;
+ uint64 i;
+ uint64 j;
+ bit slotFound;
+ uint64 cleanedSlots; // Counter for cleaned slots
+ BridgeOrder emptyOrder; // Empty order to clean slots
+ uint64 requiredFeeEth;
+ uint64 requiredFeeQubic;
+ uint64 totalRequiredFee;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
+ {
+ // Validate the input
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 1; // Error
+ return;
+ }
+
+ // Calculate fees as percentage of amount (0.5% each, 1% total)
+ locals.requiredFeeEth = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
+ locals.requiredFeeQubic = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
+ locals.totalRequiredFee = locals.requiredFeeEth + locals.requiredFeeQubic;
+
+ // Verify that the fee paid is sufficient for both fees
+ if (qpi.invocationReward() < static_cast(locals.totalRequiredFee))
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientTransactionFee,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 2; // Error
+ return;
+ }
+
+ // Accumulate fees in their respective variables
+ state._earnedFees += locals.requiredFeeEth;
+ state._earnedFeesQubic += locals.requiredFeeQubic;
+
+ // Create the order
+ locals.newOrder.orderId = state.nextOrderId++;
+ locals.newOrder.qubicSender = qpi.invocator();
+
+ // Set qubicDestination according to the direction
+ if (!input.fromQubicToEthereum)
+ {
+ // EVM TO QUBIC
+ locals.newOrder.qubicDestination = input.qubicDestination;
+
+ // Verify that there are enough locked tokens for EVM to Qubic orders
+ if (state.lockedTokens < input.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ 0,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+ }
+ else
+ {
+ // QUBIC TO EVM
+ locals.newOrder.qubicDestination = qpi.invocator();
+ }
+
+ for (locals.i = 0; locals.i < 42; ++locals.i)
+ {
+ locals.newOrder.ethAddress.set(locals.i, input.ethAddress.get(locals.i));
+ }
+ locals.newOrder.amount = input.amount;
+ locals.newOrder.orderType = 0; // Default order type
+ locals.newOrder.status = 0; // Created
+ locals.newOrder.fromQubicToEthereum = input.fromQubicToEthereum;
+ locals.newOrder.tokensReceived = false;
+ locals.newOrder.tokensLocked = false;
+
+ // Store the order
+ locals.slotFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).status == 255)
+ { // Empty slot
+ state.orders.set(locals.i, locals.newOrder);
+ locals.slotFound = true;
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.newOrder.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ output.orderId = locals.newOrder.orderId;
+ return;
+ }
+ }
+
+ // No available slots - attempt cleanup of completed orders
+ if (!locals.slotFound)
+ {
+ // Clean up completed and refunded orders to free slots
+ locals.cleanedSlots = 0;
+ for (locals.j = 0; locals.j < state.orders.capacity(); ++locals.j)
+ {
+ if (state.orders.get(locals.j).status == 2) // Completed or Refunded
+ {
+ // Create empty order to overwrite
+ locals.emptyOrder.status = 255; // Mark as empty
+ locals.emptyOrder.orderId = 0;
+ locals.emptyOrder.amount = 0;
+ // Clear other fields as needed
+ state.orders.set(locals.j, locals.emptyOrder);
+ locals.cleanedSlots++;
+ }
+ }
+
+ // If we cleaned some slots, try to find a slot again
+ if (locals.cleanedSlots > 0)
+ {
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).status == 255)
+ { // Empty slot
+ state.orders.set(locals.i, locals.newOrder);
+ locals.slotFound = true;
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.newOrder.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ output.orderId = locals.newOrder.orderId;
+ return;
+ }
+ }
+ }
+
+ // If still no slots available after cleanup
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 99, // Custom error code for "no available slots"
+ 0, // No orderId
+ locals.cleanedSlots, // Number of slots cleaned
+ 0 }; // Terminator
+ LOG_INFO(locals.log);
+ output.status = 3; // Error: no available slots
+ return;
+ }
+ }
+
+ // Retrieve an order
+ struct getOrder_locals
+ {
+ EthBridgeLogger log;
+ BridgeOrder order;
+ OrderResponse orderResp;
+ uint64 i;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getOrder)
+ {
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ locals.order = state.orders.get(locals.i);
+ if (locals.order.orderId == input.orderId && locals.order.status != 255)
+ {
+ // Populate OrderResponse with BridgeOrder data
+ locals.orderResp.orderId = locals.order.orderId;
+ locals.orderResp.originAccount = locals.order.qubicSender;
+ locals.orderResp.destinationAccount = locals.order.ethAddress;
+ locals.orderResp.amount = locals.order.amount;
+ locals.orderResp.sourceChain = state.sourceChain;
+ locals.orderResp.qubicDestination = locals.order.qubicDestination;
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ locals.order.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+
+ output.status = 0; // Success
+ output.order = locals.orderResp;
+ return;
+ }
+ }
+
+ // If order not found
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 1; // Error
+ }
+
+ // Admin Functions
+ struct setAdmin_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger adminLog;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized; // Error
+ return;
+ }
+
+ state.admin = input.address;
+
+ // Logging the admin address has changed
+ locals.adminLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 1, // Event code "Admin Changed"
+ 0 };
+ LOG_INFO(locals.adminLog);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ struct addManager_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger managerLog;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(addManager)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == NULL_ID)
+ {
+ state.managers.set(locals.i, input.address);
+
+ locals.managerLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 2, // Manager added
+ 0 };
+ LOG_INFO(locals.managerLog);
+ output.status = 0; // Success
+ return;
+ }
+ }
+
+ // No empty slot found
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::maxManagersReached,
+ 0, // No orderId
+ 0, // No amount
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::maxManagersReached;
+ return;
+ }
+
+ struct removeManager_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger managerLog;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(removeManager)
+ {
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized; // Error
+ return;
+ }
+
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == input.address)
+ {
+ state.managers.set(locals.i, NULL_ID);
+
+ locals.managerLog = AddressChangeLogger{
+ input.address,
+ CONTRACT_INDEX,
+ 3, // Manager removed
+ 0 };
+ LOG_INFO(locals.managerLog);
+ output.status = 0; // Success
+ return;
+ }
+ }
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ struct getTotalReceivedTokens_locals
+ {
+ EthBridgeLogger log;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getTotalReceivedTokens)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ state.totalReceivedTokens, // Amount of total tokens
+ 0 };
+ LOG_INFO(locals.log);
+ output.totalTokens = state.totalReceivedTokens;
+ }
+
+ struct completeOrder_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ bit orderFound;
+ BridgeOrder order;
+ TokensLogger logTokens;
+ uint64 i;
+ uint64 netAmount;
+ };
+
+ // Complete an order and release tokens
+ PUBLIC_PROCEDURE_WITH_LOCALS(completeOrder)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Verify that the invocator is a manager
+ if (!locals.isManagerOperating)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::onlyManagersCanCompleteOrders,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::onlyManagersCanCompleteOrders; // Error: not a manager
+ return;
+ }
+
+ // Check if the order exists
+ locals.orderFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).orderId == input.orderId)
+ {
+ locals.order = state.orders.get(locals.i);
+ locals.orderFound = true;
+ break;
+ }
+ }
+
+ // Order not found
+ if (!locals.orderFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::orderNotFound; // Error
+ return;
+ }
+
+ // Check order status
+ if (locals.order.status != 0)
+ { // Check it is not completed or refunded already
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState; // Error
+ return;
+ }
+
+ // Use full amount without deducting commission (commission was already charged in createOrder)
+ locals.netAmount = locals.order.amount;
+
+ // Handle order based on transfer direction
+ if (locals.order.fromQubicToEthereum)
+ {
+ // Verify that tokens were received
+ if (!locals.order.tokensReceived || !locals.order.tokensLocked)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState;
+ return;
+ }
+
+ // Tokens are already in lockedTokens from transferToContract
+ // No need to modify lockedTokens here
+ }
+ else
+ {
+ // Ensure sufficient tokens are locked for the order
+ if (state.lockedTokens < locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens; // Error
+ return;
+ }
+
+ // Transfer tokens back to the user
+ if (qpi.transfer(locals.order.qubicDestination, locals.netAmount) < 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::transferFailed; // Error
+ return;
+ }
+
+ state.lockedTokens -= locals.order.amount;
+ locals.logTokens = TokensLogger{
+ CONTRACT_INDEX,
+ state.lockedTokens,
+ state.totalReceivedTokens,
+ 0 };
+ LOG_INFO(locals.logTokens);
+ }
+
+ // Mark the order as completed
+ locals.order.status = 1; // Completed
+ state.orders.set(locals.i, locals.order); // Use the loop index
+
+ output.status = 0; // Success
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ }
+
+ // Refund an order and unlock tokens
+ struct refundOrder_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ bit orderFound;
+ BridgeOrder order;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(refundOrder)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Check if the order is handled by a manager
+ if (!locals.isManagerOperating)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::onlyManagersCanRefundOrders,
+ input.orderId,
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::onlyManagersCanRefundOrders; // Error
+ return;
+ }
+
+ // Retrieve the order
+ locals.orderFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).orderId == input.orderId)
+ {
+ locals.order = state.orders.get(locals.i);
+ locals.orderFound = true;
+ break;
+ }
+ }
+
+ // Order not found
+ if (!locals.orderFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::orderNotFound; // Error
+ return;
+ }
+
+ // Check order status
+ if (locals.order.status != 0)
+ { // Check it is not completed or refunded already
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState; // Error
+ return;
+ }
+
+ // Handle refund based on transfer direction
+ if (locals.order.fromQubicToEthereum)
+ {
+ // Only refund if tokens were received
+ if (!locals.order.tokensReceived)
+ {
+ // No tokens to return - simply cancel the order
+ locals.order.status = 2;
+ state.orders.set(locals.i, locals.order);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0;
+ return;
+ }
+
+ // Tokens were received and are in lockedTokens
+ if (!locals.order.tokensLocked)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState;
+ return;
+ }
+
+ // Verify sufficient locked tokens
+ if (state.lockedTokens < locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens;
+ return;
+ }
+
+ // Return tokens to original sender
+ if (qpi.transfer(locals.order.qubicSender, locals.order.amount) < 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::transferFailed;
+ return;
+ }
+
+ // Update locked tokens balance
+ state.lockedTokens -= locals.order.amount;
+ }
+
+ // Mark as refunded
+ locals.order.status = 2;
+ state.orders.set(locals.i, locals.order);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ input.orderId,
+ locals.order.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0; // Success
+ }
+
+ // Transfer tokens to the contract
+ struct transferToContract_locals
+ {
+ EthBridgeLogger log;
+ TokensLogger logTokens;
+ BridgeOrder order;
+ bit orderFound;
+ uint64 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(transferToContract)
+ {
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Find the order
+ locals.orderFound = false;
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).orderId == input.orderId)
+ {
+ locals.order = state.orders.get(locals.i);
+ locals.orderFound = true;
+ break;
+ }
+ }
+
+ if (!locals.orderFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::orderNotFound,
+ input.orderId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::orderNotFound;
+ return;
+ }
+
+ // Verify sender is the original order creator
+ if (locals.order.qubicSender != qpi.invocator())
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ // Verify order state
+ if (locals.order.status != 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState;
+ return;
+ }
+
+ // Verify tokens not already received
+ if (locals.order.tokensReceived)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidOrderState,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidOrderState;
+ return;
+ }
+
+ // Verify amount matches order
+ if (input.amount != locals.order.amount)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Only for Qubic-to-Ethereum orders need to receive tokens
+ if (locals.order.fromQubicToEthereum)
+ {
+ if (qpi.transfer(SELF, input.amount) < 0)
+ {
+ output.status = EthBridgeError::transferFailed;
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ return;
+ }
+
+ // Tokens go directly to lockedTokens for this order
+ state.lockedTokens += input.amount;
+
+ // Mark tokens as received AND locked
+ locals.order.tokensReceived = true;
+ locals.order.tokensLocked = true;
+ state.orders.set(locals.i, locals.order);
+
+ locals.logTokens = TokensLogger{
+ CONTRACT_INDEX,
+ state.lockedTokens,
+ state.totalReceivedTokens,
+ 0 };
+ LOG_INFO(locals.logTokens);
+ }
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0,
+ input.orderId,
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = 0;
+ }
+
+ struct withdrawFees_locals
+ {
+ EthBridgeLogger log;
+ uint64 availableFees;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(withdrawFees)
+ {
+ // Verify that only admin can withdraw fees
+ if (qpi.invocator() != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ // Calculate available fees
+ locals.availableFees = state._earnedFees - state._distributedFees;
+
+ // Verify that there are sufficient available fees
+ if (input.amount > locals.availableFees)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::insufficientLockedTokens, // Reusing this error
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::insufficientLockedTokens;
+ return;
+ }
+
+ // Verify that amount is valid
+ if (input.amount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Transfer fees to the designated wallet
+ if (qpi.transfer(state.feeRecipient, input.amount) < 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::transferFailed,
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::transferFailed;
+ return;
+ }
+
+ // Update distributed fees counter
+ state._distributedFees += input.amount;
+
+ // Successful log
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID
+ input.amount,
+ 0 };
+ LOG_INFO(locals.log);
+
+ output.status = 0; // Success
+ }
+
+ PUBLIC_FUNCTION(getAdminID)
+ {
+ output.adminId = state.admin;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getTotalLockedTokens)
+ {
+ // Log for debugging
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ state.lockedTokens, // Amount of locked tokens
+ 0 };
+ LOG_INFO(locals.log);
+
+ // Assign the value of lockedTokens to the output
+ output.totalLockedTokens = state.lockedTokens;
+ }
+
+ // Structure for the input of the getOrderByDetails function
+ struct getOrderByDetails_input
+ {
+ Array ethAddress; // Ethereum address
+ uint64 amount; // Transaction amount
+ uint8 status; // Order status (0 = created, 1 = completed, 2 = refunded)
+ };
+
+ // Structure for the output of the getOrderByDetails function
+ struct getOrderByDetails_output
+ {
+ uint8 status; // Operation status (0 = success, other = error)
+ uint64 orderId; // ID of the found order
+ id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
+ };
+
+ // Function to search for an order by details
+ struct getOrderByDetails_locals
+ {
+ uint64 i;
+ uint64 j;
+ bit addressMatch; // Flag to check if addresses match
+ BridgeOrder order;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getOrderByDetails)
+ {
+ // Validate input parameters
+ if (input.amount == 0)
+ {
+ output.status = 2; // Error: invalid amount
+ output.orderId = 0;
+ return;
+ }
+
+ // Iterate through all orders
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ locals.order = state.orders.get(locals.i);
+
+ // Check if the order matches the criteria
+ if (locals.order.status == 255) // Empty slot
+ continue;
+
+ // Compare ethAddress arrays element by element
+ locals.addressMatch = true;
+ for (locals.j = 0; locals.j < 42; ++locals.j)
+ {
+ if (locals.order.ethAddress.get(locals.j) != input.ethAddress.get(locals.j))
+ {
+ locals.addressMatch = false;
+ break;
+ }
+ }
+
+ // Verify exact match
+ if (locals.addressMatch &&
+ locals.order.amount == input.amount &&
+ locals.order.status == input.status)
+ {
+ // Found an exact match
+ output.status = 0; // Success
+ output.orderId = locals.order.orderId;
+ return;
+ }
+ }
+
+ // If no matching order was found
+ output.status = 1; // Not found
+ output.orderId = 0;
+ }
+
+ // Add Liquidity structures
+ struct addLiquidity_input
+ {
+ // No input parameters - amount comes from qpi.invocationReward()
+ };
+
+ struct addLiquidity_output
+ {
+ uint8 status; // Operation status (0 = success, other = error)
+ uint64 addedAmount; // Amount of tokens added to liquidity
+ uint64 totalLocked; // Total locked tokens after addition
+ };
+
+ struct addLiquidity_locals
+ {
+ EthBridgeLogger log;
+ id invocatorAddress;
+ bit isManagerOperating;
+ uint64 depositAmount;
+ };
+
+ // Add liquidity to the bridge (for managers to provide initial/additional liquidity)
+ PUBLIC_PROCEDURE_WITH_LOCALS(addLiquidity)
+ {
+ locals.invocatorAddress = qpi.invocator();
+ locals.isManagerOperating = false;
+ CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
+
+ // Verify that the invocator is a manager or admin
+ if (!locals.isManagerOperating && locals.invocatorAddress != state.admin)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0
+ };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
+
+ // Get the amount of tokens sent with this call
+ locals.depositAmount = qpi.invocationReward();
+
+ // Validate that some tokens were sent
+ if (locals.depositAmount == 0)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount,
+ 0, // No order ID involved
+ 0, // No amount involved
+ 0
+ };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
+
+ // Add the deposited tokens to the locked tokens pool
+ state.lockedTokens += locals.depositAmount;
+ state.totalReceivedTokens += locals.depositAmount;
+
+ // Log the successful liquidity addition
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ 0, // No order ID involved
+ locals.depositAmount, // Amount added
+ 0
+ };
+ LOG_INFO(locals.log);
+
+ // Set output values
+ output.status = 0; // Success
+ output.addedAmount = locals.depositAmount;
+ output.totalLocked = state.lockedTokens;
+ }
+
+
+ PUBLIC_FUNCTION(getAvailableFees)
+ {
+ output.availableFees = state._earnedFees - state._distributedFees;
+ output.totalEarnedFees = state._earnedFees;
+ output.totalDistributedFees = state._distributedFees;
+ }
+
+
+ struct getContractInfo_locals
+ {
+ uint64 i;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getContractInfo)
+ {
+ output.admin = state.admin;
+ output.managers = state.managers;
+ output.nextOrderId = state.nextOrderId;
+ output.lockedTokens = state.lockedTokens;
+ output.totalReceivedTokens = state.totalReceivedTokens;
+ output.earnedFees = state._earnedFees;
+ output.tradeFeeBillionths = state._tradeFeeBillionths;
+ output.sourceChain = state.sourceChain;
+
+
+ output.totalOrdersFound = 0;
+ output.emptySlots = 0;
+
+ for (locals.i = 0; locals.i < 16 && locals.i < state.orders.capacity(); ++locals.i)
+ {
+ output.firstOrders.set(locals.i, state.orders.get(locals.i));
+ }
+
+ // Count real orders vs empty ones
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ if (state.orders.get(locals.i).status == 255)
+ {
+ output.emptySlots++;
+ }
+ else
+ {
+ output.totalOrdersFound++;
+ }
+ }
+ }
+
+ // Called at the end of every tick to distribute earned fees
+ struct END_TICK_locals
+ {
+ uint64 feesToDistributeInThisTick;
+ uint64 amountPerComputor;
+ uint64 vottunFeesToDistribute;
+ };
+
+ END_TICK_WITH_LOCALS()
+ {
+ locals.feesToDistributeInThisTick = state._earnedFeesQubic - state._distributedFeesQubic;
+
+ if (locals.feesToDistributeInThisTick > 0)
+ {
+ // Distribute fees to computors holding shares of this contract.
+ // NUMBER_OF_COMPUTORS is a Qubic global constant (typically 676).
+ locals.amountPerComputor = div(locals.feesToDistributeInThisTick, (uint64)NUMBER_OF_COMPUTORS);
+
+ if (locals.amountPerComputor > 0)
+ {
+ if (qpi.distributeDividends(locals.amountPerComputor))
+ {
+ state._distributedFeesQubic += locals.amountPerComputor * NUMBER_OF_COMPUTORS;
+ }
+ }
+ }
+
+ // Distribution of Vottun fees to feeRecipient
+ locals.vottunFeesToDistribute = state._earnedFees - state._distributedFees;
+
+ if (locals.vottunFeesToDistribute > 0 && state.feeRecipient != 0)
+ {
+ if (qpi.transfer(state.feeRecipient, locals.vottunFeesToDistribute))
+ {
+ state._distributedFees += locals.vottunFeesToDistribute;
+ }
+ }
+ }
+
+ // Register Functions and Procedures
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ REGISTER_USER_FUNCTION(getOrder, 1);
+ REGISTER_USER_FUNCTION(isAdmin, 2);
+ REGISTER_USER_FUNCTION(isManager, 3);
+ REGISTER_USER_FUNCTION(getTotalReceivedTokens, 4);
+ REGISTER_USER_FUNCTION(getAdminID, 5);
+ REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
+ REGISTER_USER_FUNCTION(getOrderByDetails, 7);
+ REGISTER_USER_FUNCTION(getContractInfo, 8);
+ REGISTER_USER_FUNCTION(getAvailableFees, 9);
+
+ REGISTER_USER_PROCEDURE(createOrder, 1);
+ REGISTER_USER_PROCEDURE(setAdmin, 2);
+ REGISTER_USER_PROCEDURE(addManager, 3);
+ REGISTER_USER_PROCEDURE(removeManager, 4);
+ REGISTER_USER_PROCEDURE(completeOrder, 5);
+ REGISTER_USER_PROCEDURE(refundOrder, 6);
+ REGISTER_USER_PROCEDURE(transferToContract, 7);
+ REGISTER_USER_PROCEDURE(withdrawFees, 8);
+ REGISTER_USER_PROCEDURE(addLiquidity, 9);
+ }
+
+ // Initialize the contract with SECURE ADMIN CONFIGURATION
+ struct INITIALIZE_locals
+ {
+ uint64 i;
+ BridgeOrder emptyOrder;
+ };
+
+ INITIALIZE_WITH_LOCALS()
+ {
+ state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
+
+ //Initialize the wallet that receives fees (REPLACE WITH YOUR WALLET)
+ // state.feeRecipient = ID(_YOUR, _WALLET, _HERE, _PLACEHOLDER, _UNTIL, _YOU, _PUT, _THE, _REAL, _WALLET, _ADDRESS, _FROM, _VOTTUN, _TO, _RECEIVE, _THE, _BRIDGE, _FEES, _BETWEEN, _QUBIC, _AND, _ETHEREUM, _WITH, _HALF, _PERCENT, _COMMISSION, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
+
+ // Initialize the orders array. Good practice to zero first.
+ locals.emptyOrder = {}; // Sets all fields to 0 (including orderId and status).
+ locals.emptyOrder.status = 255; // Then set your status for empty.
+
+ for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
+ {
+ state.orders.set(locals.i, locals.emptyOrder);
+ }
+
+ // Initialize the managers array with NULL_ID to mark slots as empty
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ state.managers.set(locals.i, NULL_ID);
+ }
+
+ // Add the initial manager
+ state.managers.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B));
+
+ // Initialize the rest of the state variables
+ state.nextOrderId = 1; // Start from 1 to avoid ID 0
+ state.lockedTokens = 0;
+ state.totalReceivedTokens = 0;
+ state.sourceChain = 0; // Arbitrary number. No-EVM chain
+
+ // Initialize fee variables
+ state._tradeFeeBillionths = 5000000; // 0.5% == 5,000,000 / 1,000,000,000
+ state._earnedFees = 0;
+ state._distributedFees = 0;
+
+ state._earnedFeesQubic = 0;
+ state._distributedFeesQubic = 0;
+ }
+};
diff --git a/test/contract_vottunbridge.cpp b/test/contract_vottunbridge.cpp
new file mode 100644
index 000000000..5c069e255
--- /dev/null
+++ b/test/contract_vottunbridge.cpp
@@ -0,0 +1,1085 @@
+#define NO_UEFI
+
+#include
+#include
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 9d0a433c0..6f3b28c22 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -316,7 +316,7 @@ constexpr struct ContractDescription
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
#ifndef NO_VBRIDGE
- {"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
+ {"VBRIDGE", 178, 10000, sizeof(VOTTUNBRIDGE)}, // proposal in epoch 176, IPO in 177, construction and first use in 178
#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
From 3debd3ece83f5a86c9d8fd35cb951fbe8cb841c6 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:09:28 +0200
Subject: [PATCH 066/297] Revert "VBRIDGE: fix vcxproj.filters, adapt
construction epoch"
This reverts commit bc20113475ccc22d5a3854cab28c08e7b030f5ec.
---
src/Qubic.vcxproj.filters | 6 +++---
src/contract_core/contract_def.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 7ccada3d6..2b6ed1c5a 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -243,6 +243,9 @@
contracts
+
+ contracts
+
platform
@@ -273,9 +276,6 @@
contract_core
-
- contracts
-
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 6f3b28c22..9d0a433c0 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -316,7 +316,7 @@ constexpr struct ContractDescription
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
#ifndef NO_VBRIDGE
- {"VBRIDGE", 178, 10000, sizeof(VOTTUNBRIDGE)}, // proposal in epoch 176, IPO in 177, construction and first use in 178
+ {"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
From be6fc10d1e22d221a9aeed252a9da6da0da85243 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:09:38 +0200
Subject: [PATCH 067/297] Revert "add NO_VBRIDGE toggle"
This reverts commit 5db4dd24c6c1500ce2b4e6f955784e28b13989c0.
---
src/contract_core/contract_def.h | 8 --------
src/qubic.cpp | 2 --
2 files changed, 10 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 9d0a433c0..ff13cd6d5 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,8 +204,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
-#ifndef NO_VBRIDGE
-
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
@@ -216,8 +214,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
#include "contracts/VottunBridge.h"
-#endif
-
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -315,9 +311,7 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
-#ifndef NO_VBRIDGE
{"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -421,9 +415,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
-#ifndef NO_VBRIDGE
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 2e9776ffd..fdf2ae444 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,7 +1,5 @@
#define SINGLE_COMPILE_UNIT
-// #define NO_VBRIDGE
-
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From 2ac59bad741d143a6874e0b620dffbc9aeb0c56a Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:09:49 +0200
Subject: [PATCH 068/297] Revert "Add VottunBridge Smart Contract (#497)"
This reverts commit 8f10cb1260f830c4d77443187da169bc8383f00e.
---
.gitignore | 5 -
src/Qubic.vcxproj | 1 -
src/Qubic.vcxproj.filters | 3 -
src/contract_core/contract_def.h | 12 -
src/contracts/VottunBridge.h | 1535 ------------------------------
test/contract_vottunbridge.cpp | 1085 ---------------------
test/test.vcxproj | 1 -
7 files changed, 2642 deletions(-)
delete mode 100644 src/contracts/VottunBridge.h
delete mode 100644 test/contract_vottunbridge.cpp
diff --git a/.gitignore b/.gitignore
index 64abeb17c..bf4f57667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,3 @@ x64/
.DS_Store
.clang-format
tmp
-
-# Build directories and temporary files
-out/build/
-**/Testing/Temporary/
-**/_deps/googletest-src
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index db45e55c0..52456c8af 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -39,7 +39,6 @@
-
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 2b6ed1c5a..2bec405fb 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -243,9 +243,6 @@
contracts
-
- contracts
-
platform
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index ff13cd6d5..c31ec9074 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,16 +204,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
-#undef CONTRACT_INDEX
-#undef CONTRACT_STATE_TYPE
-#undef CONTRACT_STATE2_TYPE
-
-#define VOTTUNBRIDGE_CONTRACT_INDEX 15
-#define CONTRACT_INDEX VOTTUNBRIDGE_CONTRACT_INDEX
-#define CONTRACT_STATE_TYPE VOTTUNBRIDGE
-#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
-#include "contracts/VottunBridge.h"
-
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -311,7 +301,6 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
- {"VBRIDGE", 190, 10000, sizeof(VOTTUNBRIDGE)},
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -415,7 +404,6 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
- REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
deleted file mode 100644
index 38d9fb86b..000000000
--- a/src/contracts/VottunBridge.h
+++ /dev/null
@@ -1,1535 +0,0 @@
-using namespace QPI;
-
-struct VOTTUNBRIDGE2
-{
-};
-
-struct VOTTUNBRIDGE : public ContractBase
-{
-public:
- // Bridge Order Structure
- struct BridgeOrder
- {
- id qubicSender; // Sender address on Qubic
- id qubicDestination; // Destination address on Qubic
- Array ethAddress; // Destination Ethereum address
- uint64 orderId; // Unique ID for the order
- uint64 amount; // Amount to transfer
- uint8 orderType; // Type of order (e.g., mint, transfer)
- uint8 status; // Order status (e.g., Created, Pending, Refunded)
- bit fromQubicToEthereum; // Direction of transfer
- bit tokensReceived; // Flag to indicate if tokens have been received
- bit tokensLocked; // Flag to indicate if tokens are in locked state
- };
-
- // Input and Output Structs
- struct createOrder_input
- {
- id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
- uint64 amount;
- Array ethAddress;
- bit fromQubicToEthereum;
- };
-
- struct createOrder_output
- {
- uint8 status;
- uint64 orderId;
- };
-
- struct setAdmin_input
- {
- id address;
- };
-
- struct setAdmin_output
- {
- uint8 status;
- };
-
- struct addManager_input
- {
- id address;
- };
-
- struct addManager_output
- {
- uint8 status;
- };
-
- struct removeManager_input
- {
- id address;
- };
-
- struct removeManager_output
- {
- uint8 status;
- };
-
- struct getTotalReceivedTokens_input
- {
- uint64 amount;
- };
-
- struct getTotalReceivedTokens_output
- {
- uint64 totalTokens;
- };
-
- struct completeOrder_input
- {
- uint64 orderId;
- };
-
- struct completeOrder_output
- {
- uint8 status;
- };
-
- struct refundOrder_input
- {
- uint64 orderId;
- };
-
- struct refundOrder_output
- {
- uint8 status;
- };
-
- struct transferToContract_input
- {
- uint64 amount;
- uint64 orderId;
- };
-
- struct transferToContract_output
- {
- uint8 status;
- };
-
- // Withdraw Fees structures
- struct withdrawFees_input
- {
- uint64 amount;
- };
-
- struct withdrawFees_output
- {
- uint8 status;
- };
-
- // Get Available Fees structures
- struct getAvailableFees_input
- {
- // No parameters
- };
-
- struct getAvailableFees_output
- {
- uint64 availableFees;
- uint64 totalEarnedFees;
- uint64 totalDistributedFees;
- };
-
- // Order Response Structure
- struct OrderResponse
- {
- id originAccount; // Origin account
- Array destinationAccount; // Destination account
- uint64 orderId; // Order ID as uint64
- uint64 amount; // Amount as uint64
- Array memo; // Notes or metadata
- uint32 sourceChain; // Source chain identifier
- id qubicDestination;
- };
-
- struct getOrder_input
- {
- uint64 orderId;
- };
-
- struct getOrder_output
- {
- uint8 status;
- OrderResponse order; // Updated response format
- Array message;
- };
-
- struct getAdminID_input
- {
- uint8 idInput;
- };
-
- struct getAdminID_output
- {
- id adminId;
- };
-
- struct getContractInfo_input
- {
- // No parameters
- };
-
- struct getContractInfo_output
- {
- id admin;
- Array managers;
- uint64 nextOrderId;
- uint64 lockedTokens;
- uint64 totalReceivedTokens;
- uint64 earnedFees;
- uint32 tradeFeeBillionths;
- uint32 sourceChain;
- // Debug info
- Array firstOrders; // First 16 orders
- uint64 totalOrdersFound; // How many non-empty orders exist
- uint64 emptySlots;
- };
-
- // Logger structures
- struct EthBridgeLogger
- {
- uint32 _contractIndex; // Index of the contract
- uint32 _errorCode; // Error code
- uint64 _orderId; // Order ID if applicable
- uint64 _amount; // Amount involved in the operation
- sint8 _terminator; // Marks the end of the logged data
- };
-
- struct AddressChangeLogger
- {
- id _newAdminAddress;
- uint32 _contractIndex;
- uint8 _eventCode; // Event code 'adminchanged'
- sint8 _terminator;
- };
-
- struct TokensLogger
- {
- uint32 _contractIndex;
- uint64 _lockedTokens; // Balance tokens locked
- uint64 _totalReceivedTokens; // Balance total receivedTokens
- sint8 _terminator;
- };
-
- struct getTotalLockedTokens_locals
- {
- EthBridgeLogger log;
- };
-
- struct getTotalLockedTokens_input
- {
- // No input parameters
- };
-
- struct getTotalLockedTokens_output
- {
- uint64 totalLockedTokens;
- };
-
- // Enum for error codes
- enum EthBridgeError
- {
- onlyManagersCanCompleteOrders = 1,
- invalidAmount = 2,
- insufficientTransactionFee = 3,
- orderNotFound = 4,
- invalidOrderState = 5,
- insufficientLockedTokens = 6,
- transferFailed = 7,
- maxManagersReached = 8,
- notAuthorized = 9,
- onlyManagersCanRefundOrders = 10
- };
-
-public:
- // Contract State
- Array orders;
- id admin; // Primary admin address
- id feeRecipient; // Specific wallet to receive fees
- Array managers; // Managers list
- uint64 nextOrderId; // Counter for order IDs
- uint64 lockedTokens; // Total locked tokens in the contract (balance)
- uint64 totalReceivedTokens; // Total tokens received
- uint32 sourceChain; // Source chain identifier (e.g., Ethereum=1, Qubic=0)
- uint32 _tradeFeeBillionths; // Trade fee in billionths (e.g., 0.5% = 5,000,000)
- uint64 _earnedFees; // Accumulated fees from trades
- uint64 _distributedFees; // Fees already distributed to shareholders
- uint64 _earnedFeesQubic; // Accumulated fees from Qubic trades
- uint64 _distributedFeesQubic; // Fees already distributed to Qubic shareholders
-
- // Internal methods for admin/manager permissions
- typedef id isAdmin_input;
- typedef bit isAdmin_output;
-
- PRIVATE_FUNCTION(isAdmin)
- {
- output = (qpi.invocator() == state.admin);
- }
-
- typedef id isManager_input;
- typedef bit isManager_output;
-
- struct isManager_locals
- {
- uint64 i;
- };
-
- PRIVATE_FUNCTION_WITH_LOCALS(isManager)
- {
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
- {
- if (state.managers.get(locals.i) == input)
- {
- output = true;
- return;
- }
- }
- output = false;
- }
-
-public:
- // Create a new order and lock tokens
- struct createOrder_locals
- {
- BridgeOrder newOrder;
- EthBridgeLogger log;
- uint64 i;
- uint64 j;
- bit slotFound;
- uint64 cleanedSlots; // Counter for cleaned slots
- BridgeOrder emptyOrder; // Empty order to clean slots
- uint64 requiredFeeEth;
- uint64 requiredFeeQubic;
- uint64 totalRequiredFee;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(createOrder)
- {
- // Validate the input
- if (input.amount == 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- 0,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 1; // Error
- return;
- }
-
- // Calculate fees as percentage of amount (0.5% each, 1% total)
- locals.requiredFeeEth = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
- locals.requiredFeeQubic = div(input.amount * state._tradeFeeBillionths, 1000000000ULL);
- locals.totalRequiredFee = locals.requiredFeeEth + locals.requiredFeeQubic;
-
- // Verify that the fee paid is sufficient for both fees
- if (qpi.invocationReward() < static_cast(locals.totalRequiredFee))
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientTransactionFee,
- 0,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 2; // Error
- return;
- }
-
- // Accumulate fees in their respective variables
- state._earnedFees += locals.requiredFeeEth;
- state._earnedFeesQubic += locals.requiredFeeQubic;
-
- // Create the order
- locals.newOrder.orderId = state.nextOrderId++;
- locals.newOrder.qubicSender = qpi.invocator();
-
- // Set qubicDestination according to the direction
- if (!input.fromQubicToEthereum)
- {
- // EVM TO QUBIC
- locals.newOrder.qubicDestination = input.qubicDestination;
-
- // Verify that there are enough locked tokens for EVM to Qubic orders
- if (state.lockedTokens < input.amount)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens,
- 0,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::insufficientLockedTokens; // Error
- return;
- }
- }
- else
- {
- // QUBIC TO EVM
- locals.newOrder.qubicDestination = qpi.invocator();
- }
-
- for (locals.i = 0; locals.i < 42; ++locals.i)
- {
- locals.newOrder.ethAddress.set(locals.i, input.ethAddress.get(locals.i));
- }
- locals.newOrder.amount = input.amount;
- locals.newOrder.orderType = 0; // Default order type
- locals.newOrder.status = 0; // Created
- locals.newOrder.fromQubicToEthereum = input.fromQubicToEthereum;
- locals.newOrder.tokensReceived = false;
- locals.newOrder.tokensLocked = false;
-
- // Store the order
- locals.slotFound = false;
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).status == 255)
- { // Empty slot
- state.orders.set(locals.i, locals.newOrder);
- locals.slotFound = true;
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- locals.newOrder.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 0; // Success
- output.orderId = locals.newOrder.orderId;
- return;
- }
- }
-
- // No available slots - attempt cleanup of completed orders
- if (!locals.slotFound)
- {
- // Clean up completed and refunded orders to free slots
- locals.cleanedSlots = 0;
- for (locals.j = 0; locals.j < state.orders.capacity(); ++locals.j)
- {
- if (state.orders.get(locals.j).status == 2) // Completed or Refunded
- {
- // Create empty order to overwrite
- locals.emptyOrder.status = 255; // Mark as empty
- locals.emptyOrder.orderId = 0;
- locals.emptyOrder.amount = 0;
- // Clear other fields as needed
- state.orders.set(locals.j, locals.emptyOrder);
- locals.cleanedSlots++;
- }
- }
-
- // If we cleaned some slots, try to find a slot again
- if (locals.cleanedSlots > 0)
- {
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).status == 255)
- { // Empty slot
- state.orders.set(locals.i, locals.newOrder);
- locals.slotFound = true;
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- locals.newOrder.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 0; // Success
- output.orderId = locals.newOrder.orderId;
- return;
- }
- }
- }
-
- // If still no slots available after cleanup
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 99, // Custom error code for "no available slots"
- 0, // No orderId
- locals.cleanedSlots, // Number of slots cleaned
- 0 }; // Terminator
- LOG_INFO(locals.log);
- output.status = 3; // Error: no available slots
- return;
- }
- }
-
- // Retrieve an order
- struct getOrder_locals
- {
- EthBridgeLogger log;
- BridgeOrder order;
- OrderResponse orderResp;
- uint64 i;
- };
-
- PUBLIC_FUNCTION_WITH_LOCALS(getOrder)
- {
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- locals.order = state.orders.get(locals.i);
- if (locals.order.orderId == input.orderId && locals.order.status != 255)
- {
- // Populate OrderResponse with BridgeOrder data
- locals.orderResp.orderId = locals.order.orderId;
- locals.orderResp.originAccount = locals.order.qubicSender;
- locals.orderResp.destinationAccount = locals.order.ethAddress;
- locals.orderResp.amount = locals.order.amount;
- locals.orderResp.sourceChain = state.sourceChain;
- locals.orderResp.qubicDestination = locals.order.qubicDestination;
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- locals.order.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
-
- output.status = 0; // Success
- output.order = locals.orderResp;
- return;
- }
- }
-
- // If order not found
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::orderNotFound,
- input.orderId,
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = 1; // Error
- }
-
- // Admin Functions
- struct setAdmin_locals
- {
- EthBridgeLogger log;
- AddressChangeLogger adminLog;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
- {
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized; // Error
- return;
- }
-
- state.admin = input.address;
-
- // Logging the admin address has changed
- locals.adminLog = AddressChangeLogger{
- input.address,
- CONTRACT_INDEX,
- 1, // Event code "Admin Changed"
- 0 };
- LOG_INFO(locals.adminLog);
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = 0; // Success
- }
-
- struct addManager_locals
- {
- EthBridgeLogger log;
- AddressChangeLogger managerLog;
- uint64 i;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(addManager)
- {
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
- {
- if (state.managers.get(locals.i) == NULL_ID)
- {
- state.managers.set(locals.i, input.address);
-
- locals.managerLog = AddressChangeLogger{
- input.address,
- CONTRACT_INDEX,
- 2, // Manager added
- 0 };
- LOG_INFO(locals.managerLog);
- output.status = 0; // Success
- return;
- }
- }
-
- // No empty slot found
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::maxManagersReached,
- 0, // No orderId
- 0, // No amount
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::maxManagersReached;
- return;
- }
-
- struct removeManager_locals
- {
- EthBridgeLogger log;
- AddressChangeLogger managerLog;
- uint64 i;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(removeManager)
- {
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized; // Error
- return;
- }
-
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
- {
- if (state.managers.get(locals.i) == input.address)
- {
- state.managers.set(locals.i, NULL_ID);
-
- locals.managerLog = AddressChangeLogger{
- input.address,
- CONTRACT_INDEX,
- 3, // Manager removed
- 0 };
- LOG_INFO(locals.managerLog);
- output.status = 0; // Success
- return;
- }
- }
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = 0; // Success
- }
-
- struct getTotalReceivedTokens_locals
- {
- EthBridgeLogger log;
- };
-
- PUBLIC_FUNCTION_WITH_LOCALS(getTotalReceivedTokens)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- state.totalReceivedTokens, // Amount of total tokens
- 0 };
- LOG_INFO(locals.log);
- output.totalTokens = state.totalReceivedTokens;
- }
-
- struct completeOrder_locals
- {
- EthBridgeLogger log;
- id invocatorAddress;
- bit isManagerOperating;
- bit orderFound;
- BridgeOrder order;
- TokensLogger logTokens;
- uint64 i;
- uint64 netAmount;
- };
-
- // Complete an order and release tokens
- PUBLIC_PROCEDURE_WITH_LOCALS(completeOrder)
- {
- locals.invocatorAddress = qpi.invocator();
- locals.isManagerOperating = false;
- CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
-
- // Verify that the invocator is a manager
- if (!locals.isManagerOperating)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::onlyManagersCanCompleteOrders,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::onlyManagersCanCompleteOrders; // Error: not a manager
- return;
- }
-
- // Check if the order exists
- locals.orderFound = false;
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).orderId == input.orderId)
- {
- locals.order = state.orders.get(locals.i);
- locals.orderFound = true;
- break;
- }
- }
-
- // Order not found
- if (!locals.orderFound)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::orderNotFound,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::orderNotFound; // Error
- return;
- }
-
- // Check order status
- if (locals.order.status != 0)
- { // Check it is not completed or refunded already
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState; // Error
- return;
- }
-
- // Use full amount without deducting commission (commission was already charged in createOrder)
- locals.netAmount = locals.order.amount;
-
- // Handle order based on transfer direction
- if (locals.order.fromQubicToEthereum)
- {
- // Verify that tokens were received
- if (!locals.order.tokensReceived || !locals.order.tokensLocked)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState;
- return;
- }
-
- // Tokens are already in lockedTokens from transferToContract
- // No need to modify lockedTokens here
- }
- else
- {
- // Ensure sufficient tokens are locked for the order
- if (state.lockedTokens < locals.order.amount)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::insufficientLockedTokens; // Error
- return;
- }
-
- // Transfer tokens back to the user
- if (qpi.transfer(locals.order.qubicDestination, locals.netAmount) < 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::transferFailed,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::transferFailed; // Error
- return;
- }
-
- state.lockedTokens -= locals.order.amount;
- locals.logTokens = TokensLogger{
- CONTRACT_INDEX,
- state.lockedTokens,
- state.totalReceivedTokens,
- 0 };
- LOG_INFO(locals.logTokens);
- }
-
- // Mark the order as completed
- locals.order.status = 1; // Completed
- state.orders.set(locals.i, locals.order); // Use the loop index
-
- output.status = 0; // Success
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- }
-
- // Refund an order and unlock tokens
- struct refundOrder_locals
- {
- EthBridgeLogger log;
- id invocatorAddress;
- bit isManagerOperating;
- bit orderFound;
- BridgeOrder order;
- uint64 i;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(refundOrder)
- {
- locals.invocatorAddress = qpi.invocator();
- locals.isManagerOperating = false;
- CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
-
- // Check if the order is handled by a manager
- if (!locals.isManagerOperating)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::onlyManagersCanRefundOrders,
- input.orderId,
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::onlyManagersCanRefundOrders; // Error
- return;
- }
-
- // Retrieve the order
- locals.orderFound = false;
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).orderId == input.orderId)
- {
- locals.order = state.orders.get(locals.i);
- locals.orderFound = true;
- break;
- }
- }
-
- // Order not found
- if (!locals.orderFound)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::orderNotFound,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::orderNotFound; // Error
- return;
- }
-
- // Check order status
- if (locals.order.status != 0)
- { // Check it is not completed or refunded already
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState; // Error
- return;
- }
-
- // Handle refund based on transfer direction
- if (locals.order.fromQubicToEthereum)
- {
- // Only refund if tokens were received
- if (!locals.order.tokensReceived)
- {
- // No tokens to return - simply cancel the order
- locals.order.status = 2;
- state.orders.set(locals.i, locals.order);
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = 0;
- return;
- }
-
- // Tokens were received and are in lockedTokens
- if (!locals.order.tokensLocked)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState;
- return;
- }
-
- // Verify sufficient locked tokens
- if (state.lockedTokens < locals.order.amount)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::insufficientLockedTokens;
- return;
- }
-
- // Return tokens to original sender
- if (qpi.transfer(locals.order.qubicSender, locals.order.amount) < 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::transferFailed,
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::transferFailed;
- return;
- }
-
- // Update locked tokens balance
- state.lockedTokens -= locals.order.amount;
- }
-
- // Mark as refunded
- locals.order.status = 2;
- state.orders.set(locals.i, locals.order);
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- input.orderId,
- locals.order.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 0; // Success
- }
-
- // Transfer tokens to the contract
- struct transferToContract_locals
- {
- EthBridgeLogger log;
- TokensLogger logTokens;
- BridgeOrder order;
- bit orderFound;
- uint64 i;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(transferToContract)
- {
- if (input.amount == 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidAmount;
- return;
- }
-
- // Find the order
- locals.orderFound = false;
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).orderId == input.orderId)
- {
- locals.order = state.orders.get(locals.i);
- locals.orderFound = true;
- break;
- }
- }
-
- if (!locals.orderFound)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::orderNotFound,
- input.orderId,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::orderNotFound;
- return;
- }
-
- // Verify sender is the original order creator
- if (locals.order.qubicSender != qpi.invocator())
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
- // Verify order state
- if (locals.order.status != 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState;
- return;
- }
-
- // Verify tokens not already received
- if (locals.order.tokensReceived)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidOrderState,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidOrderState;
- return;
- }
-
- // Verify amount matches order
- if (input.amount != locals.order.amount)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidAmount;
- return;
- }
-
- // Only for Qubic-to-Ethereum orders need to receive tokens
- if (locals.order.fromQubicToEthereum)
- {
- if (qpi.transfer(SELF, input.amount) < 0)
- {
- output.status = EthBridgeError::transferFailed;
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::transferFailed,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- return;
- }
-
- // Tokens go directly to lockedTokens for this order
- state.lockedTokens += input.amount;
-
- // Mark tokens as received AND locked
- locals.order.tokensReceived = true;
- locals.order.tokensLocked = true;
- state.orders.set(locals.i, locals.order);
-
- locals.logTokens = TokensLogger{
- CONTRACT_INDEX,
- state.lockedTokens,
- state.totalReceivedTokens,
- 0 };
- LOG_INFO(locals.logTokens);
- }
-
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0,
- input.orderId,
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = 0;
- }
-
- struct withdrawFees_locals
- {
- EthBridgeLogger log;
- uint64 availableFees;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(withdrawFees)
- {
- // Verify that only admin can withdraw fees
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
- // Calculate available fees
- locals.availableFees = state._earnedFees - state._distributedFees;
-
- // Verify that there are sufficient available fees
- if (input.amount > locals.availableFees)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens, // Reusing this error
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::insufficientLockedTokens;
- return;
- }
-
- // Verify that amount is valid
- if (input.amount == 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidAmount;
- return;
- }
-
- // Transfer fees to the designated wallet
- if (qpi.transfer(state.feeRecipient, input.amount) < 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::transferFailed,
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::transferFailed;
- return;
- }
-
- // Update distributed fees counter
- state._distributedFees += input.amount;
-
- // Successful log
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
-
- output.status = 0; // Success
- }
-
- PUBLIC_FUNCTION(getAdminID)
- {
- output.adminId = state.admin;
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getTotalLockedTokens)
- {
- // Log for debugging
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- state.lockedTokens, // Amount of locked tokens
- 0 };
- LOG_INFO(locals.log);
-
- // Assign the value of lockedTokens to the output
- output.totalLockedTokens = state.lockedTokens;
- }
-
- // Structure for the input of the getOrderByDetails function
- struct getOrderByDetails_input
- {
- Array ethAddress; // Ethereum address
- uint64 amount; // Transaction amount
- uint8 status; // Order status (0 = created, 1 = completed, 2 = refunded)
- };
-
- // Structure for the output of the getOrderByDetails function
- struct getOrderByDetails_output
- {
- uint8 status; // Operation status (0 = success, other = error)
- uint64 orderId; // ID of the found order
- id qubicDestination; // Destination address on Qubic (for EVM to Qubic orders)
- };
-
- // Function to search for an order by details
- struct getOrderByDetails_locals
- {
- uint64 i;
- uint64 j;
- bit addressMatch; // Flag to check if addresses match
- BridgeOrder order;
- };
-
- PUBLIC_FUNCTION_WITH_LOCALS(getOrderByDetails)
- {
- // Validate input parameters
- if (input.amount == 0)
- {
- output.status = 2; // Error: invalid amount
- output.orderId = 0;
- return;
- }
-
- // Iterate through all orders
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- locals.order = state.orders.get(locals.i);
-
- // Check if the order matches the criteria
- if (locals.order.status == 255) // Empty slot
- continue;
-
- // Compare ethAddress arrays element by element
- locals.addressMatch = true;
- for (locals.j = 0; locals.j < 42; ++locals.j)
- {
- if (locals.order.ethAddress.get(locals.j) != input.ethAddress.get(locals.j))
- {
- locals.addressMatch = false;
- break;
- }
- }
-
- // Verify exact match
- if (locals.addressMatch &&
- locals.order.amount == input.amount &&
- locals.order.status == input.status)
- {
- // Found an exact match
- output.status = 0; // Success
- output.orderId = locals.order.orderId;
- return;
- }
- }
-
- // If no matching order was found
- output.status = 1; // Not found
- output.orderId = 0;
- }
-
- // Add Liquidity structures
- struct addLiquidity_input
- {
- // No input parameters - amount comes from qpi.invocationReward()
- };
-
- struct addLiquidity_output
- {
- uint8 status; // Operation status (0 = success, other = error)
- uint64 addedAmount; // Amount of tokens added to liquidity
- uint64 totalLocked; // Total locked tokens after addition
- };
-
- struct addLiquidity_locals
- {
- EthBridgeLogger log;
- id invocatorAddress;
- bit isManagerOperating;
- uint64 depositAmount;
- };
-
- // Add liquidity to the bridge (for managers to provide initial/additional liquidity)
- PUBLIC_PROCEDURE_WITH_LOCALS(addLiquidity)
- {
- locals.invocatorAddress = qpi.invocator();
- locals.isManagerOperating = false;
- CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
-
- // Verify that the invocator is a manager or admin
- if (!locals.isManagerOperating && locals.invocatorAddress != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0
- };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
- // Get the amount of tokens sent with this call
- locals.depositAmount = qpi.invocationReward();
-
- // Validate that some tokens were sent
- if (locals.depositAmount == 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- 0, // No order ID involved
- 0, // No amount involved
- 0
- };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidAmount;
- return;
- }
-
- // Add the deposited tokens to the locked tokens pool
- state.lockedTokens += locals.depositAmount;
- state.totalReceivedTokens += locals.depositAmount;
-
- // Log the successful liquidity addition
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- locals.depositAmount, // Amount added
- 0
- };
- LOG_INFO(locals.log);
-
- // Set output values
- output.status = 0; // Success
- output.addedAmount = locals.depositAmount;
- output.totalLocked = state.lockedTokens;
- }
-
-
- PUBLIC_FUNCTION(getAvailableFees)
- {
- output.availableFees = state._earnedFees - state._distributedFees;
- output.totalEarnedFees = state._earnedFees;
- output.totalDistributedFees = state._distributedFees;
- }
-
-
- struct getContractInfo_locals
- {
- uint64 i;
- };
-
- PUBLIC_FUNCTION_WITH_LOCALS(getContractInfo)
- {
- output.admin = state.admin;
- output.managers = state.managers;
- output.nextOrderId = state.nextOrderId;
- output.lockedTokens = state.lockedTokens;
- output.totalReceivedTokens = state.totalReceivedTokens;
- output.earnedFees = state._earnedFees;
- output.tradeFeeBillionths = state._tradeFeeBillionths;
- output.sourceChain = state.sourceChain;
-
-
- output.totalOrdersFound = 0;
- output.emptySlots = 0;
-
- for (locals.i = 0; locals.i < 16 && locals.i < state.orders.capacity(); ++locals.i)
- {
- output.firstOrders.set(locals.i, state.orders.get(locals.i));
- }
-
- // Count real orders vs empty ones
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- if (state.orders.get(locals.i).status == 255)
- {
- output.emptySlots++;
- }
- else
- {
- output.totalOrdersFound++;
- }
- }
- }
-
- // Called at the end of every tick to distribute earned fees
- struct END_TICK_locals
- {
- uint64 feesToDistributeInThisTick;
- uint64 amountPerComputor;
- uint64 vottunFeesToDistribute;
- };
-
- END_TICK_WITH_LOCALS()
- {
- locals.feesToDistributeInThisTick = state._earnedFeesQubic - state._distributedFeesQubic;
-
- if (locals.feesToDistributeInThisTick > 0)
- {
- // Distribute fees to computors holding shares of this contract.
- // NUMBER_OF_COMPUTORS is a Qubic global constant (typically 676).
- locals.amountPerComputor = div(locals.feesToDistributeInThisTick, (uint64)NUMBER_OF_COMPUTORS);
-
- if (locals.amountPerComputor > 0)
- {
- if (qpi.distributeDividends(locals.amountPerComputor))
- {
- state._distributedFeesQubic += locals.amountPerComputor * NUMBER_OF_COMPUTORS;
- }
- }
- }
-
- // Distribution of Vottun fees to feeRecipient
- locals.vottunFeesToDistribute = state._earnedFees - state._distributedFees;
-
- if (locals.vottunFeesToDistribute > 0 && state.feeRecipient != 0)
- {
- if (qpi.transfer(state.feeRecipient, locals.vottunFeesToDistribute))
- {
- state._distributedFees += locals.vottunFeesToDistribute;
- }
- }
- }
-
- // Register Functions and Procedures
- REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
- {
- REGISTER_USER_FUNCTION(getOrder, 1);
- REGISTER_USER_FUNCTION(isAdmin, 2);
- REGISTER_USER_FUNCTION(isManager, 3);
- REGISTER_USER_FUNCTION(getTotalReceivedTokens, 4);
- REGISTER_USER_FUNCTION(getAdminID, 5);
- REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
- REGISTER_USER_FUNCTION(getOrderByDetails, 7);
- REGISTER_USER_FUNCTION(getContractInfo, 8);
- REGISTER_USER_FUNCTION(getAvailableFees, 9);
-
- REGISTER_USER_PROCEDURE(createOrder, 1);
- REGISTER_USER_PROCEDURE(setAdmin, 2);
- REGISTER_USER_PROCEDURE(addManager, 3);
- REGISTER_USER_PROCEDURE(removeManager, 4);
- REGISTER_USER_PROCEDURE(completeOrder, 5);
- REGISTER_USER_PROCEDURE(refundOrder, 6);
- REGISTER_USER_PROCEDURE(transferToContract, 7);
- REGISTER_USER_PROCEDURE(withdrawFees, 8);
- REGISTER_USER_PROCEDURE(addLiquidity, 9);
- }
-
- // Initialize the contract with SECURE ADMIN CONFIGURATION
- struct INITIALIZE_locals
- {
- uint64 i;
- BridgeOrder emptyOrder;
- };
-
- INITIALIZE_WITH_LOCALS()
- {
- state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
-
- //Initialize the wallet that receives fees (REPLACE WITH YOUR WALLET)
- // state.feeRecipient = ID(_YOUR, _WALLET, _HERE, _PLACEHOLDER, _UNTIL, _YOU, _PUT, _THE, _REAL, _WALLET, _ADDRESS, _FROM, _VOTTUN, _TO, _RECEIVE, _THE, _BRIDGE, _FEES, _BETWEEN, _QUBIC, _AND, _ETHEREUM, _WITH, _HALF, _PERCENT, _COMMISSION, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
-
- // Initialize the orders array. Good practice to zero first.
- locals.emptyOrder = {}; // Sets all fields to 0 (including orderId and status).
- locals.emptyOrder.status = 255; // Then set your status for empty.
-
- for (locals.i = 0; locals.i < state.orders.capacity(); ++locals.i)
- {
- state.orders.set(locals.i, locals.emptyOrder);
- }
-
- // Initialize the managers array with NULL_ID to mark slots as empty
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
- {
- state.managers.set(locals.i, NULL_ID);
- }
-
- // Add the initial manager
- state.managers.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B));
-
- // Initialize the rest of the state variables
- state.nextOrderId = 1; // Start from 1 to avoid ID 0
- state.lockedTokens = 0;
- state.totalReceivedTokens = 0;
- state.sourceChain = 0; // Arbitrary number. No-EVM chain
-
- // Initialize fee variables
- state._tradeFeeBillionths = 5000000; // 0.5% == 5,000,000 / 1,000,000,000
- state._earnedFees = 0;
- state._distributedFees = 0;
-
- state._earnedFeesQubic = 0;
- state._distributedFeesQubic = 0;
- }
-};
diff --git a/test/contract_vottunbridge.cpp b/test/contract_vottunbridge.cpp
deleted file mode 100644
index 5c069e255..000000000
--- a/test/contract_vottunbridge.cpp
+++ /dev/null
@@ -1,1085 +0,0 @@
-#define NO_UEFI
-
-#include
-#include
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index c31ec9074..ff2a7bdfa 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,6 +204,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define QDRAW_CONTRACT_INDEX 15
+#define CONTRACT_INDEX QDRAW_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QDRAW
+#define CONTRACT_STATE2_TYPE QDRAW2
+#include "contracts/Qdraw.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -301,6 +311,7 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
+ {"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -404,6 +415,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
From 4ad2e13f9911952b90b6a341d2c6e8904b2aa389 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 9 Sep 2025 10:41:05 +0200
Subject: [PATCH 074/297] add NO_QDRAW toggle
---
src/contract_core/contract_def.h | 8 ++++++++
src/qubic.cpp | 2 ++
2 files changed, 10 insertions(+)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index ff2a7bdfa..4e891789a 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,6 +204,8 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
+#ifndef NO_QDRAW
+
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
@@ -214,6 +216,8 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QDRAW2
#include "contracts/Qdraw.h"
+#endif
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -311,7 +315,9 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
+#ifndef NO_QDRAW
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -415,7 +421,9 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
+#ifndef NO_QDRAW
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 930815065..c39e8e13d 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,5 +1,7 @@
#define SINGLE_COMPILE_UNIT
+// #define NO_QDRAW
+
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From 5ececb75b1acdfce35f1052a2022263b40f4035a Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 9 Sep 2025 11:02:36 +0200
Subject: [PATCH 075/297] update params for epoch 178 / v1.259.0
---
src/public_settings.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 89b429a95..2abbe7a7e 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -56,12 +56,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 258
-#define VERSION_C 1
+#define VERSION_B 259
+#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 177
-#define TICK 32116000
+#define EPOCH 178
+#define TICK 32420000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From fda45fb2baf52c5fde23c4d3eb39b10e0014ab3d Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 9 Sep 2025 11:25:56 +0200
Subject: [PATCH 076/297] remove last 4 chars (checksum) from QDRAW owner ID
---
src/contracts/Qdraw.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/contracts/Qdraw.h b/src/contracts/Qdraw.h
index 09b8be8cb..46c34d111 100644
--- a/src/contracts/Qdraw.h
+++ b/src/contracts/Qdraw.h
@@ -178,7 +178,7 @@ struct QDRAW : public ContractBase
state._lastWinAmount = 0;
state._lastWinner = NULL_ID;
state._lastDrawHour = qpi.hour();
- state._owner = ID(_Q, _D, _R, _A, _W, _U, _R, _A, _L, _C, _L, _P, _P, _E, _Q, _O, _G, _Q, _C, _U, _J, _N, _F, _B, _B, _B, _A, _A, _F, _X, _W, _Y, _Y, _M, _M, _C, _U, _C, _U, _K, _T, _C, _R, _Q, _B, _S, _M, _Z, _U, _D, _M, _V, _X, _P, _N,_F, _Y, _X, _U, _M);
+ state._owner = ID(_Q, _D, _R, _A, _W, _U, _R, _A, _L, _C, _L, _P, _P, _E, _Q, _O, _G, _Q, _C, _U, _J, _N, _F, _B, _B, _B, _A, _A, _F, _X, _W, _Y, _Y, _M, _M, _C, _U, _C, _U, _K, _T, _C, _R, _Q, _B, _S, _M, _Z, _U, _D, _M, _V, _X, _P, _N, _F);
}
BEGIN_TICK_WITH_LOCALS()
From 506b9a0f2d0a931ed10342735a5dbfed1876c5f2 Mon Sep 17 00:00:00 2001
From: baoLuck <91096117+baoLuck@users.noreply.github.com>
Date: Wed, 10 Sep 2025 16:06:52 +0300
Subject: [PATCH 077/297] transfer management rights logging fixed (#529)
---
src/assets/assets.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/assets/assets.h b/src/assets/assets.h
index d0fc19589..d99b9adc7 100644
--- a/src/assets/assets.h
+++ b/src/assets/assets.h
@@ -417,8 +417,8 @@ static bool transferShareManagementRights(int sourceOwnershipIndex, int sourcePo
logPM.possessionPublicKey = possessionPublicKey;
logPM.ownershipPublicKey = ownershipPublicKey;
logPM.issuerPublicKey = assets[issuanceIndex].varStruct.issuance.publicKey;
- logOM.sourceContractIndex = assets[sourcePossessionIndex].varStruct.ownership.managingContractIndex;
- logOM.destinationContractIndex = destinationPossessionManagingContractIndex;
+ logPM.sourceContractIndex = assets[sourcePossessionIndex].varStruct.ownership.managingContractIndex;
+ logPM.destinationContractIndex = destinationPossessionManagingContractIndex;
logPM.numberOfShares = numberOfShares;
*((unsigned long long*) & logPM.assetName) = *((unsigned long long*) & assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.name); // possible with 7 byte array, because it is followed by memory reserved for terminator byte
logger.logAssetPossessionManagingContractChange(logPM);
From 238650adcf353bc5280c27a98a87669cd1797a94 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 10 Sep 2025 16:04:09 +0200
Subject: [PATCH 078/297] Revert "add NO_QDRAW toggle"
This reverts commit 4ad2e13f9911952b90b6a341d2c6e8904b2aa389.
---
src/contract_core/contract_def.h | 8 --------
src/qubic.cpp | 2 --
2 files changed, 10 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 4e891789a..ff2a7bdfa 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -204,8 +204,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE NOST2
#include "contracts/Nostromo.h"
-#ifndef NO_QDRAW
-
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
@@ -216,8 +214,6 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QDRAW2
#include "contracts/Qdraw.h"
-#endif
-
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -315,9 +311,7 @@ constexpr struct ContractDescription
{"QBAY", 154, 10000, sizeof(QBAY)}, // proposal in epoch 152, IPO in 153, construction and first use in 154
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
-#ifndef NO_QDRAW
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -421,9 +415,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBAY);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
-#ifndef NO_QDRAW
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index c39e8e13d..930815065 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,7 +1,5 @@
#define SINGLE_COMPILE_UNIT
-// #define NO_QDRAW
-
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From fa7c0141bd6c6134d4815ecbd7eff51d40a223ff Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 10 Sep 2025 19:11:52 +0200
Subject: [PATCH 079/297] change qpi ID macro to function (#531)
* change qpi ID macro to function
* change months and weekdays to constexpr
---
src/contracts/qpi.h | 104 ++++++++++++++++++++++++--------------------
1 file changed, 57 insertions(+), 47 deletions(-)
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 28c3ebc4c..73675fe8a 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -55,61 +55,71 @@ namespace QPI
#define STATIC_ASSERT(condition, identifier) static_assert(condition, #identifier);
#define NULL_ID id::zero()
+
constexpr sint64 NULL_INDEX = -1;
constexpr sint64 INVALID_AMOUNT = 0x8000000000000000;
-#define _A 0
-#define _B 1
-#define _C 2
-#define _D 3
-#define _E 4
-#define _F 5
-#define _G 6
-#define _H 7
-#define _I 8
-#define _J 9
-#define _K 10
-#define _L 11
-#define _M 12
-#define _N 13
-#define _O 14
-#define _P 15
-#define _Q 16
-#define _R 17
-#define _S 18
-#define _T 19
-#define _U 20
-#define _V 21
-#define _W 22
-#define _X 23
-#define _Y 24
-#define _Z 25
-#define ID(_00, _01, _02, _03, _04, _05, _06, _07, _08, _09, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55) _mm256_set_epi64x(((((((((((((((uint64)_55) * 26 + _54) * 26 + _53) * 26 + _52) * 26 + _51) * 26 + _50) * 26 + _49) * 26 + _48) * 26 + _47) * 26 + _46) * 26 + _45) * 26 + _44) * 26 + _43) * 26 + _42, ((((((((((((((uint64)_41) * 26 + _40) * 26 + _39) * 26 + _38) * 26 + _37) * 26 + _36) * 26 + _35) * 26 + _34) * 26 + _33) * 26 + _32) * 26 + _31) * 26 + _30) * 26 + _29) * 26 + _28, ((((((((((((((uint64)_27) * 26 + _26) * 26 + _25) * 26 + _24) * 26 + _23) * 26 + _22) * 26 + _21) * 26 + _20) * 26 + _19) * 26 + _18) * 26 + _17) * 26 + _16) * 26 + _15) * 26 + _14, ((((((((((((((uint64)_13) * 26 + _12) * 26 + _11) * 26 + _10) * 26 + _09) * 26 + _08) * 26 + _07) * 26 + _06) * 26 + _05) * 26 + _04) * 26 + _03) * 26 + _02) * 26 + _01) * 26 + _00)
+ constexpr long long _A = 0;
+ constexpr long long _B = 1;
+ constexpr long long _C = 2;
+ constexpr long long _D = 3;
+ constexpr long long _E = 4;
+ constexpr long long _F = 5;
+ constexpr long long _G = 6;
+ constexpr long long _H = 7;
+ constexpr long long _I = 8;
+ constexpr long long _J = 9;
+ constexpr long long _K = 10;
+ constexpr long long _L = 11;
+ constexpr long long _M = 12;
+ constexpr long long _N = 13;
+ constexpr long long _O = 14;
+ constexpr long long _P = 15;
+ constexpr long long _Q = 16;
+ constexpr long long _R = 17;
+ constexpr long long _S = 18;
+ constexpr long long _T = 19;
+ constexpr long long _U = 20;
+ constexpr long long _V = 21;
+ constexpr long long _W = 22;
+ constexpr long long _X = 23;
+ constexpr long long _Y = 24;
+ constexpr long long _Z = 25;
+
+ inline id ID(long long _00, long long _01, long long _02, long long _03, long long _04, long long _05, long long _06, long long _07, long long _08, long long _09,
+ long long _10, long long _11, long long _12, long long _13, long long _14, long long _15, long long _16, long long _17, long long _18, long long _19,
+ long long _20, long long _21, long long _22, long long _23, long long _24, long long _25, long long _26, long long _27, long long _28, long long _29,
+ long long _30, long long _31, long long _32, long long _33, long long _34, long long _35, long long _36, long long _37, long long _38, long long _39,
+ long long _40, long long _41, long long _42, long long _43, long long _44, long long _45, long long _46, long long _47, long long _48, long long _49,
+ long long _50, long long _51, long long _52, long long _53, long long _54, long long _55)
+ {
+ return _mm256_set_epi64x(((((((((((((((uint64)_55) * 26 + _54) * 26 + _53) * 26 + _52) * 26 + _51) * 26 + _50) * 26 + _49) * 26 + _48) * 26 + _47) * 26 + _46) * 26 + _45) * 26 + _44) * 26 + _43) * 26 + _42, ((((((((((((((uint64)_41) * 26 + _40) * 26 + _39) * 26 + _38) * 26 + _37) * 26 + _36) * 26 + _35) * 26 + _34) * 26 + _33) * 26 + _32) * 26 + _31) * 26 + _30) * 26 + _29) * 26 + _28, ((((((((((((((uint64)_27) * 26 + _26) * 26 + _25) * 26 + _24) * 26 + _23) * 26 + _22) * 26 + _21) * 26 + _20) * 26 + _19) * 26 + _18) * 26 + _17) * 26 + _16) * 26 + _15) * 26 + _14, ((((((((((((((uint64)_13) * 26 + _12) * 26 + _11) * 26 + _10) * 26 + _09) * 26 + _08) * 26 + _07) * 26 + _06) * 26 + _05) * 26 + _04) * 26 + _03) * 26 + _02) * 26 + _01) * 26 + _00);
+ }
#define NUMBER_OF_COMPUTORS 676
#define QUORUM (NUMBER_OF_COMPUTORS * 2 / 3 + 1)
-#define JANUARY 1
-#define FEBRUARY 2
-#define MARCH 3
-#define APRIL 4
-#define MAY 5
-#define JUNE 6
-#define JULY 7
-#define AUGUST 8
-#define SEPTEMBER 9
-#define OCTOBER 10
-#define NOVEMBER 11
-#define DECEMBER 12
-
-#define WEDNESDAY 0
-#define THURSDAY 1
-#define FRIDAY 2
-#define SATURDAY 3
-#define SUNDAY 4
-#define MONDAY 5
-#define TUESDAY 6
+ constexpr int JANUARY = 1;
+ constexpr int FEBRUARY = 2;
+ constexpr int MARCH = 3;
+ constexpr int APRIL = 4;
+ constexpr int MAY = 5;
+ constexpr int JUNE = 6;
+ constexpr int JULY = 7;
+ constexpr int AUGUST = 8;
+ constexpr int SEPTEMBER = 9;
+ constexpr int OCTOBER = 10;
+ constexpr int NOVEMBER = 11;
+ constexpr int DECEMBER = 12;
+
+ constexpr int WEDNESDAY = 0;
+ constexpr int THURSDAY = 1;
+ constexpr int FRIDAY = 2;
+ constexpr int SATURDAY = 3;
+ constexpr int SUNDAY = 4;
+ constexpr int MONDAY = 5;
+ constexpr int TUESDAY = 6;
constexpr unsigned long long X_MULTIPLIER = 1ULL;
From f242bc4911dc91669baec5745e7d2f75bd38f798 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 14:44:03 +0700
Subject: [PATCH 080/297] add safe mul, fix overflow bug in qx
---
src/contract_core/contract_def.h | 2 +-
src/contracts/Qx.h | 22 +++++++-------
src/contracts/qpi.h | 50 ++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index ff2a7bdfa..a9aae0b3d 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -1,5 +1,5 @@
#pragma once
-
+#include "network_messages/common_def.h"
#include "platform/m256.h"
////////// Smart contracts \\\\\\\\\\
diff --git a/src/contracts/Qx.h b/src/contracts/Qx.h
index 04d28d4b5..0379f696d 100644
--- a/src/contracts/Qx.h
+++ b/src/contracts/Qx.h
@@ -533,8 +533,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.addedNumberOfShares = 0;
}
@@ -694,9 +694,9 @@ struct QX : public ContractBase
PUBLIC_PROCEDURE(AddToBidOrder)
{
- if (input.price <= 0
- || input.numberOfShares <= 0
- || qpi.invocationReward() < input.price * input.numberOfShares)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT
+ || qpi.invocationReward() < smul(input.price, input.numberOfShares))
{
output.addedNumberOfShares = 0;
@@ -707,9 +707,9 @@ struct QX : public ContractBase
}
else
{
- if (qpi.invocationReward() > input.price * input.numberOfShares)
+ if (qpi.invocationReward() > smul(input.price, input.numberOfShares))
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - input.price * input.numberOfShares);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - smul(input.price, input.numberOfShares));
}
output.addedNumberOfShares = input.numberOfShares;
@@ -869,8 +869,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.removedNumberOfShares = 0;
}
@@ -956,8 +956,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.removedNumberOfShares = 0;
}
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 73675fe8a..65b8b5380 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -895,6 +895,56 @@ namespace QPI
};
//////////
+ // safety multiplying a and b and then clamp
+
+ inline static sint64 smul(sint64 a, sint64 b)
+ {
+ sint64 hi, lo;
+ lo = _mul128(a, b, &hi);
+ if (hi != (lo >> 63))
+ {
+ return ((a > 0) == (b > 0)) ? INT64_MAX : INT64_MIN;
+ }
+ return lo;
+ }
+
+ inline static uint64 smul(uint64 a, uint64 b)
+ {
+ uint64 hi, lo;
+ lo = _umul128(a, b, &hi);
+ if (hi != 0)
+ {
+ return UINT64_MAX;
+ }
+ return lo;
+ }
+
+ inline static sint32 smul(sint32 a, sint32 b)
+ {
+ sint64 r = (sint64)(a) * (sint64)(b);
+ if (r < INT32_MIN)
+ {
+ return INT32_MIN;
+ }
+ else if (r > INT32_MAX)
+ {
+ return INT32_MAX;
+ }
+ else
+ {
+ return (sint32)r;
+ }
+ }
+
+ inline static uint32 smul(uint32 a, uint32 b)
+ {
+ uint64 r = (uint64)(a) * (uint64)(b);
+ if (r > UINT32_MAX)
+ {
+ return UINT32_MAX;
+ }
+ return (uint32)r;
+ }
// Divide a by b, but return 0 if b is 0 (rounding to lower magnitude in case of integers)
template
From a48272d79e439f37ff894b466871dabcbe365552 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:09:30 +0700
Subject: [PATCH 081/297] add logging for df function
---
src/contracts/QUtil.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index c82344d10..77e36d9a0 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -66,6 +66,16 @@ struct QUTILLogger
// Other data go here
sint8 _terminator; // Only data before "_terminator" are logged
};
+struct QUTILDFLogger
+{
+ uint32 contractId; // to distinguish bw SCs
+ uint32 padding;
+ id dfNonce;
+ id dfPubkey;
+ id dfMiningSeed;
+ id result;
+ sint8 _terminator; // Only data before "_terminator" are logged
+};
// poll and voter structs
struct QUTILPoll {
@@ -1174,6 +1184,7 @@ struct QUTIL : public ContractBase
struct BEGIN_TICK_locals
{
m256i dfPubkey, dfNonce;
+ QUTILDFLogger logger;
};
/*
* A deterministic delay function
@@ -1183,6 +1194,9 @@ struct QUTIL : public ContractBase
locals.dfPubkey = qpi.getPrevSpectrumDigest();
locals.dfNonce = qpi.getPrevComputerDigest();
state.dfCurrentState = qpi.computeMiningFunction(state.dfMiningSeed, locals.dfPubkey, locals.dfNonce);
+
+ locals.logger = QUTILDFLogger{ 0, 0, locals.dfNonce, locals.dfPubkey, state.dfMiningSeed, state.dfCurrentState};
+ LOG_INFO(locals.logger);
}
/*
From 8f1865406edd22d80c883ed22252ffea540f5f95 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:27:38 +0700
Subject: [PATCH 082/297] add unitest
---
test/qpi.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 120 insertions(+)
diff --git a/test/qpi.cpp b/test/qpi.cpp
index 2f6b15ba6..38d02f2b4 100644
--- a/test/qpi.cpp
+++ b/test/qpi.cpp
@@ -23,6 +23,126 @@ void initComputors(unsigned short computorIdOffset)
}
}
+TEST(TestCoreQPI, SafeMath)
+{
+ {
+ sint64 a = -1000000000000LL; // This is valid - negative signed integer
+ sint64 b = 2; // Positive signed integer
+ EXPECT_EQ(smul(a, b), -2000000000000);
+ }
+
+ {
+ uint64_t a = 1000000;
+ uint64_t b = 2000000;
+ uint64_t expected_ok = 2000000000000ULL;
+ EXPECT_EQ(smul(a, b), expected_ok);
+ }
+ {
+ sint64 a = INT64_MIN; // -9223372036854775808
+ sint64 b = -1; // -1
+ EXPECT_EQ(smul(a, b), INT64_MAX);
+ }
+ {
+ uint64_t a = 123456789ULL;
+ uint64_t b = 987654321ULL;
+
+ // Case: Multiplication by zero.
+ EXPECT_EQ(smul(a, 0ULL), 0ULL);
+ EXPECT_EQ(smul(0ULL, b), 0ULL);
+
+ // Case: Multiplication by one.
+ EXPECT_EQ(smul(a, 1ULL), a);
+ EXPECT_EQ(smul(1ULL, b), b);
+ }
+ {
+ // Case: A clear overflow case.
+ // UINT64_MAX is approximately 1.84e19.
+ uint64_t c = 4000000000ULL;
+ uint64_t d = 5000000000ULL; // c * d is 2e19, which overflows.
+ EXPECT_EQ(smul(c, d), UINT64_MAX);
+ }
+ {
+ // Case: Test the exact boundary of overflow.
+ uint64_t max_val = UINT64_MAX;
+ uint64_t divisor = 2;
+ uint64_t limit = max_val / divisor;
+
+ // This should not overflow.
+ EXPECT_EQ(smul(limit, divisor), limit * 2);
+
+ // This should overflow and clamp.
+ EXPECT_EQ(smul(limit + 1, divisor), UINT64_MAX);
+ }
+ {
+ // Case: A simple multiplication that does not overflow.
+ int64_t e = 1000000;
+ int64_t f = -2000000;
+ EXPECT_EQ(smul(e, f), -2000000000000LL);
+ }
+ {
+ // Case: Positive * Positive, causing overflow.
+ int64_t a = INT64_MAX / 2;
+ int64_t b = 3;
+ EXPECT_EQ(smul(a, b), INT64_MAX);
+ }
+ {
+ int64_t a = INT64_MAX / 2;
+ int64_t b = 3;
+ int64_t c = -3;
+ int64_t d = INT64_MIN / 2;
+
+ // Case: Positive * Negative, causing underflow.
+ EXPECT_EQ(smul(a, c), INT64_MIN);
+
+ // Case: Negative * Positive, causing underflow.
+ EXPECT_EQ(smul(d, b), INT64_MIN);
+ }
+ {
+ // Case: Negative * Negative, causing overflow.
+ int64_t c = -3;
+ int64_t d = INT64_MIN / 2;
+ EXPECT_EQ(smul(d, c), INT64_MAX);
+ }
+ {
+ // --- Unsigned 32-bit Tests ---
+ // No Overflow
+ uint32_t a_u32 = 60000;
+ uint32_t b_u32 = 60000;
+ EXPECT_EQ(smul(a_u32, b_u32), 3600000000U);
+
+ // Overflow
+ uint32_t c_u32 = 70000;
+ uint32_t d_u32 = 70000; // 70000*70000 = 4,900,000,000 which is > UINT32_MAX (~4.29e9)
+ EXPECT_EQ(smul(c_u32, d_u32), UINT32_MAX);
+
+ // Boundary
+ uint32_t limit_u32 = UINT32_MAX / 2;
+ uint32_t divisor_u32 = 2;
+ EXPECT_EQ(smul(limit_u32, divisor_u32), limit_u32 * 2);
+ EXPECT_EQ(smul(limit_u32 + 1, divisor_u32), UINT32_MAX);
+
+ // --- Signed 32-bit Tests ---
+ // No Overflow
+ int32_t a_s32 = 10000;
+ int32_t b_s32 = -10000;
+ EXPECT_EQ(smul(a_s32, b_s32), -100000000);
+
+ // Positive Overflow
+ int32_t c_s32 = INT32_MAX / 2;
+ int32_t d_s32 = 3;
+ EXPECT_EQ(smul(c_s32, d_s32), INT32_MAX);
+
+ // Underflow
+ int32_t e_s32 = INT32_MIN / 2;
+ int32_t f_s32 = 3;
+ EXPECT_EQ(smul(e_s32, f_s32), INT32_MIN);
+
+ // Negative * Negative, causing overflow.
+ int32_t g_s32 = -3;
+ int32_t h_s32 = INT32_MIN / 2;
+ EXPECT_EQ(smul(h_s32, g_s32), INT32_MAX);
+ }
+}
TEST(TestCoreQPI, Array)
{
From 3d9bc7ec5538d4789e5664ea28525ee770a27b8d Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 14:44:03 +0700
Subject: [PATCH 083/297] add safe mul, fix overflow bug in qx
---
src/contract_core/contract_def.h | 2 +-
src/contracts/Qx.h | 22 +++++++-------
src/contracts/qpi.h | 50 ++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 4e891789a..abffd463c 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -1,5 +1,5 @@
#pragma once
-
+#include "network_messages/common_def.h"
#include "platform/m256.h"
////////// Smart contracts \\\\\\\\\\
diff --git a/src/contracts/Qx.h b/src/contracts/Qx.h
index 04d28d4b5..0379f696d 100644
--- a/src/contracts/Qx.h
+++ b/src/contracts/Qx.h
@@ -533,8 +533,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.addedNumberOfShares = 0;
}
@@ -694,9 +694,9 @@ struct QX : public ContractBase
PUBLIC_PROCEDURE(AddToBidOrder)
{
- if (input.price <= 0
- || input.numberOfShares <= 0
- || qpi.invocationReward() < input.price * input.numberOfShares)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT
+ || qpi.invocationReward() < smul(input.price, input.numberOfShares))
{
output.addedNumberOfShares = 0;
@@ -707,9 +707,9 @@ struct QX : public ContractBase
}
else
{
- if (qpi.invocationReward() > input.price * input.numberOfShares)
+ if (qpi.invocationReward() > smul(input.price, input.numberOfShares))
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - input.price * input.numberOfShares);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - smul(input.price, input.numberOfShares));
}
output.addedNumberOfShares = input.numberOfShares;
@@ -869,8 +869,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.removedNumberOfShares = 0;
}
@@ -956,8 +956,8 @@ struct QX : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
- if (input.price <= 0
- || input.numberOfShares <= 0)
+ if (input.price <= 0 || input.price >= MAX_AMOUNT
+ || input.numberOfShares <= 0 || input.numberOfShares >= MAX_AMOUNT)
{
output.removedNumberOfShares = 0;
}
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 28c3ebc4c..a1bcd87af 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -885,6 +885,56 @@ namespace QPI
};
//////////
+ // safety multiplying a and b and then clamp
+
+ inline static sint64 smul(sint64 a, sint64 b)
+ {
+ sint64 hi, lo;
+ lo = _mul128(a, b, &hi);
+ if (hi != (lo >> 63))
+ {
+ return ((a > 0) == (b > 0)) ? INT64_MAX : INT64_MIN;
+ }
+ return lo;
+ }
+
+ inline static uint64 smul(uint64 a, uint64 b)
+ {
+ uint64 hi, lo;
+ lo = _umul128(a, b, &hi);
+ if (hi != 0)
+ {
+ return UINT64_MAX;
+ }
+ return lo;
+ }
+
+ inline static sint32 smul(sint32 a, sint32 b)
+ {
+ sint64 r = (sint64)(a) * (sint64)(b);
+ if (r < INT32_MIN)
+ {
+ return INT32_MIN;
+ }
+ else if (r > INT32_MAX)
+ {
+ return INT32_MAX;
+ }
+ else
+ {
+ return (sint32)r;
+ }
+ }
+
+ inline static uint32 smul(uint32 a, uint32 b)
+ {
+ uint64 r = (uint64)(a) * (uint64)(b);
+ if (r > UINT32_MAX)
+ {
+ return UINT32_MAX;
+ }
+ return (uint32)r;
+ }
// Divide a by b, but return 0 if b is 0 (rounding to lower magnitude in case of integers)
template
From 98e0f1229bb21e1e8e7543cd37a4ca4d64cf92ff Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:09:30 +0700
Subject: [PATCH 084/297] add logging for df function
---
src/contracts/QUtil.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index c82344d10..77e36d9a0 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -66,6 +66,16 @@ struct QUTILLogger
// Other data go here
sint8 _terminator; // Only data before "_terminator" are logged
};
+struct QUTILDFLogger
+{
+ uint32 contractId; // to distinguish bw SCs
+ uint32 padding;
+ id dfNonce;
+ id dfPubkey;
+ id dfMiningSeed;
+ id result;
+ sint8 _terminator; // Only data before "_terminator" are logged
+};
// poll and voter structs
struct QUTILPoll {
@@ -1174,6 +1184,7 @@ struct QUTIL : public ContractBase
struct BEGIN_TICK_locals
{
m256i dfPubkey, dfNonce;
+ QUTILDFLogger logger;
};
/*
* A deterministic delay function
@@ -1183,6 +1194,9 @@ struct QUTIL : public ContractBase
locals.dfPubkey = qpi.getPrevSpectrumDigest();
locals.dfNonce = qpi.getPrevComputerDigest();
state.dfCurrentState = qpi.computeMiningFunction(state.dfMiningSeed, locals.dfPubkey, locals.dfNonce);
+
+ locals.logger = QUTILDFLogger{ 0, 0, locals.dfNonce, locals.dfPubkey, state.dfMiningSeed, state.dfCurrentState};
+ LOG_INFO(locals.logger);
}
/*
From 9de0b713eef41923980c2bdc812cb09934d2ae53 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Thu, 11 Sep 2025 15:27:38 +0700
Subject: [PATCH 085/297] add unitest
---
test/qpi.cpp | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 120 insertions(+)
diff --git a/test/qpi.cpp b/test/qpi.cpp
index 2f6b15ba6..38d02f2b4 100644
--- a/test/qpi.cpp
+++ b/test/qpi.cpp
@@ -23,6 +23,126 @@ void initComputors(unsigned short computorIdOffset)
}
}
+TEST(TestCoreQPI, SafeMath)
+{
+ {
+ sint64 a = -1000000000000LL; // This is valid - negative signed integer
+ sint64 b = 2; // Positive signed integer
+ EXPECT_EQ(smul(a, b), -2000000000000);
+ }
+
+ {
+ uint64_t a = 1000000;
+ uint64_t b = 2000000;
+ uint64_t expected_ok = 2000000000000ULL;
+ EXPECT_EQ(smul(a, b), expected_ok);
+ }
+ {
+ sint64 a = INT64_MIN; // -9223372036854775808
+ sint64 b = -1; // -1
+ EXPECT_EQ(smul(a, b), INT64_MAX);
+ }
+ {
+ uint64_t a = 123456789ULL;
+ uint64_t b = 987654321ULL;
+
+ // Case: Multiplication by zero.
+ EXPECT_EQ(smul(a, 0ULL), 0ULL);
+ EXPECT_EQ(smul(0ULL, b), 0ULL);
+
+ // Case: Multiplication by one.
+ EXPECT_EQ(smul(a, 1ULL), a);
+ EXPECT_EQ(smul(1ULL, b), b);
+ }
+ {
+ // Case: A clear overflow case.
+ // UINT64_MAX is approximately 1.84e19.
+ uint64_t c = 4000000000ULL;
+ uint64_t d = 5000000000ULL; // c * d is 2e19, which overflows.
+ EXPECT_EQ(smul(c, d), UINT64_MAX);
+ }
+ {
+ // Case: Test the exact boundary of overflow.
+ uint64_t max_val = UINT64_MAX;
+ uint64_t divisor = 2;
+ uint64_t limit = max_val / divisor;
+
+ // This should not overflow.
+ EXPECT_EQ(smul(limit, divisor), limit * 2);
+
+ // This should overflow and clamp.
+ EXPECT_EQ(smul(limit + 1, divisor), UINT64_MAX);
+ }
+ {
+ // Case: A simple multiplication that does not overflow.
+ int64_t e = 1000000;
+ int64_t f = -2000000;
+ EXPECT_EQ(smul(e, f), -2000000000000LL);
+ }
+ {
+ // Case: Positive * Positive, causing overflow.
+ int64_t a = INT64_MAX / 2;
+ int64_t b = 3;
+ EXPECT_EQ(smul(a, b), INT64_MAX);
+ }
+ {
+ int64_t a = INT64_MAX / 2;
+ int64_t b = 3;
+ int64_t c = -3;
+ int64_t d = INT64_MIN / 2;
+
+ // Case: Positive * Negative, causing underflow.
+ EXPECT_EQ(smul(a, c), INT64_MIN);
+
+ // Case: Negative * Positive, causing underflow.
+ EXPECT_EQ(smul(d, b), INT64_MIN);
+ }
+ {
+ // Case: Negative * Negative, causing overflow.
+ int64_t c = -3;
+ int64_t d = INT64_MIN / 2;
+ EXPECT_EQ(smul(d, c), INT64_MAX);
+ }
+ {
+ // --- Unsigned 32-bit Tests ---
+ // No Overflow
+ uint32_t a_u32 = 60000;
+ uint32_t b_u32 = 60000;
+ EXPECT_EQ(smul(a_u32, b_u32), 3600000000U);
+
+ // Overflow
+ uint32_t c_u32 = 70000;
+ uint32_t d_u32 = 70000; // 70000*70000 = 4,900,000,000 which is > UINT32_MAX (~4.29e9)
+ EXPECT_EQ(smul(c_u32, d_u32), UINT32_MAX);
+
+ // Boundary
+ uint32_t limit_u32 = UINT32_MAX / 2;
+ uint32_t divisor_u32 = 2;
+ EXPECT_EQ(smul(limit_u32, divisor_u32), limit_u32 * 2);
+ EXPECT_EQ(smul(limit_u32 + 1, divisor_u32), UINT32_MAX);
+
+ // --- Signed 32-bit Tests ---
+ // No Overflow
+ int32_t a_s32 = 10000;
+ int32_t b_s32 = -10000;
+ EXPECT_EQ(smul(a_s32, b_s32), -100000000);
+
+ // Positive Overflow
+ int32_t c_s32 = INT32_MAX / 2;
+ int32_t d_s32 = 3;
+ EXPECT_EQ(smul(c_s32, d_s32), INT32_MAX);
+
+ // Underflow
+ int32_t e_s32 = INT32_MIN / 2;
+ int32_t f_s32 = 3;
+ EXPECT_EQ(smul(e_s32, f_s32), INT32_MIN);
+
+ // Negative * Negative, causing overflow.
+ int32_t g_s32 = -3;
+ int32_t h_s32 = INT32_MIN / 2;
+ EXPECT_EQ(smul(h_s32, g_s32), INT32_MAX);
+ }
+}
TEST(TestCoreQPI, Array)
{
From 0c33ffef6955d57d60911432cf1b0ba1cfc7a005 Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Thu, 11 Sep 2025 11:12:21 +0200
Subject: [PATCH 086/297] Bump version
---
src/public_settings.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 2abbe7a7e..4eb2b1349 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -57,7 +57,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define VERSION_A 1
#define VERSION_B 259
-#define VERSION_C 0
+#define VERSION_C 1
// Epoch and initial tick for node startup
#define EPOCH 178
From b0f7547d0ad100d8c57627b64474113e5a83743b Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Thu, 11 Sep 2025 14:20:26 +0200
Subject: [PATCH 087/297] Ignore wrong votes for specific ticks
---
src/qubic.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index c39e8e13d..f9cb92c01 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -925,6 +925,21 @@ static void processBroadcastTick(Peer* peer, RequestResponseHeader* header)
&& request->tick.second <= 59
&& request->tick.millisecond <= 999)
{
+ // Ignore incorrect votes for specific tick
+ if (request->tick.tick == 32454208)
+ {
+ m256i saltedData[2];
+ m256i saltedDigest;
+ m256i expectedComputorDigest;
+ saltedData[0] = broadcastedComputors.computors.publicKeys[request->tick.computorIndex];
+ getPublicKeyFromIdentity((unsigned char*)"LVUYVTDYAQPPEBNIYQLVIXVAFKSCKPQMVDVGKPWLHAEWQYIQERAURSZFVZII", expectedComputorDigest.m256i_u8);
+ saltedData[1] = expectedComputorDigest;
+ KangarooTwelve64To32(saltedData, &saltedDigest);
+ if (saltedDigest != request->tick.saltedComputerDigest)
+ {
+ return;
+ }
+ }
unsigned char digest[32];
request->tick.computorIndex ^= BroadcastTick::type;
KangarooTwelve(&request->tick, sizeof(Tick) - SIGNATURE_SIZE, digest, sizeof(digest));
From ecc4f9a40553f76b4386bd23f022a65831f22d4c Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Thu, 11 Sep 2025 14:33:51 +0200
Subject: [PATCH 088/297] Bump version
---
src/public_settings.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 4eb2b1349..48875c721 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -57,7 +57,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define VERSION_A 1
#define VERSION_B 259
-#define VERSION_C 1
+#define VERSION_C 2
// Epoch and initial tick for node startup
#define EPOCH 178
From 948d46e6fabb83ecbfbf197c60ddbd7bb7c42790 Mon Sep 17 00:00:00 2001
From: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
Date: Fri, 12 Sep 2025 10:13:05 +0200
Subject: [PATCH 089/297] Revert "Ignore wrong votes for specific ticks"
This reverts commit b0f7547d0ad100d8c57627b64474113e5a83743b.
---
src/qubic.cpp | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 8077595ad..930815065 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -923,21 +923,6 @@ static void processBroadcastTick(Peer* peer, RequestResponseHeader* header)
&& request->tick.second <= 59
&& request->tick.millisecond <= 999)
{
- // Ignore incorrect votes for specific tick
- if (request->tick.tick == 32454208)
- {
- m256i saltedData[2];
- m256i saltedDigest;
- m256i expectedComputorDigest;
- saltedData[0] = broadcastedComputors.computors.publicKeys[request->tick.computorIndex];
- getPublicKeyFromIdentity((unsigned char*)"LVUYVTDYAQPPEBNIYQLVIXVAFKSCKPQMVDVGKPWLHAEWQYIQERAURSZFVZII", expectedComputorDigest.m256i_u8);
- saltedData[1] = expectedComputorDigest;
- KangarooTwelve64To32(saltedData, &saltedDigest);
- if (saltedDigest != request->tick.saltedComputerDigest)
- {
- return;
- }
- }
unsigned char digest[32];
request->tick.computorIndex ^= BroadcastTick::type;
KangarooTwelve(&request->tick, sizeof(Tick) - SIGNATURE_SIZE, digest, sizeof(digest));
From 012eac46fb2e1ef34848892718be18d04b863425 Mon Sep 17 00:00:00 2001
From: cyber-pc
Date: Fri, 12 Sep 2025 21:32:11 +0700
Subject: [PATCH 090/297] ScoreAVX2: remove warning in loading 256 bits
function.
---
src/score.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/score.h b/src/score.h
index 1a800e4f4..de7d8b319 100644
--- a/src/score.h
+++ b/src/score.h
@@ -374,7 +374,7 @@ static inline __m512i load512Bits(const unsigned char* array, unsigned long long
static inline __m256i load256Bits(const unsigned char* array, unsigned long long bitLocation)
{
const unsigned long long byteIndex = bitLocation >> 3;
- const unsigned long long bitOffset = bitLocation & 7ULL;
+ const int bitOffset = (int)(bitLocation & 7ULL);
// Load a 256-bit (32-byte) vector starting at the byte index.
const __m256i v = _mm256_loadu_si256(reinterpret_cast(array + byteIndex));
From 463f63c920f0e0ccb193bb9c08c8ac87397b55f5 Mon Sep 17 00:00:00 2001
From: cyber-pc
Date: Fri, 12 Sep 2025 21:41:27 +0700
Subject: [PATCH 091/297] FullExternalMining: remove warning by using 32bits
data type.
---
src/public_settings.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 48875c721..5faa5a0fe 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -105,11 +105,11 @@ static_assert(INTERNAL_COMPUTATIONS_INTERVAL >= NUMBER_OF_COMPUTORS, "Internal c
// List of start-end for full external computation times. The event must not be overlap.
// Format is DoW-hh-mm-ss in hex format, total 4 bytes, each use 1 bytes
// DoW: Day of the week 0: Sunday, 1 = Monday ...
-static unsigned long long gFullExternalComputationTimes[][2] =
+static unsigned int gFullExternalComputationTimes[][2] =
{
- {0x040C0000ULL, 0x050C0000ULL}, // Thu 12:00:00 - Fri 12:00:00
- {0x060C0000ULL, 0x000C0000ULL}, // Sat 12:00:00 - Sun 12:00:00
- {0x010C0000ULL, 0x020C0000ULL}, // Mon 12:00:00 - Tue 12:00:00
+ {0x040C0000U, 0x050C0000U}, // Thu 12:00:00 - Fri 12:00:00
+ {0x060C0000U, 0x000C0000U}, // Sat 12:00:00 - Sun 12:00:00
+ {0x010C0000U, 0x020C0000U}, // Mon 12:00:00 - Tue 12:00:00
};
#define STACK_SIZE 4194304
From 4a660d7b983733e63ab1ea50ffcba8690a4f59f0 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:09:56 +0200
Subject: [PATCH 092/297] run IPO only at epoch construction - 1 (#536)
---
src/contract_core/ipo.h | 4 ++--
src/contract_core/qpi_ipo_impl.h | 6 +++---
src/qubic.cpp | 9 +++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/contract_core/ipo.h b/src/contract_core/ipo.h
index ab1b1ae55..2ae92336c 100644
--- a/src/contract_core/ipo.h
+++ b/src/contract_core/ipo.h
@@ -26,7 +26,7 @@ static long long bidInContractIPO(long long price, unsigned short quantity, cons
ASSERT(spectrumIndex >= 0);
ASSERT(spectrumIndex == ::spectrumIndex(sourcePublicKey));
ASSERT(contractIndex < contractCount);
- ASSERT(system.epoch < contractDescriptions[contractIndex].constructionEpoch);
+ ASSERT(system.epoch == contractDescriptions[contractIndex].constructionEpoch - 1);
long long registeredBids = -1;
@@ -128,7 +128,7 @@ static void finishIPOs()
{
for (unsigned int contractIndex = 1; contractIndex < contractCount; contractIndex++)
{
- if (system.epoch < contractDescriptions[contractIndex].constructionEpoch && contractStates[contractIndex])
+ if (system.epoch == (contractDescriptions[contractIndex].constructionEpoch - 1) && contractStates[contractIndex])
{
contractStateLock[contractIndex].acquireRead();
IPO* ipo = (IPO*)contractStates[contractIndex];
diff --git a/src/contract_core/qpi_ipo_impl.h b/src/contract_core/qpi_ipo_impl.h
index 5287f4c92..b2cc02dfa 100644
--- a/src/contract_core/qpi_ipo_impl.h
+++ b/src/contract_core/qpi_ipo_impl.h
@@ -12,7 +12,7 @@ QPI::sint64 QPI::QpiContextProcedureCall::bidInIPO(unsigned int IPOContractIndex
return -1;
}
- if (system.epoch >= contractDescriptions[IPOContractIndex].constructionEpoch) // IPO is finished.
+ if (system.epoch != (contractDescriptions[IPOContractIndex].constructionEpoch - 1)) // IPO has not started yet or is finished.
{
return -1;
}
@@ -30,7 +30,7 @@ QPI::sint64 QPI::QpiContextProcedureCall::bidInIPO(unsigned int IPOContractIndex
// Returns the ID of the entity who has made this IPO bid or NULL_ID if the ipoContractIndex or ipoBidIndex are invalid.
QPI::id QPI::QpiContextFunctionCall::ipoBidId(QPI::uint32 ipoContractIndex, QPI::uint32 ipoBidIndex) const
{
- if (ipoContractIndex >= contractCount || system.epoch >= contractDescriptions[ipoContractIndex].constructionEpoch || ipoBidIndex >= NUMBER_OF_COMPUTORS)
+ if (ipoContractIndex >= contractCount || system.epoch != (contractDescriptions[ipoContractIndex].constructionEpoch - 1) || ipoBidIndex >= NUMBER_OF_COMPUTORS)
{
return NULL_ID;
}
@@ -51,7 +51,7 @@ QPI::sint64 QPI::QpiContextFunctionCall::ipoBidPrice(QPI::uint32 ipoContractInde
return -1;
}
- if (system.epoch >= contractDescriptions[ipoContractIndex].constructionEpoch)
+ if (system.epoch != (contractDescriptions[ipoContractIndex].constructionEpoch - 1))
{
return -2;
}
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 930815065..ef789fd95 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1384,7 +1384,7 @@ static void processRequestContractIPO(Peer* peer, RequestResponseHeader* header)
respondContractIPO.contractIndex = request->contractIndex;
respondContractIPO.tick = system.tick;
if (request->contractIndex >= contractCount
- || system.epoch >= contractDescriptions[request->contractIndex].constructionEpoch)
+ || system.epoch != (contractDescriptions[request->contractIndex].constructionEpoch - 1))
{
setMem(respondContractIPO.publicKeys, sizeof(respondContractIPO.publicKeys), 0);
setMem(respondContractIPO.prices, sizeof(respondContractIPO.prices), 0);
@@ -2502,7 +2502,7 @@ static void processTickTransactionContractIPO(const Transaction* transaction, co
ASSERT(!transaction->amount && transaction->inputSize == sizeof(ContractIPOBid));
ASSERT(spectrumIndex >= 0);
ASSERT(contractIndex < contractCount);
- ASSERT(system.epoch < contractDescriptions[contractIndex].constructionEpoch);
+ ASSERT(system.epoch == (contractDescriptions[contractIndex].constructionEpoch - 1));
ContractIPOBid* contractIPOBid = (ContractIPOBid*)transaction->inputPtr();
bidInContractIPO(contractIPOBid->price, contractIPOBid->quantity, transaction->sourcePublicKey, spectrumIndex, contractIndex);
@@ -2909,7 +2909,7 @@ static void processTickTransaction(const Transaction* transaction, const m256i&
&& contractIndex < contractCount)
{
// Contract transactions
- if (system.epoch < contractDescriptions[contractIndex].constructionEpoch)
+ if (system.epoch == (contractDescriptions[contractIndex].constructionEpoch - 1))
{
// IPO
if (!transaction->amount
@@ -2918,7 +2918,8 @@ static void processTickTransaction(const Transaction* transaction, const m256i&
processTickTransactionContractIPO(transaction, spectrumIndex, contractIndex);
}
}
- else if (system.epoch < contractDescriptions[contractIndex].destructionEpoch)
+ else if (system.epoch >= contractDescriptions[contractIndex].constructionEpoch
+ && system.epoch < contractDescriptions[contractIndex].destructionEpoch)
{
// Regular contract procedure invocation
moneyFlew = processTickTransactionContractProcedure(transaction, spectrumIndex, contractIndex);
From e4cb9194c32b2119821a277dc2fe2393cf64d815 Mon Sep 17 00:00:00 2001
From: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:16:19 +0200
Subject: [PATCH 093/297] Implement DistributeQuToShareholders() in QUTIL
(#539)
---
src/contracts/QUtil.h | 78 +++++++++++++++++++
test/contract_qutil.cpp | 169 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 247 insertions(+)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 77e36d9a0..6c8d2d52c 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -55,6 +55,10 @@ constexpr uint64 QUTILLogTypeNotAuthorized = 20; // Not autho
constexpr uint64 QUTILLogTypeInsufficientFundsForCancel = 21; // Not have enough funds for poll calcellation
constexpr uint64 QUTILLogTypeMaxPollsReached = 22; // Max epoch per epoch reached
+// Fee per shareholder for DistributeQuToShareholders()
+constexpr sint64 QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER = 5;
+
+
struct QUTILLogger
{
uint32 contractId; // to distinguish bw SCs
@@ -1207,6 +1211,79 @@ struct QUTIL : public ContractBase
output = qpi.numberOfShares(input);
}
+ struct DistributeQuToShareholders_input
+ {
+ Asset asset;
+ };
+ struct DistributeQuToShareholders_output
+ {
+ sint64 shareholders;
+ sint64 totalShares;
+ sint64 amountPerShare;
+ sint64 fees;
+ };
+ struct DistributeQuToShareholders_locals
+ {
+ AssetPossessionIterator iter;
+ sint64 payBack;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(DistributeQuToShareholders)
+ {
+ // 1. Compute fee (increases linear with number of shareholders)
+ // 1.1. Count shareholders and shares
+ for (locals.iter.begin(input.asset); !locals.iter.reachedEnd(); locals.iter.next())
+ {
+ if (locals.iter.numberOfPossessedShares() > 0)
+ {
+ ++output.shareholders;
+ output.totalShares += locals.iter.numberOfPossessedShares();
+ }
+ }
+
+ // 1.2. Cancel if there are no shareholders
+ if (output.shareholders == 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ // 1.3. Compute fee (proportional to number of shareholders)
+ output.fees = output.shareholders * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+
+ // 1.4. Compute QU per share
+ output.amountPerShare = div(qpi.invocationReward() - output.fees, output.totalShares);
+
+ // 1.5. Cancel if amount is not sufficient to pay fees and at least one QU per share
+ if (output.amountPerShare <= 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ // 1.6. compute payback QU (remainder of distribution)
+ locals.payBack = qpi.invocationReward() - output.totalShares * output.amountPerShare - output.fees;
+ ASSERT(locals.payBack >= 0);
+
+ // 2. Distribute to shareholders
+ for (locals.iter.begin(input.asset); !locals.iter.reachedEnd(); locals.iter.next())
+ {
+ if (locals.iter.numberOfPossessedShares() > 0)
+ {
+ qpi.transfer(locals.iter.possessor(), locals.iter.numberOfPossessedShares() * output.amountPerShare);
+ }
+ }
+
+ // 3. Burn fee
+ qpi.burn(output.fees);
+
+ // 4. pay back QU that cannot be evenly distributed
+ if (locals.payBack > 0)
+ {
+ qpi.transfer(qpi.invocator(), locals.payBack);
+ }
+ }
+
REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
{
REGISTER_USER_FUNCTION(GetSendToManyV1Fee, 1);
@@ -1222,5 +1299,6 @@ struct QUTIL : public ContractBase
REGISTER_USER_PROCEDURE(CreatePoll, 4);
REGISTER_USER_PROCEDURE(Vote, 5);
REGISTER_USER_PROCEDURE(CancelPoll, 6);
+ REGISTER_USER_PROCEDURE(DistributeQuToShareholders, 7);
}
};
diff --git a/test/contract_qutil.cpp b/test/contract_qutil.cpp
index 8a6a17296..da6d7f87c 100644
--- a/test/contract_qutil.cpp
+++ b/test/contract_qutil.cpp
@@ -100,6 +100,13 @@ class ContractTestingQUtil : public ContractTesting {
callFunction(QUTIL_CONTRACT_INDEX, 6, input, output);
return output;
}
+
+ QUTIL::DistributeQuToShareholders_output distributeQuToShareholders(const id& invocator, const Asset& asset, sint64 amount) {
+ QUTIL::DistributeQuToShareholders_input input{ asset };
+ QUTIL::DistributeQuToShareholders_output output;
+ invokeUserProcedure(QUTIL_CONTRACT_INDEX, 7, input, output, invocator, amount);
+ return output;
+ }
};
// Helper function to generate random ID
@@ -1575,3 +1582,165 @@ TEST(QUtilTest, MultipleVoters_ShareTransfers_EligibilityTest)
EXPECT_EQ(result.voter_count.get(1), 2);
EXPECT_EQ(result.voter_count.get(2), 3);
}
+
+TEST(QUtilTest, DistributeQuToShareholders)
+{
+ ContractTestingQUtil qutil;
+
+ id distributor = generateRandomId();
+ id issuer = generateRandomId();
+ std::vector shareholder(10);
+ for (auto& v : shareholder)
+ {
+ v = generateRandomId();
+ }
+
+ increaseEnergy(issuer, 4000000000); // for issuance and transfers
+ increaseEnergy(distributor, 10000000000);
+
+ // Issue 3 asset
+ unsigned long long assetNameA = assetNameFromString("ASSETA");
+ unsigned long long assetNameB = assetNameFromString("ASSETB");
+ unsigned long long assetNameC = assetNameFromString("ASSETC");
+ Asset assetA = { issuer, assetNameA };
+ Asset assetB = { issuer, assetNameB };
+ Asset assetC = { issuer, assetNameC };
+ qutil.issueAsset(issuer, assetNameA, 10);
+ qutil.issueAsset(issuer, assetNameB, 10000);
+ qutil.issueAsset(issuer, assetNameC, 10000000);
+
+ // Distribute assets
+ // shareholder 0-2: 1 A, 500 B, 500 C
+ for (int i = 0; i < 3; i++)
+ {
+ qutil.transferAsset(issuer, shareholder[i], assetA, 1);
+ qutil.transferAsset(issuer, shareholder[i], assetB, 500);
+ qutil.transferAsset(issuer, shareholder[i], assetC, 600);
+ }
+ // shareholder 3-5: 0 A, 2000 B, 500 C
+ for (int i = 3; i < 6; i++)
+ {
+ qutil.transferAsset(issuer, shareholder[i], assetB, 2000);
+ qutil.transferAsset(issuer, shareholder[i], assetC, 500);
+ }
+ // shareholder 6-9: 1 A, 500 B, 0 C
+ for (int i = 6; i < 10; i++)
+ {
+ qutil.transferAsset(issuer, shareholder[i], assetA, 1);
+ qutil.transferAsset(issuer, shareholder[i], assetB, 500);
+ }
+
+ QUTIL::DistributeQuToShareholders_output output;
+ sint64 distributorBalanceBefore, shareholderBalanceBefore;
+
+ // Error case 1: asset without shareholders
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, { distributor, assetNameA }, 10000000);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore);
+ EXPECT_EQ(output.shareholders, 0);
+ EXPECT_EQ(output.totalShares, 0);
+ EXPECT_EQ(output.amountPerShare, 0);
+ EXPECT_EQ(output.fees, 0);
+
+ // Error case 2: amount too low to pay fee
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetA, 1);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore);
+ EXPECT_EQ(output.shareholders, 8);
+ EXPECT_EQ(output.totalShares, 10);
+ EXPECT_LE(output.amountPerShare, 0);
+ EXPECT_EQ(output.fees, 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Error case 3: amount too low to pay 1 QU per share
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetA, 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER + 9);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore);
+ EXPECT_EQ(output.shareholders, 8);
+ EXPECT_EQ(output.totalShares, 10);
+ EXPECT_EQ(output.amountPerShare, 0);
+ EXPECT_EQ(output.fees, 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetA + exactly calculated amount
+ sint64 amountPerShare = 50;
+ sint64 totalAmount = 10 * amountPerShare + 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetA, totalAmount);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + amountPerShare);
+ EXPECT_EQ(output.shareholders, 8);
+ EXPECT_EQ(output.totalShares, 10);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetA + amount with some QUs that cannot be evenly distributed and are refundet
+ amountPerShare = 100;
+ totalAmount = 10 * amountPerShare + 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetA, totalAmount + 7);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + amountPerShare);
+ EXPECT_EQ(output.shareholders, 8);
+ EXPECT_EQ(output.totalShares, 10);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 8 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetB + exactly calculated amount
+ amountPerShare = 1000;
+ totalAmount = 10000 * amountPerShare + 11 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetB, totalAmount);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + 500 * amountPerShare);
+ EXPECT_EQ(output.shareholders, 11);
+ EXPECT_EQ(output.totalShares, 10000);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 11 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetB + amount with some QUs that cannot be evenly distributed and are refundet
+ amountPerShare = 42;
+ totalAmount = 10000 * amountPerShare + 11 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetB, totalAmount + 9999);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + 500 * amountPerShare);
+ EXPECT_EQ(output.shareholders, 11);
+ EXPECT_EQ(output.totalShares, 10000);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 11 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetC + exactly calculated amount (fee is minimal)
+ amountPerShare = 123;
+ totalAmount = 10000000 * amountPerShare + 7 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetC, totalAmount);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + 600 * amountPerShare);
+ EXPECT_EQ(output.shareholders, 7);
+ EXPECT_EQ(output.totalShares, 10000000);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 7 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+
+ // Success case with assetC + non-minimal fee (fee payed too much is donation for running QUTIL -> burned with fee)
+ amountPerShare = 654;
+ totalAmount = 10000000 * amountPerShare + 7 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ distributorBalanceBefore = getBalance(distributor);
+ shareholderBalanceBefore = getBalance(shareholder[0]);
+ output = qutil.distributeQuToShareholders(distributor, assetC, totalAmount + 123456);
+ EXPECT_EQ(getBalance(distributor), distributorBalanceBefore - totalAmount);
+ EXPECT_EQ(getBalance(shareholder[0]), shareholderBalanceBefore + 600 * amountPerShare);
+ EXPECT_EQ(output.shareholders, 7);
+ EXPECT_EQ(output.totalShares, 10000000);
+ EXPECT_EQ(output.amountPerShare, amountPerShare);
+ EXPECT_EQ(output.fees, 7 * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER);
+}
From d638e9b782ec1281468482a381afba149ec5b4ce Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Mon, 15 Sep 2025 10:35:16 +0200
Subject: [PATCH 094/297] Deactivate delay function (#538)
* Deactivate aritifical delay function
* Deactivates BEGIN_TICK in qutil SC with #if 0
* Remove logger for delay function
* Deactivates logger for the delay function with #if 0
---
src/contracts/QUtil.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 6c8d2d52c..9bca348a6 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -70,6 +70,9 @@ struct QUTILLogger
// Other data go here
sint8 _terminator; // Only data before "_terminator" are logged
};
+
+// Deactivate logger for delay function
+#if 0
struct QUTILDFLogger
{
uint32 contractId; // to distinguish bw SCs
@@ -80,6 +83,7 @@ struct QUTILDFLogger
id result;
sint8 _terminator; // Only data before "_terminator" are logged
};
+#endif
// poll and voter structs
struct QUTILPoll {
@@ -1185,6 +1189,8 @@ struct QUTIL : public ContractBase
state.dfMiningSeed = qpi.getPrevSpectrumDigest();
}
+ // Deactivate delay function
+ #if 0
struct BEGIN_TICK_locals
{
m256i dfPubkey, dfNonce;
@@ -1198,10 +1204,11 @@ struct QUTIL : public ContractBase
locals.dfPubkey = qpi.getPrevSpectrumDigest();
locals.dfNonce = qpi.getPrevComputerDigest();
state.dfCurrentState = qpi.computeMiningFunction(state.dfMiningSeed, locals.dfPubkey, locals.dfNonce);
-
+
locals.logger = QUTILDFLogger{ 0, 0, locals.dfNonce, locals.dfPubkey, state.dfMiningSeed, state.dfCurrentState};
LOG_INFO(locals.logger);
}
+ #endif
/*
* @return Return total number of shares that currently exist of the asset given as input
From 8a410de3db252de21197e2f1d8a79199bc00ba20 Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Mon, 15 Sep 2025 10:35:58 +0200
Subject: [PATCH 095/297] Decouples TARGET_TICK_DURATION and tick_storage
allocation (#541)
This commit decouples the allocation of the tick_storage, tx_addon and
logging by introducing a new `#define TICK_DURATION_FOR_ALLOCATION_MS`
that inidicated the assumed tick duration in miliseconds.
To be able to use sub second tick durations the computation of
MAX_NUMBER_OF_TICKS computation is adjusted to be based on total
number of miliseconds in a epoch.
---
src/public_settings.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 5faa5a0fe..ef67fd780 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -23,7 +23,12 @@
// Number of ticks from prior epoch that are kept after seamless epoch transition. These can be requested after transition.
#define TICKS_TO_KEEP_FROM_PRIOR_EPOCH 100
+// The tick duration used for timing and scheduling logic.
#define TARGET_TICK_DURATION 1000
+
+// The tick duration used to calculate the size of memory buffers.
+// This determines the memory footprint of the application.
+#define TICK_DURATION_FOR_ALLOCATION_MS 500
#define TRANSACTION_SPARSENESS 1
// Below are 2 variables that are used for auto-F5 feature:
@@ -37,7 +42,7 @@
#define NEXT_TICK_TIMEOUT_THRESHOLD 5ULL // Multiplier of TARGET_TICK_DURATION for the system to discard next tick in tickData.
// This will lead to zero `expectedNextTickTransactionDigest` in consensus
-
+
#define PEER_REFRESHING_PERIOD 120000ULL
#if AUTO_FORCE_NEXT_TICK_THRESHOLD != 0
static_assert(NEXT_TICK_TIMEOUT_THRESHOLD < AUTO_FORCE_NEXT_TICK_THRESHOLD, "Timeout threshold must be smaller than auto F5 threshold");
@@ -94,7 +99,7 @@ static constexpr unsigned int SOLUTION_THRESHOLD_DEFAULT = 321;
// include commonly needed definitions
#include "network_messages/common_def.h"
-#define MAX_NUMBER_OF_TICKS_PER_EPOCH (((((60 * 60 * 24 * 7) / (TARGET_TICK_DURATION / 1000)) + NUMBER_OF_COMPUTORS - 1) / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS)
+#define MAX_NUMBER_OF_TICKS_PER_EPOCH (((((60ULL * 60 * 24 * 7 * 1000) / TICK_DURATION_FOR_ALLOCATION_MS) + NUMBER_OF_COMPUTORS - 1) / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS)
#define FIRST_TICK_TRANSACTION_OFFSET sizeof(unsigned long long)
#define MAX_TRANSACTION_SIZE (MAX_INPUT_SIZE + sizeof(Transaction) + SIGNATURE_SIZE)
From f1f4af29ff015d92430852de39b98ebd24a04470 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 15 Sep 2025 10:55:16 +0200
Subject: [PATCH 096/297] update params for epoch 179 / v1.260.0
---
src/public_settings.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index ef67fd780..78963049c 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -61,12 +61,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 259
-#define VERSION_C 2
+#define VERSION_B 260
+#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 178
-#define TICK 32420000
+#define EPOCH 179
+#define TICK 32742000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From 98cbd373c4b7c1f442ce71f251599495e4023ced Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 16 Sep 2025 11:03:40 +0200
Subject: [PATCH 097/297] fix overflow vulnerabilities in QUtil, add safe add
in QPI (#548)
---
src/contracts/QUtil.h | 71 ++++++++++++++++++++++++++++++++++++++-----
src/contracts/qpi.h | 47 ++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 7 deletions(-)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 9bca348a6..df02a2b4f 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -231,6 +231,7 @@ struct QUTIL : public ContractBase
id currentId;
sint64 t;
uint64 useNext;
+ uint64 totalNumTransfers;
QUTILLogger logger;
};
@@ -500,9 +501,33 @@ struct QUTIL : public ContractBase
{
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTIL_STM1_TRIGGERED };
LOG_INFO(locals.logger);
- state.total = input.amt0 + input.amt1 + input.amt2 + input.amt3 + input.amt4 + input.amt5 + input.amt6 + input.amt7 + input.amt8 + input.amt9 + input.amt10 + input.amt11 + input.amt12 + input.amt13 + input.amt14 + input.amt15 + input.amt16 + input.amt17 + input.amt18 + input.amt19 + input.amt20 + input.amt21 + input.amt22 + input.amt23 + input.amt24 + QUTIL_STM1_INVOCATION_FEE;
- // invalid amount (<0), return fund and exit
- if ((input.amt0 < 0) || (input.amt1 < 0) || (input.amt2 < 0) || (input.amt3 < 0) || (input.amt4 < 0) || (input.amt5 < 0) || (input.amt6 < 0) || (input.amt7 < 0) || (input.amt8 < 0) || (input.amt9 < 0) || (input.amt10 < 0) || (input.amt11 < 0) || (input.amt12 < 0) || (input.amt13 < 0) || (input.amt14 < 0) || (input.amt15 < 0) || (input.amt16 < 0) || (input.amt17 < 0) || (input.amt18 < 0) || (input.amt19 < 0) || (input.amt20 < 0) || (input.amt21 < 0) || (input.amt22 < 0) || (input.amt23 < 0) || (input.amt24 < 0))
+
+ // invalid amount (<0 or >= MAX_AMOUNT), return fund and exit
+ if ((input.amt0 < 0) || (input.amt0 >= MAX_AMOUNT)
+ || (input.amt1 < 0) || (input.amt1 >= MAX_AMOUNT)
+ || (input.amt2 < 0) || (input.amt2 >= MAX_AMOUNT)
+ || (input.amt3 < 0) || (input.amt3 >= MAX_AMOUNT)
+ || (input.amt4 < 0) || (input.amt4 >= MAX_AMOUNT)
+ || (input.amt5 < 0) || (input.amt5 >= MAX_AMOUNT)
+ || (input.amt6 < 0) || (input.amt6 >= MAX_AMOUNT)
+ || (input.amt7 < 0) || (input.amt7 >= MAX_AMOUNT)
+ || (input.amt8 < 0) || (input.amt8 >= MAX_AMOUNT)
+ || (input.amt9 < 0) || (input.amt9 >= MAX_AMOUNT)
+ || (input.amt10 < 0) || (input.amt10 >= MAX_AMOUNT)
+ || (input.amt11 < 0) || (input.amt11 >= MAX_AMOUNT)
+ || (input.amt12 < 0) || (input.amt12 >= MAX_AMOUNT)
+ || (input.amt13 < 0) || (input.amt13 >= MAX_AMOUNT)
+ || (input.amt14 < 0) || (input.amt14 >= MAX_AMOUNT)
+ || (input.amt15 < 0) || (input.amt15 >= MAX_AMOUNT)
+ || (input.amt16 < 0) || (input.amt16 >= MAX_AMOUNT)
+ || (input.amt17 < 0) || (input.amt17 >= MAX_AMOUNT)
+ || (input.amt18 < 0) || (input.amt18 >= MAX_AMOUNT)
+ || (input.amt19 < 0) || (input.amt19 >= MAX_AMOUNT)
+ || (input.amt20 < 0) || (input.amt20 >= MAX_AMOUNT)
+ || (input.amt21 < 0) || (input.amt21 >= MAX_AMOUNT)
+ || (input.amt22 < 0) || (input.amt22 >= MAX_AMOUNT)
+ || (input.amt23 < 0) || (input.amt23 >= MAX_AMOUNT)
+ || (input.amt24 < 0) || (input.amt24 >= MAX_AMOUNT))
{
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTIL_STM1_INVALID_AMOUNT_NUMBER };
output.returnCode = QUTIL_STM1_INVALID_AMOUNT_NUMBER;
@@ -512,9 +537,40 @@ struct QUTIL : public ContractBase
qpi.transfer(qpi.invocator(), qpi.invocationReward());
}
}
+
+ // Make sure that the sum of all amounts does not overflow and is equal to qpi.invocationReward()
+ state.total = qpi.invocationReward();
+ state.total -= input.amt0; if (state.total < 0) goto exit;
+ state.total -= input.amt1; if (state.total < 0) goto exit;
+ state.total -= input.amt2; if (state.total < 0) goto exit;
+ state.total -= input.amt3; if (state.total < 0) goto exit;
+ state.total -= input.amt4; if (state.total < 0) goto exit;
+ state.total -= input.amt5; if (state.total < 0) goto exit;
+ state.total -= input.amt6; if (state.total < 0) goto exit;
+ state.total -= input.amt7; if (state.total < 0) goto exit;
+ state.total -= input.amt8; if (state.total < 0) goto exit;
+ state.total -= input.amt9; if (state.total < 0) goto exit;
+ state.total -= input.amt10; if (state.total < 0) goto exit;
+ state.total -= input.amt11; if (state.total < 0) goto exit;
+ state.total -= input.amt12; if (state.total < 0) goto exit;
+ state.total -= input.amt13; if (state.total < 0) goto exit;
+ state.total -= input.amt14; if (state.total < 0) goto exit;
+ state.total -= input.amt15; if (state.total < 0) goto exit;
+ state.total -= input.amt16; if (state.total < 0) goto exit;
+ state.total -= input.amt17; if (state.total < 0) goto exit;
+ state.total -= input.amt18; if (state.total < 0) goto exit;
+ state.total -= input.amt19; if (state.total < 0) goto exit;
+ state.total -= input.amt20; if (state.total < 0) goto exit;
+ state.total -= input.amt21; if (state.total < 0) goto exit;
+ state.total -= input.amt22; if (state.total < 0) goto exit;
+ state.total -= input.amt23; if (state.total < 0) goto exit;
+ state.total -= input.amt24; if (state.total < 0) goto exit;
+ state.total -= QUTIL_STM1_INVOCATION_FEE; if (state.total < 0) goto exit;
+
// insufficient or too many qubic transferred, return fund and exit (we don't want to return change)
- if (qpi.invocationReward() != state.total)
+ if (state.total != 0)
{
+ exit:
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTIL_STM1_WRONG_FUND };
LOG_INFO(locals.logger);
output.returnCode = QUTIL_STM1_WRONG_FUND;
@@ -675,7 +731,7 @@ struct QUTIL : public ContractBase
LOG_INFO(locals.logger);
qpi.transfer(input.dst24, input.amt24);
}
- locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, state.total, QUTIL_STM1_SUCCESS };
+ locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTIL_STM1_SUCCESS};
LOG_INFO(locals.logger);
output.returnCode = QUTIL_STM1_SUCCESS;
qpi.burn(QUTIL_STM1_INVOCATION_FEE);
@@ -695,7 +751,8 @@ struct QUTIL : public ContractBase
output.total = 0;
// Number of addresses and transfers is > 0 and total transfers do not exceed limit (including 2 transfers from invocator to contract and contract to invocator)
- if (input.dstCount <= 0 || input.numTransfersEach <= 0 || input.dstCount * input.numTransfersEach + 2 > CONTRACT_ACTION_TRACKER_SIZE)
+ locals.totalNumTransfers = smul((uint64)input.dstCount, (uint64)input.numTransfersEach);
+ if (input.dstCount <= 0 || input.numTransfersEach <= 0 || locals.totalNumTransfers > CONTRACT_ACTION_TRACKER_SIZE - 2)
{
if (qpi.invocationReward() > 0)
{
@@ -708,7 +765,7 @@ struct QUTIL : public ContractBase
}
// Check the fund is enough
- if (qpi.invocationReward() < input.dstCount * input.numTransfersEach)
+ if ((uint64)qpi.invocationReward() < locals.totalNumTransfers)
{
if (qpi.invocationReward() > 0)
{
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index 65b8b5380..d963e1f60 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -946,6 +946,53 @@ namespace QPI
return (uint32)r;
}
+ //////////
+ // safety adding a and b and then clamp
+
+ inline static sint64 sadd(sint64 a, sint64 b)
+ {
+ sint64 sum = a + b;
+ if (a < 0 && b < 0 && sum > 0) // negative overflow
+ return INT64_MIN;
+ if (a > 0 && b > 0 && sum < 0) // positive overflow
+ return INT64_MAX;
+ return sum;
+ }
+
+ inline static uint64 sadd(uint64 a, uint64 b)
+ {
+ if (UINT64_MAX - a < b)
+ return UINT64_MAX;
+ return a + b;
+ }
+
+ inline static sint32 sadd(sint32 a, sint32 b)
+ {
+ sint64 sum = (sint64)(a) + (sint64)(b);
+ if (sum < INT32_MIN)
+ {
+ return INT32_MIN;
+ }
+ else if (sum > INT32_MAX)
+ {
+ return INT32_MAX;
+ }
+ else
+ {
+ return (sint32)sum;
+ }
+ }
+
+ inline static uint32 sadd(uint32 a, uint32 b)
+ {
+ uint64 sum = (uint64)(a) + (uint64)(b);
+ if (sum > UINT32_MAX)
+ {
+ return UINT32_MAX;
+ }
+ return (uint32)sum;
+ }
+
// Divide a by b, but return 0 if b is 0 (rounding to lower magnitude in case of integers)
template
inline static constexpr T div(T a, T b)
From db76542205784492bf9b5ec69ee726c9ddd6d238 Mon Sep 17 00:00:00 2001
From: TakaYuPP
Date: Wed, 17 Sep 2025 09:19:09 -0400
Subject: [PATCH 098/297] fix: fixed double payment for
transferShareManagementRight fee (#549)
---
src/contracts/Nostromo.h | 1 -
src/contracts/Qbay.h | 6 +++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/contracts/Nostromo.h b/src/contracts/Nostromo.h
index 0ac00b390..4b0480036 100644
--- a/src/contracts/Nostromo.h
+++ b/src/contracts/Nostromo.h
@@ -1147,7 +1147,6 @@ struct NOST : public ContractBase
{
// success
output.transferredNumberOfShares = input.numberOfShares;
- qpi.transfer(id(QX_CONTRACT_INDEX, 0, 0, 0), state.transferRightsFee);
if (qpi.invocationReward() > state.transferRightsFee)
{
qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.transferRightsFee);
diff --git a/src/contracts/Qbay.h b/src/contracts/Qbay.h
index c6de2a0c5..15f668dea 100644
--- a/src/contracts/Qbay.h
+++ b/src/contracts/Qbay.h
@@ -2171,7 +2171,6 @@ struct QBAY : public ContractBase
{
// success
output.transferredNumberOfShares = input.numberOfShares;
- qpi.transfer(id(QX_CONTRACT_INDEX, 0, 0, 0), state.transferRightsFee);
if (qpi.invocationReward() > state.transferRightsFee)
{
qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.transferRightsFee);
@@ -2502,6 +2501,11 @@ struct QBAY : public ContractBase
}
+ BEGIN_EPOCH()
+ {
+ state.transferRightsFee = 100;
+ }
+
struct END_EPOCH_locals
{
QX::TransferShareManagementRights_input transferShareManagementRights_input;
From 4eb874ba3855045e700f575ef5484c194d9a98fe Mon Sep 17 00:00:00 2001
From: TakaYuPP
Date: Mon, 22 Sep 2025 07:38:12 -0400
Subject: [PATCH 099/297] feat: added the transferShareManagementRights and
LOG_INFO into Qswap sc (#544)
* feat: added the transferShareManagementRights and LOG_INFO into Qswap smart contract
* fix: changed state logging variables to local logging variables
---
src/contracts/Qswap.h | 158 ++++++++++++++++++++++++++++++++++++++++
test/contract_qswap.cpp | 19 ++++-
2 files changed, 176 insertions(+), 1 deletion(-)
diff --git a/src/contracts/Qswap.h b/src/contracts/Qswap.h
index 12bfe6fe3..13672be8d 100644
--- a/src/contracts/Qswap.h
+++ b/src/contracts/Qswap.h
@@ -1,5 +1,15 @@
using namespace QPI;
+// Log types enum for QSWAP contract
+enum QSWAPLogInfo {
+ QSWAPAddLiquidity = 4,
+ QSWAPRemoveLiquidity = 5,
+ QSWAPSwapExactQuForAsset = 6,
+ QSWAPSwapQuForExactAsset = 7,
+ QSWAPSwapExactAssetForQu = 8,
+ QSWAPSwapAssetForExactQu = 9
+};
+
// FIXED CONSTANTS
constexpr uint64 QSWAP_INITIAL_MAX_POOL = 16384;
constexpr uint64 QSWAP_MAX_POOL = QSWAP_INITIAL_MAX_POOL * X_MULTIPLIER;
@@ -12,6 +22,39 @@ struct QSWAP2
{
};
+// Logging message structures for QSWAP procedures
+struct QSWAPAddLiquidityMessage
+{
+ uint32 _contractIndex;
+ uint32 _type;
+ id assetIssuer;
+ uint64 assetName;
+ sint64 userIncreaseLiquidity;
+ sint64 quAmount;
+ sint64 assetAmount;
+ sint8 _terminator;
+};
+
+struct QSWAPRemoveLiquidityMessage
+{
+ uint32 _contractIndex;
+ uint32 _type;
+ sint64 quAmount;
+ sint64 assetAmount;
+ sint8 _terminator;
+};
+
+struct QSWAPSwapMessage
+{
+ uint32 _contractIndex;
+ uint32 _type;
+ id assetIssuer;
+ uint64 assetName;
+ sint64 assetAmountIn;
+ sint64 assetAmountOut;
+ sint8 _terminator;
+};
+
struct QSWAP : public ContractBase
{
public:
@@ -230,6 +273,17 @@ struct QSWAP : public ContractBase
sint64 assetAmountIn;
};
+ struct TransferShareManagementRights_input
+ {
+ Asset asset;
+ sint64 numberOfShares;
+ uint32 newManagingContractIndex;
+ };
+ struct TransferShareManagementRights_output
+ {
+ sint64 transferredNumberOfShares;
+ };
+
protected:
uint32 swapFeeRate; // e.g. 30: 0.3% (base: 10_000)
uint32 teamFeeRate; // e.g. 20: 20% (base: 100)
@@ -895,6 +949,7 @@ struct QSWAP : public ContractBase
struct AddLiquidity_locals
{
+ QSWAPAddLiquidityMessage addLiquidityMessage;
id poolID;
sint64 poolSlot;
PoolBasicState poolBasicState;
@@ -1210,6 +1265,16 @@ struct QSWAP : public ContractBase
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+ // Log AddLiquidity procedure
+ locals.addLiquidityMessage._contractIndex = SELF_INDEX;
+ locals.addLiquidityMessage._type = QSWAPAddLiquidity;
+ locals.addLiquidityMessage.assetIssuer = input.assetIssuer;
+ locals.addLiquidityMessage.assetName = input.assetName;
+ locals.addLiquidityMessage.userIncreaseLiquidity = output.userIncreaseLiquidity;
+ locals.addLiquidityMessage.quAmount = output.quAmount;
+ locals.addLiquidityMessage.assetAmount = output.assetAmount;
+ LOG_INFO(locals.addLiquidityMessage);
+
if (qpi.invocationReward() > locals.quTransferAmount)
{
qpi.transfer(qpi.invocator(), qpi.invocationReward() - locals.quTransferAmount);
@@ -1218,6 +1283,7 @@ struct QSWAP : public ContractBase
struct RemoveLiquidity_locals
{
+ QSWAPRemoveLiquidityMessage removeLiquidityMessage;
id poolID;
PoolBasicState poolBasicState;
sint64 userLiquidityElementIndex;
@@ -1346,10 +1412,18 @@ struct QSWAP : public ContractBase
locals.poolBasicState.reservedAssetAmount -= locals.burnAssetAmount;
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+
+ // Log RemoveLiquidity procedure
+ locals.removeLiquidityMessage._contractIndex = SELF_INDEX;
+ locals.removeLiquidityMessage._type = QSWAPRemoveLiquidity;
+ locals.removeLiquidityMessage.quAmount = output.quAmount;
+ locals.removeLiquidityMessage.assetAmount = output.assetAmount;
+ LOG_INFO(locals.removeLiquidityMessage);
}
struct SwapExactQuForAsset_locals
{
+ QSWAPSwapMessage swapMessage;
id poolID;
sint64 poolSlot;
sint64 quAmountIn;
@@ -1466,10 +1540,20 @@ struct QSWAP : public ContractBase
locals.poolBasicState.reservedQuAmount += locals.quAmountIn - sint64(locals.feeToTeam.low) - sint64(locals.feeToProtocol.low);
locals.poolBasicState.reservedAssetAmount -= locals.assetAmountOut;
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+
+ // Log SwapExactQuForAsset procedure
+ locals.swapMessage._contractIndex = SELF_INDEX;
+ locals.swapMessage._type = QSWAPSwapExactQuForAsset;
+ locals.swapMessage.assetIssuer = input.assetIssuer;
+ locals.swapMessage.assetName = input.assetName;
+ locals.swapMessage.assetAmountIn = locals.quAmountIn;
+ locals.swapMessage.assetAmountOut = output.assetAmountOut;
+ LOG_INFO(locals.swapMessage);
}
struct SwapQuForExactAsset_locals
{
+ QSWAPSwapMessage swapMessage;
id poolID;
sint64 poolSlot;
PoolBasicState poolBasicState;
@@ -1601,10 +1685,20 @@ struct QSWAP : public ContractBase
locals.poolBasicState.reservedQuAmount += locals.quAmountIn - sint64(locals.feeToTeam.low) - sint64(locals.feeToProtocol.low);
locals.poolBasicState.reservedAssetAmount -= input.assetAmountOut;
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+
+ // Log SwapQuForExactAsset procedure
+ locals.swapMessage._contractIndex = SELF_INDEX;
+ locals.swapMessage._type = QSWAPSwapQuForExactAsset;
+ locals.swapMessage.assetIssuer = input.assetIssuer;
+ locals.swapMessage.assetName = input.assetName;
+ locals.swapMessage.assetAmountIn = output.quAmountIn;
+ locals.swapMessage.assetAmountOut = input.assetAmountOut;
+ LOG_INFO(locals.swapMessage);
}
struct SwapExactAssetForQu_locals
{
+ QSWAPSwapMessage swapMessage;
id poolID;
sint64 poolSlot;
PoolBasicState poolBasicState;
@@ -1755,10 +1849,20 @@ struct QSWAP : public ContractBase
state.protocolEarnedFee += locals.feeToProtocol.low;
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+
+ // Log SwapExactAssetForQu procedure
+ locals.swapMessage._contractIndex = SELF_INDEX;
+ locals.swapMessage._type = QSWAPSwapExactAssetForQu;
+ locals.swapMessage.assetIssuer = input.assetIssuer;
+ locals.swapMessage.assetName = input.assetName;
+ locals.swapMessage.assetAmountIn = input.assetAmountIn;
+ locals.swapMessage.assetAmountOut = output.quAmountOut;
+ LOG_INFO(locals.swapMessage);
}
struct SwapAssetForExactQu_locals
{
+ QSWAPSwapMessage swapMessage;
id poolID;
sint64 poolSlot;
PoolBasicState poolBasicState;
@@ -1903,6 +2007,15 @@ struct QSWAP : public ContractBase
locals.poolBasicState.reservedQuAmount -= sint64(locals.feeToTeam.low);
locals.poolBasicState.reservedQuAmount -= sint64(locals.feeToProtocol.low);
state.mPoolBasicStates.set(locals.poolSlot, locals.poolBasicState);
+
+ // Log SwapAssetForExactQu procedure
+ locals.swapMessage._contractIndex = SELF_INDEX;
+ locals.swapMessage._type = QSWAPSwapAssetForExactQu;
+ locals.swapMessage.assetIssuer = input.assetIssuer;
+ locals.swapMessage.assetName = input.assetName;
+ locals.swapMessage.assetAmountIn = output.assetAmountIn;
+ locals.swapMessage.assetAmountOut = input.quAmountOut;
+ LOG_INFO(locals.swapMessage);
}
struct TransferShareOwnershipAndPossession_locals
@@ -1982,6 +2095,46 @@ struct QSWAP : public ContractBase
output.success = true;
}
+ PUBLIC_PROCEDURE(TransferShareManagementRights)
+ {
+ if (qpi.invocationReward() < QSWAP_FEE_BASE_100)
+ {
+ return ;
+ }
+
+ if (qpi.numberOfPossessedShares(input.asset.assetName, input.asset.issuer,qpi.invocator(), qpi.invocator(), SELF_INDEX, SELF_INDEX) < input.numberOfShares)
+ {
+ // not enough shares available
+ output.transferredNumberOfShares = 0;
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ }
+ else
+ {
+ if (qpi.releaseShares(input.asset, qpi.invocator(), qpi.invocator(), input.numberOfShares,
+ input.newManagingContractIndex, input.newManagingContractIndex, QSWAP_FEE_BASE_100) < 0)
+ {
+ // error
+ output.transferredNumberOfShares = 0;
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ }
+ else
+ {
+ // success
+ output.transferredNumberOfShares = input.numberOfShares;
+ if (qpi.invocationReward() > QSWAP_FEE_BASE_100)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - QSWAP_FEE_BASE_100);
+ }
+ }
+ }
+ }
+
REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
{
// functions
@@ -2005,6 +2158,7 @@ struct QSWAP : public ContractBase
REGISTER_USER_PROCEDURE(SwapExactAssetForQu, 8);
REGISTER_USER_PROCEDURE(SwapAssetForExactQu, 9);
REGISTER_USER_PROCEDURE(SetTeamInfo, 10);
+ REGISTER_USER_PROCEDURE(TransferShareManagementRights, 11);
}
INITIALIZE()
@@ -2036,4 +2190,8 @@ struct QSWAP : public ContractBase
}
}
}
+ PRE_ACQUIRE_SHARES()
+ {
+ output.allowTransfer = true;
+ }
};
diff --git a/test/contract_qswap.cpp b/test/contract_qswap.cpp
index 350e06215..78c1a4296 100644
--- a/test/contract_qswap.cpp
+++ b/test/contract_qswap.cpp
@@ -29,6 +29,7 @@ constexpr uint32 SWAP_QU_FOR_EXACT_ASSET_IDX = 7;
constexpr uint32 SWAP_EXACT_ASSET_FOR_QU_IDX = 8;
constexpr uint32 SWAP_ASSET_FOR_EXACT_QU_IDX = 9;
constexpr uint32 SET_TEAM_INFO_IDX = 10;
+constexpr uint32 TRANSFER_SHARE_MANAGEMENT_RIGHTS_IDX = 11;
class QswapChecker : public QSWAP
@@ -203,6 +204,13 @@ class ContractTestingQswap : protected ContractTesting
return output;
}
+ QSWAP::TransferShareManagementRights_output transferShareManagementRights(const id& invocator, QSWAP::TransferShareManagementRights_input input, uint64 inputValue)
+ {
+ QSWAP::TransferShareManagementRights_output output;
+ invokeUserProcedure(QSWAP_CONTRACT_INDEX, TRANSFER_SHARE_MANAGEMENT_RIGHTS_IDX, input, output, invocator, inputValue);
+ return output;
+ }
+
QSWAP::QuoteExactQuInput_output quoteExactQuInput(QSWAP::QuoteExactQuInput_input input)
{
QSWAP::QuoteExactQuInput_output output;
@@ -323,7 +331,7 @@ TEST(ContractSwap, QuoteTest)
2. issue duplicate asset
3. issue asset with invalid input params, such as numberOfShares: 0
*/
-TEST(ContractSwap, IssueAsset)
+TEST(ContractSwap, IssueAssetAndTransferShareManagementRights)
{
ContractTestingQswap qswap;
@@ -349,6 +357,15 @@ TEST(ContractSwap, IssueAsset)
EXPECT_EQ(qswap.transferAsset(issuer, ts_input), transferAmount);
EXPECT_EQ(numberOfPossessedShares(assetName, issuer, newId, newId, QSWAP_CONTRACT_INDEX, QSWAP_CONTRACT_INDEX), transferAmount);
// printf("%lld\n", getBalance(QSWAP_CONTRACT_ID));
+ increaseEnergy(issuer, 100);
+ uint64 qswapIdBalance = getBalance(QSWAP_CONTRACT_ID);
+ uint64 issuerBalance = getBalance(issuer);
+ QSWAP::TransferShareManagementRights_input tsr_input = {Asset{issuer, assetName}, transferAmount, QX_CONTRACT_INDEX};
+ EXPECT_EQ(qswap.transferShareManagementRights(issuer, tsr_input, 100).transferredNumberOfShares, transferAmount);
+ EXPECT_EQ(getBalance(id(QX_CONTRACT_INDEX, 0, 0, 0)), 100);
+ EXPECT_EQ(getBalance(QSWAP_CONTRACT_ID), qswapIdBalance);
+ EXPECT_EQ(getBalance(issuer), issuerBalance - 100);
+ EXPECT_EQ(numberOfPossessedShares(assetName, issuer, issuer, issuer, QX_CONTRACT_INDEX, QX_CONTRACT_INDEX), transferAmount);
}
// 1. not enough energy for asset issue fee
From 9454c1de3c89dc31453562ca669d0aecdd2c563b Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Mon, 22 Sep 2025 18:51:09 +0700
Subject: [PATCH 100/297] Update test project to use Windows SDK version
available on GitHub Build. (#554)
---
test/test.vcxproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 36293222b..e2d687303 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -17,7 +17,7 @@
{30e8e249-6b00-4575-bcdf-be2445d5e099}
Win32Proj
- 10.0.22621.0
+ 10.0
Application
v143
Unicode
From fb72ae257a6aa1443f4cd3898dc80d2ea2d4010d Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Mon, 22 Sep 2025 18:51:09 +0700
Subject: [PATCH 101/297] Update test project to use Windows SDK version
available on GitHub Build. (#554)
---
test/test.vcxproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 36293222b..e2d687303 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -17,7 +17,7 @@
{30e8e249-6b00-4575-bcdf-be2445d5e099}
Win32Proj
- 10.0.22621.0
+ 10.0
Application
v143
Unicode
From c15d46f97d85e12964335ed4aebbdefb50d9c298 Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:23:43 +0700
Subject: [PATCH 102/297] Speed up score for 1000 ticks. (#553)
* Improve score test, allow matching result before performance.
* Speed up score functions.
* Increase score's number of ticks to 1000.
* Remove score's unused functions.
---
src/public_settings.h | 2 +-
src/score.h | 478 ++++++++++++++++++++++++++++--------------
test/score.cpp | 248 +++++++++++++++++-----
test/score_params.h | 11 +-
4 files changed, 532 insertions(+), 207 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 78963049c..bd3fbe558 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -84,7 +84,7 @@ static unsigned short CUSTOM_MINING_V2_CACHE_FILE_NAME[] = L"custom_mining_v2_ca
static constexpr unsigned long long NUMBER_OF_INPUT_NEURONS = 512; // K
static constexpr unsigned long long NUMBER_OF_OUTPUT_NEURONS = 512; // L
-static constexpr unsigned long long NUMBER_OF_TICKS = 600; // N
+static constexpr unsigned long long NUMBER_OF_TICKS = 1000; // N
static constexpr unsigned long long NUMBER_OF_NEIGHBORS = 728; // 2M. Must be divided by 2
static constexpr unsigned long long NUMBER_OF_MUTATIONS = 150;
static constexpr unsigned long long POPULATION_THRESHOLD = NUMBER_OF_INPUT_NEURONS + NUMBER_OF_OUTPUT_NEURONS + NUMBER_OF_MUTATIONS; // P
diff --git a/src/score.h b/src/score.h
index de7d8b319..0921cfbf2 100644
--- a/src/score.h
+++ b/src/score.h
@@ -33,30 +33,29 @@ static_assert(false, "Either AVX2 or AVX512 is required.");
#endif
#if defined (__AVX512F__)
- static constexpr int BATCH_SIZE = 64;
- static constexpr int BATCH_SIZE_X8 = BATCH_SIZE * 8;
- static inline int popcnt512(__m512i v)
- {
- __m512i pc = _mm512_popcnt_epi64(v);
- return (int)_mm512_reduce_add_epi64(pc);
- }
+static constexpr int BATCH_SIZE = 64;
+static constexpr int BATCH_SIZE_X8 = BATCH_SIZE * 8;
+static inline int popcnt512(__m512i v)
+{
+ __m512i pc = _mm512_popcnt_epi64(v);
+ return (int)_mm512_reduce_add_epi64(pc);
+}
#elif defined(__AVX2__)
- static constexpr int BATCH_SIZE = 32;
- static constexpr int BATCH_SIZE_X8 = BATCH_SIZE * 8;
- static inline unsigned popcnt256(__m256i v)
- {
- return popcnt64(_mm256_extract_epi64(v, 0)) +
- popcnt64(_mm256_extract_epi64(v, 1)) +
- popcnt64(_mm256_extract_epi64(v, 2)) +
- popcnt64(_mm256_extract_epi64(v, 3));
- }
+static constexpr int BATCH_SIZE = 32;
+static constexpr int BATCH_SIZE_X8 = BATCH_SIZE * 8;
+static inline unsigned popcnt256(__m256i v)
+{
+ return popcnt64(_mm256_extract_epi64(v, 0)) +
+ popcnt64(_mm256_extract_epi64(v, 1)) +
+ popcnt64(_mm256_extract_epi64(v, 2)) +
+ popcnt64(_mm256_extract_epi64(v, 3));
+}
#endif
constexpr unsigned long long POOL_VEC_SIZE = (((1ULL << 32) + 64)) >> 3; // 2^32+64 bits ~ 512MB
constexpr unsigned long long POOL_VEC_PADDING_SIZE = (POOL_VEC_SIZE + 200 - 1) / 200 * 200; // padding for multiple of 200
constexpr unsigned long long STATE_SIZE = 200;
-static const char gLUT3States[] = { 0, 1, -1 };
static void generateRandom2Pool(const unsigned char* miningSeed, unsigned char* state, unsigned char* pool)
{
@@ -140,50 +139,6 @@ static void extract64Bits(unsigned long long number, char* output)
}
}
-static void packNegPos(const char* data,
- unsigned long long dataSize,
- unsigned char* negMask,
- unsigned char* posMask)
-{
- for (unsigned long long i = 0; i < dataSize; ++i)
- {
- negMask[i] = (data[i] == -1);
- posMask[i] = (data[i] == 1);
- }
-}
-
-static void unpackNegPos(
- const unsigned char* negMask,
- const unsigned char* posMask,
- const unsigned long long dataSize,
- char* data)
-{
- for (unsigned long long i = 0; i < dataSize; ++i)
- {
- data[i] = 0;
- if (negMask[i])
- {
- data[i] = -1;
- continue;
- }
- if (posMask[i])
- {
- data[i] = 1;
- continue;
- }
- }
-}
-
-static char convertMaskValue(unsigned char pos, unsigned char neg)
-{
- /*
- value = +1 if pos=1 , neg=0
- value = -1 if pos=0 , neg=1
- value = 0 otherwise
- */
- return (char)(pos - neg);
-}
-
static void setBitValue(unsigned char* data, unsigned long long bitIdx, unsigned char bitValue)
{
// (data[bitIdx >> 3] & ~(1u << (bitIdx & 7u))). Set the bit at data[bitIdx >> 3] byte become zeros
@@ -200,14 +155,6 @@ static unsigned char getBitValue(const unsigned char* data, unsigned long long
return ((data[bitIdx >> 3] >> (bitIdx & 7u)) & 1u);
}
-static char getValueFromBit(const unsigned char* negMask, const unsigned char* posMask, unsigned long long bitIdx)
-{
- unsigned long long idx = bitIdx; /* bit index */
- unsigned char negBit = (negMask[idx >> 3] >> (idx & 7)) & 1u;
- unsigned char posBit = (posMask[idx >> 3] >> (idx & 7)) & 1u;
- return convertMaskValue(posBit, negBit);
-}
-
template
static void paddingDatabits(
unsigned char* data,
@@ -278,7 +225,7 @@ static void packNegPosWithPadding(const char* data,
const __m512i vMinus1 = _mm512_set1_epi8(-1);
const __m512i vPlus1 = _mm512_set1_epi8(+1);
unsigned long long k = 0;
- for (; k + BATCH_SIZE < dataSizeInBits; k += BATCH_SIZE)
+ for (; k + BATCH_SIZE <= dataSizeInBits; k += BATCH_SIZE)
{
__m512i v = _mm512_loadu_si512(reinterpret_cast(data + k));
__mmask64 mNeg = _mm512_cmpeq_epi8_mask(v, vMinus1);
@@ -297,7 +244,7 @@ static void packNegPosWithPadding(const char* data,
const __m256i vMinus1 = _mm256_set1_epi8(-1);
const __m256i vPlus1 = _mm256_set1_epi8(+1);
unsigned long long k = 0;
- for (; k + BATCH_SIZE < dataSizeInBits; k += BATCH_SIZE)
+ for (; k + BATCH_SIZE <= dataSizeInBits; k += BATCH_SIZE)
{
__m256i v = _mm256_loadu_si256(reinterpret_cast(data + k));
@@ -337,22 +284,6 @@ static void packNegPosWithPadding(const char* data,
}
}
-static void unpackNegPosBits(const unsigned char* negMask,
- const unsigned char* posMask,
- unsigned long long dataSize,
- unsigned long long paddedSize,
- char* out)
-{
- const unsigned long long startBit = paddedSize; /* first real */
- for (unsigned long long i = 0; i < dataSize; ++i)
- {
- unsigned long long idx = startBit + i; /* bit index */
- unsigned char negBit = (negMask[idx >> 3] >> (idx & 7)) & 1u;
- unsigned char posBit = (posMask[idx >> 3] >> (idx & 7)) & 1u;
- out[i] = convertMaskValue(posBit, negBit);
- }
-}
-
// Load 256/512 values start from a bit index into a m512 or m256 register
#if defined (__AVX512F__)
static inline __m512i load512Bits(const unsigned char* array, unsigned long long bitLocation)
@@ -462,7 +393,7 @@ struct ScoreFunction
typedef char Neuron;
typedef unsigned char NeuronType;
-
+
// Data for roll back
struct ANN
{
@@ -872,53 +803,158 @@ struct ScoreFunction
{
unsigned long long population = currentANN.population;
- // Prepare the padding regions
- currentANN.prepareData();
- // Test copy padding
unsigned char* pPaddingNeuronMinus = currentANN.neuronMinus1s;
unsigned char* pPaddingNeuronPlus = currentANN.neuronPlus1s;
-
unsigned char* pPaddingSynapseMinus = currentANN.synapseMinus1s;
unsigned char* pPaddingSynapsePlus = currentANN.synapsePlus1s;
paddingDatabits(pPaddingNeuronMinus, population);
paddingDatabits(pPaddingNeuronPlus, population);
+
#if defined (__AVX512F__)
- const unsigned long long chunks = incommingSynapsesPitch >> 9; /* bits/512 */
-#else
- const unsigned long long chunks = incommingSynapsesPitch >> 8; /* bits/256 */
-#endif
- for (unsigned long long n = 0; n < population; ++n, pPaddingSynapsePlus += incommingSynapseBatchSize, pPaddingSynapseMinus += incommingSynapseBatchSize)
+ constexpr unsigned long long chunks = incommingSynapsesPitch >> 9;
+ __m512i minusBlock[chunks];
+ __m512i minusNext[chunks];
+ __m512i plusBlock[chunks];
+ __m512i plusNext[chunks];
+
+ constexpr unsigned long long blockSizeNeurons = 64ULL;
+ constexpr unsigned long long bytesPerWord = 8ULL;
+
+ unsigned long long n = 0;
+ const unsigned long long lastBlock = (population / blockSizeNeurons) * blockSizeNeurons;
+ for (; n < lastBlock; n += blockSizeNeurons)
+ {
+ // byteIndex = start byte for word containing neuron n
+ unsigned long long byteIndex = ((n >> 6) << 3); // (n / 64) * 8
+ unsigned long long curIdx = byteIndex;
+ unsigned long long nextIdx = byteIndex + bytesPerWord; // +8 bytes
+
+ // Load the neuron windows once per block for all chunks
+ unsigned long long loadCur = curIdx;
+ unsigned long long loadNext = nextIdx;
+ for (unsigned blk = 0; blk < chunks; ++blk, loadCur += BATCH_SIZE, loadNext += BATCH_SIZE)
+ {
+ plusBlock[blk] = _mm512_loadu_si512((const void*)(pPaddingNeuronPlus + loadCur));
+ plusNext[blk] = _mm512_loadu_si512((const void*)(pPaddingNeuronPlus + loadNext));
+ minusBlock[blk] = _mm512_loadu_si512((const void*)(pPaddingNeuronMinus + loadCur));
+ minusNext[blk] = _mm512_loadu_si512((const void*)(pPaddingNeuronMinus + loadNext));
+ }
+
+ __m512i sh = _mm512_setzero_si512();
+ __m512i sh64 = _mm512_set1_epi64(64);
+ const __m512i ones512 = _mm512_set1_epi64(1);
+
+ // For each neuron inside this 64-neuron block
+ for (unsigned int lane = 0; lane < 64; ++lane)
+ {
+ const unsigned long long current_n = n + lane;
+ // synapse pointers for this neuron
+ unsigned char* pSynapsePlus = pPaddingSynapsePlus + current_n * incommingSynapseBatchSize;
+ unsigned char* pSynapseMinus = pPaddingSynapseMinus + current_n * incommingSynapseBatchSize;
+
+ __m512i plusPopulation = _mm512_setzero_si512();
+ __m512i minusPopulation = _mm512_setzero_si512();
+
+ for (unsigned blk = 0; blk < chunks; ++blk)
+ {
+ const __m512i synP = _mm512_loadu_si512((const void*)(pSynapsePlus + blk * BATCH_SIZE));
+ const __m512i synM = _mm512_loadu_si512((const void*)(pSynapseMinus + blk * BATCH_SIZE));
+
+ // stitch 64-bit lanes: cur >> s | next << (64 - s)
+ __m512i neuronPlus = _mm512_or_si512(_mm512_srlv_epi64(plusBlock[blk], sh), _mm512_sllv_epi64(plusNext[blk], sh64));
+ __m512i neuronMinus = _mm512_or_si512(_mm512_srlv_epi64(minusBlock[blk], sh), _mm512_sllv_epi64(minusNext[blk], sh64));
+
+ __m512i tmpP = _mm512_and_si512(neuronMinus, synM);
+ const __m512i plus = _mm512_ternarylogic_epi64(neuronPlus, synP, tmpP, 234);
+
+ __m512i tmpM = _mm512_and_si512(neuronMinus, synP);
+ const __m512i minus = _mm512_ternarylogic_epi64(neuronPlus, synM, tmpM, 234);
+
+ plusPopulation = _mm512_add_epi64(plusPopulation, _mm512_popcnt_epi64(plus));
+ minusPopulation = _mm512_add_epi64(minusPopulation, _mm512_popcnt_epi64(minus));
+ }
+ sh = _mm512_add_epi64(sh, ones512);
+ sh64 = _mm512_sub_epi64(sh64, ones512);
+
+ // Reduce to scalar and compute neuron value
+ int score = (int)_mm512_reduce_add_epi64(_mm512_sub_epi64(plusPopulation, minusPopulation));
+ char neuronValue = (score > 0) - (score < 0);
+ neuronValueBuffer[current_n] = neuronValue;
+
+ // Update the neuron positive and negative bitmaps
+ unsigned char nNextNeg = neuronValue < 0 ? 1 : 0;
+ unsigned char nNextPos = neuronValue > 0 ? 1 : 0;
+ setBitValue(currentANN.nextneuronMinus1s, current_n + radius, nNextNeg);
+ setBitValue(currentANN.nextNeuronPlus1s, current_n + radius, nNextPos);
+ }
+ }
+
+ for (; n < population; ++n)
{
char neuronValue = 0;
int score = 0;
- int synapseBlkIdx = 0; // blk index of synapse
- int neuronBlkIdx = 0;
- for (unsigned blk = 0; blk < chunks; ++blk, synapseBlkIdx += BATCH_SIZE, neuronBlkIdx +=BATCH_SIZE_X8)
+ unsigned char* pSynapsePlus = pPaddingSynapsePlus + n * incommingSynapseBatchSize;
+ unsigned char* pSynapseMinus = pPaddingSynapseMinus + n * incommingSynapseBatchSize;
+
+ const unsigned long long byteIndex = n >> 3;
+ const unsigned int bitOffset = (n & 7U);
+ const unsigned int bitOffset_8 = (8u - bitOffset);
+ __m512i sh = _mm512_set1_epi64((long long)bitOffset);
+ __m512i sh8 = _mm512_set1_epi64((long long)bitOffset_8);
+
+ __m512i plusPopulation = _mm512_setzero_si512();
+ __m512i minusPopulation = _mm512_setzero_si512();
+
+ for (unsigned blk = 0; blk < chunks; ++blk, pSynapsePlus += BATCH_SIZE, pSynapseMinus += BATCH_SIZE)
{
-#if defined (__AVX512F__)
- const __m512i synapsePlus = _mm512_loadu_si512((const void*)(pPaddingSynapsePlus + synapseBlkIdx));
- const __m512i synapseMinus = _mm512_loadu_si512((const void*)(pPaddingSynapseMinus + synapseBlkIdx));
+ const __m512i synapsePlus = _mm512_loadu_si512((const void*)(pSynapsePlus));
+ const __m512i synapseMinus = _mm512_loadu_si512((const void*)(pSynapseMinus));
- __m512i neuronPlus = load512Bits(pPaddingNeuronPlus, n + neuronBlkIdx);
- __m512i neuronMinus = load512Bits(pPaddingNeuronMinus, n + neuronBlkIdx);
+ __m512i neuronPlus = _mm512_loadu_si512((const void*)(pPaddingNeuronPlus + byteIndex + blk * BATCH_SIZE));
+ __m512i neuronPlusNext = _mm512_loadu_si512((const void*)(pPaddingNeuronPlus + byteIndex + blk * BATCH_SIZE + 1));
+ __m512i neuronMinus = _mm512_loadu_si512((const void*)(pPaddingNeuronMinus + byteIndex + blk * BATCH_SIZE));
+ __m512i neuronMinusNext = _mm512_loadu_si512((const void*)(pPaddingNeuronMinus + byteIndex + blk * BATCH_SIZE + 1));
- //__m512i plus = _mm512_or_si512(_mm512_and_si512(neuronPlus, synapsePlus),
- // _mm512_and_si512(neuronMinus, synapseMinus));
+ neuronPlus = _mm512_or_si512(_mm512_srlv_epi64(neuronPlus, sh), _mm512_sllv_epi64(neuronPlusNext, sh8));
+ neuronMinus = _mm512_or_si512(_mm512_srlv_epi64(neuronMinus, sh), _mm512_sllv_epi64(neuronMinusNext, sh8));
- //__m512i minus = _mm512_or_si512(_mm512_and_si512(neuronPlus, synapseMinus),
- // _mm512_and_si512(neuronMinus, synapsePlus));
+ __m512i tempP = _mm512_and_si512(neuronMinus, synapseMinus);
+ const __m512i plus = _mm512_ternarylogic_epi64(neuronPlus, synapsePlus, tempP, 234);
- const __m512i plus = _mm512_ternarylogic_epi64(neuronPlus, synapsePlus, _mm512_and_si512(neuronMinus, synapseMinus), 234);
- const __m512i minus = _mm512_ternarylogic_epi64(neuronPlus, synapseMinus, _mm512_and_si512(neuronMinus, synapsePlus), 234);
+ __m512i tempM = _mm512_and_si512(neuronMinus, synapsePlus);
+ const __m512i minus = _mm512_ternarylogic_epi64(neuronPlus, synapseMinus, tempM, 234);
- const __m512i plusPopulation = _mm512_popcnt_epi64(plus);
- const __m512i minusPopulation = _mm512_popcnt_epi64(minus);
- score += (int)_mm512_reduce_add_epi64(_mm512_sub_epi64(plusPopulation, minusPopulation));
+ tempP = _mm512_popcnt_epi64(plus);
+ tempM = _mm512_popcnt_epi64(minus);
+ plusPopulation = _mm512_add_epi64(tempP, plusPopulation);
+ minusPopulation = _mm512_add_epi64(tempM, minusPopulation);
+ }
+ score = (int)_mm512_reduce_add_epi64(_mm512_sub_epi64(plusPopulation, minusPopulation));
+ neuronValue = (score > 0) - (score < 0);
+ neuronValueBuffer[n] = neuronValue;
+
+ unsigned char nNextNeg = neuronValue < 0 ? 1 : 0;
+ unsigned char nNextPos = neuronValue > 0 ? 1 : 0;
+ setBitValue(currentANN.nextneuronMinus1s, n + radius, nNextNeg);
+ setBitValue(currentANN.nextNeuronPlus1s, n + radius, nNextPos);
+ }
#else
+ constexpr unsigned long long chunks = incommingSynapsesPitch >> 8;
+ for (unsigned long long n = 0; n < population; ++n, pPaddingSynapsePlus += incommingSynapseBatchSize, pPaddingSynapseMinus += incommingSynapseBatchSize)
+ {
+ char neuronValue = 0;
+ int score = 0;
+ unsigned char* pSynapsePlus = pPaddingSynapsePlus;
+ unsigned char* pSynapseMinus = pPaddingSynapseMinus;
+
+ int synapseBlkIdx = 0; // blk index of synapse
+ int neuronBlkIdx = 0;
+ for (unsigned blk = 0; blk < chunks; ++blk, synapseBlkIdx += BATCH_SIZE, neuronBlkIdx += BATCH_SIZE_X8)
+ {
// Process 256bits at once, neigbor shilf 64 bytes = 256 bits
const __m256i synapsePlus = _mm256_loadu_si256((const __m256i*)(pPaddingSynapsePlus + synapseBlkIdx));
const __m256i synapseMinus = _mm256_loadu_si256((const __m256i*)(pPaddingSynapseMinus + synapseBlkIdx));
@@ -933,7 +969,6 @@ struct ScoreFunction
_mm256_and_si256(neuronMinus, synapsePlus));
score += popcnt256(plus) - popcnt256(minus);
-#endif
}
neuronValue = (score > 0) - (score < 0);
@@ -944,8 +979,11 @@ struct ScoreFunction
unsigned char nNextPos = neuronValue > 0 ? 1 : 0;
setBitValue(currentANN.nextneuronMinus1s, n + radius, nNextNeg);
setBitValue(currentANN.nextNeuronPlus1s, n + radius, nNextPos);
-
}
+#endif
+
+
+
copyMem(currentANN.neurons, neuronValueBuffer, population * sizeof(Neuron));
copyMem(currentANN.neuronMinus1s, currentANN.nextneuronMinus1s, sizeof(currentANN.neuronMinus1s));
copyMem(currentANN.neuronPlus1s, currentANN.nextNeuronPlus1s, sizeof(currentANN.neuronPlus1s));
@@ -960,16 +998,8 @@ struct ScoreFunction
// Save the neuron value for comparison
copyMem(previousNeuronValue, neurons, population * sizeof(Neuron));
-
- const __m512i vPop = _mm512_set1_epi64(population);
- const __m512i vPitch = _mm512_set1_epi64(static_cast(incommingSynapsesPitch));
- const __m512i vStrideL = _mm512_set1_epi64(incommingSynapsesPitch - 1);
- const __m512i vStrideR = _mm512_set1_epi64(incommingSynapsesPitch + 1);
- const __m512i vNeighbor = _mm512_set1_epi64(static_cast(numberOfNeighbors));
-
- const __m512i lane01234567 = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0); // constant
- long long test[8] = { 0 };
{
+ //PROFILE_NAMED_SCOPE("convertSynapse");
// Compute the incomming synapse of each neurons
setMem(paddingIncommingSynapses, sizeof(paddingIncommingSynapses), 0);
for (unsigned long long n = 0; n < population; ++n)
@@ -997,6 +1027,7 @@ struct ScoreFunction
// Prepare masks
{
+ //PROFILE_NAMED_SCOPE("prepareMask");
packNegPosWithPadding(currentANN.neurons,
population,
radius,
@@ -1011,6 +1042,7 @@ struct ScoreFunction
}
{
+ //PROFILE_NAMED_SCOPE("processTickLoop");
for (unsigned long long tick = 0; tick < numberOfTicks; ++tick)
{
processTick();
@@ -1018,25 +1050,9 @@ struct ScoreFunction
// - N ticks have passed (already in for loop)
// - All neuron values are unchanged
// - All output neurons have non-zero values
- bool shouldExit = true;
- bool allNeuronsUnchanged = true;
- bool allOutputNeuronsIsNonZeros = true;
- for (unsigned long long n = 0; n < population; ++n)
- {
- // Neuron unchanged check
- if (previousNeuronValue[n] != neurons[n])
- {
- allNeuronsUnchanged = false;
- }
-
- // Ouput neuron value check
- if (neuronTypes[n] == OUTPUT_NEURON_TYPE && neurons[n] == 0)
- {
- allOutputNeuronsIsNonZeros = false;
- }
- }
- if (allOutputNeuronsIsNonZeros || allNeuronsUnchanged)
+ if (areAllNeuronsUnchanged((const char*)previousNeuronValue, (const char*)neurons, population)
+ || areAllNeuronsZeros((const char*)neurons, (const char*)neuronTypes, population))
{
break;
}
@@ -1047,6 +1063,111 @@ struct ScoreFunction
}
}
+ bool areAllNeuronsZeros(
+ const char* neurons,
+ const char* neuronTypes,
+ unsigned long long population)
+ {
+
+#if defined (__AVX512F__)
+ const __m512i zero = _mm512_setzero_si512();
+ const __m512i typeOutput = _mm512_set1_epi8(OUTPUT_NEURON_TYPE);
+
+ unsigned long long i = 0;
+ for (; i + BATCH_SIZE <= population; i += BATCH_SIZE)
+ {
+ __m512i cur = _mm512_loadu_si512((const void*)(neurons + i));
+ __m512i types = _mm512_loadu_si512((const void*)(neuronTypes + i));
+
+ __mmask64 type_mask = _mm512_cmpeq_epi8_mask(types, typeOutput);
+ __mmask64 zero_mask = _mm512_cmpeq_epi8_mask(cur, zero);
+
+ if (type_mask & zero_mask)
+ return false;
+ }
+#else
+ const __m256i zero = _mm256_setzero_si256();
+ const __m256i typeOutput = _mm256_set1_epi8(OUTPUT_NEURON_TYPE);
+
+ unsigned long long i = 0;
+ for (; i + BATCH_SIZE <= population; i += BATCH_SIZE)
+ {
+ __m256i cur = _mm256_loadu_si256((const __m256i*)(neurons + i));
+ __m256i types = _mm256_loadu_si256((const __m256i*)(neuronTypes + i));
+
+ // Compare for type == OUTPUT
+ __m256i type_cmp = _mm256_cmpeq_epi8(types, typeOutput);
+ int type_mask = _mm256_movemask_epi8(type_cmp);
+
+ // Compare for neuron == 0
+ __m256i zero_cmp = _mm256_cmpeq_epi8(cur, zero);
+ int zero_mask = _mm256_movemask_epi8(zero_cmp);
+
+ // If both masks overlap → some output neuron is zero
+ if (type_mask & zero_mask)
+ {
+ return false;
+ }
+ }
+
+#endif
+ for (; i < population; i++)
+ {
+ // Neuron unchanged check
+ if (neuronTypes[i] == OUTPUT_NEURON_TYPE && neurons[i] == 0)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ bool areAllNeuronsUnchanged(
+ const char* previousNeuronValue,
+ const char* neurons,
+ unsigned long long population)
+ {
+ unsigned long long i = 0;
+ for (; i + BATCH_SIZE <= population; i += BATCH_SIZE)
+ {
+
+#if defined (__AVX512F__)
+ __m512i prev = _mm512_loadu_si512((const void*)(previousNeuronValue + i));
+ __m512i cur = _mm512_loadu_si512((const void*)(neurons + i));
+
+ __mmask64 neq_mask = _mm512_cmpneq_epi8_mask(prev, cur);
+ if (neq_mask)
+ {
+ return false;
+ }
+#else
+ __m256i v_prev = _mm256_loadu_si256((const __m256i*)(previousNeuronValue + i));
+ __m256i v_curr = _mm256_loadu_si256((const __m256i*)(neurons + i));
+ __m256i cmp = _mm256_cmpeq_epi8(v_prev, v_curr);
+
+ int mask = _mm256_movemask_epi8(cmp);
+
+ // -1 means all bytes equal
+ if (mask != -1)
+ {
+ return false;
+ }
+#endif
+ }
+
+ for (; i < population; i++)
+ {
+ // Neuron unchanged check
+ if (previousNeuronValue[i] != neurons[i])
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
unsigned int computeNonMatchingOutput()
{
unsigned long long population = currentANN.population;
@@ -1057,7 +1178,61 @@ struct ScoreFunction
// Because the output neuron order never changes, the order is preserved
unsigned int R = 0;
unsigned long long outputIdx = 0;
- for (unsigned long long i = 0; i < population; i++)
+ unsigned long long i = 0;
+#if defined (__AVX512F__)
+ const __m512i typeOutputAVX = _mm512_set1_epi8(OUTPUT_NEURON_TYPE);
+ for (; i + BATCH_SIZE <= population; i += BATCH_SIZE)
+ {
+ // Load 64 neuron types and compare with OUTPUT_NEURON_TYPE
+ __m512i types = _mm512_loadu_si512((const void*)(neuronTypes + i));
+ __mmask64 type_mask = _mm512_cmpeq_epi8_mask(types, typeOutputAVX);
+
+ if (type_mask == 0)
+ {
+ continue; // no output neurons in this 64-wide block, just skip
+ }
+
+ // Output neuron existed in this block
+ for (int k = 0; k < BATCH_SIZE; ++k)
+ {
+ if (type_mask & (1ULL << k))
+ {
+ char neuronVal = neurons[i + k];
+ if (neuronVal != outputNeuronExpectedValue[outputIdx])
+ {
+ R++;
+ }
+ outputIdx++;
+ }
+ }
+ }
+#else
+ const __m256i typeOutputAVX = _mm256_set1_epi8(OUTPUT_NEURON_TYPE);
+ for (; i + BATCH_SIZE <= population; i += BATCH_SIZE)
+ {
+ __m256i types_vec = _mm256_loadu_si256((const __m256i*)(neuronTypes + i));
+ __m256i cmp_vec = _mm256_cmpeq_epi8(types_vec, typeOutputAVX);
+ unsigned int type_mask = _mm256_movemask_epi8(cmp_vec);
+
+ if (type_mask == 0)
+ {
+ continue; // no output neurons in this 32-wide block, just skip
+ }
+ for (int k = 0; k < BATCH_SIZE; ++k)
+ {
+ if (type_mask & (1U << k))
+ {
+ char neuronVal = neurons[i + k];
+ if (neuronVal != outputNeuronExpectedValue[outputIdx])
+ R++;
+ outputIdx++;
+ }
+ }
+ }
+#endif
+
+ // remainder loop
+ for (; i < population; i++)
{
if (neuronTypes[i] == OUTPUT_NEURON_TYPE)
{
@@ -1068,6 +1243,7 @@ struct ScoreFunction
outputIdx++;
}
}
+
return R;
}
@@ -1159,7 +1335,7 @@ struct ScoreFunction
}
void initializeRandom2(
- const unsigned char* publicKey,
+ const unsigned char* publicKey,
const unsigned char* nonce,
const unsigned char* pRandom2Pool)
{
@@ -1202,9 +1378,9 @@ struct ScoreFunction
unsigned char extractValue = (unsigned char)((initValue->synapseWeight[i] >> shiftVal) & mask);
switch (extractValue)
{
- case 2: synapses[32 * i + j] = -1; break;
- case 3: synapses[32 * i + j] = 1; break;
- default: synapses[32 * i + j] = 0;
+ case 2: synapses[32 * i + j] = -1; break;
+ case 3: synapses[32 * i + j] = 1; break;
+ default: synapses[32 * i + j] = 0;
}
}
}
@@ -1236,7 +1412,7 @@ struct ScoreFunction
{
// Setup the random starting point
initializeRandom2(publicKey, nonce, pRandom2Pool);
-
+
// Initialize
unsigned int bestR = initializeANN();
@@ -1272,7 +1448,7 @@ struct ScoreFunction
currentANN.copyDataTo(bestANN);
}
- ASSERT(bestANN.population <= populationThreshold);
+ //ASSERT(bestANN.population <= populationThreshold);
}
unsigned int score = numberOfOutputNeurons - bestR;
@@ -1567,5 +1743,3 @@ struct ScoreFunction
}
}
};
-
-
diff --git a/test/score.cpp b/test/score.cpp
index 7b11cbcce..cc7c19f53 100644
--- a/test/score.cpp
+++ b/test/score.cpp
@@ -38,11 +38,14 @@ static constexpr bool PRINT_DETAILED_INFO = false;
// set to 0 for run all available samples
// For profiling enable, run all available samples
-static constexpr unsigned long long COMMON_TEST_NUMBER_OF_SAMPLES = ENABLE_PROFILING ? 0 : 32;
+static constexpr unsigned long long COMMON_TEST_NUMBER_OF_SAMPLES = 32;
+static constexpr unsigned long long PROFILING_NUMBER_OF_SAMPLES = 32;
+
// set 0 for run maximum number of threads of the computer.
// For profiling enable, set it equal to deployment setting
-static constexpr int MAX_NUMBER_OF_THREADS = ENABLE_PROFILING ? 12 : 0;
+static constexpr int MAX_NUMBER_OF_THREADS = 0;
+static constexpr int MAX_NUMBER_OF_PROFILING_THREADS = 12;
static bool gCompareReference = false;
// Only run on specific index of samples and setting
@@ -62,7 +65,6 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
{
return;
}
-
auto pScore = std::make_unique>();
+
pScore->initMemory();
pScore->initMiningData(miningSeed);
int x = 0;
@@ -113,7 +116,7 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
gtIndex = gScoreIndexMap[i];
}
- if (ENABLE_PROFILING || PRINT_DETAILED_INFO || gtIndex < 0 || (score_value != gScoresGroundTruth[sampleIndex][gtIndex]))
+ if (PRINT_DETAILED_INFO || gtIndex < 0 || (score_value != gScoresGroundTruth[sampleIndex][gtIndex]))
{
if (gScoreProcessingTime.count(i) == 0)
{
@@ -123,8 +126,6 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
{
gScoreProcessingTime[i] += elapsed;
}
-
- if (!ENABLE_PROFILING)
{
std::cout << "[sample " << sampleIndex
<< "; setting " << i << ": "
@@ -134,7 +135,7 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
<< kSettings[i][score_params::POPULATION_THRESHOLD] << ", "
<< kSettings[i][score_params::NUMBER_OF_MUTATIONS] << ", "
<< kSettings[i][score_params::SOLUTION_THRESHOLD]
- << "]"
+ << "]"
<< std::endl;
std::cout << " score " << score_value;
if (gtIndex >= 0)
@@ -148,8 +149,6 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
std::cout << " time " << elapsed << " ms " << std::endl;
}
}
-
- if (!ENABLE_PROFILING)
{
EXPECT_GT(gScoreIndexMap.count(i), 0);
if (gtIndex >= 0)
@@ -160,27 +159,68 @@ static void processElement(unsigned char* miningSeed, unsigned char* publicKey,
}
}
+// Recursive template to process each element in scoreSettings
+template
+static void processElementWithPerformance(unsigned char* miningSeed, unsigned char* publicKey, unsigned char* nonce, int sampleIndex)
+{
+ auto pScore = std::make_unique>();
+
+ pScore->initMemory();
+ pScore->initMiningData(miningSeed);
+ int x = 0;
+ top_of_stack = (unsigned long long)(&x);
+ auto t0 = std::chrono::high_resolution_clock::now();
+ unsigned int score_value = (*pScore)(0, publicKey, miningSeed, nonce);
+ auto t1 = std::chrono::high_resolution_clock::now();
+ auto d = t1 - t0;
+ auto elapsed = std::chrono::duration_cast(d).count();
+
+#pragma omp critical
+ {
+ if (gScoreProcessingTime.count(i) == 0)
+ {
+ gScoreProcessingTime[i] = elapsed;
+ }
+ else
+ {
+ gScoreProcessingTime[i] += elapsed;
+ }
+ }
+}
+
// Main processing function
-template
+template
static void processHelper(unsigned char* miningSeed, unsigned char* publicKey, unsigned char* nonce, int sampleIndex, std::index_sequence)
{
- (processElement(miningSeed, publicKey, nonce, sampleIndex), ...);
+ if constexpr (profiling)
+ {
+ (processElementWithPerformance(miningSeed, publicKey, nonce, sampleIndex), ...);
+ }
+ else
+ {
+ (processElement(miningSeed, publicKey, nonce, sampleIndex), ...);
+ }
}
// Recursive template to process each element in scoreSettings
-template
+template
static void process(unsigned char* miningSeed, unsigned char* publicKey, unsigned char* nonce, int sampleIndex)
{
- processHelper(miningSeed, publicKey, nonce, sampleIndex, std::make_index_sequence{});
+ processHelper(miningSeed, publicKey, nonce, sampleIndex, std::make_index_sequence{});
}
void runCommonTests()
{
-#ifdef ENABLE_PROFILING
- gProfilingDataCollector.init(1024);
-#endif
-
#if defined (__AVX512F__) && !GENERIC_K12
initAVX512KangarooTwelveConstants();
#endif
@@ -195,21 +235,23 @@ void runCommonTests()
// Convert the raw string and do the data verification
unsigned long long numberOfSamplesReadFromFile = sampleString.size();
unsigned long long numberOfSamples = numberOfSamplesReadFromFile;
- if (COMMON_TEST_NUMBER_OF_SAMPLES > 0)
+ unsigned long long requestedNumberOfSamples = COMMON_TEST_NUMBER_OF_SAMPLES;
+
+ if (requestedNumberOfSamples > 0)
{
- std::cout << "Request testing with " << COMMON_TEST_NUMBER_OF_SAMPLES << " samples." << std::endl;
+ std::cout << "Request testing with " << requestedNumberOfSamples << " samples." << std::endl;
- numberOfSamples = std::min(COMMON_TEST_NUMBER_OF_SAMPLES, numberOfSamples);
- if (COMMON_TEST_NUMBER_OF_SAMPLES <= numberOfSamples)
+ numberOfSamples = std::min(requestedNumberOfSamples, numberOfSamples);
+ if (requestedNumberOfSamples <= numberOfSamples)
{
- numberOfSamples = COMMON_TEST_NUMBER_OF_SAMPLES;
+ numberOfSamples = requestedNumberOfSamples;
}
else // Request number of samples greater than existed. Only valid for reference score validation only
{
if (gCompareReference)
{
- numberOfSamples = COMMON_TEST_NUMBER_OF_SAMPLES;
- std::cout << "Refenrece comparison mode: " << numberOfSamples << " samples are read from file for comparision."
+ numberOfSamples = requestedNumberOfSamples;
+ std::cout << "Refenrece comparison mode: " << numberOfSamples << " samples are read from file for comparision."
<< "Remained are generated randomly."
<< std::endl;
}
@@ -279,7 +321,7 @@ void runCommonTests()
int count = 0;
for (unsigned long long j = 0; j < score_params::MAX_PARAM_TYPE; ++j)
{
- if (scoresSettingHeader[j] == score_params::kSettings[i][j])
+ if (scoresSettingHeader[j] == kSettings[i][j])
{
count++;
}
@@ -318,6 +360,7 @@ void runCommonTests()
}
}
+
// Run the test
unsigned int numberOfThreads = std::thread::hardware_concurrency();
if (MAX_NUMBER_OF_THREADS > 0)
@@ -325,23 +368,15 @@ void runCommonTests()
numberOfThreads = numberOfThreads > MAX_NUMBER_OF_THREADS ? MAX_NUMBER_OF_THREADS : numberOfThreads;
}
- if (ENABLE_PROFILING)
+ if (numberOfThreads > 1)
{
- std::cout << "Running " << numberOfThreads << " threads for collecting multiple threads performance" << std::endl;
+ std::cout << "Compare score only. Lauching test with all available " << numberOfThreads << " threads." << std::endl;
}
else
{
- if (numberOfThreads > 1)
- {
- std::cout << "Compare score only. Lauching test with all available " << numberOfThreads << " threads." << std::endl;
- }
- else
- {
- std::cout << "Running one sample on one thread for collecting single thread performance." << std::endl;
- }
+ std::cout << "Running one sample on one thread for collecting single thread performance." << std::endl;
}
-
std::vector samples;
for (int i = 0; i < numberOfSamples; ++i)
{
@@ -353,29 +388,26 @@ void runCommonTests()
samples.push_back(i);
}
- std::string compTerm = " and compare with groundtruths from file.";
+ std::string compTerm = "and compare with groundtruths from file.";
if (gCompareReference)
{
- compTerm = " and compare with reference code.";
- }
- if (ENABLE_PROFILING)
- {
- compTerm = "for profiling, without comparing any result (set test case FAILED as default)";
+ compTerm = "and compare with reference code.";
}
std::cout << "Processing " << samples.size() << " samples " << compTerm << "..." << std::endl;
+ gScoreProcessingTime.clear();
#pragma omp parallel for num_threads(numberOfThreads)
for (int i = 0; i < samples.size(); ++i)
{
int index = samples[i];
- process(miningSeeds[index].m256i_u8, publicKeys[index].m256i_u8, nonces[index].m256i_u8, index);
+ process<0, numberOfGeneratedSetting>(miningSeeds[index].m256i_u8, publicKeys[index].m256i_u8, nonces[index].m256i_u8, index);
#pragma omp critical
std::cout << i << ", ";
}
std::cout << std::endl;
// Print the average processing time
- if (PRINT_DETAILED_INFO || ENABLE_PROFILING)
+ if (PRINT_DETAILED_INFO)
{
for (auto scoreTime : gScoreProcessingTime)
{
@@ -391,18 +423,137 @@ void runCommonTests()
<< "]: " << processingTime << " ms" << std::endl;
}
}
+}
-#ifdef ENABLE_PROFILING
- gProfilingDataCollector.writeToFile();
+void runPerformanceTests()
+{
+
+#if defined (__AVX512F__) && !GENERIC_K12
+ initAVX512KangarooTwelveConstants();
#endif
-}
+ constexpr unsigned long long numberOfGeneratedSetting = sizeof(score_params::kProfileSettings) / sizeof(score_params::kProfileSettings[0]);
+
+ // Read the parameters and results
+ auto sampleString = readCSV(COMMON_TEST_SAMPLES_FILE_NAME);
+ auto scoresString = readCSV(COMMON_TEST_SCORES_FILE_NAME);
+ ASSERT_FALSE(sampleString.empty());
+ ASSERT_FALSE(scoresString.empty());
+ // Convert the raw string and do the data verification
+ unsigned long long numberOfSamplesReadFromFile = sampleString.size();
+ unsigned long long numberOfSamples = numberOfSamplesReadFromFile;
+ unsigned long long requestedNumberOfSamples = PROFILING_NUMBER_OF_SAMPLES;
+
+ if (requestedNumberOfSamples > 0)
+ {
+ std::cout << "Request testing with " << requestedNumberOfSamples << " samples." << std::endl;
+
+ numberOfSamples = std::min(requestedNumberOfSamples, numberOfSamples);
+ if (requestedNumberOfSamples <= numberOfSamples)
+ {
+ numberOfSamples = requestedNumberOfSamples;
+ }
+ }
+
+ std::vector miningSeeds(numberOfSamples);
+ std::vector publicKeys(numberOfSamples);
+ std::vector nonces(numberOfSamples);
+
+ // Reading the input samples
+ for (unsigned long long i = 0; i < numberOfSamples; ++i)
+ {
+ if (i < numberOfSamplesReadFromFile)
+ {
+ miningSeeds[i] = hexTo32Bytes(sampleString[i][0], 32);
+ publicKeys[i] = hexTo32Bytes(sampleString[i][1], 32);
+ nonces[i] = hexTo32Bytes(sampleString[i][2], 32);
+ }
+ else // Samples from files are not enough, randomly generate more
+ {
+ _rdrand64_step((unsigned long long*) & miningSeeds[i].m256i_u8[0]);
+ _rdrand64_step((unsigned long long*) & miningSeeds[i].m256i_u8[8]);
+ _rdrand64_step((unsigned long long*) & miningSeeds[i].m256i_u8[16]);
+ _rdrand64_step((unsigned long long*) & miningSeeds[i].m256i_u8[24]);
+
+ _rdrand64_step((unsigned long long*) & publicKeys[i].m256i_u8[0]);
+ _rdrand64_step((unsigned long long*) & publicKeys[i].m256i_u8[8]);
+ _rdrand64_step((unsigned long long*) & publicKeys[i].m256i_u8[16]);
+ _rdrand64_step((unsigned long long*) & publicKeys[i].m256i_u8[24]);
+
+ _rdrand64_step((unsigned long long*) & nonces[i].m256i_u8[0]);
+ _rdrand64_step((unsigned long long*) & nonces[i].m256i_u8[8]);
+ _rdrand64_step((unsigned long long*) & nonces[i].m256i_u8[16]);
+ _rdrand64_step((unsigned long long*) & nonces[i].m256i_u8[24]);
+
+ }
+ }
+
+ std::cout << "Profiling " << numberOfGeneratedSetting << " param combinations. " << std::endl;
+
+ // Run the profiling
+ unsigned int numberOfThreads = std::thread::hardware_concurrency();
+ if (MAX_NUMBER_OF_PROFILING_THREADS > 0)
+ {
+ numberOfThreads = numberOfThreads > MAX_NUMBER_OF_PROFILING_THREADS ? MAX_NUMBER_OF_PROFILING_THREADS : numberOfThreads;
+ }
+ std::cout << "Running " << numberOfThreads << " threads for collecting multiple threads performance" << std::endl;
+
+ std::vector samples;
+ for (int i = 0; i < numberOfSamples; ++i)
+ {
+ if (!filteredSamples.empty()
+ && std::find(filteredSamples.begin(), filteredSamples.end(), i) == filteredSamples.end())
+ {
+ continue;
+ }
+ samples.push_back(i);
+ }
+
+ std::string compTerm = "for profiling, don't compare any result.";
+
+ std::cout << "Processing " << samples.size() << " samples " << compTerm << "..." << std::endl;
+ gScoreProcessingTime.clear();
+#pragma omp parallel for num_threads(numberOfThreads)
+ for (int i = 0; i < samples.size(); ++i)
+ {
+ int index = samples[i];
+ process<1, numberOfGeneratedSetting>(miningSeeds[index].m256i_u8, publicKeys[index].m256i_u8, nonces[index].m256i_u8, index);
+#pragma omp critical
+ std::cout << i << ", ";
+ }
+ std::cout << std::endl;
+
+ // Print the average processing time
+ for (auto scoreTime : gScoreProcessingTime)
+ {
+ unsigned long long processingTime = filteredSamples.empty() ? scoreTime.second / numberOfSamples : scoreTime.second / filteredSamples.size();
+ std::cout << "Avg processing time [setting " << scoreTime.first << " "
+ << kProfileSettings[scoreTime.first][score_params::NUMBER_OF_INPUT_NEURONS] << ", "
+ << kProfileSettings[scoreTime.first][score_params::NUMBER_OF_OUTPUT_NEURONS] << ", "
+ << kProfileSettings[scoreTime.first][score_params::NUMBER_OF_TICKS] << ", "
+ << kProfileSettings[scoreTime.first][score_params::NUMBER_OF_NEIGHBORS] << ", "
+ << kProfileSettings[scoreTime.first][score_params::POPULATION_THRESHOLD] << ", "
+ << kProfileSettings[scoreTime.first][score_params::NUMBER_OF_MUTATIONS] << ", "
+ << kProfileSettings[scoreTime.first][score_params::SOLUTION_THRESHOLD]
+ << "]: " << processingTime << " ms" << std::endl;
+ }
+ gProfilingDataCollector.writeToFile();
+}
TEST(TestQubicScoreFunction, CommonTests)
{
runCommonTests();
}
+#if ENABLE_PROFILING
+
+TEST(TestQubicScoreFunction, PerformanceTests)
+{
+ runPerformanceTests();
+}
+#endif
+
+#if not ENABLE_PROFILING
TEST(TestQubicScoreFunction, TestDeterministic)
{
constexpr int NUMBER_OF_THREADS = 4;
@@ -445,7 +596,7 @@ TEST(TestQubicScoreFunction, TestDeterministic)
pScore->initMemory();
// Run with 4 mining seeds, each run 4 separate threads and the result need to matched
- int scores[NUMBER_OF_PHASES][NUMBER_OF_THREADS * NUMBER_OF_SAMPLES] = {0};
+ int scores[NUMBER_OF_PHASES][NUMBER_OF_THREADS * NUMBER_OF_SAMPLES] = { 0 };
for (unsigned long long i = 0; i < NUMBER_OF_PHASES; ++i)
{
pScore->initMiningData(miningSeeds[i]);
@@ -482,3 +633,4 @@ TEST(TestQubicScoreFunction, TestDeterministic)
}
}
}
+#endif
diff --git a/test/score_params.h b/test/score_params.h
index 1748db117..7ef8b8910 100644
--- a/test/score_params.h
+++ b/test/score_params.h
@@ -17,15 +17,14 @@ enum ParamType
// Comment out when we want to reduce the number of running test
static constexpr unsigned long long kSettings[][MAX_PARAM_TYPE] = {
-#if ENABLE_PROFILING
- {::NUMBER_OF_INPUT_NEURONS, ::NUMBER_OF_OUTPUT_NEURONS, ::NUMBER_OF_TICKS, ::NUMBER_OF_NEIGHBORS, ::POPULATION_THRESHOLD, ::NUMBER_OF_MUTATIONS, ::SOLUTION_THRESHOLD_DEFAULT},
-#else
- //{ ::NUMBER_OF_INPUT_NEURONS, ::NUMBER_OF_OUTPUT_NEURONS, ::NUMBER_OF_TICKS, ::NUMBER_OF_NEIGHBORS, ::POPULATION_THRESHOLD, ::NUMBER_OF_MUTATIONS, ::SOLUTION_THRESHOLD_DEFAULT },
{64, 64, 50, 64, 178, 50, 36},
{256, 256, 120, 256, 612, 100, 171},
{512, 512, 150, 512, 1174, 150, 300},
{1024, 1024, 200, 1024, 3000, 200, 600}
-
-#endif
};
+
+static constexpr unsigned long long kProfileSettings[][MAX_PARAM_TYPE] = {
+ {::NUMBER_OF_INPUT_NEURONS, ::NUMBER_OF_OUTPUT_NEURONS, ::NUMBER_OF_TICKS, ::NUMBER_OF_NEIGHBORS, ::POPULATION_THRESHOLD, ::NUMBER_OF_MUTATIONS, ::SOLUTION_THRESHOLD_DEFAULT},
+};
+
}
From d01fd104a97c88827a5d299547f1f2fd7b192e3d Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 23 Sep 2025 09:24:30 +0200
Subject: [PATCH 103/297] update guidelines (#555)
* Update test project to use Windows SDK version available on GitHub Build. (#554)
* update contract deployment
* add ToC to contributing doc
---------
Co-authored-by: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
---
doc/contracts.md | 3 ++-
doc/contributing.md | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/doc/contracts.md b/doc/contracts.md
index aa174afbe..dbf3290c1 100644
--- a/doc/contracts.md
+++ b/doc/contracts.md
@@ -107,7 +107,7 @@ After going through this validation process, a contract can be integrated in off
Steps for deploying a contract:
-1. Finish development, review, and tests as written above.
+1. Finish development, review, and tests as written above. This includes waiting for approval of your PR by the core dev team. If you need to make any significant changes to the code after the computors accepted your proposal, you will need to make a second proposal.
2. A proposal for including your contract into the Qubic Core needs to be prepared.
We recommend to add your proposal description to https://github.com/qubic/proposal/tree/main/SmartContracts via a pull request (this directory also contains files from other contracts added before, which can be used as a template).
The proposal description should include a detailed description of your contract (see point 1 of the [Development section](#development)) and the final source code of the contract.
@@ -635,3 +635,4 @@ The function `castVote()` is a more complex example combining both, calling a co
+
diff --git a/doc/contributing.md b/doc/contributing.md
index 48d4cd6b0..761a61449 100644
--- a/doc/contributing.md
+++ b/doc/contributing.md
@@ -1,5 +1,16 @@
# How to Contribute
+## Table of contents
+
+1. [Contributing as an external developer](#contributing-as-an-external-developer)
+2. [Development workflow / branches](#development-workflow--branches)
+3. [Coding guidelines](#coding-guidelines)
+ 1. [Most important principles](#most-important-principles)
+ 2. [General guidelines](#general-guidelines)
+ 3. [Style guidelines](#style-guidelines)
+4. [Version naming scheme](#version-naming-scheme)
+5. [Profiling](#profiling)
+
## Contributing as an external developer
If you find bugs, typos, or other problems that can be fixed with a few changes, you are more than welcome to contribute these fixes with a pull request as follows.
@@ -391,3 +402,4 @@ Even when bound by serializing instructions, the system environment at the time
Another rich source: [Intel® 64 and IA-32 Architectures Software Developer's Manual Combined Volumes: 1, 2A, 2B, 2C, 2D, 3A, 3B, 3C, 3D, and 4](https://cdrdv2.intel.com/v1/dl/getContent/671200)
+
From eadb4dfc4304743f3220746ab26bd4643358c548 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 23 Sep 2025 10:02:17 +0200
Subject: [PATCH 104/297] update params for epoch 180 / v1.261.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index bd3fbe558..e7fb6d551 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -61,12 +61,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 260
+#define VERSION_B 261
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 179
-#define TICK 32742000
+#define EPOCH 180
+#define TICK 33232000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From 1c3f7fcadbcfb46e1404dff73a796365def4e8cf Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 23 Sep 2025 10:17:37 +0200
Subject: [PATCH 105/297] Update contract-verify to new release (#556)
---
.github/workflows/contract-verify.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/contract-verify.yml b/.github/workflows/contract-verify.yml
index cf8775c36..9350371d3 100644
--- a/.github/workflows/contract-verify.yml
+++ b/.github/workflows/contract-verify.yml
@@ -32,6 +32,6 @@ jobs:
echo "contract-filepaths=$files" >> "$GITHUB_OUTPUT"
- name: Contract verify action step
id: verify
- uses: Franziska-Mueller/qubic-contract-verify@v0.3.3-beta
+ uses: Franziska-Mueller/qubic-contract-verify@v1.0.0
with:
filepaths: '${{ steps.filepaths.outputs.contract-filepaths }}'
From c54800c8b7c70f107a86802bd80566881005e603 Mon Sep 17 00:00:00 2001
From: fnordspace
Date: Tue, 23 Sep 2025 16:10:46 +0200
Subject: [PATCH 106/297] Increase TICK_DUATION_FOR_ALLOCATION_MS
---
src/public_settings.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index e7fb6d551..fe854d9f9 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -28,7 +28,7 @@
// The tick duration used to calculate the size of memory buffers.
// This determines the memory footprint of the application.
-#define TICK_DURATION_FOR_ALLOCATION_MS 500
+#define TICK_DURATION_FOR_ALLOCATION_MS 750
#define TRANSACTION_SPARSENESS 1
// Below are 2 variables that are used for auto-F5 feature:
From 48c869d7cd60ca834eea97b1a130b388e8383b5e Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Wed, 24 Sep 2025 00:15:18 +0700
Subject: [PATCH 107/297] fix a bug in logging
---
src/logging/logging.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/logging/logging.h b/src/logging/logging.h
index c200a0ad1..bbc923378 100644
--- a/src/logging/logging.h
+++ b/src/logging/logging.h
@@ -576,12 +576,14 @@ class qLogger
#endif
}
+ // updateTick is called right after _tick is processed
static void updateTick(unsigned int _tick)
{
#if ENABLED_LOGGING
ASSERT((_tick == lastUpdatedTick + 1) || (_tick == tickBegin));
+ ASSERT(_tick >= tickBegin);
#if LOG_STATE_DIGEST
- unsigned long long index = lastUpdatedTick - tickBegin;
+ unsigned long long index = _tick - tickBegin;
XKCP::KangarooTwelve_Final(&k12, digests[index].m256i_u8, (const unsigned char*)"", 0);
XKCP::KangarooTwelve_Initialize(&k12, 128, 32); // init new k12
XKCP::KangarooTwelve_Update(&k12, digests[index].m256i_u8, 32); // feed the prev hash back to this
From 7a13c95d3db19fff7d2b2ccf75d769bd6f4f15cf Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 24 Sep 2025 18:05:02 +0200
Subject: [PATCH 108/297] add timeout to contract-verify action
---
.github/workflows/contract-verify.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/contract-verify.yml b/.github/workflows/contract-verify.yml
index 9350371d3..5511bec52 100644
--- a/.github/workflows/contract-verify.yml
+++ b/.github/workflows/contract-verify.yml
@@ -20,6 +20,7 @@ on:
jobs:
contract_verify_job:
runs-on: ubuntu-latest
+ timeout-minutes: 15 # Sometimes the parser can get stuck
name: Verify smart contract files
steps:
# Checkout repo to use files of the repo as input for container action
From 5314cf10ff480dd99e5af89d5d2458d798141cfe Mon Sep 17 00:00:00 2001
From: icyblob
Date: Mon, 29 Sep 2025 07:42:48 -0400
Subject: [PATCH 109/297] Msvault v2.0 (#485)
* Enable live fee voting
* Add functions for fee vote checking
* Fix isShareHolder & voteFeeChange
* MsVault now supports assets
* Add unit test for MsVault Asset
* Add getManagedAssetBalance
* Add revoke asset procedure
* Fix releaseAssetTo bug & address minor comments
* Add output status to procedures
* Update fee refund for deposit/depositAsset
* Logging consistency with output status
* Fix warnings
* Fix the deposit fee bug
Integrate the asset transactions into the unit test GetRevenue
* Fix local variable declaration
* Move asset part to the end of state var
---------
Co-authored-by: fnordspace
Co-authored-by: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
---
src/contracts/MsVault.h | 1669 +++++++++++++++++++++++++++++++------
test/contract_msvault.cpp | 901 ++++++++++++++++++--
2 files changed, 2225 insertions(+), 345 deletions(-)
diff --git a/src/contracts/MsVault.h b/src/contracts/MsVault.h
index 66a01c18d..3bf99e0de 100644
--- a/src/contracts/MsVault.h
+++ b/src/contracts/MsVault.h
@@ -6,12 +6,15 @@ constexpr uint64 MSVAULT_INITIAL_MAX_VAULTS = 131072ULL; // 2^17
constexpr uint64 MSVAULT_MAX_VAULTS = MSVAULT_INITIAL_MAX_VAULTS * X_MULTIPLIER;
// MSVAULT asset name : 23727827095802701, using assetNameFromString("MSVAULT") utility in test_util.h
static constexpr uint64 MSVAULT_ASSET_NAME = 23727827095802701;
+constexpr uint64 MSVAULT_MAX_ASSET_TYPES = 8; // Max number of different asset types a vault can hold
constexpr uint64 MSVAULT_REGISTERING_FEE = 5000000ULL;
constexpr uint64 MSVAULT_RELEASE_FEE = 100000ULL;
constexpr uint64 MSVAULT_RELEASE_RESET_FEE = 1000000ULL;
constexpr uint64 MSVAULT_HOLDING_FEE = 500000ULL;
constexpr uint64 MSVAULT_BURN_FEE = 0ULL; // Integer percentage from 1 -> 100
+constexpr uint64 MSVAULT_VOTE_FEE_CHANGE_FEE = 10000000ULL; // Deposit fee for adjusting other fees, and refund if shareholders
+constexpr uint64 MSVAULT_REVOKE_FEE = 100ULL;
// [TODO]: Turn this assert ON when MSVAULT_BURN_FEE > 0
//static_assert(MSVAULT_BURN_FEE > 0, "SC requires burning qu to operate, the burn fee must be higher than 0!");
@@ -25,19 +28,46 @@ struct MSVAULT2
struct MSVAULT : public ContractBase
{
public:
+ // Procedure Status Codes ---
+ // 0: GENEREAL_FAILURE
+ // 1: SUCCESS
+ // 2: FAILURE_INSUFFICIENT_FEE
+ // 3: FAILURE_INVALID_VAULT (Invalid vault ID or vault inactive)
+ // 4: FAILURE_NOT_AUTHORIZED (not owner, not shareholder, etc.)
+ // 5: FAILURE_INVALID_PARAMS (amount is 0, destination is NULL, etc.)
+ // 6: FAILURE_INSUFFICIENT_BALANCE
+ // 7: FAILURE_LIMIT_REACHED (max vaults, max asset types, etc.)
+ // 8: FAILURE_TRANSFER_FAILED
+ // 9: PENDING_APPROVAL
+
+ struct AssetBalance
+ {
+ Asset asset;
+ uint64 balance;
+ };
+
struct Vault
{
id vaultName;
Array owners;
Array releaseAmounts;
Array releaseDestinations;
- uint64 balance;
+ uint64 qubicBalance;
uint8 numberOfOwners;
uint8 requiredApprovals;
bit isActive;
};
- struct MsVaultFeeVote
+ struct VaultAssetPart
+ {
+ Array assetBalances;
+ uint8 numberOfAssetTypes;
+ Array releaseAssets;
+ Array releaseAssetAmounts;
+ Array releaseAssetDestinations;
+ };
+
+ struct MsVaultFeeVote
{
uint64 registeringFee;
uint64 releaseFee;
@@ -50,15 +80,19 @@ struct MSVAULT : public ContractBase
struct MSVaultLogger
{
uint32 _contractIndex;
- // 1: Invalid vault ID or vault inactive
- // 2: Caller not an owner
- // 3: Invalid parameters (e.g., amount=0, destination=NULL_ID)
- // 4: Release successful
- // 5: Insufficient balance
- // 6: Release not fully approved
- // 7: Reset release requests successful
- uint32 _type;
- uint64 vaultId;
+ // _type corresponds to Procedure Status Codes
+ // 0: GENEREAL_FAILURE
+ // 1: SUCCESS
+ // 2: FAILURE_INSUFFICIENT_FEE
+ // 3: FAILURE_INVALID_VAULT
+ // 4: FAILURE_NOT_AUTHORIZED
+ // 5: FAILURE_INVALID_PARAMS
+ // 6: FAILURE_INSUFFICIENT_BALANCE
+ // 7: FAILURE_LIMIT_REACHED
+ // 8: FAILURE_TRANSFER_FAILED
+ // 9: PENDING_APPROVAL
+ uint32 _type;
+ uint64 vaultId;
id ownerID;
uint64 amount;
id destination;
@@ -130,6 +164,16 @@ struct MSVAULT : public ContractBase
uint64 result;
};
+ struct getManagedAssetBalance_input
+ {
+ Asset asset;
+ id owner;
+ };
+ struct getManagedAssetBalance_output
+ {
+ sint64 balance;
+ };
+
// Procedures and functions' structs
struct registerVault_input
{
@@ -139,22 +183,25 @@ struct MSVAULT : public ContractBase
};
struct registerVault_output
{
+ uint64 status;
};
struct registerVault_locals
{
+ MSVaultLogger logger;
uint64 ownerCount;
uint64 i;
sint64 ii;
uint64 j;
uint64 k;
uint64 count;
+ uint64 found;
sint64 slotIndex;
Vault newVault;
Vault tempVault;
id proposedOwner;
-
+ Vault newQubicVault;
+ VaultAssetPart newAssetVault;
Array tempOwners;
-
resetReleaseRequests_input rr_in;
resetReleaseRequests_output rr_out;
resetReleaseRequests_locals rr_locals;
@@ -166,13 +213,16 @@ struct MSVAULT : public ContractBase
};
struct deposit_output
{
+ uint64 status;
};
struct deposit_locals
{
+ MSVaultLogger logger;
Vault vault;
isValidVaultId_input iv_in;
isValidVaultId_output iv_out;
isValidVaultId_locals iv_locals;
+ uint64 amountToDeposit;
};
struct releaseTo_input
@@ -183,6 +233,7 @@ struct MSVAULT : public ContractBase
};
struct releaseTo_output
{
+ uint64 status;
};
struct releaseTo_locals
{
@@ -218,6 +269,7 @@ struct MSVAULT : public ContractBase
};
struct resetRelease_output
{
+ uint64 status;
};
struct resetRelease_locals
{
@@ -240,7 +292,7 @@ struct MSVAULT : public ContractBase
isValidVaultId_locals iv_locals;
};
- struct voteFeeChange_input
+ struct voteFeeChange_input
{
uint64 newRegisteringFee;
uint64 newReleaseFee;
@@ -251,9 +303,11 @@ struct MSVAULT : public ContractBase
};
struct voteFeeChange_output
{
+ uint64 status;
};
struct voteFeeChange_locals
{
+ MSVaultLogger logger;
uint64 i;
uint64 sumVote;
bit needNewRecord;
@@ -357,7 +411,7 @@ struct MSVAULT : public ContractBase
uint64 burnedAmount;
};
- struct getFees_input
+ struct getFees_input
{
};
struct getFees_output
@@ -392,13 +446,239 @@ struct MSVAULT : public ContractBase
uint64 requiredApprovals;
};
+ struct getFeeVotes_input
+ {
+ };
+ struct getFeeVotes_output
+ {
+ uint64 status;
+ uint64 numberOfFeeVotes;
+ Array feeVotes;
+ };
+ struct getFeeVotes_locals
+ {
+ uint64 i;
+ };
+
+ struct getFeeVotesOwner_input
+ {
+ };
+ struct getFeeVotesOwner_output
+ {
+ uint64 status;
+ uint64 numberOfFeeVotes;
+ Array feeVotesOwner;
+ };
+ struct getFeeVotesOwner_locals
+ {
+ uint64 i;
+ };
+
+ struct getFeeVotesScore_input
+ {
+ };
+ struct getFeeVotesScore_output
+ {
+ uint64 status;
+ uint64 numberOfFeeVotes;
+ Array feeVotesScore;
+ };
+ struct getFeeVotesScore_locals
+ {
+ uint64 i;
+ };
+
+ struct getUniqueFeeVotes_input
+ {
+ };
+ struct getUniqueFeeVotes_output
+ {
+ uint64 status;
+ uint64 numberOfUniqueFeeVotes;
+ Array uniqueFeeVotes;
+ };
+ struct getUniqueFeeVotes_locals
+ {
+ uint64 i;
+ };
+
+ struct getUniqueFeeVotesRanking_input
+ {
+ };
+ struct getUniqueFeeVotesRanking_output
+ {
+ uint64 status;
+ uint64 numberOfUniqueFeeVotes;
+ Array uniqueFeeVotesRanking;
+ };
+ struct getUniqueFeeVotesRanking_locals
+ {
+ uint64 i;
+ };
+
+ struct depositAsset_input
+ {
+ uint64 vaultId;
+ Asset asset;
+ uint64 amount;
+ };
+ struct depositAsset_output
+ {
+ uint64 status;
+ };
+ struct depositAsset_locals
+ {
+ MSVaultLogger logger;
+ Vault qubicVault; // Object for the Qubic-related part of the vault
+ VaultAssetPart assetVault; // Object for the Asset-related part of the vault
+ AssetBalance ab;
+ sint64 assetIndex;
+ uint64 i;
+ sint64 userAssetBalance;
+ sint64 tempShares;
+ sint64 transferResult;
+ sint64 transferedShares;
+ QX::TransferShareOwnershipAndPossession_input qx_in;
+ QX::TransferShareOwnershipAndPossession_output qx_out;
+ sint64 transferredNumberOfShares;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct revokeAssetManagementRights_input
+ {
+ Asset asset;
+ sint64 numberOfShares;
+ };
+ struct revokeAssetManagementRights_output
+ {
+ sint64 transferredNumberOfShares;
+ uint64 status;
+ };
+ struct revokeAssetManagementRights_locals
+ {
+ MSVaultLogger logger;
+ sint64 managedBalance;
+ sint64 result;
+ };
+
+ struct releaseAssetTo_input
+ {
+ uint64 vaultId;
+ Asset asset;
+ uint64 amount;
+ id destination;
+ };
+ struct releaseAssetTo_output
+ {
+ uint64 status;
+ };
+ struct releaseAssetTo_locals
+ {
+ Vault qubicVault;
+ VaultAssetPart assetVault;
+ MSVaultLogger logger;
+ sint64 ownerIndex;
+ uint64 approvals;
+ bit releaseApproved;
+ AssetBalance ab;
+ uint64 i;
+ sint64 assetIndex;
+ isOwnerOfVault_input io_in;
+ isOwnerOfVault_output io_out;
+ isOwnerOfVault_locals io_locals;
+ findOwnerIndexInVault_input fi_in;
+ findOwnerIndexInVault_output fi_out;
+ findOwnerIndexInVault_locals fi_locals;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ QX::TransferShareOwnershipAndPossession_input qx_in;
+ QX::TransferShareOwnershipAndPossession_output qx_out;
+ sint64 releaseResult;
+ };
+
+ struct resetAssetRelease_input
+ {
+ uint64 vaultId;
+ };
+ struct resetAssetRelease_output
+ {
+ uint64 status;
+ };
+ struct resetAssetRelease_locals
+ {
+ Vault qubicVault;
+ VaultAssetPart assetVault;
+ sint64 ownerIndex;
+ MSVaultLogger logger;
+ isOwnerOfVault_input io_in;
+ isOwnerOfVault_output io_out;
+ isOwnerOfVault_locals io_locals;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ findOwnerIndexInVault_input fi_in;
+ findOwnerIndexInVault_output fi_out;
+ findOwnerIndexInVault_locals fi_locals;
+ uint64 i;
+ };
+
+ struct getAssetReleaseStatus_input
+ {
+ uint64 vaultId;
+ };
+ struct getAssetReleaseStatus_output
+ {
+ uint64 status;
+ Array assets;
+ Array amounts;
+ Array destinations;
+ };
+ struct getAssetReleaseStatus_locals
+ {
+ Vault qubicVault;
+ VaultAssetPart assetVault;
+ uint64 i;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct getVaultAssetBalances_input
+ {
+ uint64 vaultId;
+ };
+ struct getVaultAssetBalances_output
+ {
+ uint64 status;
+ uint64 numberOfAssetTypes;
+ Array assetBalances;
+ };
+ struct getVaultAssetBalances_locals
+ {
+ uint64 i;
+ Vault qubicVault;
+ VaultAssetPart assetVault;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
struct END_EPOCH_locals
{
uint64 i;
uint64 j;
- Vault v;
+ uint64 k;
+ Vault qubicVault;
+ VaultAssetPart assetVault;
sint64 amountToDistribute;
uint64 feeToBurn;
+ AssetBalance ab;
+ QX::TransferShareOwnershipAndPossession_input qx_in;
+ QX::TransferShareOwnershipAndPossession_output qx_out;
+ id qxAdress;
};
protected:
@@ -426,6 +706,8 @@ struct MSVAULT : public ContractBase
uint64 liveDepositFee;
uint64 liveBurnFee;
+ Array vaultAssetParts;
+
// Helper Functions
PRIVATE_FUNCTION_WITH_LOCALS(isValidVaultId)
{
@@ -473,68 +755,71 @@ struct MSVAULT : public ContractBase
// Procedures and functions
PUBLIC_PROCEDURE_WITH_LOCALS(registerVault)
{
- // [TODO]: Change this to
- // if (qpi.invocationReward() < state.liveRegisteringFee)
- if (qpi.invocationReward() < MSVAULT_REGISTERING_FEE)
+ output.status = 0;
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.vaultId = -1; // Not yet created
+
+ if (qpi.invocationReward() < (sint64)state.liveRegisteringFee)
{
qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
return;
}
+ if (qpi.invocationReward() > (sint64)state.liveRegisteringFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveRegisteringFee);
+ }
+
locals.ownerCount = 0;
for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
{
locals.proposedOwner = input.owners.get(locals.i);
if (locals.proposedOwner != NULL_ID)
{
- locals.tempOwners.set(locals.ownerCount, locals.proposedOwner);
- locals.ownerCount = locals.ownerCount + 1;
+ // Check for duplicates
+ locals.found = false;
+ for (locals.j = 0; locals.j < locals.ownerCount; locals.j++)
+ {
+ if (locals.tempOwners.get(locals.j) == locals.proposedOwner)
+ {
+ locals.found = true;
+ break;
+ }
+ }
+ if (!locals.found)
+ {
+ locals.tempOwners.set(locals.ownerCount, locals.proposedOwner);
+ locals.ownerCount++;
+ }
}
}
if (locals.ownerCount <= 1)
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- if (locals.ownerCount > MSVAULT_MAX_OWNERS)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ qpi.transfer(qpi.invocator(), (sint64)state.liveRegisteringFee);
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
return;
}
- for (locals.i = locals.ownerCount; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
- {
- locals.tempOwners.set(locals.i, NULL_ID);
- }
-
- // Check if requiredApprovals is valid: must be <= numberOfOwners, > 1
+ // requiredApprovals must be > 1 and <= numberOfOwners
if (input.requiredApprovals <= 1 || input.requiredApprovals > locals.ownerCount)
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- // Find empty slot
- locals.slotIndex = -1;
- for (locals.ii = 0; locals.ii < MSVAULT_MAX_VAULTS; locals.ii++)
- {
- locals.tempVault = state.vaults.get(locals.ii);
- if (!locals.tempVault.isActive && locals.tempVault.numberOfOwners == 0 && locals.tempVault.balance == 0)
- {
- locals.slotIndex = locals.ii;
- break;
- }
- }
-
- if (locals.slotIndex == -1)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ qpi.transfer(qpi.invocator(), (sint64)state.liveRegisteringFee);
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
return;
}
- for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
+ // Check co-ownership limits
+ for (locals.i = 0; locals.i < locals.ownerCount; locals.i = locals.i + 1)
{
locals.proposedOwner = locals.tempOwners.get(locals.i);
locals.count = 0;
@@ -548,101 +833,408 @@ struct MSVAULT : public ContractBase
if (locals.tempVault.owners.get(locals.k) == locals.proposedOwner)
{
locals.count++;
- if (locals.count >= MSVAULT_MAX_COOWNER)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
}
}
}
}
+ if (locals.count >= MSVAULT_MAX_COOWNER)
+ {
+ qpi.transfer(qpi.invocator(), (sint64)state.liveRegisteringFee);
+ output.status = 7; // FAILURE_LIMIT_REACHED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+ }
+
+ // Find empty slot
+ locals.slotIndex = -1;
+ for (locals.ii = 0; locals.ii < MSVAULT_MAX_VAULTS; locals.ii++)
+ {
+ locals.tempVault = state.vaults.get(locals.ii);
+ if (!locals.tempVault.isActive && locals.tempVault.numberOfOwners == 0 && locals.tempVault.qubicBalance == 0)
+ {
+ locals.slotIndex = locals.ii;
+ break;
+ }
}
- locals.newVault.vaultName = input.vaultName;
- locals.newVault.numberOfOwners = (uint8)locals.ownerCount;
- locals.newVault.requiredApprovals = (uint8)input.requiredApprovals;
- locals.newVault.balance = 0;
- locals.newVault.isActive = true;
+ if (locals.slotIndex == -1)
+ {
+ qpi.transfer(qpi.invocator(), (sint64)state.liveRegisteringFee);
+ output.status = 7; // FAILURE_LIMIT_REACHED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
- locals.rr_in.vault = locals.newVault;
- resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
- locals.newVault = locals.rr_out.vault;
+ // Initialize the new vault
+ locals.newQubicVault.vaultName = input.vaultName;
+ locals.newQubicVault.numberOfOwners = (uint8)locals.ownerCount;
+ locals.newQubicVault.requiredApprovals = (uint8)input.requiredApprovals;
+ locals.newQubicVault.qubicBalance = 0;
+ locals.newQubicVault.isActive = true;
+ // Set owners
for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
{
- locals.newVault.owners.set(locals.i, locals.tempOwners.get(locals.i));
+ locals.newQubicVault.owners.set(locals.i, locals.tempOwners.get(locals.i));
+ }
+ // Clear remaining owner slots
+ for (locals.i = locals.ownerCount; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
+ {
+ locals.newQubicVault.owners.set(locals.i, NULL_ID);
}
- state.vaults.set((uint64)locals.slotIndex, locals.newVault);
+ // Reset release requests for both Qubic and Assets
+ locals.rr_in.vault = locals.newQubicVault;
+ resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
+ locals.newQubicVault = locals.rr_out.vault;
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveRegisteringFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveRegisteringFee);
- // }
- if (qpi.invocationReward() > MSVAULT_REGISTERING_FEE)
+ // Init the Asset part of the vault
+ locals.newAssetVault.numberOfAssetTypes = 0;
+ for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_REGISTERING_FEE);
+ locals.newAssetVault.releaseAssets.set(locals.i, { NULL_ID, 0 });
+ locals.newAssetVault.releaseAssetAmounts.set(locals.i, 0);
+ locals.newAssetVault.releaseAssetDestinations.set(locals.i, NULL_ID);
}
+ state.vaults.set((uint64)locals.slotIndex, locals.newQubicVault);
+ state.vaultAssetParts.set((uint64)locals.slotIndex, locals.newAssetVault);
+
state.numberOfActiveVaults++;
- // [TODO]: Change this to
- //state.totalRevenue += state.liveRegisteringFee;
- state.totalRevenue += MSVAULT_REGISTERING_FEE;
+ state.totalRevenue += state.liveRegisteringFee;
+ output.status = 1; // SUCCESS
+ locals.logger.vaultId = locals.slotIndex;
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
}
PUBLIC_PROCEDURE_WITH_LOCALS(deposit)
{
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+ output.status = 0; // FAILURE_GENERAL
- if (!locals.iv_out.result)
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.vaultId = input.vaultId;
+
+ if (qpi.invocationReward() < (sint64)state.liveDepositFee)
{
qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
return;
}
- locals.vault = state.vaults.get(input.vaultId);
- if (!locals.vault.isActive)
+ // calculate the actual amount to deposit into the vault
+ locals.amountToDeposit = qpi.invocationReward() - state.liveDepositFee;
+
+ // make sure the deposit amount is greater than zero
+ if (locals.amountToDeposit == 0)
{
+ // The user only send the exact fee amount, with nothing left to deposit
+ // this is an invalid operation, so we refund everything
qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
return;
}
- locals.vault.balance += qpi.invocationReward();
- state.vaults.set(input.vaultId, locals.vault);
- }
-
- PUBLIC_PROCEDURE_WITH_LOCALS(releaseTo)
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+ if (!locals.vault.isActive)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // add the collected fee to the total revenue
+ state.totalRevenue += state.liveDepositFee;
+
+ // add the remaining amount to the specified vault's balance
+ locals.vault.qubicBalance += locals.amountToDeposit;
+
+ state.vaults.set(input.vaultId, locals.vault);
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(revokeAssetManagementRights)
{
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveReleaseFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseFee);
- //}
- if (qpi.invocationReward() > MSVAULT_RELEASE_FEE)
+ // This procedure allows a user to revoke asset management rights from MsVault
+ // and transfer them back to QX, which is the default manager for trading.
+
+ output.status = 0; // FAILURE_GENERAL
+ output.transferredNumberOfShares = 0;
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.amount = input.numberOfShares;
+
+ if (qpi.invocationReward() < (sint64)MSVAULT_REVOKE_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.transferredNumberOfShares = 0;
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (qpi.invocationReward() > (sint64)MSVAULT_REVOKE_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)MSVAULT_REVOKE_FEE);
+ }
+
+ // must transfer a positive number of shares.
+ if (input.numberOfShares <= 0)
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_FEE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.transferredNumberOfShares = 0;
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
}
- // [TODO]: Change this to
- //state.totalRevenue += state.liveReleaseFee;
- state.totalRevenue += MSVAULT_RELEASE_FEE;
+
+ // Check if MsVault actually manages the specified number of shares for the caller.
+ locals.managedBalance = qpi.numberOfShares(
+ input.asset,
+ { qpi.invocator(), SELF_INDEX },
+ { qpi.invocator(), SELF_INDEX }
+ );
+
+ if (locals.managedBalance < input.numberOfShares)
+ {
+ // The user is trying to revoke more shares than are managed by MsVault.
+ output.transferredNumberOfShares = 0;
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+ else
+ {
+ // The balance check passed. Proceed to release the management rights.
+ locals.result = qpi.releaseShares(
+ input.asset,
+ qpi.invocator(), // owner
+ qpi.invocator(), // possessor
+ input.numberOfShares,
+ QX_CONTRACT_INDEX,
+ QX_CONTRACT_INDEX,
+ MSVAULT_REVOKE_FEE
+ );
+
+ if (locals.result < 0)
+ {
+ output.transferredNumberOfShares = 0;
+ output.status = 8; // FAILURE_TRANSFER_FAILED
+ }
+ else
+ {
+ output.transferredNumberOfShares = input.numberOfShares;
+ output.status = 1; // SUCCESS
+ }
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(depositAsset)
+ {
+ output.status = 0; // GENEREAL_FAILURE
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.vaultId = input.vaultId;
+ locals.logger.amount = input.amount;
+
+ if (qpi.invocationReward() < (sint64)state.liveDepositFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (qpi.invocationReward() > (sint64)state.liveDepositFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveDepositFee);
+ }
+
+ locals.userAssetBalance = qpi.numberOfShares(input.asset,
+ { qpi.invocator(), SELF_INDEX },
+ { qpi.invocator(), SELF_INDEX });
+
+ if (locals.userAssetBalance < (sint64)input.amount || input.amount == 0)
+ {
+ // User does not have enough shares, or is trying to deposit zero. Abort and refund the fee.
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ qpi.transfer(qpi.invocator(), state.liveDepositFee);
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // check if vault id is valid and the vault is active
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+ if (!locals.iv_out.result)
+ {
+ output.status = 3; // FAILURE_INVALID_VAULT
+ qpi.transfer(qpi.invocator(), state.liveDepositFee);
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return; // invalid vault id
+ }
+
+ locals.qubicVault = state.vaults.get(input.vaultId);
+ locals.assetVault = state.vaultAssetParts.get(input.vaultId);
+ if (!locals.qubicVault.isActive)
+ {
+ output.status = 3; // FAILURE_INVALID_VAULT
+ qpi.transfer(qpi.invocator(), state.liveDepositFee);
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return; // vault is not active
+ }
+
+ // check if the vault has room for a new asset type
+ locals.assetIndex = -1;
+ for (locals.i = 0; locals.i < locals.assetVault.numberOfAssetTypes; locals.i++)
+ {
+ locals.ab = locals.assetVault.assetBalances.get(locals.i);
+ if (locals.ab.asset.assetName == input.asset.assetName && locals.ab.asset.issuer == input.asset.issuer)
+ {
+ locals.assetIndex = locals.i;
+ break;
+ }
+ }
+
+ // if the asset is new to this vault, check if there's an empty slot.
+ if (locals.assetIndex == -1 && locals.assetVault.numberOfAssetTypes >= MSVAULT_MAX_ASSET_TYPES)
+ {
+ // no more new asset
+ output.status = 7; // FAILURE_LIMIT_REACHED
+ qpi.transfer(qpi.invocator(), state.liveDepositFee);
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // All checks passed, now perform the transfer of ownership.
+ state.totalRevenue += state.liveDepositFee;
+
+ locals.tempShares = qpi.numberOfShares(
+ input.asset,
+ { SELF, SELF_INDEX },
+ { SELF, SELF_INDEX }
+ );
+
+ locals.qx_in.assetName = input.asset.assetName;
+ locals.qx_in.issuer = input.asset.issuer;
+ locals.qx_in.numberOfShares = input.amount;
+ locals.qx_in.newOwnerAndPossessor = SELF;
+
+ locals.transferResult = qpi.transferShareOwnershipAndPossession(input.asset.assetName, input.asset.issuer, qpi.invocator(), qpi.invocator(), input.amount, SELF);
+
+ if (locals.transferResult < 0)
+ {
+ output.status = 8; // FAILURE_TRANSFER_FAILED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.transferedShares = qpi.numberOfShares(input.asset, { SELF, SELF_INDEX }, { SELF, SELF_INDEX }) - locals.tempShares;
+
+ if (locals.transferedShares != (sint64)input.amount)
+ {
+ output.status = 8; // FAILURE_TRANSFER_FAILED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // If the transfer succeeds, update the vault's internal accounting.
+ if (locals.assetIndex != -1)
+ {
+ // Asset type exists, update balance
+ locals.ab = locals.assetVault.assetBalances.get(locals.assetIndex);
+ locals.ab.balance += input.amount;
+ locals.assetVault.assetBalances.set(locals.assetIndex, locals.ab);
+ }
+ else
+ {
+ // Add the new asset type to the vault's balance list
+ locals.ab.asset = input.asset;
+ locals.ab.balance = input.amount;
+ locals.assetVault.assetBalances.set(locals.assetVault.numberOfAssetTypes, locals.ab);
+ locals.assetVault.numberOfAssetTypes++;
+ }
+
+ state.vaults.set(input.vaultId, locals.qubicVault);
+ state.vaultAssetParts.set(input.vaultId, locals.assetVault);
+
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(releaseTo)
+ {
+ output.status = 0; // GENEREAL_FAILURE
locals.logger._contractIndex = CONTRACT_INDEX;
- locals.logger._type = 0;
locals.logger.vaultId = input.vaultId;
locals.logger.ownerID = qpi.invocator();
locals.logger.amount = input.amount;
locals.logger.destination = input.destination;
+ if (qpi.invocationReward() < (sint64)state.liveReleaseFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (qpi.invocationReward() > (sint64)state.liveReleaseFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveReleaseFee);
+ }
+
+ state.totalRevenue += state.liveReleaseFee;
+
locals.iv_in.vaultId = input.vaultId;
isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
if (!locals.iv_out.result)
{
- locals.logger._type = 1;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -651,7 +1243,9 @@ struct MSVAULT : public ContractBase
if (!locals.vault.isActive)
{
- locals.logger._type = 1;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -661,21 +1255,27 @@ struct MSVAULT : public ContractBase
isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
if (!locals.io_out.result)
{
- locals.logger._type = 2;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 4; // FAILURE_NOT_AUTHORIZED
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
if (input.amount == 0 || input.destination == NULL_ID)
{
- locals.logger._type = 3;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
- if (locals.vault.balance < input.amount)
+ if (locals.vault.qubicBalance < input.amount)
{
- locals.logger._type = 5;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -688,9 +1288,9 @@ struct MSVAULT : public ContractBase
locals.vault.releaseAmounts.set(locals.ownerIndex, input.amount);
locals.vault.releaseDestinations.set(locals.ownerIndex, input.destination);
+ // Check for approvals
locals.approvals = 0;
- locals.totalOwners = (uint64)locals.vault.numberOfOwners;
- for (locals.i = 0; locals.i < locals.totalOwners; locals.i++)
+ for (locals.i = 0; locals.i < (uint64)locals.vault.numberOfOwners; locals.i++)
{
if (locals.vault.releaseAmounts.get(locals.i) == input.amount &&
locals.vault.releaseDestinations.get(locals.i) == input.destination)
@@ -708,10 +1308,10 @@ struct MSVAULT : public ContractBase
if (locals.releaseApproved)
{
// Still need to re-check the balance before releasing funds
- if (locals.vault.balance >= input.amount)
+ if (locals.vault.qubicBalance >= input.amount)
{
qpi.transfer(input.destination, input.amount);
- locals.vault.balance -= input.amount;
+ locals.vault.qubicBalance -= input.amount;
locals.rr_in.vault = locals.vault;
resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
@@ -719,51 +1319,278 @@ struct MSVAULT : public ContractBase
state.vaults.set(input.vaultId, locals.vault);
- locals.logger._type = 4;
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
}
else
{
- locals.logger._type = 5;
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
}
}
else
{
state.vaults.set(input.vaultId, locals.vault);
- locals.logger._type = 6;
+ output.status = 9; // PENDING_APPROVAL
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
}
}
- PUBLIC_PROCEDURE_WITH_LOCALS(resetRelease)
+ PUBLIC_PROCEDURE_WITH_LOCALS(releaseAssetTo)
{
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveReleaseResetFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseResetFee);
- //}
- if (qpi.invocationReward() > MSVAULT_RELEASE_RESET_FEE)
+ output.status = 0; // GENEREAL_FAILURE
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.vaultId = input.vaultId;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.amount = input.amount;
+ locals.logger.destination = input.destination;
+
+ if (qpi.invocationReward() < (sint64)state.liveReleaseFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (qpi.invocationReward() > (sint64)state.liveReleaseFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveReleaseFee);
+ }
+
+ state.totalRevenue += state.liveReleaseFee;
+
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
{
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_RESET_FEE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.qubicVault = state.vaults.get(input.vaultId);
+ locals.assetVault = state.vaultAssetParts.get(input.vaultId);
+
+ if (!locals.qubicVault.isActive)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.io_in.vault = locals.qubicVault;
+ locals.io_in.ownerID = qpi.invocator();
+ isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
+ if (!locals.io_out.result)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 4; // FAILURE_NOT_AUTHORIZED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
}
- // [TODO]: Change this to
- //state.totalRevenue += state.liveReleaseResetFee;
- state.totalRevenue += MSVAULT_RELEASE_RESET_FEE;
+
+ if (locals.qubicVault.qubicBalance < MSVAULT_REVOKE_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (input.amount == 0 || input.destination == NULL_ID)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // Find the asset in the vault
+ locals.assetIndex = -1;
+ for (locals.i = 0; locals.i < locals.assetVault.numberOfAssetTypes; locals.i++)
+ {
+ locals.ab = locals.assetVault.assetBalances.get(locals.i);
+ if (locals.ab.asset.assetName == input.asset.assetName && locals.ab.asset.issuer == input.asset.issuer)
+ {
+ locals.assetIndex = locals.i;
+ break;
+ }
+ }
+ if (locals.assetIndex == -1)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 5; // FAILURE_INVALID_PARAMS
+ locals.logger._type = (uint32)output.status; // Asset not found
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (locals.assetVault.assetBalances.get(locals.assetIndex).balance < input.amount)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ // Record the release request
+ locals.fi_in.vault = locals.qubicVault;
+ locals.fi_in.ownerID = qpi.invocator();
+ findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
+ locals.ownerIndex = locals.fi_out.index;
+
+ locals.assetVault.releaseAssets.set(locals.ownerIndex, input.asset);
+ locals.assetVault.releaseAssetAmounts.set(locals.ownerIndex, input.amount);
+ locals.assetVault.releaseAssetDestinations.set(locals.ownerIndex, input.destination);
+
+ // Check for approvals
+ locals.approvals = 0;
+ for (locals.i = 0; locals.i < (uint64)locals.qubicVault.numberOfOwners; locals.i++)
+ {
+ if (locals.assetVault.releaseAssetAmounts.get(locals.i) == input.amount &&
+ locals.assetVault.releaseAssetDestinations.get(locals.i) == input.destination &&
+ locals.assetVault.releaseAssets.get(locals.i).assetName == input.asset.assetName &&
+ locals.assetVault.releaseAssets.get(locals.i).issuer == input.asset.issuer)
+ {
+ locals.approvals++;
+ }
+ }
+
+ locals.releaseApproved = false;
+ if (locals.approvals >= (uint64)locals.qubicVault.requiredApprovals)
+ {
+ locals.releaseApproved = true;
+ }
+
+ if (locals.releaseApproved)
+ {
+ // Re-check balance before transfer
+ if (locals.assetVault.assetBalances.get(locals.assetIndex).balance >= input.amount)
+ {
+ locals.qx_out.transferredNumberOfShares = qpi.transferShareOwnershipAndPossession(
+ input.asset.assetName,
+ input.asset.issuer,
+ SELF, // owner
+ SELF, // possessor
+ input.amount,
+ input.destination // new owner & possessor
+ );
+ if (locals.qx_out.transferredNumberOfShares > 0)
+ {
+ // Update internal asset balance
+ locals.ab = locals.assetVault.assetBalances.get(locals.assetIndex);
+ locals.ab.balance -= input.amount;
+ locals.assetVault.assetBalances.set(locals.assetIndex, locals.ab);
+
+ // Release management rights from MsVault to QX for the recipient
+ locals.releaseResult = qpi.releaseShares(
+ input.asset,
+ input.destination, // new owner
+ input.destination, // new possessor
+ input.amount,
+ QX_CONTRACT_INDEX,
+ QX_CONTRACT_INDEX,
+ MSVAULT_REVOKE_FEE
+ );
+
+ if (locals.releaseResult >= 0)
+ {
+ // Deduct the fee from the vault's balance upon success
+ locals.qubicVault.qubicBalance -= MSVAULT_REVOKE_FEE;
+ output.status = 1; // SUCCESS
+ }
+ else
+ {
+ // Log an error if management rights transfer fails
+ output.status = 8; // FAILURE_TRANSFER_FAILED
+ }
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+
+ // Reset all asset release requests
+ for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
+ {
+ locals.assetVault.releaseAssets.set(locals.i, { NULL_ID, 0 });
+ locals.assetVault.releaseAssetAmounts.set(locals.i, 0);
+ locals.assetVault.releaseAssetDestinations.set(locals.i, NULL_ID);
+ }
+ }
+ else
+ {
+ output.status = 8; // FAILURE_TRANSFER_FAILED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+ state.vaults.set(input.vaultId, locals.qubicVault);
+ state.vaultAssetParts.set(input.vaultId, locals.assetVault);
+ }
+ else
+ {
+ output.status = 6; // FAILURE_INSUFFICIENT_BALANCE
+ state.vaults.set(input.vaultId, locals.qubicVault);
+ state.vaultAssetParts.set(input.vaultId, locals.assetVault);
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+ }
+ else
+ {
+ state.vaults.set(input.vaultId, locals.qubicVault);
+ state.vaultAssetParts.set(input.vaultId, locals.assetVault);
+ output.status = 9; // PENDING_APPROVAL
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(resetRelease)
+ {
+ output.status = 0; // GENEREAL_FAILURE
locals.logger._contractIndex = CONTRACT_INDEX;
- locals.logger._type = 0;
locals.logger.vaultId = input.vaultId;
locals.logger.ownerID = qpi.invocator();
locals.logger.amount = 0;
locals.logger.destination = NULL_ID;
+ if (qpi.invocationReward() < (sint64)state.liveReleaseResetFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+ if (qpi.invocationReward() > (sint64)state.liveReleaseResetFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveReleaseResetFee);
+ }
+
+ state.totalRevenue += state.liveReleaseResetFee;
+
locals.iv_in.vaultId = input.vaultId;
isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
if (!locals.iv_out.result)
{
- locals.logger._type = 1;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -772,7 +1599,9 @@ struct MSVAULT : public ContractBase
if (!locals.vault.isActive)
{
- locals.logger._type = 1;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -782,7 +1611,9 @@ struct MSVAULT : public ContractBase
isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
if (!locals.io_out.result)
{
- locals.logger._type = 2;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 4; // FAILURE_NOT_AUTHORIZED
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
return;
}
@@ -797,122 +1628,231 @@ struct MSVAULT : public ContractBase
state.vaults.set(input.vaultId, locals.vault);
- locals.logger._type = 7;
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(resetAssetRelease)
+ {
+ output.status = 0; // GENEREAL_FAILURE
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.vaultId = input.vaultId;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.amount = 0;
+ locals.logger.destination = NULL_ID;
+
+ if (qpi.invocationReward() < (sint64)state.liveReleaseResetFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+ if (qpi.invocationReward() > (sint64)state.liveReleaseResetFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - (sint64)state.liveReleaseResetFee);
+ }
+
+ state.totalRevenue += state.liveReleaseResetFee;
+
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.qubicVault = state.vaults.get(input.vaultId);
+ locals.assetVault = state.vaultAssetParts.get(input.vaultId);
+
+ if (!locals.qubicVault.isActive)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 3; // FAILURE_INVALID_VAULT
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.io_in.vault = locals.qubicVault;
+ locals.io_in.ownerID = qpi.invocator();
+ isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
+ if (!locals.io_out.result)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 4; // FAILURE_NOT_AUTHORIZED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.fi_in.vault = locals.qubicVault;
+ locals.fi_in.ownerID = qpi.invocator();
+ findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
+ locals.ownerIndex = locals.fi_out.index;
+
+ locals.assetVault.releaseAssets.set(locals.ownerIndex, { NULL_ID, 0 });
+ locals.assetVault.releaseAssetAmounts.set(locals.ownerIndex, 0);
+ locals.assetVault.releaseAssetDestinations.set(locals.ownerIndex, NULL_ID);
+
+ state.vaults.set(input.vaultId, locals.qubicVault);
+ state.vaultAssetParts.set(input.vaultId, locals.assetVault);
+
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
LOG_INFO(locals.logger);
}
- // [TODO]: Uncomment this to enable live fee update
PUBLIC_PROCEDURE_WITH_LOCALS(voteFeeChange)
{
- return;
- // locals.ish_in.candidate = qpi.invocator();
- // isShareHolder(qpi, state, locals.ish_in, locals.ish_out, locals.ish_locals);
- // if (!locals.ish_out.result)
- // {
- // return;
- // }
- //
- // qpi.transfer(qpi.invocator(), qpi.invocationReward());
- // locals.nShare = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), qpi.invocator(), qpi.invocator(), MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
- //
- // locals.fs.registeringFee = input.newRegisteringFee;
- // locals.fs.releaseFee = input.newReleaseFee;
- // locals.fs.releaseResetFee = input.newReleaseResetFee;
- // locals.fs.holdingFee = input.newHoldingFee;
- // locals.fs.depositFee = input.newDepositFee;
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //locals.fs.burnFee = input.burnFee;
- //
- // locals.needNewRecord = true;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.currentAddr = state.feeVotesOwner.get(locals.i);
- // locals.realScore = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), locals.currentAddr, locals.currentAddr, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
- // state.feeVotesScore.set(locals.i, locals.realScore);
- // if (locals.currentAddr == qpi.invocator())
- // {
- // locals.needNewRecord = false;
- // }
- // }
- // if (locals.needNewRecord)
- // {
- // state.feeVotes.set(state.feeVotesAddrCount, locals.fs);
- // state.feeVotesOwner.set(state.feeVotesAddrCount, qpi.invocator());
- // state.feeVotesScore.set(state.feeVotesAddrCount, locals.nShare);
- // state.feeVotesAddrCount = state.feeVotesAddrCount + 1;
- // }
- //
- // locals.sumVote = 0;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.sumVote = locals.sumVote + state.feeVotesScore.get(locals.i);
- // }
- // if (locals.sumVote < QUORUM)
- // {
- // return;
- // }
- //
- // state.uniqueFeeVotesCount = 0;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.currentVote = state.feeVotes.get(locals.i);
- // locals.found = false;
- // locals.uniqueIndex = 0;
- // locals.j;
- // for (locals.j = 0; locals.j < state.uniqueFeeVotesCount; locals.j = locals.j + 1)
- // {
- // locals.uniqueVote = state.uniqueFeeVotes.get(locals.j);
- // if (locals.uniqueVote.registeringFee == locals.currentVote.registeringFee &&
- // locals.uniqueVote.releaseFee == locals.currentVote.releaseFee &&
- // locals.uniqueVote.releaseResetFee == locals.currentVote.releaseResetFee &&
- // locals.uniqueVote.holdingFee == locals.currentVote.holdingFee &&
- // locals.uniqueVote.depositFee == locals.currentVote.depositFee
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //&& locals.uniqueVote.burnFee == locals.currentVote.burnFee
- // )
- // {
- // locals.found = true;
- // locals.uniqueIndex = locals.j;
- // break;
- // }
- // }
- // if (locals.found)
- // {
- // locals.currentRank = state.uniqueFeeVotesRanking.get(locals.uniqueIndex);
- // state.uniqueFeeVotesRanking.set(locals.uniqueIndex, locals.currentRank + state.feeVotesScore.get(locals.i));
- // }
- // else
- // {
- // state.uniqueFeeVotes.set(state.uniqueFeeVotesCount, locals.currentVote);
- // state.uniqueFeeVotesRanking.set(state.uniqueFeeVotesCount, state.feeVotesScore.get(locals.i));
- // state.uniqueFeeVotesCount = state.uniqueFeeVotesCount + 1;
- // }
- // }
- //
- // for (locals.i = 0; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
- // {
- // if (state.uniqueFeeVotesRanking.get(locals.i) >= QUORUM)
- // {
- // state.liveRegisteringFee = state.uniqueFeeVotes.get(locals.i).registeringFee;
- // state.liveReleaseFee = state.uniqueFeeVotes.get(locals.i).releaseFee;
- // state.liveReleaseResetFee = state.uniqueFeeVotes.get(locals.i).releaseResetFee;
- // state.liveHoldingFee = state.uniqueFeeVotes.get(locals.i).holdingFee;
- // state.liveDepositFee = state.uniqueFeeVotes.get(locals.i).depositFee;
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //state.liveBurnFee = state.uniqueFeeVotes.get(locals.i).burnFee;
-
- // state.feeVotesAddrCount = 0;
- // state.uniqueFeeVotesCount = 0;
- // return;
- // }
- // }
+ output.status = 0; // GENEREAL_FAILURE
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger.ownerID = qpi.invocator();
+
+ if (qpi.invocationReward() < (sint64)MSVAULT_VOTE_FEE_CHANGE_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output.status = 2; // FAILURE_INSUFFICIENT_FEE
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.ish_in.candidate = qpi.invocator();
+ isShareHolder(qpi, state, locals.ish_in, locals.ish_out, locals.ish_locals);
+ if (!locals.ish_out.result)
+ {
+ output.status = 4; // FAILURE_NOT_AUTHORIZED
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ locals.nShare = qpi.numberOfShares({ NULL_ID, MSVAULT_ASSET_NAME }, AssetOwnershipSelect::byOwner(qpi.invocator()), AssetPossessionSelect::byPossessor(qpi.invocator()));
+
+ locals.fs.registeringFee = input.newRegisteringFee;
+ locals.fs.releaseFee = input.newReleaseFee;
+ locals.fs.releaseResetFee = input.newReleaseResetFee;
+ locals.fs.holdingFee = input.newHoldingFee;
+ locals.fs.depositFee = input.newDepositFee;
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //locals.fs.burnFee = input.burnFee;
+
+ locals.needNewRecord = true;
+ for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ locals.currentAddr = state.feeVotesOwner.get(locals.i);
+ locals.realScore = qpi.numberOfShares({ NULL_ID, MSVAULT_ASSET_NAME }, AssetOwnershipSelect::byOwner(locals.currentAddr), AssetPossessionSelect::byPossessor(locals.currentAddr));
+ state.feeVotesScore.set(locals.i, locals.realScore);
+ if (locals.currentAddr == qpi.invocator())
+ {
+ locals.needNewRecord = false;
+ state.feeVotes.set(locals.i, locals.fs); // Update existing vote
+ }
+ }
+ if (locals.needNewRecord && state.feeVotesAddrCount < MSVAULT_MAX_FEE_VOTES)
+ {
+ state.feeVotes.set(state.feeVotesAddrCount, locals.fs);
+ state.feeVotesOwner.set(state.feeVotesAddrCount, qpi.invocator());
+ state.feeVotesScore.set(state.feeVotesAddrCount, locals.nShare);
+ state.feeVotesAddrCount = state.feeVotesAddrCount + 1;
+ }
+
+ locals.sumVote = 0;
+ for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ locals.sumVote = locals.sumVote + state.feeVotesScore.get(locals.i);
+ }
+ if (locals.sumVote < QUORUM)
+ {
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ state.uniqueFeeVotesCount = 0;
+ // Reset unique vote ranking
+ for (locals.i = 0; locals.i < MSVAULT_MAX_FEE_VOTES; locals.i = locals.i + 1)
+ {
+ state.uniqueFeeVotesRanking.set(locals.i, 0);
+ }
+
+ for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ locals.currentVote = state.feeVotes.get(locals.i);
+ locals.found = false;
+ locals.uniqueIndex = 0;
+ for (locals.j = 0; locals.j < state.uniqueFeeVotesCount; locals.j = locals.j + 1)
+ {
+ locals.uniqueVote = state.uniqueFeeVotes.get(locals.j);
+ if (locals.uniqueVote.registeringFee == locals.currentVote.registeringFee &&
+ locals.uniqueVote.releaseFee == locals.currentVote.releaseFee &&
+ locals.uniqueVote.releaseResetFee == locals.currentVote.releaseResetFee &&
+ locals.uniqueVote.holdingFee == locals.currentVote.holdingFee &&
+ locals.uniqueVote.depositFee == locals.currentVote.depositFee
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //&& locals.uniqueVote.burnFee == locals.currentVote.burnFee
+ )
+ {
+ locals.found = true;
+ locals.uniqueIndex = locals.j;
+ break;
+ }
+ }
+ if (locals.found)
+ {
+ locals.currentRank = state.uniqueFeeVotesRanking.get(locals.uniqueIndex);
+ state.uniqueFeeVotesRanking.set(locals.uniqueIndex, locals.currentRank + state.feeVotesScore.get(locals.i));
+ }
+ else if (state.uniqueFeeVotesCount < MSVAULT_MAX_FEE_VOTES)
+ {
+ state.uniqueFeeVotes.set(state.uniqueFeeVotesCount, locals.currentVote);
+ state.uniqueFeeVotesRanking.set(state.uniqueFeeVotesCount, state.feeVotesScore.get(locals.i));
+ state.uniqueFeeVotesCount = state.uniqueFeeVotesCount + 1;
+ }
+ }
+
+ for (locals.i = 0; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
+ {
+ if (state.uniqueFeeVotesRanking.get(locals.i) >= QUORUM)
+ {
+ state.liveRegisteringFee = state.uniqueFeeVotes.get(locals.i).registeringFee;
+ state.liveReleaseFee = state.uniqueFeeVotes.get(locals.i).releaseFee;
+ state.liveReleaseResetFee = state.uniqueFeeVotes.get(locals.i).releaseResetFee;
+ state.liveHoldingFee = state.uniqueFeeVotes.get(locals.i).holdingFee;
+ state.liveDepositFee = state.uniqueFeeVotes.get(locals.i).depositFee;
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //state.liveBurnFee = state.uniqueFeeVotes.get(locals.i).burnFee;
+
+ state.feeVotesAddrCount = 0;
+ state.uniqueFeeVotesCount = 0;
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
+ return;
+ }
+ }
+ output.status = 1; // SUCCESS
+ locals.logger._type = (uint32)output.status;
+ LOG_INFO(locals.logger);
}
PUBLIC_FUNCTION_WITH_LOCALS(getVaults)
{
output.numberOfVaults = 0ULL;
locals.count = 0ULL;
- for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
+ for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS && locals.count < MSVAULT_MAX_COOWNER; locals.i++)
{
locals.v = state.vaults.get(locals.i);
if (locals.v.isActive)
@@ -957,6 +1897,33 @@ struct MSVAULT : public ContractBase
output.status = 1ULL;
}
+ PUBLIC_FUNCTION_WITH_LOCALS(getAssetReleaseStatus)
+ {
+ output.status = 0ULL;
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ return; // output.status = false
+ }
+
+ locals.qubicVault = state.vaults.get(input.vaultId);
+ if (!locals.qubicVault.isActive)
+ {
+ return; // output.status = false
+ }
+ locals.assetVault = state.vaultAssetParts.get(input.vaultId);
+
+ for (locals.i = 0; locals.i < (uint64)locals.qubicVault.numberOfOwners; locals.i++)
+ {
+ output.assets.set(locals.i, locals.assetVault.releaseAssets.get(locals.i));
+ output.amounts.set(locals.i, locals.assetVault.releaseAssetAmounts.get(locals.i));
+ output.destinations.set(locals.i, locals.assetVault.releaseAssetDestinations.get(locals.i));
+ }
+ output.status = 1ULL;
+ }
+
PUBLIC_FUNCTION_WITH_LOCALS(getBalanceOf)
{
output.status = 0ULL;
@@ -973,7 +1940,32 @@ struct MSVAULT : public ContractBase
{
return; // output.status = false
}
- output.balance = locals.vault.balance;
+ output.balance = locals.vault.qubicBalance;
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getVaultAssetBalances)
+ {
+ output.status = 0ULL;
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ return; // output.status = false
+ }
+
+ locals.qubicVault = state.vaults.get(input.vaultId);
+ if (!locals.qubicVault.isActive)
+ {
+ return; // output.status = false
+ }
+ locals.assetVault = state.vaultAssetParts.get(input.vaultId);
+ output.numberOfAssetTypes = locals.assetVault.numberOfAssetTypes;
+ for (locals.i = 0; locals.i < locals.assetVault.numberOfAssetTypes; locals.i++)
+ {
+ output.assetBalances.set(locals.i, locals.assetVault.assetBalances.get(locals.i));
+ }
output.status = 1ULL;
}
@@ -1004,23 +1996,19 @@ struct MSVAULT : public ContractBase
output.totalDistributedToShareholders = state.totalDistributedToShareholders;
// [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
//output.burnedAmount = state.burnedAmount;
+ output.burnedAmount = 0;
}
PUBLIC_FUNCTION(getFees)
{
- output.registeringFee = MSVAULT_REGISTERING_FEE;
- output.releaseFee = MSVAULT_RELEASE_FEE;
- output.releaseResetFee = MSVAULT_RELEASE_RESET_FEE;
- output.holdingFee = MSVAULT_HOLDING_FEE;
- output.depositFee = 0ULL;
- // [TODO]: Change this to:
- //output.registeringFee = state.liveRegisteringFee;
- //output.releaseFee = state.liveReleaseFee;
- //output.releaseResetFee = state.liveReleaseResetFee;
- //output.holdingFee = state.liveHoldingFee;
- //output.depositFee = state.liveDepositFee;
+ output.registeringFee = state.liveRegisteringFee;
+ output.releaseFee = state.liveReleaseFee;
+ output.releaseResetFee = state.liveReleaseResetFee;
+ output.holdingFee = state.liveHoldingFee;
+ output.depositFee = state.liveDepositFee;
// [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
//output.burnFee = state.liveBurnFee;
+ output.burnFee = MSVAULT_BURN_FEE;
}
PUBLIC_FUNCTION_WITH_LOCALS(getVaultOwners)
@@ -1054,17 +2042,93 @@ struct MSVAULT : public ContractBase
output.status = 1ULL;
}
- // [TODO]: Uncomment this to enable live fee update
PUBLIC_FUNCTION_WITH_LOCALS(isShareHolder)
{
- // if (qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), input.candidate, input.candidate, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX) > 0)
- // {
- // output.result = 1ULL;
- // }
- // else
- // {
- // output.result = 0ULL;
- // }
+ if (qpi.numberOfShares({ NULL_ID, MSVAULT_ASSET_NAME }, AssetOwnershipSelect::byOwner(input.candidate),
+ AssetPossessionSelect::byPossessor(input.candidate)) > 0)
+ {
+ output.result = 1ULL;
+ }
+ else
+ {
+ output.result = 0ULL;
+ }
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getFeeVotes)
+ {
+ output.status = 0ULL;
+
+ for (locals.i = 0ULL; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ output.feeVotes.set(locals.i, state.feeVotes.get(locals.i));
+ }
+
+ output.numberOfFeeVotes = state.feeVotesAddrCount;
+
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getFeeVotesOwner)
+ {
+ output.status = 0ULL;
+
+ for (locals.i = 0ULL; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ output.feeVotesOwner.set(locals.i, state.feeVotesOwner.get(locals.i));
+ }
+ output.numberOfFeeVotes = state.feeVotesAddrCount;
+
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getFeeVotesScore)
+ {
+ output.status = 0ULL;
+
+ for (locals.i = 0ULL; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ {
+ output.feeVotesScore.set(locals.i, state.feeVotesScore.get(locals.i));
+ }
+ output.numberOfFeeVotes = state.feeVotesAddrCount;
+
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getUniqueFeeVotes)
+ {
+ output.status = 0ULL;
+
+ for (locals.i = 0ULL; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
+ {
+ output.uniqueFeeVotes.set(locals.i, state.uniqueFeeVotes.get(locals.i));
+ }
+ output.numberOfUniqueFeeVotes = state.uniqueFeeVotesCount;
+
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION(getManagedAssetBalance)
+ {
+ // Get management rights balance the owner transferred to MsVault
+ output.balance = qpi.numberOfShares(
+ input.asset,
+ { input.owner, SELF_INDEX },
+ { input.owner, SELF_INDEX }
+ );
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getUniqueFeeVotesRanking)
+ {
+ output.status = 0ULL;
+
+ for (locals.i = 0ULL; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
+ {
+ output.uniqueFeeVotesRanking.set(locals.i, state.uniqueFeeVotesRanking.get(locals.i));
+ }
+ output.numberOfUniqueFeeVotes = state.uniqueFeeVotesCount;
+
+ output.status = 1ULL;
}
INITIALIZE()
@@ -1083,47 +2147,72 @@ struct MSVAULT : public ContractBase
END_EPOCH_WITH_LOCALS()
{
+ locals.qxAdress = id(QX_CONTRACT_INDEX, 0, 0, 0);
for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
{
- locals.v = state.vaults.get(locals.i);
- if (locals.v.isActive)
+ locals.qubicVault = state.vaults.get(locals.i);
+ if (locals.qubicVault.isActive)
{
- // [TODO]: Change this to
- //if (locals.v.balance >= state.liveHoldingFee)
- //{
- // locals.v.balance -= state.liveHoldingFee;
- // state.totalRevenue += state.liveHoldingFee;
- // state.vaults.set(locals.i, locals.v);
- //}
- if (locals.v.balance >= MSVAULT_HOLDING_FEE)
+ if (locals.qubicVault.qubicBalance >= state.liveHoldingFee)
{
- locals.v.balance -= MSVAULT_HOLDING_FEE;
- state.totalRevenue += MSVAULT_HOLDING_FEE;
- state.vaults.set(locals.i, locals.v);
+ locals.qubicVault.qubicBalance -= state.liveHoldingFee;
+ state.totalRevenue += state.liveHoldingFee;
+ state.vaults.set(locals.i, locals.qubicVault);
}
else
{
// Not enough funds to pay holding fee
- if (locals.v.balance > 0)
+ if (locals.qubicVault.qubicBalance > 0)
+ {
+ state.totalRevenue += locals.qubicVault.qubicBalance;
+ }
+
+ locals.assetVault = state.vaultAssetParts.get(locals.i);
+ for (locals.k = 0; locals.k < locals.assetVault.numberOfAssetTypes; locals.k++)
+ {
+ locals.ab = locals.assetVault.assetBalances.get(locals.k);
+ if (locals.ab.balance > 0)
+ {
+ // Prepare the transfer request to QX
+ locals.qx_in.assetName = locals.ab.asset.assetName;
+ locals.qx_in.issuer = locals.ab.asset.issuer;
+ locals.qx_in.numberOfShares = locals.ab.balance;
+ locals.qx_in.newOwnerAndPossessor = locals.qxAdress;
+
+ INVOKE_OTHER_CONTRACT_PROCEDURE(QX, TransferShareOwnershipAndPossession, locals.qx_in, locals.qx_out, 0);
+ }
+ }
+ locals.qubicVault.isActive = false;
+ locals.qubicVault.qubicBalance = 0;
+ locals.qubicVault.requiredApprovals = 0;
+ locals.qubicVault.vaultName = NULL_ID;
+ locals.qubicVault.numberOfOwners = 0;
+ for (locals.j = 0; locals.j < MSVAULT_MAX_OWNERS; locals.j++)
{
- state.totalRevenue += locals.v.balance;
+ locals.qubicVault.owners.set(locals.j, NULL_ID);
+ locals.qubicVault.releaseAmounts.set(locals.j, 0);
+ locals.qubicVault.releaseDestinations.set(locals.j, NULL_ID);
+ }
+
+ // clear asset release proposals
+ locals.assetVault.numberOfAssetTypes = 0;
+ for (locals.j = 0; locals.j < MSVAULT_MAX_ASSET_TYPES; locals.j++)
+ {
+ locals.assetVault.assetBalances.set(locals.j, { { NULL_ID, 0 }, 0 });
}
- locals.v.isActive = false;
- locals.v.balance = 0;
- locals.v.requiredApprovals = 0;
- locals.v.vaultName = NULL_ID;
- locals.v.numberOfOwners = 0;
for (locals.j = 0; locals.j < MSVAULT_MAX_OWNERS; locals.j++)
{
- locals.v.owners.set(locals.j, NULL_ID);
- locals.v.releaseAmounts.set(locals.j, 0);
- locals.v.releaseDestinations.set(locals.j, NULL_ID);
+ locals.assetVault.releaseAssets.set(locals.j, { NULL_ID, 0 });
+ locals.assetVault.releaseAssetAmounts.set(locals.j, 0);
+ locals.assetVault.releaseAssetDestinations.set(locals.j, NULL_ID);
}
+
if (state.numberOfActiveVaults > 0)
{
state.numberOfActiveVaults--;
}
- state.vaults.set(locals.i, locals.v);
+ state.vaults.set(locals.i, locals.qubicVault);
+ state.vaultAssetParts.set(locals.i, locals.assetVault);
}
}
}
@@ -1166,5 +2255,29 @@ struct MSVAULT : public ContractBase
REGISTER_USER_FUNCTION(getVaultOwners, 11);
REGISTER_USER_FUNCTION(isShareHolder, 12);
REGISTER_USER_PROCEDURE(voteFeeChange, 13);
+ REGISTER_USER_FUNCTION(getFeeVotes, 14);
+ REGISTER_USER_FUNCTION(getFeeVotesOwner, 15);
+ REGISTER_USER_FUNCTION(getFeeVotesScore, 16);
+ REGISTER_USER_FUNCTION(getUniqueFeeVotes, 17);
+ REGISTER_USER_FUNCTION(getUniqueFeeVotesRanking, 18);
+ // New asset-related functions and procedures
+ REGISTER_USER_PROCEDURE(depositAsset, 19);
+ REGISTER_USER_PROCEDURE(releaseAssetTo, 20);
+ REGISTER_USER_PROCEDURE(resetAssetRelease, 21);
+ REGISTER_USER_FUNCTION(getVaultAssetBalances, 22);
+ REGISTER_USER_FUNCTION(getAssetReleaseStatus, 23);
+ REGISTER_USER_FUNCTION(getManagedAssetBalance, 24);
+ REGISTER_USER_PROCEDURE(revokeAssetManagementRights, 25);
+
+ }
+
+ PRE_ACQUIRE_SHARES()
+ {
+ output.requestedFee = 0;
+ output.allowTransfer = true;
+ }
+
+ POST_ACQUIRE_SHARES()
+ {
}
};
diff --git a/test/contract_msvault.cpp b/test/contract_msvault.cpp
index 9c51671f8..e0993ddba 100644
--- a/test/contract_msvault.cpp
+++ b/test/contract_msvault.cpp
@@ -8,9 +8,13 @@ static const id OWNER2 = ID(_F, _X, _J, _F, _B, _T, _J, _M, _Y, _F, _J, _H, _P,
static const id OWNER3 = ID(_K, _E, _F, _D, _Z, _T, _Y, _L, _F, _E, _R, _A, _H, _D, _V, _L, _N, _Q, _O, _R, _D, _H, _F, _Q, _I, _B, _S, _B, _Z, _C, _W, _S, _Z, _X, _Z, _F, _F, _A, _N, _O, _T, _F, _A, _H, _W, _M, _O, _V, _G, _T, _R, _Q, _J, _P, _X, _D);
static const id TEST_VAULT_NAME = ID(_M, _Y, _M, _S, _V, _A, _U, _L, _U, _S, _E, _D, _F, _O, _R, _U, _N, _I, _T, _T, _T, _E, _S, _T, _I, _N, _G, _P, _U, _R, _P, _O, _S, _E, _S, _O, _N, _L, _Y, _U, _N, _I, _T, _T, _E, _S, _C, _O, _R, _E, _S, _M, _A, _R, _T, _T);
-static constexpr uint64 TWO_OF_TWO = 2ULL;
+static constexpr uint64 TWO_OF_TWO = 2ULL;
static constexpr uint64 TWO_OF_THREE = 2ULL;
+static const id DESTINATION = id::randomValue();
+static constexpr uint64 QX_ISSUE_ASSET_FEE = 1000000000ull;
+static constexpr uint64 QX_MANAGEMENT_TRANSFER_FEE = 100ull;
+
class ContractTestingMsVault : protected ContractTesting
{
public:
@@ -20,6 +24,8 @@ class ContractTestingMsVault : protected ContractTesting
initEmptyUniverse();
INIT_CONTRACT(MSVAULT);
callSystemProcedure(MSVAULT_CONTRACT_INDEX, INITIALIZE);
+ INIT_CONTRACT(QX);
+ callSystemProcedure(QX_CONTRACT_INDEX, INITIALIZE);
}
void beginEpoch(bool expectSuccess = true)
@@ -32,7 +38,7 @@ class ContractTestingMsVault : protected ContractTesting
callSystemProcedure(MSVAULT_CONTRACT_INDEX, END_EPOCH, expectSuccess);
}
- void registerVault(uint64 requiredApprovals, id vaultName, const std::vector& owners, uint64 fee)
+ MSVAULT::registerVault_output registerVault(uint64 requiredApprovals, id vaultName, const std::vector& owners, uint64 fee)
{
MSVAULT::registerVault_input input;
for (uint64 i = 0; i < MSVAULT_MAX_OWNERS; i++)
@@ -43,18 +49,20 @@ class ContractTestingMsVault : protected ContractTesting
input.vaultName = vaultName;
MSVAULT::registerVault_output regOut;
invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 1, input, regOut, owners[0], fee);
+ return regOut;
}
- void deposit(uint64 vaultId, uint64 amount, const id& from)
+ MSVAULT::deposit_output deposit(uint64 vaultId, uint64 amount, const id& from)
{
MSVAULT::deposit_input input;
input.vaultId = vaultId;
increaseEnergy(from, amount);
MSVAULT::deposit_output depOut;
invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 2, input, depOut, from, amount);
+ return depOut;
}
- void releaseTo(uint64 vaultId, uint64 amount, const id& destination, const id& owner, uint64 fee = MSVAULT_RELEASE_FEE)
+ MSVAULT::releaseTo_output releaseTo(uint64 vaultId, uint64 amount, const id& destination, const id& owner, uint64 fee = MSVAULT_RELEASE_FEE)
{
MSVAULT::releaseTo_input input;
input.vaultId = vaultId;
@@ -64,9 +72,10 @@ class ContractTestingMsVault : protected ContractTesting
increaseEnergy(owner, fee);
MSVAULT::releaseTo_output relOut;
invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 3, input, relOut, owner, fee);
+ return relOut;
}
- void resetRelease(uint64 vaultId, const id& owner, uint64 fee = MSVAULT_RELEASE_RESET_FEE)
+ MSVAULT::resetRelease_output resetRelease(uint64 vaultId, const id& owner, uint64 fee = MSVAULT_RELEASE_RESET_FEE)
{
MSVAULT::resetRelease_input input;
input.vaultId = vaultId;
@@ -74,6 +83,7 @@ class ContractTestingMsVault : protected ContractTesting
increaseEnergy(owner, fee);
MSVAULT::resetRelease_output rstOut;
invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 4, input, rstOut, owner, fee);
+ return rstOut;
}
MSVAULT::getVaultName_output getVaultName(uint64 vaultId) const
@@ -131,11 +141,115 @@ class ContractTestingMsVault : protected ContractTesting
return -1;
}
+ void issueAsset(const id& issuer, const std::string& assetNameStr, sint64 numberOfShares)
+ {
+ uint64 assetName = assetNameFromString(assetNameStr.c_str());
+ QX::IssueAsset_input input{ assetName, numberOfShares, 0, 0 };
+ QX::IssueAsset_output output;
+ increaseEnergy(issuer, QX_ISSUE_ASSET_FEE);
+ invokeUserProcedure(QX_CONTRACT_INDEX, 1, input, output, issuer, QX_ISSUE_ASSET_FEE);
+ }
+
+ QX::TransferShareOwnershipAndPossession_output transferAsset(const id& from, const id& to, const Asset& asset, uint64_t amount) {
+ QX::TransferShareOwnershipAndPossession_input input;
+ input.issuer = asset.issuer;
+ input.newOwnerAndPossessor = to;
+ input.assetName = asset.assetName;
+ input.numberOfShares = amount;
+ QX::TransferShareOwnershipAndPossession_output output;
+ invokeUserProcedure(QX_CONTRACT_INDEX, 2, input, output, from, 1000000);
+ return output;
+ }
+
+ int64_t transferShareManagementRights(const id& from, const Asset& asset, sint64 numberOfShares, uint32 newManagingContractIndex)
+ {
+ QX::TransferShareManagementRights_input input;
+ input.asset = asset;
+ input.numberOfShares = numberOfShares;
+ input.newManagingContractIndex = newManagingContractIndex;
+ QX::TransferShareManagementRights_output output;
+ output.transferredNumberOfShares = 0;
+ invokeUserProcedure(QX_CONTRACT_INDEX, 9, input, output, from, 0);
+ return output.transferredNumberOfShares;
+ }
+
+ MSVAULT::revokeAssetManagementRights_output revokeAssetManagementRights(const id& from, const Asset& asset, sint64 numberOfShares)
+ {
+ MSVAULT::revokeAssetManagementRights_input input;
+ input.asset = asset;
+ input.numberOfShares = numberOfShares;
+ MSVAULT::revokeAssetManagementRights_output output;
+ output.transferredNumberOfShares = 0;
+ output.status = 0;
+
+ // The fee required by QX is 100. Do this to ensure enough fee.
+ const uint64 fee = 100;
+ increaseEnergy(from, fee);
+
+ invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 25, input, output, from, fee);
+ return output;
+ }
+
+ MSVAULT::depositAsset_output depositAsset(uint64 vaultId, const Asset& asset, uint64 amount, const id& from)
+ {
+ MSVAULT::depositAsset_input input;
+ input.vaultId = vaultId;
+ input.asset = asset;
+ input.amount = amount;
+ MSVAULT::depositAsset_output output;
+ invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 19, input, output, from, 0);
+ return output;
+ }
+
+ MSVAULT::releaseAssetTo_output releaseAssetTo(uint64 vaultId, const Asset& asset, uint64 amount, const id& destination, const id& owner, uint64 fee = MSVAULT_RELEASE_FEE)
+ {
+ MSVAULT::releaseAssetTo_input input;
+ input.vaultId = vaultId;
+ input.asset = asset;
+ input.amount = amount;
+ input.destination = destination;
+
+ increaseEnergy(owner, fee);
+ MSVAULT::releaseAssetTo_output output;
+ invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 20, input, output, owner, fee);
+ return output;
+ }
+
+ MSVAULT::resetAssetRelease_output resetAssetRelease(uint64 vaultId, const id& owner, uint64 fee = MSVAULT_RELEASE_RESET_FEE)
+ {
+ MSVAULT::resetAssetRelease_input input;
+ input.vaultId = vaultId;
+
+ increaseEnergy(owner, fee);
+ MSVAULT::resetAssetRelease_output output;
+ invokeUserProcedure(MSVAULT_CONTRACT_INDEX, 21, input, output, owner, fee);
+ return output;
+ }
+
+ MSVAULT::getVaultAssetBalances_output getVaultAssetBalances(uint64 vaultId) const
+ {
+ MSVAULT::getVaultAssetBalances_input input;
+ input.vaultId = vaultId;
+ MSVAULT::getVaultAssetBalances_output output;
+ callFunction(MSVAULT_CONTRACT_INDEX, 22, input, output);
+ return output;
+ }
+
+ MSVAULT::getAssetReleaseStatus_output getAssetReleaseStatus(uint64 vaultId) const
+ {
+ MSVAULT::getAssetReleaseStatus_input input;
+ input.vaultId = vaultId;
+ MSVAULT::getAssetReleaseStatus_output output;
+ callFunction(MSVAULT_CONTRACT_INDEX, 23, input, output);
+ return output;
+ }
+
~ContractTestingMsVault()
{
}
};
+
TEST(ContractMsVault, RegisterVault_InsufficientFee)
{
ContractTestingMsVault msVault;
@@ -144,8 +258,10 @@ TEST(ContractMsVault, RegisterVault_InsufficientFee)
auto vaultsO1Before = msVault.getVaults(OWNER1);
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
+
// Attempt with insufficient fee
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, 5000ULL);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, 5000ULL);
+ EXPECT_EQ(regOut.status, 2ULL); // FAILURE_INSUFFICIENT_FEE
// No new vault should be created
auto vaultsO1After = msVault.getVaults(OWNER1);
@@ -158,8 +274,10 @@ TEST(ContractMsVault, RegisterVault_OneOwner)
ContractTestingMsVault msVault;
auto vaultsO1Before = msVault.getVaults(OWNER1);
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
+
// Only one owner => should fail
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 5ULL); // FAILURE_INVALID_PARAMS
// Should fail, no new vault
auto vaultsO1After = msVault.getVaults(OWNER1);
@@ -173,7 +291,8 @@ TEST(ContractMsVault, RegisterVault_Success)
auto vaultsO1Before = msVault.getVaults(OWNER1);
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL); // SUCCESS
auto vaultsO1After = msVault.getVaults(OWNER1);
EXPECT_EQ(static_cast(vaultsO1After.numberOfVaults),
@@ -202,7 +321,8 @@ TEST(ContractMsVault, GetVaultName)
auto vaultsO1Before = msVault.getVaults(OWNER1);
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1After = msVault.getVaults(OWNER1);
EXPECT_EQ(static_cast(vaultsO1After.numberOfVaults),
@@ -221,7 +341,8 @@ TEST(ContractMsVault, Deposit_InvalidVault)
ContractTestingMsVault msVault;
// deposit to a non-existent vault
auto beforeBalance = msVault.getBalanceOf(999ULL);
- msVault.deposit(999ULL, 5000ULL, OWNER1);
+ auto depOut = msVault.deposit(999ULL, 5000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 3ULL); // FAILURE_INVALID_VAULT
// no change in balance
auto afterBalance = msVault.getBalanceOf(999ULL);
EXPECT_EQ(afterBalance.balance, beforeBalance.balance);
@@ -234,13 +355,15 @@ TEST(ContractMsVault, Deposit_Success)
auto vaultsO1Before = msVault.getVaults(OWNER1);
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1After = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1After.vaultIds.get(vaultsO1Before.numberOfVaults);
auto balBefore = msVault.getBalanceOf(vaultId);
- msVault.deposit(vaultId, 10000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 10000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
auto balAfter = msVault.getBalanceOf(vaultId);
EXPECT_EQ(balAfter.balance, balBefore.balance + 10000ULL);
}
@@ -250,16 +373,19 @@ TEST(ContractMsVault, ReleaseTo_NonOwner)
ContractTestingMsVault msVault;
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 10000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 10000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
auto releaseStatusBefore = msVault.getReleaseStatus(vaultId);
// Non-owner attempt release
- msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER3);
+ auto relOut = msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER3);
+ EXPECT_EQ(relOut.status, 4ULL); // FAILURE_NOT_AUTHORIZED
auto releaseStatusAfter = msVault.getReleaseStatus(vaultId);
// No approvals should be set
@@ -273,21 +399,25 @@ TEST(ContractMsVault, ReleaseTo_InvalidParams)
increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE);
// 2 out of 2 owners
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 10000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 10000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
auto releaseStatusBefore = msVault.getReleaseStatus(vaultId);
// amount=0
- msVault.releaseTo(vaultId, 0ULL, OWNER2, OWNER1);
+ auto relOut1 = msVault.releaseTo(vaultId, 0ULL, OWNER2, OWNER1);
+ EXPECT_EQ(relOut1.status, 5ULL); // FAILURE_INVALID_PARAMS
auto releaseStatusAfter1 = msVault.getReleaseStatus(vaultId);
EXPECT_EQ(releaseStatusAfter1.amounts.get(0), releaseStatusBefore.amounts.get(0));
// destination NULL_ID
- msVault.releaseTo(vaultId, 5000ULL, NULL_ID, OWNER1);
+ auto relOut2 = msVault.releaseTo(vaultId, 5000ULL, NULL_ID, OWNER1);
+ EXPECT_EQ(relOut2.status, 5ULL); // FAILURE_INVALID_PARAMS
auto releaseStatusAfter2 = msVault.getReleaseStatus(vaultId);
EXPECT_EQ(releaseStatusAfter2.amounts.get(0), releaseStatusBefore.amounts.get(0));
}
@@ -300,13 +430,16 @@ TEST(ContractMsVault, ReleaseTo_PartialApproval)
increaseEnergy(OWNER3, 100000000ULL);
// 2 out of 3 owners
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 15000ULL, OWNER1);
- msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 15000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
+ auto relOut = msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER1);
+ EXPECT_EQ(relOut.status, 9ULL); // PENDING_APPROVAL
auto status = msVault.getReleaseStatus(vaultId);
// Partial approval means just first owner sets the request
@@ -323,18 +456,22 @@ TEST(ContractMsVault, ReleaseTo_FullApproval)
increaseEnergy(OWNER3, 100000000ULL);
// 2 out of 3
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 10000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 10000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
// OWNER1 requests 5000 Qubics to OWNER3
- msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER1);
+ auto relOut1 = msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER1);
+ EXPECT_EQ(relOut1.status, 9ULL); // PENDING_APPROVAL
// Not approved yet
- msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER2); // second approval
+ auto relOut2 = msVault.releaseTo(vaultId, 5000ULL, OWNER3, OWNER2); // second approval
+ EXPECT_EQ(relOut2.status, 1ULL); // SUCCESS
// After full approval, amount should be released
auto bal = msVault.getBalanceOf(vaultId);
@@ -350,16 +487,19 @@ TEST(ContractMsVault, ReleaseTo_InsufficientBalance)
increaseEnergy(OWNER3, 100000000ULL);
// 2 out of 2
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 10000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 10000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
auto balBefore = msVault.getBalanceOf(vaultId);
// Attempt to release more than balance
- msVault.releaseTo(vaultId, 20000ULL, OWNER3, OWNER1);
+ auto relOut = msVault.releaseTo(vaultId, 20000ULL, OWNER3, OWNER1);
+ EXPECT_EQ(relOut.status, 6ULL); // FAILURE_INSUFFICIENT_BALANCE
// Should fail, balance no change
auto balAfter = msVault.getBalanceOf(vaultId);
@@ -375,17 +515,21 @@ TEST(ContractMsVault, ResetRelease_NonOwner)
increaseEnergy(OWNER3, 100000000ULL);
// 2 out of 2
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 5000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 5000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
- msVault.releaseTo(vaultId, 2000ULL, OWNER2, OWNER1);
+ auto relOut = msVault.releaseTo(vaultId, 2000ULL, OWNER2, OWNER1);
+ EXPECT_EQ(relOut.status, 9ULL); // PENDING_APPROVAL
auto statusBefore = msVault.getReleaseStatus(vaultId);
- msVault.resetRelease(vaultId, OWNER3); // Non owner tries to reset
+ auto rstOut = msVault.resetRelease(vaultId, OWNER3); // Non owner tries to reset
+ EXPECT_EQ(rstOut.status, 4ULL); // FAILURE_NOT_AUTHORIZED
auto statusAfter = msVault.getReleaseStatus(vaultId);
// No change in release requests
@@ -401,17 +545,22 @@ TEST(ContractMsVault, ResetRelease_Success)
increaseEnergy(OWNER2, 100000000ULL);
increaseEnergy(OWNER3, 100000000ULL);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
auto vaultsO1 = msVault.getVaults(OWNER1);
uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
- msVault.deposit(vaultId, 5000ULL, OWNER1);
+ auto depOut = msVault.deposit(vaultId, 5000ULL, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
// OWNER2 requests a releaseTo
- msVault.releaseTo(vaultId, 2000ULL, OWNER1, OWNER2);
+ auto relOut = msVault.releaseTo(vaultId, 2000ULL, OWNER1, OWNER2);
+ EXPECT_EQ(relOut.status, 9ULL);
+
// Now reset by OWNER2
- msVault.resetRelease(vaultId, OWNER2);
+ auto rstOut = msVault.resetRelease(vaultId, OWNER2);
+ EXPECT_EQ(rstOut.status, 1ULL);
auto status = msVault.getReleaseStatus(vaultId);
// All cleared
@@ -432,60 +581,678 @@ TEST(ContractMsVault, GetVaults_Multiple)
auto vaultsForOwner2Before = msVault.getVaults(OWNER2);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ auto regOut1 = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut1.status, 1ULL);
+ auto regOut2 = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut2.status, 1ULL);
auto vaultsForOwner2After = msVault.getVaults(OWNER2);
EXPECT_GE(static_cast(vaultsForOwner2After.numberOfVaults),
- static_cast(vaultsForOwner2Before.numberOfVaults + 2U));
+ static_cast(vaultsForOwner2Before.numberOfVaults + 2U));
}
TEST(ContractMsVault, GetRevenue)
{
ContractTestingMsVault msVault;
+ const Asset assetTest = { OWNER1, assetNameFromString("TESTREV") };
+
+ increaseEnergy(OWNER1, 1000000000ULL);
+ increaseEnergy(OWNER2, 1000000000ULL);
+
+ uint64 expectedRevenue = 0;
+ auto revenueInfo = msVault.getRevenueInfo();
+ EXPECT_EQ(revenueInfo.totalRevenue, expectedRevenue);
+ EXPECT_EQ(revenueInfo.numberOfActiveVaults, 0U);
+
+ // Register a vault, generating the first fee
+ auto regOut = msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+ expectedRevenue += MSVAULT_REGISTERING_FEE;
+
+ auto vaults = msVault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
+
+ // Deposit QUs to ensure the vault can pay holding fees
+ const uint64 depositAmount = 10000000; // 10M QUs
+ auto depOut = msVault.deposit(vaultId, depositAmount, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
+ // expectedRevenue += state.liveDepositFee; // Fee is currently 0
+
+ // Generate Qubic-based fees
+ auto relOut = msVault.releaseTo(vaultId, 1000ULL, DESTINATION, OWNER1);
+ EXPECT_EQ(relOut.status, 9ULL); // Pending approval
+ expectedRevenue += MSVAULT_RELEASE_FEE;
+ auto rstOut = msVault.resetRelease(vaultId, OWNER1);
+ EXPECT_EQ(rstOut.status, 1ULL);
+ expectedRevenue += MSVAULT_RELEASE_RESET_FEE;
+
+ // Generate Asset-based fees
+ msVault.issueAsset(OWNER1, "TESTREV", 10000);
+ msVault.transferShareManagementRights(OWNER1, assetTest, 5000, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msVault.depositAsset(vaultId, assetTest, 1000, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+ // expectedRevenue += state.liveDepositFee; // Fee is currently 0
+ auto relAssetOut = msVault.releaseAssetTo(vaultId, assetTest, 50, DESTINATION, OWNER2);
+ EXPECT_EQ(relAssetOut.status, 9ULL); // Pending approval
+ expectedRevenue += MSVAULT_RELEASE_FEE;
+ auto rstAssetOut = msVault.resetAssetRelease(vaultId, OWNER2);
+ EXPECT_EQ(rstAssetOut.status, 1ULL);
+ expectedRevenue += MSVAULT_RELEASE_RESET_FEE;
+
+ // Verify revenue before the first epoch ends
+ revenueInfo = msVault.getRevenueInfo();
+ EXPECT_EQ(revenueInfo.totalRevenue, expectedRevenue);
+
+ msVault.endEpoch();
msVault.beginEpoch();
- auto revenueOutput = msVault.getRevenueInfo();
- EXPECT_EQ(revenueOutput.totalRevenue, 0U);
- EXPECT_EQ(revenueOutput.totalDistributedToShareholders, 0U);
- EXPECT_EQ(revenueOutput.numberOfActiveVaults, 0U);
+ // Holding fee from the active vault is collected
+ expectedRevenue += MSVAULT_HOLDING_FEE;
- increaseEnergy(OWNER1, 100000000ULL);
- increaseEnergy(OWNER2, 100000000000ULL);
- increaseEnergy(OWNER3, 100000ULL);
+ revenueInfo = msVault.getRevenueInfo();
+ EXPECT_EQ(revenueInfo.numberOfActiveVaults, 1U);
+ EXPECT_EQ(revenueInfo.totalRevenue, expectedRevenue);
+
+ // Verify dividends were distributed correctly based on the total revenue so far
+ uint64 expectedDistribution = (expectedRevenue / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS;
+ EXPECT_EQ(revenueInfo.totalDistributedToShareholders, expectedDistribution);
+
+ // Make more revenue generation actions in the new epoch
+ auto relOut2 = msVault.releaseTo(vaultId, 2000ULL, DESTINATION, OWNER2);
+ EXPECT_EQ(relOut2.status, 9ULL);
+ expectedRevenue += MSVAULT_RELEASE_FEE;
+
+ auto rstOut2 = msVault.resetRelease(vaultId, OWNER2);
+ EXPECT_EQ(rstOut2.status, 1ULL);
+ expectedRevenue += MSVAULT_RELEASE_RESET_FEE;
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ // Revoke some of the previously granted management rights.
+ // This one has a fee, but it is paid to QX, not kept by MsVault.
+ // Therefore, expectedRevenue should NOT be incremented.
+ auto revokeOut = msVault.revokeAssetManagementRights(OWNER1, assetTest, 2000);
+ EXPECT_EQ(revokeOut.status, 1ULL);
+ // End the second epoch
msVault.endEpoch();
+ msVault.beginEpoch();
+
+ // Another holding fee is collected
+ expectedRevenue += MSVAULT_HOLDING_FEE;
+
+ revenueInfo = msVault.getRevenueInfo();
+ EXPECT_EQ(revenueInfo.numberOfActiveVaults, 1U);
+ EXPECT_EQ(revenueInfo.totalRevenue, expectedRevenue);
+
+ // Verify the new cumulative dividend distribution
+ expectedDistribution = (expectedRevenue / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS;
+ EXPECT_EQ(revenueInfo.totalDistributedToShareholders, expectedDistribution);
+ // No new transactions in this epoch
+ msVault.endEpoch();
msVault.beginEpoch();
- revenueOutput = msVault.getRevenueInfo();
- // first vault is destroyed after paying dividends
- EXPECT_EQ(revenueOutput.totalRevenue, MSVAULT_REGISTERING_FEE);
- EXPECT_EQ(revenueOutput.totalDistributedToShareholders, ((int)MSVAULT_REGISTERING_FEE / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS);
- EXPECT_EQ(revenueOutput.numberOfActiveVaults, 0U);
+ // A third holding fee is collected
+ expectedRevenue += MSVAULT_HOLDING_FEE;
- increaseEnergy(OWNER1, 100000000ULL);
- increaseEnergy(OWNER2, 100000000ULL);
- increaseEnergy(OWNER3, 100000000ULL);
+ revenueInfo = msVault.getRevenueInfo();
+ EXPECT_EQ(revenueInfo.numberOfActiveVaults, 1U);
+ EXPECT_EQ(revenueInfo.totalRevenue, expectedRevenue);
- msVault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ // Verify the final cumulative dividend distribution
+ expectedDistribution = (expectedRevenue / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS;
+ EXPECT_EQ(revenueInfo.totalDistributedToShareholders, expectedDistribution);
+}
- auto vaultsO1 = msVault.getVaults(OWNER1);
- uint64 vaultId = vaultsO1.vaultIds.get(vaultsO1.numberOfVaults - 1);
+TEST(ContractMsVault, ManagementRightsVsDirectDeposit)
+{
+ ContractTestingMsVault msvault;
+
+ // Create an issuer and two users.
+ const id ISSUER = id::randomValue();
+ const id USER_WITH_RIGHTS = id::randomValue(); // This user will do it correctly
+ const id USER_WITHOUT_RIGHTS = id::randomValue(); // This user will attempt a direct deposit first
+
+ Asset assetTest = { ISSUER, assetNameFromString("ASSET") };
+ const sint64 initialDistribution = 50000;
+
+ // Give everyone energy for fees
+ increaseEnergy(ISSUER, QX_ISSUE_ASSET_FEE + (1000000 * 2));
+ increaseEnergy(USER_WITH_RIGHTS, MSVAULT_REGISTERING_FEE + (1000000 * 3));
+ increaseEnergy(USER_WITHOUT_RIGHTS, 1000000 * 3); // More energy for the correct attempt later
+
+ // Issue the asset and distribute it to the two users
+ msvault.issueAsset(ISSUER, "ASSET", initialDistribution * 2);
+ msvault.transferAsset(ISSUER, USER_WITH_RIGHTS, assetTest, initialDistribution);
+ msvault.transferAsset(ISSUER, USER_WITHOUT_RIGHTS, assetTest, initialDistribution);
+
+ // Verify initial on-chain balances (both users' shares are managed by QX currently)
+ EXPECT_EQ(numberOfShares(assetTest, { USER_WITH_RIGHTS, QX_CONTRACT_INDEX },
+ { USER_WITH_RIGHTS, QX_CONTRACT_INDEX }), initialDistribution);
+ EXPECT_EQ(numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX }), initialDistribution);
+
+ // Create a simple vault owned by USER_WITH_RIGHTS
+ auto regOut = msvault.registerVault(2, TEST_VAULT_NAME, { USER_WITH_RIGHTS, OWNER1 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+
+ auto vaults = msvault.getVaults(USER_WITH_RIGHTS);
+ uint64 vaultId = vaults.vaultIds.get(0);
+
+ // User with Management Rights
+ const sint64 sharesToManage1 = 10000;
+ msvault.transferShareManagementRights(USER_WITH_RIGHTS, assetTest, sharesToManage1, MSVAULT_CONTRACT_INDEX);
+
+ // verify that management rights were transferred successfully
+ EXPECT_EQ(numberOfShares(assetTest, { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX }), sharesToManage1);
+ EXPECT_EQ(numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX }), 0);
+
+ // This user now makes multiple deposits
+ const sint64 deposit1_U1 = 1000;
+ const sint64 deposit2_U1 = 2500;
+ auto depAssetOut1 = msvault.depositAsset(vaultId, assetTest, deposit1_U1, USER_WITH_RIGHTS);
+ EXPECT_EQ(depAssetOut1.status, 1ULL);
+
+ // Verify balances after first deposit
+ sint64 sc_onchain_balance = numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(sc_onchain_balance, deposit1_U1);
+ sint64 user_managed_balance = numberOfShares(assetTest, { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(user_managed_balance, sharesToManage1 - deposit1_U1);
+
+ auto depAssetOut2 = msvault.depositAsset(vaultId, assetTest, deposit2_U1, USER_WITH_RIGHTS);
+ EXPECT_EQ(depAssetOut2.status, 1ULL);
+
+ // verify balances after second deposit
+ sc_onchain_balance = numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(sc_onchain_balance, deposit1_U1 + deposit2_U1);
+ sint64 user1_managed_balance = numberOfShares(assetTest, { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITH_RIGHTS, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(user1_managed_balance, sharesToManage1 - deposit1_U1 - deposit2_U1);
+
+ // user without management rights
+ sint64 sc_balance_before_direct_attempt = sc_onchain_balance;
+ sint64 user3_balance_before = numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX });
+
+ // This user attempts to deposit directly
+ auto depAssetOut3 = msvault.depositAsset(vaultId, assetTest, 500, USER_WITHOUT_RIGHTS);
+ EXPECT_EQ(depAssetOut3.status, 6ULL); // FAILURE_INSUFFICIENT_BALANCE
+
+ // Verify that no shares were transferred
+ sint64 sc_balance_after_direct_attempt = numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(sc_balance_after_direct_attempt, sc_balance_before_direct_attempt);
+
+ sint64 user3_balance_after = numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, QX_CONTRACT_INDEX });
+ EXPECT_EQ(user3_balance_after, user3_balance_before); // User's balance should be unchanged
+
+ sint64 user3_balance_after_msvault = numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(user3_balance_after_msvault, 0);
+
+ // the second user now does it the correct way
+ const sint64 sharesToManage2 = 8000;
+ msvault.transferShareManagementRights(USER_WITHOUT_RIGHTS, assetTest, sharesToManage2, MSVAULT_CONTRACT_INDEX);
+
+ // Verify their management rights were transferred successfully
+ EXPECT_EQ(numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX }), sharesToManage2);
+
+ const sint64 deposit1_U2 = 4000;
+ auto depAssetOut4 = msvault.depositAsset(vaultId, assetTest, deposit1_U2, USER_WITHOUT_RIGHTS);
+ EXPECT_EQ(depAssetOut4.status, 1ULL);
+
+ // check the total balance in the smart contract
+ sint64 final_sc_balance = numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ sint64 total_deposited = deposit1_U1 + deposit2_U1 + deposit1_U2;
+ EXPECT_EQ(final_sc_balance, total_deposited);
+
+ // Also verify the second user's remaining managed balance
+ sint64 user2_managed_balance = numberOfShares(assetTest, { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX },
+ { USER_WITHOUT_RIGHTS, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(user2_managed_balance, sharesToManage2 - deposit1_U2);
+}
- msVault.deposit(vaultId, 500000000ULL, OWNER1);
+TEST(ContractMsVault, DepositAsset_Success)
+{
+ ContractTestingMsVault msvault;
+ Asset assetTest = { OWNER1, assetNameFromString("ASSET") };
- msVault.endEpoch();
+ // Create a vault and issue an asset to OWNER1
+ increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE + QX_ISSUE_ASSET_FEE);
+ auto regOut = msvault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+ auto vaults = msvault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
- msVault.beginEpoch();
+ msvault.issueAsset(OWNER1, "ASSET", 1000000);
+
+ auto OWNER4 = id::randomValue();
+
+ auto transfered = msvault.transferShareManagementRights(OWNER1, assetTest, 5000, MSVAULT_CONTRACT_INDEX);
+
+ // Deposit the asset into the vault
+ auto depAssetOut = msvault.depositAsset(vaultId, assetTest, 500, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+
+ // Check the vault's asset balance
+ auto assetBalances = msvault.getVaultAssetBalances(vaultId);
+ EXPECT_EQ(assetBalances.status, 1ULL);
+ EXPECT_EQ(assetBalances.numberOfAssetTypes, 1ULL);
+
+ auto firstAssetBalance = assetBalances.assetBalances.get(0);
+ EXPECT_EQ(firstAssetBalance.asset.issuer, assetTest.issuer);
+ EXPECT_EQ(firstAssetBalance.asset.assetName, assetTest.assetName);
+ EXPECT_EQ(firstAssetBalance.balance, 500ULL);
+
+ // Check SC's shares
+ sint64 scShares = numberOfShares(assetTest,
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(scShares, 500LL);
+}
+
+TEST(ContractMsVault, DepositAsset_MaxTypes)
+{
+ ContractTestingMsVault msvault;
+
+ // Create a vault
+ increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE + QX_ISSUE_ASSET_FEE * (MSVAULT_MAX_ASSET_TYPES + 1)); // Extra energy for fees
+ auto regOut = msvault.registerVault(2ULL, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+ auto vaults = msvault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
+
+ // Deposit the maximum number of different asset types
+ for (uint64 i = 0; i < MSVAULT_MAX_ASSET_TYPES; i++)
+ {
+ std::string assetName = "ASSET" + std::to_string(i);
+ Asset currentAsset = { OWNER1, assetNameFromString(assetName.c_str()) };
+ msvault.issueAsset(OWNER1, assetName, 1000000);
+ msvault.transferShareManagementRights(OWNER1, currentAsset, 100000, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(vaultId, currentAsset, 1000, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+ }
+
+ // Check if max asset types reached
+ auto balances = msvault.getVaultAssetBalances(vaultId);
+ EXPECT_EQ(balances.numberOfAssetTypes, MSVAULT_MAX_ASSET_TYPES);
+
+ // Try to deposit one more asset type
+ Asset extraAsset = { OWNER1, assetNameFromString("ASSETE") };
+ msvault.issueAsset(OWNER1, "ASSETE", 100000);
+ msvault.transferShareManagementRights(OWNER1, extraAsset, 100000, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(vaultId, extraAsset, 1000, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 7ULL); // FAILURE_LIMIT_REACHED
+
+ // The number of asset types should not have increased
+ auto balancesAfter = msvault.getVaultAssetBalances(vaultId);
+ EXPECT_EQ(balancesAfter.numberOfAssetTypes, MSVAULT_MAX_ASSET_TYPES);
+}
+
+TEST(ContractMsVault, ReleaseAssetTo_FullApproval)
+{
+ ContractTestingMsVault msvault;
+ Asset assetTest = { OWNER1, assetNameFromString("ASSET") };
+
+ // Create a 2-of-3 vault, issue and deposit an asset
+ increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE + MSVAULT_RELEASE_FEE + QX_ISSUE_ASSET_FEE + QX_MANAGEMENT_TRANSFER_FEE);
+ increaseEnergy(OWNER2, MSVAULT_RELEASE_FEE);
+ auto regOut = msvault.registerVault(TWO_OF_THREE, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+ auto vaults = msvault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
+
+ msvault.issueAsset(OWNER1, "ASSET", 1000000);
+ msvault.transferShareManagementRights(OWNER1, assetTest, 800, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(vaultId, assetTest, 800, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+
+ // Deposit funds into the vault to cover the upcoming management transfer fee.
+ auto depOut = msvault.deposit(vaultId, QX_MANAGEMENT_TRANSFER_FEE, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
+
+ // Check initial balances for the destination
+ EXPECT_EQ(numberOfShares(assetTest, { DESTINATION, QX_CONTRACT_INDEX }, { DESTINATION, QX_CONTRACT_INDEX }), 0LL);
+ EXPECT_EQ(numberOfShares(assetTest, { DESTINATION, MSVAULT_CONTRACT_INDEX }, { DESTINATION, MSVAULT_CONTRACT_INDEX }), 0LL);
+ auto vaultAssetBalanceBefore = msvault.getVaultAssetBalances(vaultId).assetBalances.get(0).balance;
+ EXPECT_EQ(vaultAssetBalanceBefore, 800ULL);
+
+ // Owners approve the release
+ auto relAssetOut1 = msvault.releaseAssetTo(vaultId, assetTest, 500, DESTINATION, OWNER1);
+ EXPECT_EQ(relAssetOut1.status, 9ULL);
+ auto relAssetOut2 = msvault.releaseAssetTo(vaultId, assetTest, 500, DESTINATION, OWNER2);
+ EXPECT_EQ(relAssetOut2.status, 1ULL);
+
+ // Check final balances
+ sint64 destBalanceManagedByQx = numberOfShares(assetTest, { DESTINATION, QX_CONTRACT_INDEX }, { DESTINATION, QX_CONTRACT_INDEX });
+ sint64 destBalanceManagedByMsVault = numberOfShares(assetTest, { DESTINATION, MSVAULT_CONTRACT_INDEX }, { DESTINATION, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(destBalanceManagedByQx, 500LL);
+ EXPECT_EQ(destBalanceManagedByMsVault, 0LL);
+
+ auto vaultAssetBalanceAfter = msvault.getVaultAssetBalances(vaultId).assetBalances.get(0).balance;
+ EXPECT_EQ(vaultAssetBalanceAfter, 300ULL); // 800 - 500
+
+ // The vault's qubic balance should be 0 after paying the management transfer fee
+ auto vaultQubicBalanceAfter = msvault.getBalanceOf(vaultId);
+ EXPECT_EQ(vaultQubicBalanceAfter.balance, 0LL);
+
+ // Release status should be reset
+ auto releaseStatus = msvault.getAssetReleaseStatus(vaultId);
+ EXPECT_EQ(releaseStatus.amounts.get(0), 0ULL);
+ EXPECT_EQ(releaseStatus.destinations.get(0), NULL_ID);
+}
+
+TEST(ContractMsVault, ReleaseAssetTo_PartialApproval)
+{
+ ContractTestingMsVault msvault;
+ Asset assetTest = { OWNER1, assetNameFromString("ASSET") };
+
+ // Setup
+ increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE + MSVAULT_RELEASE_FEE + QX_MANAGEMENT_TRANSFER_FEE);
+ auto regOut = msvault.registerVault(TWO_OF_THREE, TEST_VAULT_NAME, { OWNER1, OWNER2, OWNER3 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+
+ auto vaults = msvault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
+ msvault.issueAsset(OWNER1, "ASSET", 1000000);
+ msvault.transferShareManagementRights(OWNER1, assetTest, 800, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(vaultId, assetTest, 800, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+
+ // Deposit the fee into the vault so it can process release requests.
+ auto depOut = msvault.deposit(vaultId, QX_MANAGEMENT_TRANSFER_FEE, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
+
+ // Only one owner approves
+ auto relAssetOut = msvault.releaseAssetTo(vaultId, assetTest, 500, DESTINATION, OWNER1);
+ EXPECT_EQ(relAssetOut.status, 9ULL); // PENDING_APPROVAL
+
+ // Check release status is pending
+ auto status = msvault.getAssetReleaseStatus(vaultId);
+ EXPECT_EQ(status.status, 1ULL);
+ // Owner 1 is at index 0
+ EXPECT_EQ(status.assets.get(0).assetName, assetTest.assetName);
+ EXPECT_EQ(status.amounts.get(0), 500ULL);
+ EXPECT_EQ(status.destinations.get(0), DESTINATION);
+ // Other owner slots are empty
+ EXPECT_EQ(status.amounts.get(1), 0ULL);
+
+ // Balances should be unchanged
+ sint64 destinationBalance = numberOfShares(assetTest, { DESTINATION, QX_CONTRACT_INDEX },
+ { DESTINATION, QX_CONTRACT_INDEX });
+ EXPECT_EQ(destinationBalance, 0LL);
+ auto vaultBalance = msvault.getVaultAssetBalances(vaultId).assetBalances.get(0).balance;
+ EXPECT_EQ(vaultBalance, 800ULL);
+}
+
+TEST(ContractMsVault, ResetAssetRelease_Success)
+{
+ ContractTestingMsVault msvault;
+ Asset assetTest = { OWNER1, assetNameFromString("ASSET") };
+
+ // Setup
+ increaseEnergy(OWNER1, MSVAULT_REGISTERING_FEE + MSVAULT_RELEASE_RESET_FEE + MSVAULT_RELEASE_FEE + QX_MANAGEMENT_TRANSFER_FEE);
+ auto regOut = msvault.registerVault(TWO_OF_TWO, TEST_VAULT_NAME, { OWNER1, OWNER2 }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+ auto vaults = msvault.getVaults(OWNER1);
+ uint64 vaultId = vaults.vaultIds.get(0);
+ msvault.issueAsset(OWNER1, "ASSET", 1000000);
+ msvault.transferShareManagementRights(OWNER1, assetTest, 100, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(vaultId, assetTest, 100, OWNER1);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+
+ auto depOut = msvault.deposit(vaultId, QX_MANAGEMENT_TRANSFER_FEE, OWNER1);
+ EXPECT_EQ(depOut.status, 1ULL);
+
+ // Propose and then reset a release
+ auto relAssetOut = msvault.releaseAssetTo(vaultId, assetTest, 50, DESTINATION, OWNER1);
+ EXPECT_EQ(relAssetOut.status, 9ULL);
+
+ // Check status is pending before reset
+ auto statusBefore = msvault.getAssetReleaseStatus(vaultId);
+ EXPECT_EQ(statusBefore.amounts.get(0), 50ULL);
+
+ // Reset the release
+ auto rstAssetOut = msvault.resetAssetRelease(vaultId, OWNER1);
+ EXPECT_EQ(rstAssetOut.status, 1ULL);
+
+ // Status should be cleared for that owner
+ auto statusAfter = msvault.getAssetReleaseStatus(vaultId);
+ EXPECT_EQ(statusAfter.amounts.get(0), 0ULL);
+ EXPECT_EQ(statusAfter.destinations.get(0), NULL_ID);
+
+ // Vault balance should be unchanged
+ auto vaultBalance = msvault.getVaultAssetBalances(vaultId).assetBalances.get(0).balance;
+ EXPECT_EQ(vaultBalance, 100ULL);
+}
+
+TEST(ContractMsVault, FullLifecycle_BalanceVerification)
+{
+ ContractTestingMsVault msvault;
+ const id USER = OWNER1;
+ const id PARTNER = OWNER2;
+ const id DESTINATION_ACC = OWNER3;
+ Asset assetTest = { USER, assetNameFromString("ASSET") };
+ const sint64 initialShares = 10000;
+ const sint64 sharesToManage = 5000;
+ const sint64 sharesToDeposit = 4000;
+ const sint64 sharesToRelease = 1500;
+
+ // Issue asset and create a type 2 vault
+ increaseEnergy(USER, MSVAULT_REGISTERING_FEE + QX_ISSUE_ASSET_FEE + QX_MANAGEMENT_TRANSFER_FEE);
+ increaseEnergy(PARTNER, MSVAULT_RELEASE_FEE);
+
+ msvault.issueAsset(USER, "ASSET", initialShares);
+ auto regOut = msvault.registerVault(TWO_OF_TWO, TEST_VAULT_NAME, { USER, PARTNER }, MSVAULT_REGISTERING_FEE);
+ EXPECT_EQ(regOut.status, 1ULL);
+
+ auto vaults = msvault.getVaults(USER);
+ uint64 vaultId = vaults.vaultIds.get(0);
+
+ // Verify user has full on-chain balance under QX management
+ sint64 userShares_QX = numberOfShares(assetTest, { USER, QX_CONTRACT_INDEX }, { USER, QX_CONTRACT_INDEX });
+ EXPECT_EQ(userShares_QX, initialShares);
+
+ // Fund the vault for the future management transfer fee
+ auto depOut = msvault.deposit(vaultId, QX_MANAGEMENT_TRANSFER_FEE, USER);
+ EXPECT_EQ(depOut.status, 1ULL);
+
+ // User gives MsVault management rights over a portion of their shares
+ msvault.transferShareManagementRights(USER, assetTest, sharesToManage, MSVAULT_CONTRACT_INDEX);
+
+ // Verify on-chain balances after management transfer
+ sint64 userShares_MSVAULT_Managed = numberOfShares(assetTest, { USER, MSVAULT_CONTRACT_INDEX }, { USER, MSVAULT_CONTRACT_INDEX });
+ userShares_QX = numberOfShares(assetTest, { USER, QX_CONTRACT_INDEX }, { USER, QX_CONTRACT_INDEX });
+ EXPECT_EQ(userShares_MSVAULT_Managed, sharesToManage);
+ EXPECT_EQ(userShares_QX, initialShares - sharesToManage);
+
+ // User deposits the MsVault-managed shares into the vault
+ auto depAssetOut = msvault.depositAsset(vaultId, assetTest, sharesToDeposit, USER);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+
+ // User's on-chain balance of MsVault-managed shares should decrease
+ userShares_MSVAULT_Managed = numberOfShares(assetTest, { USER, MSVAULT_CONTRACT_INDEX }, { USER, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(userShares_MSVAULT_Managed, sharesToManage - sharesToDeposit); // 5000 - 4000 = 1000
+
+ // MsVault contract's on-chain balance should increase
+ sint64 scShares_onchain = numberOfShares(assetTest,
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(scShares_onchain, sharesToDeposit);
+
+ // Vault's internal balance should match the on-chain balance
+ auto vaultBalances = msvault.getVaultAssetBalances(vaultId);
+ EXPECT_EQ(vaultBalances.status, 1ULL);
+ EXPECT_EQ(vaultBalances.numberOfAssetTypes, 1ULL);
+ EXPECT_EQ(vaultBalances.assetBalances.get(0).balance, sharesToDeposit);
+
+ // Both owners approve a release to the destination
+ auto relAssetOut1 = msvault.releaseAssetTo(vaultId, assetTest, sharesToRelease, DESTINATION_ACC, USER);
+ EXPECT_EQ(relAssetOut1.status, 9ULL);
+ auto relAssetOut2 = msvault.releaseAssetTo(vaultId, assetTest, sharesToRelease, DESTINATION_ACC, PARTNER);
+ EXPECT_EQ(relAssetOut2.status, 1ULL);
+
+ // MsVault contract's on-chain balance should decrease
+ scShares_onchain = numberOfShares(assetTest, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(scShares_onchain, sharesToDeposit - sharesToRelease);
+
+ // Vault's internal balance should be updated correctly
+ vaultBalances = msvault.getVaultAssetBalances(vaultId);
+ EXPECT_EQ(vaultBalances.assetBalances.get(0).balance, sharesToDeposit - sharesToRelease);
+
+ // Vault's internal qubic balance should decrease by the fee
+ EXPECT_EQ(msvault.getBalanceOf(vaultId).balance, 0);
+
+ // Destination's on-chain balance should increase, and it should be managed by QX
+ sint64 destinationSharesManagedByQx = numberOfShares(assetTest, { DESTINATION_ACC, QX_CONTRACT_INDEX }, { DESTINATION_ACC, QX_CONTRACT_INDEX });
+ sint64 destinationSharesManagedByMsVault = numberOfShares(assetTest, { DESTINATION_ACC, MSVAULT_CONTRACT_INDEX }, { DESTINATION_ACC, MSVAULT_CONTRACT_INDEX });
+
+ EXPECT_EQ(destinationSharesManagedByQx, sharesToRelease);
+ EXPECT_EQ(destinationSharesManagedByMsVault, 0);
+}
+
+TEST(ContractMsVault, StressTest_MultiUser_MultiAsset)
+{
+ ContractTestingMsVault msvault;
+
+ // Define users, assets, and vaults
+ const int USER_COUNT = 16;
+ const int ASSET_COUNT = 8;
+ const int VAULT_COUNT = 3;
+ std::vector users;
+ std::vector assets;
+
+ for (int i = 0; i < USER_COUNT; ++i)
+ {
+ users.push_back(id::randomValue());
+ increaseEnergy(users[i], 1000000000000ULL);
+ }
+
+ for (int i = 0; i < ASSET_COUNT; ++i)
+ {
+ // Issue each asset from a different user for variety
+ id issuer = users[i];
+ std::string assetName = "ASSET" + std::to_string(i);
+ assets.push_back({ issuer, assetNameFromString(assetName.c_str()) });
+ msvault.issueAsset(issuer, assetName, 1000000); // Issue 1M of each token
+ }
+
+ // Create 3 vaults with different sets of 4 owners each
+ EXPECT_EQ(msvault.registerVault(3, id::randomValue(), { users[0], users[1], users[2], users[3] }, MSVAULT_REGISTERING_FEE).status, 1ULL);
+ EXPECT_EQ(msvault.registerVault(2, id::randomValue(), { users[4], users[5], users[6], users[7] }, MSVAULT_REGISTERING_FEE).status, 1ULL);
+ EXPECT_EQ(msvault.registerVault(4, id::randomValue(), { users[8], users[9], users[10], users[11] }, MSVAULT_REGISTERING_FEE).status, 1ULL);
+
+ // Each of the 8 assets is deposited twice by its owner
+ uint64 targetVaultId = 0;
+ const sint64 depositAmount = 100;
+
+ for (int i = 0; i < USER_COUNT; ++i)
+ {
+ int assetIndex = i % ASSET_COUNT;
+ Asset assetToDeposit = assets[assetIndex];
+ id owner_of_asset = users[assetIndex];
+
+ msvault.transferShareManagementRights(owner_of_asset, assetToDeposit, depositAmount, MSVAULT_CONTRACT_INDEX);
+ auto depAssetOut = msvault.depositAsset(targetVaultId, assetToDeposit, depositAmount, owner_of_asset);
+ EXPECT_EQ(depAssetOut.status, 1ULL);
+ }
+
+ auto depOut = msvault.deposit(targetVaultId, QX_MANAGEMENT_TRANSFER_FEE, users[0]);
+ EXPECT_EQ(depOut.status, 1ULL);
+
+ // Check the state of the target vault
+ auto vaultBalances = msvault.getVaultAssetBalances(targetVaultId);
+ EXPECT_EQ(vaultBalances.status, 1ULL);
+ EXPECT_EQ(vaultBalances.numberOfAssetTypes, (uint64_t)ASSET_COUNT);
+ for (uint64 i = 0; i < ASSET_COUNT; ++i)
+ {
+ // Verify each asset has a balance of 200 (deposited twice)
+ EXPECT_EQ(vaultBalances.assetBalances.get(i).balance, depositAmount * 2);
+ }
+
+ // From Vault 0, owners 0, 1, and 2 approve a release
+ const id releaseDestination = users[15];
+ const Asset assetToRelease = assets[0]; // Release ASSET_0
+ const sint64 releaseAmount = 75;
+
+ // A 3-of-4 vault, so we need 3 approvals
+ EXPECT_EQ(msvault.releaseAssetTo(targetVaultId, assetToRelease, releaseAmount, releaseDestination, users[0]).status, 9ULL);
+ EXPECT_EQ(msvault.releaseAssetTo(targetVaultId, assetToRelease, releaseAmount, releaseDestination, users[1]).status, 9ULL);
+ EXPECT_EQ(msvault.releaseAssetTo(targetVaultId, assetToRelease, releaseAmount, releaseDestination, users[2]).status, 1ULL);
+
+ // Check destination on-chain balance
+ sint64 destBalance = numberOfShares(assetToRelease, { releaseDestination, QX_CONTRACT_INDEX },
+ { releaseDestination, QX_CONTRACT_INDEX });
+ EXPECT_EQ(destBalance, releaseAmount);
+
+ // Check vault's internal accounting for the released asset
+ vaultBalances = msvault.getVaultAssetBalances(targetVaultId);
+ bool foundReleasedAsset = false;
+ for (uint64 i = 0; i < vaultBalances.numberOfAssetTypes; ++i)
+ {
+ auto bal = vaultBalances.assetBalances.get(i);
+ if (bal.asset.assetName == assetToRelease.assetName && bal.asset.issuer == assetToRelease.issuer)
+ {
+ // Expected balance is (100 * 2) - 75 = 125
+ EXPECT_EQ(bal.balance, (depositAmount * 2) - releaseAmount);
+ foundReleasedAsset = true;
+ break;
+ }
+ }
+ EXPECT_TRUE(foundReleasedAsset);
+
+ // Check MsVault's on-chain balance for the released asset
+ sint64 scOnChainBalance = numberOfShares(assetToRelease, { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX },
+ { id(MSVAULT_CONTRACT_INDEX, 0, 0, 0), MSVAULT_CONTRACT_INDEX });
+ // The total on-chain balance should also be (100 * 2) - 75 = 125
+ EXPECT_EQ(scOnChainBalance, (depositAmount * 2) - releaseAmount);
+}
+
+TEST(ContractMsVault, RevokeAssetManagementRights_Success)
+{
+ ContractTestingMsVault msvault;
+
+ const id USER = OWNER1;
+ const Asset asset = { USER, assetNameFromString("REVOKE") };
+ const sint64 initialShares = 10000;
+ const sint64 sharesToManage = 4000;
+ const sint64 sharesToRevoke = 3000;
+
+ // Issue asset and transfer management rights to MsVault
+ increaseEnergy(USER, QX_ISSUE_ASSET_FEE + 1000000 + 100); // Energy for all fees
+ msvault.issueAsset(USER, "REVOKE", initialShares);
+
+ // Verify initial state: all shares managed by QX
+ EXPECT_EQ(numberOfShares(asset, { USER, QX_CONTRACT_INDEX }, { USER, QX_CONTRACT_INDEX }), initialShares);
+ EXPECT_EQ(numberOfShares(asset, { USER, MSVAULT_CONTRACT_INDEX }, { USER, MSVAULT_CONTRACT_INDEX }), 0);
+
+ // User gives MsVault management rights over a portion of their shares
+ msvault.transferShareManagementRights(USER, asset, sharesToManage, MSVAULT_CONTRACT_INDEX);
+
+ // Verify intermediate state: rights are split between QX and MsVault
+ EXPECT_EQ(numberOfShares(asset, { USER, QX_CONTRACT_INDEX }, { USER, QX_CONTRACT_INDEX }), initialShares - sharesToManage);
+ EXPECT_EQ(numberOfShares(asset, { USER, MSVAULT_CONTRACT_INDEX }, { USER, MSVAULT_CONTRACT_INDEX }), sharesToManage);
+
+ // User revokes a portion of the managed rights from MsVault. The helper now handles the fee.
+ auto revokeOut = msvault.revokeAssetManagementRights(USER, asset, sharesToRevoke);
- revenueOutput = msVault.getRevenueInfo();
+ // Verify the outcome
+ EXPECT_EQ(revokeOut.status, 1ULL);
+ EXPECT_EQ(revokeOut.transferredNumberOfShares, sharesToRevoke);
- auto total_revenue = MSVAULT_REGISTERING_FEE * 2 + MSVAULT_HOLDING_FEE;
- EXPECT_EQ(revenueOutput.totalRevenue, total_revenue);
- EXPECT_EQ(revenueOutput.totalDistributedToShareholders, ((int)(total_revenue) / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS);
- EXPECT_EQ(revenueOutput.numberOfActiveVaults, 1U);
+ // The amount managed by MsVault should decrease
+ sint64 finalManagedByMsVault = numberOfShares(asset, { USER, MSVAULT_CONTRACT_INDEX }, { USER, MSVAULT_CONTRACT_INDEX });
+ EXPECT_EQ(finalManagedByMsVault, sharesToManage - sharesToRevoke); // 4000 - 3000 = 1000
+ // The amount managed by QX should increase accordingly
+ sint64 finalManagedByQx = numberOfShares(asset, { USER, QX_CONTRACT_INDEX }, { USER, QX_CONTRACT_INDEX });
+ EXPECT_EQ(finalManagedByQx, (initialShares - sharesToManage) + sharesToRevoke); // 6000 + 3000 = 9000
}
From 29a5586ded0309d4bf4908a86348b10d410ba8dc Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 13:48:56 +0200
Subject: [PATCH 110/297] add MSVAULT_V1 toggle
---
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contract_core/contract_def.h | 6 +-
src/contracts/MsVault_v1.h | 1170 ++++++++++++++++++++++++++++++
src/qubic.cpp | 2 +
5 files changed, 1181 insertions(+), 1 deletion(-)
create mode 100644 src/contracts/MsVault_v1.h
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 287f0b4de..118861cc4 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -23,6 +23,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 268209f5f..891354cdf 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -276,6 +276,9 @@
contracts
+
+ contracts
+
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index a9aae0b3d..9b86a73f6 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -172,7 +172,11 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_INDEX MSVAULT_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE MSVAULT
#define CONTRACT_STATE2_TYPE MSVAULT2
-#include "contracts/MsVault.h"
+#ifdef MSVAULT_V1
+ #include "contracts/MsVault_v1.h"
+#else
+ #include "contracts/MsVault.h"
+#endif
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
diff --git a/src/contracts/MsVault_v1.h b/src/contracts/MsVault_v1.h
new file mode 100644
index 000000000..66a01c18d
--- /dev/null
+++ b/src/contracts/MsVault_v1.h
@@ -0,0 +1,1170 @@
+using namespace QPI;
+
+constexpr uint64 MSVAULT_MAX_OWNERS = 16;
+constexpr uint64 MSVAULT_MAX_COOWNER = 8;
+constexpr uint64 MSVAULT_INITIAL_MAX_VAULTS = 131072ULL; // 2^17
+constexpr uint64 MSVAULT_MAX_VAULTS = MSVAULT_INITIAL_MAX_VAULTS * X_MULTIPLIER;
+// MSVAULT asset name : 23727827095802701, using assetNameFromString("MSVAULT") utility in test_util.h
+static constexpr uint64 MSVAULT_ASSET_NAME = 23727827095802701;
+
+constexpr uint64 MSVAULT_REGISTERING_FEE = 5000000ULL;
+constexpr uint64 MSVAULT_RELEASE_FEE = 100000ULL;
+constexpr uint64 MSVAULT_RELEASE_RESET_FEE = 1000000ULL;
+constexpr uint64 MSVAULT_HOLDING_FEE = 500000ULL;
+constexpr uint64 MSVAULT_BURN_FEE = 0ULL; // Integer percentage from 1 -> 100
+// [TODO]: Turn this assert ON when MSVAULT_BURN_FEE > 0
+//static_assert(MSVAULT_BURN_FEE > 0, "SC requires burning qu to operate, the burn fee must be higher than 0!");
+
+static constexpr uint64 MSVAULT_MAX_FEE_VOTES = 64;
+
+
+struct MSVAULT2
+{
+};
+
+struct MSVAULT : public ContractBase
+{
+public:
+ struct Vault
+ {
+ id vaultName;
+ Array owners;
+ Array releaseAmounts;
+ Array releaseDestinations;
+ uint64 balance;
+ uint8 numberOfOwners;
+ uint8 requiredApprovals;
+ bit isActive;
+ };
+
+ struct MsVaultFeeVote
+ {
+ uint64 registeringFee;
+ uint64 releaseFee;
+ uint64 releaseResetFee;
+ uint64 holdingFee;
+ uint64 depositFee;
+ uint64 burnFee;
+ };
+
+ struct MSVaultLogger
+ {
+ uint32 _contractIndex;
+ // 1: Invalid vault ID or vault inactive
+ // 2: Caller not an owner
+ // 3: Invalid parameters (e.g., amount=0, destination=NULL_ID)
+ // 4: Release successful
+ // 5: Insufficient balance
+ // 6: Release not fully approved
+ // 7: Reset release requests successful
+ uint32 _type;
+ uint64 vaultId;
+ id ownerID;
+ uint64 amount;
+ id destination;
+ sint8 _terminator;
+ };
+
+ struct isValidVaultId_input
+ {
+ uint64 vaultId;
+ };
+ struct isValidVaultId_output
+ {
+ bit result;
+ };
+ struct isValidVaultId_locals
+ {
+ };
+
+ struct findOwnerIndexInVault_input
+ {
+ Vault vault;
+ id ownerID;
+ };
+ struct findOwnerIndexInVault_output
+ {
+ sint64 index;
+ };
+ struct findOwnerIndexInVault_locals
+ {
+ sint64 i;
+ };
+
+ struct isOwnerOfVault_input
+ {
+ Vault vault;
+ id ownerID;
+ };
+ struct isOwnerOfVault_output
+ {
+ bit result;
+ };
+ struct isOwnerOfVault_locals
+ {
+ findOwnerIndexInVault_input fi_in;
+ findOwnerIndexInVault_output fi_out;
+ findOwnerIndexInVault_locals fi_locals;
+ };
+
+ struct resetReleaseRequests_input
+ {
+ Vault vault;
+ };
+ struct resetReleaseRequests_output
+ {
+ Vault vault;
+ };
+ struct resetReleaseRequests_locals
+ {
+ uint64 i;
+ };
+
+ struct isShareHolder_input
+ {
+ id candidate;
+ };
+ struct isShareHolder_locals {};
+ struct isShareHolder_output
+ {
+ uint64 result;
+ };
+
+ // Procedures and functions' structs
+ struct registerVault_input
+ {
+ id vaultName;
+ Array owners;
+ uint64 requiredApprovals;
+ };
+ struct registerVault_output
+ {
+ };
+ struct registerVault_locals
+ {
+ uint64 ownerCount;
+ uint64 i;
+ sint64 ii;
+ uint64 j;
+ uint64 k;
+ uint64 count;
+ sint64 slotIndex;
+ Vault newVault;
+ Vault tempVault;
+ id proposedOwner;
+
+ Array tempOwners;
+
+ resetReleaseRequests_input rr_in;
+ resetReleaseRequests_output rr_out;
+ resetReleaseRequests_locals rr_locals;
+ };
+
+ struct deposit_input
+ {
+ uint64 vaultId;
+ };
+ struct deposit_output
+ {
+ };
+ struct deposit_locals
+ {
+ Vault vault;
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct releaseTo_input
+ {
+ uint64 vaultId;
+ uint64 amount;
+ id destination;
+ };
+ struct releaseTo_output
+ {
+ };
+ struct releaseTo_locals
+ {
+ Vault vault;
+ MSVaultLogger logger;
+
+ sint64 ownerIndex;
+ uint64 approvals;
+ uint64 totalOwners;
+ bit releaseApproved;
+ uint64 i;
+
+ isOwnerOfVault_input io_in;
+ isOwnerOfVault_output io_out;
+ isOwnerOfVault_locals io_locals;
+
+ findOwnerIndexInVault_input fi_in;
+ findOwnerIndexInVault_output fi_out;
+ findOwnerIndexInVault_locals fi_locals;
+
+ resetReleaseRequests_input rr_in;
+ resetReleaseRequests_output rr_out;
+ resetReleaseRequests_locals rr_locals;
+
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct resetRelease_input
+ {
+ uint64 vaultId;
+ };
+ struct resetRelease_output
+ {
+ };
+ struct resetRelease_locals
+ {
+ Vault vault;
+ MSVaultLogger logger;
+ sint64 ownerIndex;
+
+ isOwnerOfVault_input io_in;
+ isOwnerOfVault_output io_out;
+ isOwnerOfVault_locals io_locals;
+
+ findOwnerIndexInVault_input fi_in;
+ findOwnerIndexInVault_output fi_out;
+ findOwnerIndexInVault_locals fi_locals;
+
+ bit found;
+
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct voteFeeChange_input
+ {
+ uint64 newRegisteringFee;
+ uint64 newReleaseFee;
+ uint64 newReleaseResetFee;
+ uint64 newHoldingFee;
+ uint64 newDepositFee;
+ uint64 burnFee;
+ };
+ struct voteFeeChange_output
+ {
+ };
+ struct voteFeeChange_locals
+ {
+ uint64 i;
+ uint64 sumVote;
+ bit needNewRecord;
+ uint64 nShare;
+ MsVaultFeeVote fs;
+
+ id currentAddr;
+ uint64 realScore;
+ MsVaultFeeVote currentVote;
+ MsVaultFeeVote uniqueVote;
+
+ bit found;
+ uint64 uniqueIndex;
+ uint64 j;
+ uint64 currentRank;
+
+ isShareHolder_input ish_in;
+ isShareHolder_output ish_out;
+ isShareHolder_locals ish_locals;
+ };
+
+ struct getVaults_input
+ {
+ id publicKey;
+ };
+ struct getVaults_output
+ {
+ uint64 numberOfVaults;
+ Array vaultIds;
+ Array vaultNames;
+ };
+ struct getVaults_locals
+ {
+ uint64 count;
+ uint64 i, j;
+ Vault v;
+ };
+
+ struct getReleaseStatus_input
+ {
+ uint64 vaultId;
+ };
+ struct getReleaseStatus_output
+ {
+ uint64 status;
+ Array amounts;
+ Array destinations;
+ };
+ struct getReleaseStatus_locals
+ {
+ Vault vault;
+ uint64 i;
+
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct getBalanceOf_input
+ {
+ uint64 vaultId;
+ };
+ struct getBalanceOf_output
+ {
+ uint64 status;
+ sint64 balance;
+ };
+ struct getBalanceOf_locals
+ {
+ Vault vault;
+
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct getVaultName_input
+ {
+ uint64 vaultId;
+ };
+ struct getVaultName_output
+ {
+ uint64 status;
+ id vaultName;
+ };
+ struct getVaultName_locals
+ {
+ Vault vault;
+
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+ };
+
+ struct getRevenueInfo_input {};
+ struct getRevenueInfo_output
+ {
+ uint64 numberOfActiveVaults;
+ uint64 totalRevenue;
+ uint64 totalDistributedToShareholders;
+ uint64 burnedAmount;
+ };
+
+ struct getFees_input
+ {
+ };
+ struct getFees_output
+ {
+ uint64 registeringFee;
+ uint64 releaseFee;
+ uint64 releaseResetFee;
+ uint64 holdingFee;
+ uint64 depositFee; // currently always 0
+ uint64 burnFee;
+ };
+
+ struct getVaultOwners_input
+ {
+ uint64 vaultId;
+ };
+ struct getVaultOwners_locals
+ {
+ isValidVaultId_input iv_in;
+ isValidVaultId_output iv_out;
+ isValidVaultId_locals iv_locals;
+
+ Vault v;
+ uint64 i;
+ };
+ struct getVaultOwners_output
+ {
+ uint64 status;
+ uint64 numberOfOwners;
+ Array owners;
+
+ uint64 requiredApprovals;
+ };
+
+ struct END_EPOCH_locals
+ {
+ uint64 i;
+ uint64 j;
+ Vault v;
+ sint64 amountToDistribute;
+ uint64 feeToBurn;
+ };
+
+protected:
+ // Contract states
+ Array vaults;
+
+ uint64 numberOfActiveVaults;
+ uint64 totalRevenue;
+ uint64 totalDistributedToShareholders;
+ uint64 burnedAmount;
+
+ Array feeVotes;
+ Array feeVotesOwner;
+ Array feeVotesScore;
+ uint64 feeVotesAddrCount;
+
+ Array uniqueFeeVotes;
+ Array uniqueFeeVotesRanking;
+ uint64 uniqueFeeVotesCount;
+
+ uint64 liveRegisteringFee;
+ uint64 liveReleaseFee;
+ uint64 liveReleaseResetFee;
+ uint64 liveHoldingFee;
+ uint64 liveDepositFee;
+ uint64 liveBurnFee;
+
+ // Helper Functions
+ PRIVATE_FUNCTION_WITH_LOCALS(isValidVaultId)
+ {
+ if (input.vaultId < MSVAULT_MAX_VAULTS)
+ {
+ output.result = true;
+ }
+ else
+ {
+ output.result = false;
+ }
+ }
+
+ PRIVATE_FUNCTION_WITH_LOCALS(findOwnerIndexInVault)
+ {
+ output.index = -1;
+ for (locals.i = 0; locals.i < (sint64)input.vault.numberOfOwners; locals.i++)
+ {
+ if (input.vault.owners.get(locals.i) == input.ownerID)
+ {
+ output.index = locals.i;
+ break;
+ }
+ }
+ }
+
+ PRIVATE_FUNCTION_WITH_LOCALS(isOwnerOfVault)
+ {
+ locals.fi_in.vault = input.vault;
+ locals.fi_in.ownerID = input.ownerID;
+ findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
+ output.result = (locals.fi_out.index != -1);
+ }
+
+ PRIVATE_FUNCTION_WITH_LOCALS(resetReleaseRequests)
+ {
+ for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
+ {
+ input.vault.releaseAmounts.set(locals.i, 0);
+ input.vault.releaseDestinations.set(locals.i, NULL_ID);
+ }
+ output.vault = input.vault;
+ }
+
+ // Procedures and functions
+ PUBLIC_PROCEDURE_WITH_LOCALS(registerVault)
+ {
+ // [TODO]: Change this to
+ // if (qpi.invocationReward() < state.liveRegisteringFee)
+ if (qpi.invocationReward() < MSVAULT_REGISTERING_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ locals.ownerCount = 0;
+ for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
+ {
+ locals.proposedOwner = input.owners.get(locals.i);
+ if (locals.proposedOwner != NULL_ID)
+ {
+ locals.tempOwners.set(locals.ownerCount, locals.proposedOwner);
+ locals.ownerCount = locals.ownerCount + 1;
+ }
+ }
+
+ if (locals.ownerCount <= 1)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ if (locals.ownerCount > MSVAULT_MAX_OWNERS)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ for (locals.i = locals.ownerCount; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
+ {
+ locals.tempOwners.set(locals.i, NULL_ID);
+ }
+
+ // Check if requiredApprovals is valid: must be <= numberOfOwners, > 1
+ if (input.requiredApprovals <= 1 || input.requiredApprovals > locals.ownerCount)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ // Find empty slot
+ locals.slotIndex = -1;
+ for (locals.ii = 0; locals.ii < MSVAULT_MAX_VAULTS; locals.ii++)
+ {
+ locals.tempVault = state.vaults.get(locals.ii);
+ if (!locals.tempVault.isActive && locals.tempVault.numberOfOwners == 0 && locals.tempVault.balance == 0)
+ {
+ locals.slotIndex = locals.ii;
+ break;
+ }
+ }
+
+ if (locals.slotIndex == -1)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
+ {
+ locals.proposedOwner = locals.tempOwners.get(locals.i);
+ locals.count = 0;
+ for (locals.j = 0; locals.j < MSVAULT_MAX_VAULTS; locals.j++)
+ {
+ locals.tempVault = state.vaults.get(locals.j);
+ if (locals.tempVault.isActive)
+ {
+ for (locals.k = 0; locals.k < (uint64)locals.tempVault.numberOfOwners; locals.k++)
+ {
+ if (locals.tempVault.owners.get(locals.k) == locals.proposedOwner)
+ {
+ locals.count++;
+ if (locals.count >= MSVAULT_MAX_COOWNER)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ locals.newVault.vaultName = input.vaultName;
+ locals.newVault.numberOfOwners = (uint8)locals.ownerCount;
+ locals.newVault.requiredApprovals = (uint8)input.requiredApprovals;
+ locals.newVault.balance = 0;
+ locals.newVault.isActive = true;
+
+ locals.rr_in.vault = locals.newVault;
+ resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
+ locals.newVault = locals.rr_out.vault;
+
+ for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
+ {
+ locals.newVault.owners.set(locals.i, locals.tempOwners.get(locals.i));
+ }
+
+ state.vaults.set((uint64)locals.slotIndex, locals.newVault);
+
+ // [TODO]: Change this to
+ //if (qpi.invocationReward() > state.liveRegisteringFee)
+ //{
+ // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveRegisteringFee);
+ // }
+ if (qpi.invocationReward() > MSVAULT_REGISTERING_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_REGISTERING_FEE);
+ }
+
+ state.numberOfActiveVaults++;
+
+ // [TODO]: Change this to
+ //state.totalRevenue += state.liveRegisteringFee;
+ state.totalRevenue += MSVAULT_REGISTERING_FEE;
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(deposit)
+ {
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+ if (!locals.vault.isActive)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ locals.vault.balance += qpi.invocationReward();
+ state.vaults.set(input.vaultId, locals.vault);
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(releaseTo)
+ {
+ // [TODO]: Change this to
+ //if (qpi.invocationReward() > state.liveReleaseFee)
+ //{
+ // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseFee);
+ //}
+ if (qpi.invocationReward() > MSVAULT_RELEASE_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_FEE);
+ }
+ // [TODO]: Change this to
+ //state.totalRevenue += state.liveReleaseFee;
+ state.totalRevenue += MSVAULT_RELEASE_FEE;
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger._type = 0;
+ locals.logger.vaultId = input.vaultId;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.amount = input.amount;
+ locals.logger.destination = input.destination;
+
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ locals.logger._type = 1;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+
+ if (!locals.vault.isActive)
+ {
+ locals.logger._type = 1;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.io_in.vault = locals.vault;
+ locals.io_in.ownerID = qpi.invocator();
+ isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
+ if (!locals.io_out.result)
+ {
+ locals.logger._type = 2;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (input.amount == 0 || input.destination == NULL_ID)
+ {
+ locals.logger._type = 3;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ if (locals.vault.balance < input.amount)
+ {
+ locals.logger._type = 5;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.fi_in.vault = locals.vault;
+ locals.fi_in.ownerID = qpi.invocator();
+ findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
+ locals.ownerIndex = locals.fi_out.index;
+
+ locals.vault.releaseAmounts.set(locals.ownerIndex, input.amount);
+ locals.vault.releaseDestinations.set(locals.ownerIndex, input.destination);
+
+ locals.approvals = 0;
+ locals.totalOwners = (uint64)locals.vault.numberOfOwners;
+ for (locals.i = 0; locals.i < locals.totalOwners; locals.i++)
+ {
+ if (locals.vault.releaseAmounts.get(locals.i) == input.amount &&
+ locals.vault.releaseDestinations.get(locals.i) == input.destination)
+ {
+ locals.approvals++;
+ }
+ }
+
+ locals.releaseApproved = false;
+ if (locals.approvals >= (uint64)locals.vault.requiredApprovals)
+ {
+ locals.releaseApproved = true;
+ }
+
+ if (locals.releaseApproved)
+ {
+ // Still need to re-check the balance before releasing funds
+ if (locals.vault.balance >= input.amount)
+ {
+ qpi.transfer(input.destination, input.amount);
+ locals.vault.balance -= input.amount;
+
+ locals.rr_in.vault = locals.vault;
+ resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
+ locals.vault = locals.rr_out.vault;
+
+ state.vaults.set(input.vaultId, locals.vault);
+
+ locals.logger._type = 4;
+ LOG_INFO(locals.logger);
+ }
+ else
+ {
+ locals.logger._type = 5;
+ LOG_INFO(locals.logger);
+ }
+ }
+ else
+ {
+ state.vaults.set(input.vaultId, locals.vault);
+ locals.logger._type = 6;
+ LOG_INFO(locals.logger);
+ }
+ }
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(resetRelease)
+ {
+ // [TODO]: Change this to
+ //if (qpi.invocationReward() > state.liveReleaseResetFee)
+ //{
+ // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseResetFee);
+ //}
+ if (qpi.invocationReward() > MSVAULT_RELEASE_RESET_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_RESET_FEE);
+ }
+ // [TODO]: Change this to
+ //state.totalRevenue += state.liveReleaseResetFee;
+ state.totalRevenue += MSVAULT_RELEASE_RESET_FEE;
+
+ locals.logger._contractIndex = CONTRACT_INDEX;
+ locals.logger._type = 0;
+ locals.logger.vaultId = input.vaultId;
+ locals.logger.ownerID = qpi.invocator();
+ locals.logger.amount = 0;
+ locals.logger.destination = NULL_ID;
+
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ locals.logger._type = 1;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+
+ if (!locals.vault.isActive)
+ {
+ locals.logger._type = 1;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.io_in.vault = locals.vault;
+ locals.io_in.ownerID = qpi.invocator();
+ isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
+ if (!locals.io_out.result)
+ {
+ locals.logger._type = 2;
+ LOG_INFO(locals.logger);
+ return;
+ }
+
+ locals.fi_in.vault = locals.vault;
+ locals.fi_in.ownerID = qpi.invocator();
+ findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
+ locals.ownerIndex = locals.fi_out.index;
+
+ locals.vault.releaseAmounts.set(locals.ownerIndex, 0);
+ locals.vault.releaseDestinations.set(locals.ownerIndex, NULL_ID);
+
+ state.vaults.set(input.vaultId, locals.vault);
+
+ locals.logger._type = 7;
+ LOG_INFO(locals.logger);
+ }
+
+ // [TODO]: Uncomment this to enable live fee update
+ PUBLIC_PROCEDURE_WITH_LOCALS(voteFeeChange)
+ {
+ return;
+ // locals.ish_in.candidate = qpi.invocator();
+ // isShareHolder(qpi, state, locals.ish_in, locals.ish_out, locals.ish_locals);
+ // if (!locals.ish_out.result)
+ // {
+ // return;
+ // }
+ //
+ // qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ // locals.nShare = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), qpi.invocator(), qpi.invocator(), MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
+ //
+ // locals.fs.registeringFee = input.newRegisteringFee;
+ // locals.fs.releaseFee = input.newReleaseFee;
+ // locals.fs.releaseResetFee = input.newReleaseResetFee;
+ // locals.fs.holdingFee = input.newHoldingFee;
+ // locals.fs.depositFee = input.newDepositFee;
+ // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ // //locals.fs.burnFee = input.burnFee;
+ //
+ // locals.needNewRecord = true;
+ // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ // {
+ // locals.currentAddr = state.feeVotesOwner.get(locals.i);
+ // locals.realScore = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), locals.currentAddr, locals.currentAddr, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
+ // state.feeVotesScore.set(locals.i, locals.realScore);
+ // if (locals.currentAddr == qpi.invocator())
+ // {
+ // locals.needNewRecord = false;
+ // }
+ // }
+ // if (locals.needNewRecord)
+ // {
+ // state.feeVotes.set(state.feeVotesAddrCount, locals.fs);
+ // state.feeVotesOwner.set(state.feeVotesAddrCount, qpi.invocator());
+ // state.feeVotesScore.set(state.feeVotesAddrCount, locals.nShare);
+ // state.feeVotesAddrCount = state.feeVotesAddrCount + 1;
+ // }
+ //
+ // locals.sumVote = 0;
+ // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ // {
+ // locals.sumVote = locals.sumVote + state.feeVotesScore.get(locals.i);
+ // }
+ // if (locals.sumVote < QUORUM)
+ // {
+ // return;
+ // }
+ //
+ // state.uniqueFeeVotesCount = 0;
+ // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
+ // {
+ // locals.currentVote = state.feeVotes.get(locals.i);
+ // locals.found = false;
+ // locals.uniqueIndex = 0;
+ // locals.j;
+ // for (locals.j = 0; locals.j < state.uniqueFeeVotesCount; locals.j = locals.j + 1)
+ // {
+ // locals.uniqueVote = state.uniqueFeeVotes.get(locals.j);
+ // if (locals.uniqueVote.registeringFee == locals.currentVote.registeringFee &&
+ // locals.uniqueVote.releaseFee == locals.currentVote.releaseFee &&
+ // locals.uniqueVote.releaseResetFee == locals.currentVote.releaseResetFee &&
+ // locals.uniqueVote.holdingFee == locals.currentVote.holdingFee &&
+ // locals.uniqueVote.depositFee == locals.currentVote.depositFee
+ // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ // //&& locals.uniqueVote.burnFee == locals.currentVote.burnFee
+ // )
+ // {
+ // locals.found = true;
+ // locals.uniqueIndex = locals.j;
+ // break;
+ // }
+ // }
+ // if (locals.found)
+ // {
+ // locals.currentRank = state.uniqueFeeVotesRanking.get(locals.uniqueIndex);
+ // state.uniqueFeeVotesRanking.set(locals.uniqueIndex, locals.currentRank + state.feeVotesScore.get(locals.i));
+ // }
+ // else
+ // {
+ // state.uniqueFeeVotes.set(state.uniqueFeeVotesCount, locals.currentVote);
+ // state.uniqueFeeVotesRanking.set(state.uniqueFeeVotesCount, state.feeVotesScore.get(locals.i));
+ // state.uniqueFeeVotesCount = state.uniqueFeeVotesCount + 1;
+ // }
+ // }
+ //
+ // for (locals.i = 0; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
+ // {
+ // if (state.uniqueFeeVotesRanking.get(locals.i) >= QUORUM)
+ // {
+ // state.liveRegisteringFee = state.uniqueFeeVotes.get(locals.i).registeringFee;
+ // state.liveReleaseFee = state.uniqueFeeVotes.get(locals.i).releaseFee;
+ // state.liveReleaseResetFee = state.uniqueFeeVotes.get(locals.i).releaseResetFee;
+ // state.liveHoldingFee = state.uniqueFeeVotes.get(locals.i).holdingFee;
+ // state.liveDepositFee = state.uniqueFeeVotes.get(locals.i).depositFee;
+ // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ // //state.liveBurnFee = state.uniqueFeeVotes.get(locals.i).burnFee;
+
+ // state.feeVotesAddrCount = 0;
+ // state.uniqueFeeVotesCount = 0;
+ // return;
+ // }
+ // }
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getVaults)
+ {
+ output.numberOfVaults = 0ULL;
+ locals.count = 0ULL;
+ for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
+ {
+ locals.v = state.vaults.get(locals.i);
+ if (locals.v.isActive)
+ {
+ for (locals.j = 0ULL; locals.j < (uint64)locals.v.numberOfOwners; locals.j++)
+ {
+ if (locals.v.owners.get(locals.j) == input.publicKey)
+ {
+ output.vaultIds.set(locals.count, locals.i);
+ output.vaultNames.set(locals.count, locals.v.vaultName);
+ locals.count++;
+ break;
+ }
+ }
+ }
+ }
+ output.numberOfVaults = locals.count;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getReleaseStatus)
+ {
+ output.status = 0ULL;
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ return; // output.status = false
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+ if (!locals.vault.isActive)
+ {
+ return; // output.status = false
+ }
+
+ for (locals.i = 0; locals.i < (uint64)locals.vault.numberOfOwners; locals.i++)
+ {
+ output.amounts.set(locals.i, locals.vault.releaseAmounts.get(locals.i));
+ output.destinations.set(locals.i, locals.vault.releaseDestinations.get(locals.i));
+ }
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getBalanceOf)
+ {
+ output.status = 0ULL;
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ return; // output.status = false
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+ if (!locals.vault.isActive)
+ {
+ return; // output.status = false
+ }
+ output.balance = locals.vault.balance;
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getVaultName)
+ {
+ output.status = 0ULL;
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+
+ if (!locals.iv_out.result)
+ {
+ return; // output.status = false
+ }
+
+ locals.vault = state.vaults.get(input.vaultId);
+ if (!locals.vault.isActive)
+ {
+ return; // output.status = false
+ }
+ output.vaultName = locals.vault.vaultName;
+ output.status = 1ULL;
+ }
+
+ PUBLIC_FUNCTION(getRevenueInfo)
+ {
+ output.numberOfActiveVaults = state.numberOfActiveVaults;
+ output.totalRevenue = state.totalRevenue;
+ output.totalDistributedToShareholders = state.totalDistributedToShareholders;
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //output.burnedAmount = state.burnedAmount;
+ }
+
+ PUBLIC_FUNCTION(getFees)
+ {
+ output.registeringFee = MSVAULT_REGISTERING_FEE;
+ output.releaseFee = MSVAULT_RELEASE_FEE;
+ output.releaseResetFee = MSVAULT_RELEASE_RESET_FEE;
+ output.holdingFee = MSVAULT_HOLDING_FEE;
+ output.depositFee = 0ULL;
+ // [TODO]: Change this to:
+ //output.registeringFee = state.liveRegisteringFee;
+ //output.releaseFee = state.liveReleaseFee;
+ //output.releaseResetFee = state.liveReleaseResetFee;
+ //output.holdingFee = state.liveHoldingFee;
+ //output.depositFee = state.liveDepositFee;
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //output.burnFee = state.liveBurnFee;
+ }
+
+ PUBLIC_FUNCTION_WITH_LOCALS(getVaultOwners)
+ {
+ output.status = 0ULL;
+ output.numberOfOwners = 0;
+
+ locals.iv_in.vaultId = input.vaultId;
+ isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
+ if (!locals.iv_out.result)
+ {
+ return;
+ }
+
+ locals.v = state.vaults.get(input.vaultId);
+
+ if (!locals.v.isActive)
+ {
+ return;
+ }
+
+ output.numberOfOwners = (uint64)locals.v.numberOfOwners;
+
+ for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
+ {
+ output.owners.set(locals.i, locals.v.owners.get(locals.i));
+ }
+
+ output.requiredApprovals = (uint64)locals.v.requiredApprovals;
+
+ output.status = 1ULL;
+ }
+
+ // [TODO]: Uncomment this to enable live fee update
+ PUBLIC_FUNCTION_WITH_LOCALS(isShareHolder)
+ {
+ // if (qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), input.candidate, input.candidate, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX) > 0)
+ // {
+ // output.result = 1ULL;
+ // }
+ // else
+ // {
+ // output.result = 0ULL;
+ // }
+ }
+
+ INITIALIZE()
+ {
+ state.numberOfActiveVaults = 0ULL;
+ state.totalRevenue = 0ULL;
+ state.totalDistributedToShareholders = 0ULL;
+ state.burnedAmount = 0ULL;
+ state.liveBurnFee = MSVAULT_BURN_FEE;
+ state.liveRegisteringFee = MSVAULT_REGISTERING_FEE;
+ state.liveReleaseFee = MSVAULT_RELEASE_FEE;
+ state.liveReleaseResetFee = MSVAULT_RELEASE_RESET_FEE;
+ state.liveHoldingFee = MSVAULT_HOLDING_FEE;
+ state.liveDepositFee = 0ULL;
+ }
+
+ END_EPOCH_WITH_LOCALS()
+ {
+ for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
+ {
+ locals.v = state.vaults.get(locals.i);
+ if (locals.v.isActive)
+ {
+ // [TODO]: Change this to
+ //if (locals.v.balance >= state.liveHoldingFee)
+ //{
+ // locals.v.balance -= state.liveHoldingFee;
+ // state.totalRevenue += state.liveHoldingFee;
+ // state.vaults.set(locals.i, locals.v);
+ //}
+ if (locals.v.balance >= MSVAULT_HOLDING_FEE)
+ {
+ locals.v.balance -= MSVAULT_HOLDING_FEE;
+ state.totalRevenue += MSVAULT_HOLDING_FEE;
+ state.vaults.set(locals.i, locals.v);
+ }
+ else
+ {
+ // Not enough funds to pay holding fee
+ if (locals.v.balance > 0)
+ {
+ state.totalRevenue += locals.v.balance;
+ }
+ locals.v.isActive = false;
+ locals.v.balance = 0;
+ locals.v.requiredApprovals = 0;
+ locals.v.vaultName = NULL_ID;
+ locals.v.numberOfOwners = 0;
+ for (locals.j = 0; locals.j < MSVAULT_MAX_OWNERS; locals.j++)
+ {
+ locals.v.owners.set(locals.j, NULL_ID);
+ locals.v.releaseAmounts.set(locals.j, 0);
+ locals.v.releaseDestinations.set(locals.j, NULL_ID);
+ }
+ if (state.numberOfActiveVaults > 0)
+ {
+ state.numberOfActiveVaults--;
+ }
+ state.vaults.set(locals.i, locals.v);
+ }
+ }
+ }
+
+ {
+ locals.amountToDistribute = QPI::div(state.totalRevenue - state.totalDistributedToShareholders, NUMBER_OF_COMPUTORS);
+
+ // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
+ //// Burn fee
+ //locals.feeToBurn = QPI::div(locals.amountToDistribute * state.liveBurnFee, 100ULL);
+ //if (locals.feeToBurn > 0)
+ //{
+ // qpi.burn(locals.feeToBurn);
+ //}
+ //locals.amountToDistribute -= locals.feeToBurn;
+ //state.burnedAmount += locals.feeToBurn;
+
+ if (locals.amountToDistribute > 0 && state.totalRevenue > state.totalDistributedToShareholders)
+ {
+ if (qpi.distributeDividends(locals.amountToDistribute))
+ {
+ state.totalDistributedToShareholders += locals.amountToDistribute * NUMBER_OF_COMPUTORS;
+ }
+ }
+ }
+ }
+
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ REGISTER_USER_PROCEDURE(registerVault, 1);
+ REGISTER_USER_PROCEDURE(deposit, 2);
+ REGISTER_USER_PROCEDURE(releaseTo, 3);
+ REGISTER_USER_PROCEDURE(resetRelease, 4);
+ REGISTER_USER_FUNCTION(getVaults, 5);
+ REGISTER_USER_FUNCTION(getReleaseStatus, 6);
+ REGISTER_USER_FUNCTION(getBalanceOf, 7);
+ REGISTER_USER_FUNCTION(getVaultName, 8);
+ REGISTER_USER_FUNCTION(getRevenueInfo, 9);
+ REGISTER_USER_FUNCTION(getFees, 10);
+ REGISTER_USER_FUNCTION(getVaultOwners, 11);
+ REGISTER_USER_FUNCTION(isShareHolder, 12);
+ REGISTER_USER_PROCEDURE(voteFeeChange, 13);
+ }
+};
diff --git a/src/qubic.cpp b/src/qubic.cpp
index ef789fd95..9fd54bd32 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,5 +1,7 @@
#define SINGLE_COMPILE_UNIT
+// #define MSVAULT_V1
+
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From efd29c7b4629560dec0b918eaccf73c24594673f Mon Sep 17 00:00:00 2001
From: N-010
Date: Mon, 29 Sep 2025 14:51:46 +0300
Subject: [PATCH 111/297] Random Lottery (#552)
* Adds Random Lottery
* Adds RL to contract_def.h
* Adds contract_rl to project files
* Adds RandomLottery to vcxproj files.Refactoring contract_rl
---------
Co-authored-by: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
---
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contract_core/contract_def.h | 12 +
src/contracts/RandomLottery.h | 528 +++++++++++++++++++++++++++++++
test/contract_rl.cpp | 367 +++++++++++++++++++++
test/test.vcxproj | 1 +
test/test.vcxproj.filters | 1 +
7 files changed, 913 insertions(+)
create mode 100644 src/contracts/RandomLottery.h
create mode 100644 test/contract_rl.cpp
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 118861cc4..bc6bf3c0f 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -26,6 +26,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 891354cdf..e7d357bc3 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -276,6 +276,9 @@
contracts
+
+ contracts
+
contracts
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 9b86a73f6..71466c20b 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -218,6 +218,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QDRAW2
#include "contracts/Qdraw.h"
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define RL_CONTRACT_INDEX 16
+#define CONTRACT_INDEX RL_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE RL
+#define CONTRACT_STATE2_TYPE RL2
+#include "contracts/RandomLottery.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -316,6 +326,7 @@ constexpr struct ContractDescription
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
+ {"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -420,6 +431,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/RandomLottery.h b/src/contracts/RandomLottery.h
new file mode 100644
index 000000000..402f076f1
--- /dev/null
+++ b/src/contracts/RandomLottery.h
@@ -0,0 +1,528 @@
+/**
+ * @file RandomLottery.h
+ * @brief Random Lottery contract definition: state, data structures, and user / internal
+ * procedures.
+ *
+ * This header declares the RL (Random Lottery) contract which:
+ * - Sells tickets during a SELLING epoch.
+ * - Draws a pseudo-random winner when the epoch ends.
+ * - Distributes fees (team, distribution, burn, winner).
+ * - Records winners' history in a ring-like buffer.
+ */
+
+using namespace QPI;
+
+/// Maximum number of players allowed in the lottery.
+constexpr uint16 RL_MAX_NUMBER_OF_PLAYERS = 1024;
+
+/// Maximum number of winners kept in the on-chain winners history buffer.
+constexpr uint16 RL_MAX_NUMBER_OF_WINNERS_IN_HISTORY = 1024;
+
+/**
+ * @brief Developer address for the RandomLottery contract.
+ *
+ * IMPORTANT:
+ * The macro ID and the individual token macros (_Z, _T, _Q, etc.) must be available.
+ * If clang reports 'ID' undeclared here, include the QPI identity / address utilities first.
+ */
+static const id RL_DEV_ADDRESS = ID(_Z, _T, _Z, _E, _A, _Q, _G, _U, _P, _I, _K, _T, _X, _F, _Y, _X, _Y, _E, _I, _T, _L, _A, _K, _F, _T, _D, _X, _C,
+ _R, _L, _W, _E, _T, _H, _N, _G, _H, _D, _Y, _U, _W, _E, _Y, _Q, _N, _Q, _S, _R, _H, _O, _W, _M, _U, _J, _L, _E);
+/// Owner address (currently identical to developer address; can be split in future revisions).
+static const id RL_OWNER_ADDRESS = RL_DEV_ADDRESS;
+
+/// Placeholder structure for future extensions.
+struct RL2
+{
+};
+
+/**
+ * @brief Main contract class implementing the random lottery mechanics.
+ *
+ * Lifecycle:
+ * 1. INITIALIZE sets defaults (fees, ticket price, state LOCKED).
+ * 2. BEGIN_EPOCH opens ticket selling (SELLING).
+ * 3. Users call BuyTicket while SELLING.
+ * 4. END_EPOCH closes, computes fees, selects winner, distributes, burns rest.
+ * 5. Players list is cleared for next epoch.
+ */
+struct RL : public ContractBase
+{
+public:
+ /**
+ * @brief High-level finite state of the lottery.
+ * SELLING: tickets can be purchased.
+ * LOCKED: purchases closed; waiting for epoch transition.
+ */
+ enum class EState : uint8
+ {
+ SELLING,
+ LOCKED
+ };
+
+ /**
+ * @brief Standardized return / error codes for procedures.
+ */
+ enum class EReturnCode : uint8
+ {
+ SUCCESS = 0,
+ // Ticket-related errors
+ TICKET_INVALID_PRICE = 1,
+ TICKET_ALREADY_PURCHASED = 2,
+ TICKET_ALL_SOLD_OUT = 3,
+ TICKET_SELLING_CLOSED = 4,
+ // Access-related errors
+ ACCESS_DENIED = 5,
+ // Fee-related errors
+ FEE_INVALID_PERCENT_VALUE = 6,
+ // Fallback
+ UNKNOW_ERROR = UINT8_MAX
+ };
+
+ //---- User-facing I/O structures -------------------------------------------------------------
+
+ struct BuyTicket_input
+ {
+ };
+
+ struct BuyTicket_output
+ {
+ uint8 returnCode = static_cast(EReturnCode::SUCCESS);
+ };
+
+ struct GetFees_input
+ {
+ };
+
+ struct GetFees_output
+ {
+ uint8 teamFeePercent = 0;
+ uint8 distributionFeePercent = 0;
+ uint8 winnerFeePercent = 0;
+ uint8 burnPercent = 0;
+ uint8 returnCode = static_cast(EReturnCode::SUCCESS);
+ };
+
+ struct GetPlayers_input
+ {
+ };
+
+ struct GetPlayers_output
+ {
+ Array players;
+ uint16 numberOfPlayers = 0;
+ uint8 returnCode = static_cast(EReturnCode::SUCCESS);
+ };
+
+ struct GetPlayers_locals
+ {
+ uint64 arrayIndex = 0;
+ sint32 i = 0;
+ };
+
+ /**
+ * @brief Stored winner snapshot for an epoch.
+ */
+ struct WinnerInfo
+ {
+ id winnerAddress = id::zero();
+ uint64 revenue = 0;
+ uint16 epoch = 0;
+ uint32 tick = 0;
+ };
+
+ struct FillWinnersInfo_input
+ {
+ id winnerAddress = id::zero();
+ uint64 revenue = 0;
+ };
+
+ struct FillWinnersInfo_output
+ {
+ };
+
+ struct FillWinnersInfo_locals
+ {
+ WinnerInfo winnerInfo = {};
+ };
+
+ struct GetWinner_input
+ {
+ };
+
+ struct GetWinner_output
+ {
+ id winnerAddress = id::zero();
+ uint64 index = 0;
+ };
+
+ struct GetWinner_locals
+ {
+ uint64 randomNum = 0;
+ sint32 i = 0;
+ sint32 j = 0;
+ };
+
+ struct GetWinners_input
+ {
+ };
+
+ struct GetWinners_output
+ {
+ Array winners;
+ uint64 numberOfWinners = 0;
+ uint8 returnCode = static_cast(EReturnCode::SUCCESS);
+ };
+
+ struct ReturnAllTickets_input
+ {
+ };
+ struct ReturnAllTickets_output
+ {
+ };
+
+ struct ReturnAllTickets_locals
+ {
+ sint32 i = 0;
+ };
+
+ struct END_EPOCH_locals
+ {
+ GetWinner_input getWinnerInput = {};
+ GetWinner_output getWinnerOutput = {};
+ GetWinner_locals getWinnerLocals = {};
+
+ FillWinnersInfo_input fillWinnersInfoInput = {};
+ FillWinnersInfo_output fillWinnersInfoOutput = {};
+ FillWinnersInfo_locals fillWinnersInfoLocals = {};
+
+ ReturnAllTickets_input returnAllTicketsInput = {};
+ ReturnAllTickets_output returnAllTicketsOutput = {};
+ ReturnAllTickets_locals returnAllTicketsLocals = {};
+
+ uint64 teamFee = 0;
+ uint64 distributionFee = 0;
+ uint64 winnerAmount = 0;
+ uint64 burnedAmount = 0;
+
+ uint64 revenue = 0;
+ Entity entity = {};
+
+ sint32 i = 0;
+ };
+
+public:
+ /**
+ * @brief Registers all externally callable functions and procedures with their numeric
+ * identifiers. Mapping numbers must remain stable to preserve external interface compatibility.
+ */
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ REGISTER_USER_FUNCTION(GetFees, 1);
+ REGISTER_USER_FUNCTION(GetPlayers, 2);
+ REGISTER_USER_FUNCTION(GetWinners, 3);
+ REGISTER_USER_PROCEDURE(BuyTicket, 1);
+ }
+
+ /**
+ * @brief Contract initialization hook.
+ * Sets default fees, ticket price, addresses, and locks the lottery (no selling yet).
+ */
+ INITIALIZE()
+ {
+ // Addresses
+ state.teamAddress = RL_DEV_ADDRESS;
+ state.ownerAddress = RL_OWNER_ADDRESS;
+
+ // Default fee percentages (sum <= 100; winner percent derived)
+ state.teamFeePercent = 10;
+ state.distributionFeePercent = 20;
+ state.burnPercent = 2;
+ state.winnerFeePercent = 100 - state.teamFeePercent - state.distributionFeePercent - state.burnPercent;
+
+ // Default ticket price
+ state.ticketPrice = 1000000;
+
+ // Start locked
+ state.currentState = EState::LOCKED;
+ }
+
+ /**
+ * @brief Opens ticket selling for a new epoch.
+ */
+ BEGIN_EPOCH() { state.currentState = EState::SELLING; }
+
+ /**
+ * @brief Closes epoch: computes revenue, selects winner (if >1 player),
+ * distributes fees, burns leftover, records winner, then clears players.
+ */
+ END_EPOCH_WITH_LOCALS()
+ {
+ state.currentState = EState::LOCKED;
+
+ // Single-player edge case: refund instead of drawing.
+ if (state.players.population() == 1)
+ {
+ ReturnAllTickets(qpi, state, locals.returnAllTicketsInput, locals.returnAllTicketsOutput, locals.returnAllTicketsLocals);
+ }
+ else if (state.players.population() > 1)
+ {
+ qpi.getEntity(SELF, locals.entity);
+ locals.revenue = locals.entity.incomingAmount - locals.entity.outgoingAmount;
+
+ // Winner selection (pseudo-random).
+ GetWinner(qpi, state, locals.getWinnerInput, locals.getWinnerOutput, locals.getWinnerLocals);
+
+ if (locals.getWinnerOutput.winnerAddress != id::zero())
+ {
+ // Fee splits
+ locals.winnerAmount = div(locals.revenue * state.winnerFeePercent, 100ULL);
+ locals.teamFee = div(locals.revenue * state.teamFeePercent, 100ULL);
+ locals.distributionFee = div(locals.revenue * state.distributionFeePercent, 100ULL);
+ locals.burnedAmount = div(locals.revenue * state.burnPercent, 100ULL);
+
+ // Team fee
+ if (locals.teamFee > 0)
+ {
+ qpi.transfer(state.teamAddress, locals.teamFee);
+ }
+
+ // Distribution fee
+ if (locals.distributionFee > 0)
+ {
+ qpi.distributeDividends(div(locals.distributionFee, uint64(NUMBER_OF_COMPUTORS)));
+ }
+
+ // Winner payout
+ if (locals.winnerAmount > 0)
+ {
+ qpi.transfer(locals.getWinnerOutput.winnerAddress, locals.winnerAmount);
+ }
+
+ // Burn remainder
+ if (locals.burnedAmount > 0)
+ {
+ qpi.burn(locals.burnedAmount);
+ }
+
+ // Persist winner record
+ locals.fillWinnersInfoInput.winnerAddress = locals.getWinnerOutput.winnerAddress;
+ locals.fillWinnersInfoInput.revenue = locals.winnerAmount;
+ FillWinnersInfo(qpi, state, locals.fillWinnersInfoInput, locals.fillWinnersInfoOutput, locals.fillWinnersInfoLocals);
+ }
+ else
+ {
+ // Return funds to players if no winner could be selected (should be impossible).
+ ReturnAllTickets(qpi, state, locals.returnAllTicketsInput, locals.returnAllTicketsOutput, locals.returnAllTicketsLocals);
+ }
+ }
+
+ // Prepare for next epoch.
+ state.players.reset();
+ }
+
+ /**
+ * @brief Returns currently configured fee percentages.
+ */
+ PUBLIC_FUNCTION(GetFees)
+ {
+ output.teamFeePercent = state.teamFeePercent;
+ output.distributionFeePercent = state.distributionFeePercent;
+ output.winnerFeePercent = state.winnerFeePercent;
+ output.burnPercent = state.burnPercent;
+ }
+
+ /**
+ * @brief Retrieves the active players list for the ongoing epoch.
+ */
+ PUBLIC_FUNCTION_WITH_LOCALS(GetPlayers)
+ {
+ locals.arrayIndex = 0;
+
+ locals.i = state.players.nextElementIndex(NULL_INDEX);
+ while (locals.i != NULL_INDEX)
+ {
+ output.players.set(locals.arrayIndex++, state.players.key(locals.i));
+ locals.i = state.players.nextElementIndex(locals.i);
+ };
+
+ output.numberOfPlayers = locals.arrayIndex;
+ }
+
+ /**
+ * @brief Returns historical winners (ring buffer segment).
+ */
+ PUBLIC_FUNCTION(GetWinners)
+ {
+ output.winners = state.winners;
+ output.numberOfWinners = state.winnersInfoNextEmptyIndex;
+ }
+
+ /**
+ * @brief Attempts to buy a ticket (must send exact price unless zero is forbidden; state must
+ * be SELLING). Reverts with proper return codes for invalid cases.
+ */
+ PUBLIC_PROCEDURE(BuyTicket)
+ {
+ // Selling closed
+ if (state.currentState == EState::LOCKED)
+ {
+ output.returnCode = static_cast(EReturnCode::TICKET_SELLING_CLOSED);
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ return;
+ }
+
+ // Already purchased
+ if (state.players.contains(qpi.invocator()))
+ {
+ output.returnCode = static_cast(EReturnCode::TICKET_ALREADY_PURCHASED);
+ return;
+ }
+
+ // Capacity full
+ if (state.players.add(qpi.invocator()) == NULL_INDEX)
+ {
+ output.returnCode = static_cast(EReturnCode::TICKET_ALL_SOLD_OUT);
+ return;
+ }
+
+ // Price mismatch
+ if (qpi.invocationReward() != state.ticketPrice && qpi.invocationReward() > 0)
+ {
+ output.returnCode = static_cast(EReturnCode::TICKET_INVALID_PRICE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ state.players.remove(qpi.invocator());
+
+ state.players.cleanupIfNeeded(80);
+ return;
+ }
+ }
+
+private:
+ /**
+ * @brief Internal: records a winner into the cyclic winners array.
+ */
+ PRIVATE_PROCEDURE_WITH_LOCALS(FillWinnersInfo)
+ {
+ if (input.winnerAddress == id::zero())
+ {
+ return;
+ }
+ if (RL_MAX_NUMBER_OF_WINNERS_IN_HISTORY >= state.winners.capacity() - 1)
+ {
+ state.winnersInfoNextEmptyIndex = 0;
+ }
+ locals.winnerInfo.winnerAddress = input.winnerAddress;
+ locals.winnerInfo.revenue = input.revenue;
+ locals.winnerInfo.epoch = qpi.epoch();
+ locals.winnerInfo.tick = qpi.tick();
+ state.winners.set(state.winnersInfoNextEmptyIndex++, locals.winnerInfo);
+ }
+
+ /**
+ * @brief Internal: pseudo-random selection of a winner index using hardware RNG.
+ */
+ PRIVATE_PROCEDURE_WITH_LOCALS(GetWinner)
+ {
+ if (state.players.population() == 0)
+ {
+ return;
+ }
+
+ locals.randomNum = mod(qpi.K12(qpi.getPrevSpectrumDigest()).u64._0, state.players.population());
+
+ locals.j = 0;
+ locals.i = state.players.nextElementIndex(NULL_INDEX);
+ while (locals.i != NULL_INDEX)
+ {
+ if (locals.j++ == locals.randomNum)
+ {
+ output.winnerAddress = state.players.key(locals.i);
+ output.index = locals.i;
+ break;
+ }
+
+ locals.i = state.players.nextElementIndex(locals.i);
+ };
+ }
+
+ PRIVATE_PROCEDURE_WITH_LOCALS(ReturnAllTickets)
+ {
+ locals.i = state.players.nextElementIndex(NULL_INDEX);
+ while (locals.i != NULL_INDEX)
+ {
+ qpi.transfer(state.players.key(locals.i), state.ticketPrice);
+
+ locals.i = state.players.nextElementIndex(locals.i);
+ };
+ }
+
+protected:
+ /**
+ * @brief Address of the team managing the lottery contract.
+ * Initialized to a zero address.
+ */
+ id teamAddress = id::zero();
+
+ /**
+ * @brief Address of the owner of the lottery contract.
+ * Initialized to a zero address.
+ */
+ id ownerAddress = id::zero();
+
+ /**
+ * @brief Percentage of the revenue allocated to the team.
+ * Value is between 0 and 100.
+ */
+ uint8 teamFeePercent = 0;
+
+ /**
+ * @brief Percentage of the revenue allocated for distribution.
+ * Value is between 0 and 100.
+ */
+ uint8 distributionFeePercent = 0;
+
+ /**
+ * @brief Percentage of the revenue allocated to the winner.
+ * Automatically calculated as the remainder after other fees.
+ */
+ uint8 winnerFeePercent = 0;
+
+ /**
+ * @brief Percentage of the revenue to be burned.
+ * Value is between 0 and 100.
+ */
+ uint8 burnPercent = 0;
+
+ /**
+ * @brief Price of a single lottery ticket.
+ * Value is in the smallest currency unit (e.g., cents).
+ */
+ uint64 ticketPrice = 0;
+
+ /**
+ * @brief Set of players participating in the current lottery epoch.
+ * Maximum capacity is defined by RL_MAX_NUMBER_OF_PLAYERS.
+ */
+ HashSet players = {};
+
+ /**
+ * @brief Circular buffer storing the history of winners.
+ * Maximum capacity is defined by RL_MAX_NUMBER_OF_WINNERS_IN_HISTORY.
+ */
+ Array winners = {};
+
+ /**
+ * @brief Index pointing to the next empty slot in the winners array.
+ * Used for maintaining the circular buffer of winners.
+ */
+ uint64 winnersInfoNextEmptyIndex = 0;
+
+ /**
+ * @brief Current state of the lottery contract.
+ * Can be either SELLING (tickets available) or LOCKED (epoch closed).
+ */
+ EState currentState = EState::LOCKED;
+};
diff --git a/test/contract_rl.cpp b/test/contract_rl.cpp
new file mode 100644
index 000000000..319081acc
--- /dev/null
+++ b/test/contract_rl.cpp
@@ -0,0 +1,367 @@
+// File: test/contract_rl.cpp
+#define NO_UEFI
+
+#include "contract_testing.h"
+
+constexpr uint16 PROCEDURE_INDEX_BUY_TICKET = 1;
+constexpr uint16 FUNCTION_INDEX_GET_FEES = 1;
+constexpr uint16 FUNCTION_INDEX_GET_PLAYERS = 2;
+constexpr uint16 FUNCTION_INDEX_GET_WINNERS = 3;
+
+// Equality operator for comparing WinnerInfo objects
+bool operator==(const RL::WinnerInfo& left, const RL::WinnerInfo& right)
+{
+ return left.winnerAddress == right.winnerAddress && left.revenue == right.revenue && left.epoch == right.epoch && left.tick == right.tick;
+}
+
+// Test helper that exposes internal state assertions
+class RLChecker : public RL
+{
+public:
+ void checkTicketPrice(const uint64& price) { EXPECT_EQ(ticketPrice, price); }
+
+ void checkFees(const GetFees_output& fees)
+ {
+ EXPECT_EQ(fees.returnCode, static_cast(EReturnCode::SUCCESS));
+
+ EXPECT_EQ(fees.distributionFeePercent, distributionFeePercent);
+ EXPECT_EQ(fees.teamFeePercent, teamFeePercent);
+ EXPECT_EQ(fees.winnerFeePercent, winnerFeePercent);
+ EXPECT_EQ(fees.burnPercent, burnPercent);
+ }
+
+ void checkPlayers(const GetPlayers_output& output) const
+ {
+ EXPECT_EQ(output.returnCode, static_cast(EReturnCode::SUCCESS));
+ EXPECT_EQ(output.players.capacity(), players.capacity());
+ EXPECT_EQ(static_cast(output.numberOfPlayers), players.population());
+
+ for (uint64 i = 0, playerArrayIndex = 0; i < players.capacity(); ++i)
+ {
+ if (!players.isEmptySlot(i))
+ {
+ EXPECT_EQ(output.players.get(playerArrayIndex++), players.key(i));
+ }
+ }
+ }
+
+ void checkWinners(const GetWinners_output& output) const
+ {
+ EXPECT_EQ(output.returnCode, static_cast(EReturnCode::SUCCESS));
+ EXPECT_EQ(output.winners.capacity(), winners.capacity());
+ EXPECT_EQ(output.numberOfWinners, winnersInfoNextEmptyIndex);
+
+ for (uint64 i = 0; i < output.numberOfWinners; ++i)
+ {
+ EXPECT_EQ(output.winners.get(i), winners.get(i));
+ }
+ }
+
+ void randomlyAddPlayers(uint64 maxNewPlayers)
+ {
+ const uint64 newPlayerCount = mod(maxNewPlayers, players.capacity());
+ for (uint64 i = 0; i < newPlayerCount; ++i)
+ {
+ players.add(id::randomValue());
+ }
+ }
+
+ void randomlyAddWinners(uint64 maxNewWinners)
+ {
+ const uint64 newWinnerCount = mod(maxNewWinners, winners.capacity());
+
+ winnersInfoNextEmptyIndex = 0;
+ WinnerInfo wi;
+
+ for (uint64 i = 0; i < newWinnerCount; ++i)
+ {
+ wi.epoch = 1;
+ wi.tick = 1;
+ wi.revenue = 1000000;
+ wi.winnerAddress = id::randomValue();
+ winners.set(winnersInfoNextEmptyIndex++, wi);
+ }
+ }
+
+ void setSelling() { currentState = EState::SELLING; }
+
+ void setLocked() { currentState = EState::LOCKED; }
+
+ uint64 playersPopulation() const { return players.population(); }
+
+ uint64 getTicketPrice() const { return ticketPrice; }
+};
+
+class ContractTestingRL : protected ContractTesting
+{
+public:
+ ContractTestingRL()
+ {
+ initEmptySpectrum();
+ initEmptyUniverse();
+ INIT_CONTRACT(RL);
+ callSystemProcedure(RL_CONTRACT_INDEX, INITIALIZE);
+ }
+
+ RLChecker* getState() { return reinterpret_cast(contractStates[RL_CONTRACT_INDEX]); }
+
+ RL::GetFees_output getFees()
+ {
+ RL::GetFees_input input;
+ RL::GetFees_output output;
+
+ callFunction(RL_CONTRACT_INDEX, FUNCTION_INDEX_GET_FEES, input, output);
+ return output;
+ }
+
+ RL::GetPlayers_output getPlayers()
+ {
+ RL::GetPlayers_input input;
+ RL::GetPlayers_output output;
+
+ callFunction(RL_CONTRACT_INDEX, FUNCTION_INDEX_GET_PLAYERS, input, output);
+ return output;
+ }
+
+ RL::GetWinners_output getWinners()
+ {
+ RL::GetWinners_input input;
+ RL::GetWinners_output output;
+
+ callFunction(RL_CONTRACT_INDEX, FUNCTION_INDEX_GET_WINNERS, input, output);
+ return output;
+ }
+
+ RL::BuyTicket_output buyTicket(const id& user, uint64 reward)
+ {
+ RL::BuyTicket_input input;
+ RL::BuyTicket_output output;
+ invokeUserProcedure(RL_CONTRACT_INDEX, PROCEDURE_INDEX_BUY_TICKET, input, output, user, reward);
+ return output;
+ }
+
+ void BeginEpoch() { callSystemProcedure(RL_CONTRACT_INDEX, BEGIN_EPOCH); }
+
+ void EndEpoch() { callSystemProcedure(RL_CONTRACT_INDEX, END_EPOCH); }
+};
+
+TEST(ContractRandomLottery, GetFees)
+{
+ ContractTestingRL ctl;
+ RL::GetFees_output output = ctl.getFees();
+ ctl.getState()->checkFees(output);
+}
+
+TEST(ContractRandomLottery, GetPlayers)
+{
+ ContractTestingRL ctl;
+
+ // Initially empty
+ RL::GetPlayers_output output = ctl.getPlayers();
+ ctl.getState()->checkPlayers(output);
+
+ // Add random players directly to state (test helper)
+ constexpr uint64 maxPlayersToAdd = 10;
+ ctl.getState()->randomlyAddPlayers(maxPlayersToAdd);
+ output = ctl.getPlayers();
+ ctl.getState()->checkPlayers(output);
+}
+
+TEST(ContractRandomLottery, GetWinners)
+{
+ ContractTestingRL ctl;
+
+ // Populate winners history artificially
+ constexpr uint64 maxNewWinners = 10;
+ ctl.getState()->randomlyAddWinners(maxNewWinners);
+ RL::GetWinners_output winnersOutput = ctl.getWinners();
+ ctl.getState()->checkWinners(winnersOutput);
+}
+
+TEST(ContractRandomLottery, BuyTicket)
+{
+ ContractTestingRL ctl;
+
+ const uint64 ticketPrice = ctl.getState()->getTicketPrice();
+
+ // 1. Attempt when state is LOCKED (should fail and refund invocation reward)
+ {
+ const id userLocked = id::randomValue();
+ increaseEnergy(userLocked, ticketPrice * 2);
+ RL::BuyTicket_output out = ctl.buyTicket(userLocked, ticketPrice);
+ EXPECT_EQ(out.returnCode, static_cast(RL::EReturnCode::TICKET_SELLING_CLOSED));
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 0);
+ }
+
+ // Switch to SELLING to allow purchases
+ ctl.getState()->setSelling();
+
+ // 2. Loop over several users and test invalid price, success, duplicate
+ constexpr uint64 userCount = 5;
+ uint64 expectedPlayers = 0;
+
+ for (uint64 i = 0; i < userCount; ++i)
+ {
+ const id user = id::randomValue();
+ increaseEnergy(user, ticketPrice * 5);
+
+ // (a) Invalid price (wrong reward sent) — player not added
+ {
+ const RL::BuyTicket_output outInvalid = ctl.buyTicket(user, ticketPrice - 1);
+ EXPECT_EQ(outInvalid.returnCode, static_cast(RL::EReturnCode::TICKET_INVALID_PRICE));
+ EXPECT_EQ(ctl.getState()->playersPopulation(), expectedPlayers);
+ }
+
+ // (b) Valid purchase — player added
+ {
+ const RL::BuyTicket_output outOk = ctl.buyTicket(user, ticketPrice);
+ EXPECT_EQ(outOk.returnCode, static_cast(RL::EReturnCode::SUCCESS));
+ ++expectedPlayers;
+ EXPECT_EQ(ctl.getState()->playersPopulation(), expectedPlayers);
+ }
+
+ // (c) Duplicate purchase — rejected
+ {
+ const RL::BuyTicket_output outDup = ctl.buyTicket(user, ticketPrice);
+ EXPECT_EQ(outDup.returnCode, static_cast(RL::EReturnCode::TICKET_ALREADY_PURCHASED));
+ EXPECT_EQ(ctl.getState()->playersPopulation(), expectedPlayers);
+ }
+ }
+
+ // 3. Sanity check: number of unique players matches expectations
+ EXPECT_EQ(expectedPlayers, userCount);
+}
+
+TEST(ContractRandomLottery, EndEpoch)
+{
+ ContractTestingRL ctl;
+
+ // Helper: contract balance holder (SELF account)
+ const id contractAddress = id(RL_CONTRACT_INDEX, 0, 0, 0);
+ const uint64 ticketPrice = ctl.getState()->getTicketPrice();
+
+ // Current fee configuration (set in INITIALIZE)
+ const RL::GetFees_output fees = ctl.getFees();
+ const uint8 teamPercent = fees.teamFeePercent; // Team commission percent
+ const uint8 distributionPercent = fees.distributionFeePercent; // Distribution (dividends) percent
+ const uint8 burnPercent = fees.burnPercent; // Burn percent
+ const uint8 winnerPercent = fees.winnerFeePercent; // Winner payout percent
+
+ // --- Scenario 1: No players (should just lock and clear silently) ---
+ {
+ ctl.BeginEpoch();
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 0u);
+
+ RL::GetWinners_output before = ctl.getWinners();
+ EXPECT_EQ(before.numberOfWinners, 0u);
+
+ ctl.EndEpoch();
+
+ RL::GetWinners_output after = ctl.getWinners();
+ EXPECT_EQ(after.numberOfWinners, 0u);
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 0u);
+ }
+
+ // --- Scenario 2: Exactly one player (ticket refunded, no winner recorded) ---
+ {
+ ctl.BeginEpoch();
+
+ const id solo = id::randomValue();
+ increaseEnergy(solo, ticketPrice);
+ const uint64 balanceBefore = getBalance(solo);
+
+ const RL::BuyTicket_output out = ctl.buyTicket(solo, ticketPrice);
+ EXPECT_EQ(out.returnCode, static_cast(RL::EReturnCode::SUCCESS));
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 1u);
+ EXPECT_EQ(getBalance(solo), balanceBefore - ticketPrice);
+
+ ctl.EndEpoch();
+
+ // Refund happened
+ EXPECT_EQ(getBalance(solo), balanceBefore);
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 0u);
+
+ const RL::GetWinners_output winners = ctl.getWinners();
+ EXPECT_EQ(winners.numberOfWinners, 0u);
+ }
+
+ // --- Scenario 3: Multiple players (winner chosen, fees processed, remainder burned) ---
+ {
+ ctl.BeginEpoch();
+
+ constexpr uint32 N = 5;
+ struct PlayerInfo
+ {
+ id addr;
+ uint64 balanceBefore;
+ uint64 balanceAfterBuy;
+ };
+ std::vector infos;
+ infos.reserve(N);
+
+ // Add N distinct players with valid purchases
+ for (uint32 i = 0; i < N; ++i)
+ {
+ const id randomUser = id::randomValue();
+ increaseEnergy(randomUser, ticketPrice * 2);
+ const uint64 bBefore = getBalance(randomUser);
+ const RL::BuyTicket_output out = ctl.buyTicket(randomUser, ticketPrice);
+ EXPECT_EQ(out.returnCode, static_cast(RL::EReturnCode::SUCCESS));
+ EXPECT_EQ(getBalance(randomUser), bBefore - ticketPrice);
+ infos.push_back({randomUser, bBefore, bBefore - ticketPrice});
+ }
+
+ EXPECT_EQ(ctl.getState()->playersPopulation(), N);
+
+ const uint64 contractBalanceBefore = getBalance(contractAddress);
+ EXPECT_EQ(contractBalanceBefore, ticketPrice * N);
+
+ const uint64 teamBalanceBefore = getBalance(RL_DEV_ADDRESS);
+
+ const RL::GetWinners_output winnersBefore = ctl.getWinners();
+ const uint64 winnersCountBefore = winnersBefore.numberOfWinners;
+
+ ctl.EndEpoch();
+
+ // Players reset after epoch end
+ EXPECT_EQ(ctl.getState()->playersPopulation(), 0u);
+
+ const RL::GetWinners_output winnersAfter = ctl.getWinners();
+ EXPECT_EQ(winnersAfter.numberOfWinners, winnersCountBefore + 1);
+
+ // Newly appended winner info
+ const RL::WinnerInfo wi = winnersAfter.winners.get(winnersCountBefore);
+ EXPECT_NE(wi.winnerAddress, id::zero());
+ EXPECT_EQ(wi.revenue, (ticketPrice * N * winnerPercent) / 100);
+
+ // Winner address must be one of the players
+ bool found = false;
+ for (const PlayerInfo& inf : infos)
+ {
+ if (inf.addr == wi.winnerAddress)
+ {
+ found = true;
+ break;
+ }
+ }
+ EXPECT_TRUE(found);
+
+ // Check winner balance increment and others unchanged
+ for (const PlayerInfo& inf : infos)
+ {
+ const uint64 bal = getBalance(inf.addr);
+ const uint64 balanceAfterBuy = inf.addr == wi.winnerAddress ? inf.balanceAfterBuy + wi.revenue : inf.balanceAfterBuy;
+ EXPECT_EQ(bal, balanceAfterBuy);
+ }
+
+ // Team fee transferred
+ const uint64 teamFeeExpected = (ticketPrice * N * teamPercent) / 100;
+ EXPECT_EQ(getBalance(RL_DEV_ADDRESS), teamBalanceBefore + teamFeeExpected);
+
+ // Burn
+ const uint64 burnExpected = contractBalanceBefore - ((contractBalanceBefore * burnPercent) / 100) -
+ ((((contractBalanceBefore * distributionPercent) / 100) / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS) -
+ ((contractBalanceBefore * teamPercent) / 100) - ((contractBalanceBefore * winnerPercent) / 100);
+ EXPECT_EQ(getBalance(contractAddress), burnExpected);
+ }
+}
diff --git a/test/test.vcxproj b/test/test.vcxproj
index e2d687303..7f87688eb 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -134,6 +134,7 @@
+
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index f3e87e847..569e14ce1 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -27,6 +27,7 @@
+
From f3cd543dd3dbee4b6893ae1f47c1346d41244097 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 14:03:24 +0200
Subject: [PATCH 112/297] add NO_RANDOM_LOTTERY toggle
---
src/contract_core/contract_def.h | 10 +++++++++-
src/qubic.cpp | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 71466c20b..726ce6779 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -218,16 +218,20 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QDRAW2
#include "contracts/Qdraw.h"
+#ifndef NO_RANDOM_LOTTERY
+
+constexpr unsigned short RL_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
-#define RL_CONTRACT_INDEX 16
#define CONTRACT_INDEX RL_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE RL
#define CONTRACT_STATE2_TYPE RL2
#include "contracts/RandomLottery.h"
+#endif
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -326,7 +330,9 @@ constexpr struct ContractDescription
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
+#ifndef NO_RANDOM_LOTTERY
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -431,7 +437,9 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
+#ifndef NO_RANDOM_LOTTERY
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 9fd54bd32..eb63bb754 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,6 +1,7 @@
#define SINGLE_COMPILE_UNIT
// #define MSVAULT_V1
+// #define NO_RANDOM_LOTTERY
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
From ab457cd179730c8ec05c0aefc9387c42cdaa35b0 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 14:14:18 +0200
Subject: [PATCH 113/297] update params for epoch 181 / v1.262.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index fe854d9f9..43a6208b6 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -61,12 +61,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 261
+#define VERSION_B 262
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 180
-#define TICK 33232000
+#define EPOCH 181
+#define TICK 33750000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From ec062a363e70d4cf59cb0c80447ba8603141ae1c Mon Sep 17 00:00:00 2001
From: baoLuck <91096117+baoLuck@users.noreply.github.com>
Date: Mon, 29 Sep 2025 18:42:37 +0300
Subject: [PATCH 114/297] QBond smart contract (#559)
* QBond sc added
* dev and admin addresses changed
* explicit namespace
* review fixes
* gtests
---------
Co-authored-by: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
---
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contract_core/contract_def.h | 14 +-
src/contracts/QBond.h | 1334 ++++++++++++++++++++++++++++++
test/contract_qbond.cpp | 437 ++++++++++
test/test.vcxproj | 1 +
test/test.vcxproj.filters | 1 +
7 files changed, 1790 insertions(+), 1 deletion(-)
create mode 100644 src/contracts/QBond.h
create mode 100644 test/contract_qbond.cpp
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index bc6bf3c0f..7ffd11251 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -42,6 +42,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index e7d357bc3..50caefccb 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -123,6 +123,9 @@
contracts
+
+ contracts
+
contract_core
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 726ce6779..8d0337b1e 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -232,6 +232,16 @@ constexpr unsigned short RL_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#endif
+constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define CONTRACT_INDEX QBOND_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QBOND
+#define CONTRACT_STATE2_TYPE QBOND2
+#include "contracts/QBond.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -333,6 +343,7 @@ constexpr struct ContractDescription
#ifndef NO_RANDOM_LOTTERY
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
#endif
+ {"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -438,8 +449,9 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
#ifndef NO_RANDOM_LOTTERY
- REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
#endif
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/QBond.h b/src/contracts/QBond.h
new file mode 100644
index 000000000..427c241ce
--- /dev/null
+++ b/src/contracts/QBond.h
@@ -0,0 +1,1334 @@
+using namespace QPI;
+
+constexpr uint64 QBOND_MAX_EPOCH_COUNT = 1024ULL;
+constexpr uint64 QBOND_MBOND_PRICE = 1000000ULL;
+constexpr uint64 QBOND_MAX_QUEUE_SIZE = 10ULL;
+constexpr uint64 QBOND_MIN_MBONDS_TO_STAKE = 10ULL;
+constexpr sint64 QBOND_MBONDS_EMISSION = 1000000000LL;
+constexpr uint16 QBOND_START_EPOCH = 182;
+
+constexpr uint64 QBOND_STAKE_FEE_PERCENT = 50; // 0.5%
+constexpr uint64 QBOND_TRADE_FEE_PERCENT = 3; // 0.03%
+constexpr uint64 QBOND_MBOND_TRANSFER_FEE = 100;
+
+constexpr uint64 QBOND_QVAULT_DISTRIBUTION_PERCENT = 9900; // 99%
+
+struct QBOND2
+{
+};
+
+struct QBOND : public ContractBase
+{
+public:
+ struct StakeEntry
+ {
+ id staker;
+ sint64 amount;
+ };
+
+ struct MBondInfo
+ {
+ uint64 name;
+ sint64 stakersAmount;
+ sint64 totalStaked;
+ };
+
+ struct Stake_input
+ {
+ sint64 quMillions;
+ };
+ struct Stake_output
+ {
+ };
+
+ struct TransferMBondOwnershipAndPossession_input
+ {
+ id newOwnerAndPossessor;
+ sint64 epoch;
+ sint64 numberOfMBonds;
+ };
+ struct TransferMBondOwnershipAndPossession_output
+ {
+ sint64 transferredMBonds;
+ };
+
+ struct AddAskOrder_input
+ {
+ sint64 epoch;
+ sint64 price;
+ sint64 numberOfMBonds;
+ };
+ struct AddAskOrder_output
+ {
+ sint64 addedMBondsAmount;
+ };
+
+ struct RemoveAskOrder_input
+ {
+ sint64 epoch;
+ sint64 price;
+ sint64 numberOfMBonds;
+ };
+ struct RemoveAskOrder_output
+ {
+ sint64 removedMBondsAmount;
+ };
+
+ struct AddBidOrder_input
+ {
+ sint64 epoch;
+ sint64 price;
+ sint64 numberOfMBonds;
+ };
+ struct AddBidOrder_output
+ {
+ sint64 addedMBondsAmount;
+ };
+
+ struct RemoveBidOrder_input
+ {
+ sint64 epoch;
+ sint64 price;
+ sint64 numberOfMBonds;
+ };
+ struct RemoveBidOrder_output
+ {
+ sint64 removedMBondsAmount;
+ };
+
+ struct BurnQU_input
+ {
+ sint64 amount;
+ };
+ struct BurnQU_output
+ {
+ sint64 amount;
+ };
+
+ struct UpdateCFA_input
+ {
+ id user;
+ bit operation; // 0 to remove, 1 to add
+ };
+ struct UpdateCFA_output
+ {
+ bit result;
+ };
+
+ struct GetFees_input
+ {
+ };
+ struct GetFees_output
+ {
+ uint64 stakeFeePercent;
+ uint64 tradeFeePercent;
+ uint64 transferFee;
+ };
+
+ struct GetEarnedFees_input
+ {
+ };
+ struct GetEarnedFees_output
+ {
+ uint64 stakeFees;
+ uint64 tradeFees;
+ };
+
+ struct GetInfoPerEpoch_input
+ {
+ sint64 epoch;
+ };
+ struct GetInfoPerEpoch_output
+ {
+ uint64 stakersAmount;
+ sint64 totalStaked;
+ sint64 apy;
+ };
+
+ struct GetOrders_input
+ {
+ sint64 epoch;
+ sint64 askOrdersOffset;
+ sint64 bidOrdersOffset;
+ };
+ struct GetOrders_output
+ {
+ struct Order
+ {
+ id owner;
+ sint64 epoch;
+ sint64 numberOfMBonds;
+ sint64 price;
+ };
+
+ Array askOrders;
+ Array bidOrders;
+ };
+
+ struct GetUserOrders_input
+ {
+ id owner;
+ sint64 askOrdersOffset;
+ sint64 bidOrdersOffset;
+ };
+ struct GetUserOrders_output
+ {
+ struct Order
+ {
+ id owner;
+ sint64 epoch;
+ sint64 numberOfMBonds;
+ sint64 price;
+ };
+
+ Array askOrders;
+ Array bidOrders;
+ };
+
+ struct GetMBondsTable_input
+ {
+ };
+ struct GetMBondsTable_output
+ {
+ struct TableEntry
+ {
+ sint64 epoch;
+ uint64 apy;
+ };
+ Array info;
+ };
+
+ struct GetUserMBonds_input
+ {
+ id owner;
+ };
+ struct GetUserMBonds_output
+ {
+ sint64 totalMBondsAmount;
+ struct MBondEntity
+ {
+ sint64 epoch;
+ sint64 amount;
+ uint64 apy;
+ };
+ Array mbonds;
+ };
+
+ struct GetCFA_input
+ {
+ };
+ struct GetCFA_output
+ {
+ Array commissionFreeAddresses;
+ };
+
+protected:
+ Array _stakeQueue;
+ HashMap _epochMbondInfoMap;
+ HashMap _userTotalStakedMap;
+ HashSet _commissionFreeAddresses;
+ uint64 _qearnIncomeAmount;
+ uint64 _totalEarnedAmount;
+ uint64 _earnedAmountFromTrade;
+ uint64 _distributedAmount;
+ id _adminAddress;
+ id _devAddress;
+
+ struct _Order
+ {
+ id owner;
+ sint64 epoch;
+ sint64 numberOfMBonds;
+ };
+ Collection<_Order, 1048576> _askOrders;
+ Collection<_Order, 1048576> _bidOrders;
+
+ struct _NumberOfReservedMBonds_input
+ {
+ id owner;
+ sint64 epoch;
+ } _numberOfReservedMBonds_input;
+
+ struct _NumberOfReservedMBonds_output
+ {
+ sint64 amount;
+ } _numberOfReservedMBonds_output;
+
+ struct _NumberOfReservedMBonds_locals
+ {
+ sint64 elementIndex;
+ id mbondIdentity;
+ _Order order;
+ MBondInfo tempMbondInfo;
+ };
+
+ PRIVATE_FUNCTION_WITH_LOCALS(_NumberOfReservedMBonds)
+ {
+ output.amount = 0;
+ if (!state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo))
+ {
+ return;
+ }
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity, 0);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ locals.order = state._askOrders.element(locals.elementIndex);
+ if (locals.order.epoch == input.epoch && locals.order.owner == input.owner)
+ {
+ output.amount += locals.order.numberOfMBonds;
+ }
+
+ locals.elementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ struct Stake_locals
+ {
+ sint64 amountInQueue;
+ sint64 userMBondsAmount;
+ sint64 tempAmount;
+ uint64 counter;
+ sint64 amountToStake;
+ uint64 amountAndFee;
+ StakeEntry tempStakeEntry;
+ MBondInfo tempMbondInfo;
+ QEARN::lock_input lock_input;
+ QEARN::lock_output lock_output;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(Stake)
+ {
+ locals.amountAndFee = sadd(smul((uint64) input.quMillions, QBOND_MBOND_PRICE), div(smul(smul((uint64) input.quMillions, QBOND_MBOND_PRICE), QBOND_STAKE_FEE_PERCENT), 10000ULL));
+
+ if (input.quMillions <= 0
+ || input.quMillions >= MAX_AMOUNT
+ || !state._epochMbondInfoMap.get(qpi.epoch(), locals.tempMbondInfo)
+ || qpi.invocationReward() < 0
+ || (uint64) qpi.invocationReward() < locals.amountAndFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ if ((uint64) qpi.invocationReward() > locals.amountAndFee)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - locals.amountAndFee);
+ }
+
+ if (state._commissionFreeAddresses.getElementIndex(qpi.invocator()) != NULL_INDEX)
+ {
+ qpi.transfer(qpi.invocator(), div(smul((uint64) input.quMillions, QBOND_MBOND_PRICE) * QBOND_STAKE_FEE_PERCENT, 10000ULL));
+ }
+ else
+ {
+ state._totalEarnedAmount += div(smul((uint64) input.quMillions, QBOND_MBOND_PRICE) * QBOND_STAKE_FEE_PERCENT, 10000ULL);
+ }
+
+ locals.amountInQueue = input.quMillions;
+ for (locals.counter = 0; locals.counter < QBOND_MAX_QUEUE_SIZE; locals.counter++)
+ {
+ if (state._stakeQueue.get(locals.counter).staker != NULL_ID)
+ {
+ locals.amountInQueue += state._stakeQueue.get(locals.counter).amount;
+ }
+ else
+ {
+ locals.tempStakeEntry.staker = qpi.invocator();
+ locals.tempStakeEntry.amount = input.quMillions;
+ state._stakeQueue.set(locals.counter, locals.tempStakeEntry);
+ break;
+ }
+ }
+
+ if (locals.amountInQueue < QBOND_MIN_MBONDS_TO_STAKE)
+ {
+ return;
+ }
+
+ locals.tempStakeEntry.staker = NULL_ID;
+ locals.tempStakeEntry.amount = 0;
+ locals.amountToStake = 0;
+ for (locals.counter = 0; locals.counter < QBOND_MAX_QUEUE_SIZE; locals.counter++)
+ {
+ if (state._stakeQueue.get(locals.counter).staker == NULL_ID)
+ {
+ break;
+ }
+
+ if (state._userTotalStakedMap.get(state._stakeQueue.get(locals.counter).staker, locals.userMBondsAmount))
+ {
+ state._userTotalStakedMap.replace(state._stakeQueue.get(locals.counter).staker, locals.userMBondsAmount + state._stakeQueue.get(locals.counter).amount);
+ }
+ else
+ {
+ state._userTotalStakedMap.set(state._stakeQueue.get(locals.counter).staker, state._stakeQueue.get(locals.counter).amount);
+ }
+
+ if (qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, state._stakeQueue.get(locals.counter).staker, state._stakeQueue.get(locals.counter).staker, SELF_INDEX, SELF_INDEX) <= 0)
+ {
+ locals.tempMbondInfo.stakersAmount++;
+ }
+ qpi.transferShareOwnershipAndPossession(locals.tempMbondInfo.name, SELF, SELF, SELF, state._stakeQueue.get(locals.counter).amount, state._stakeQueue.get(locals.counter).staker);
+ locals.amountToStake += state._stakeQueue.get(locals.counter).amount;
+ state._stakeQueue.set(locals.counter, locals.tempStakeEntry);
+ }
+
+ locals.tempMbondInfo.totalStaked += locals.amountToStake;
+ state._epochMbondInfoMap.replace(qpi.epoch(), locals.tempMbondInfo);
+
+ INVOKE_OTHER_CONTRACT_PROCEDURE(QEARN, lock, locals.lock_input, locals.lock_output, locals.amountToStake * QBOND_MBOND_PRICE);
+ }
+
+ struct TransferMBondOwnershipAndPossession_locals
+ {
+ MBondInfo tempMbondInfo;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(TransferMBondOwnershipAndPossession)
+ {
+ if (input.numberOfMBonds >= MAX_AMOUNT || input.numberOfMBonds <= 0 || qpi.invocationReward() < QBOND_MBOND_TRANSFER_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ if (qpi.invocationReward() > QBOND_MBOND_TRANSFER_FEE)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - QBOND_MBOND_TRANSFER_FEE);
+ }
+
+ state._numberOfReservedMBonds_input.epoch = input.epoch;
+ state._numberOfReservedMBonds_input.owner = qpi.invocator();
+ CALL(_NumberOfReservedMBonds, state._numberOfReservedMBonds_input, state._numberOfReservedMBonds_output);
+
+ if (state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo)
+ && qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, qpi.invocator(), qpi.invocator(), SELF_INDEX, SELF_INDEX) - state._numberOfReservedMBonds_output.amount < input.numberOfMBonds)
+ {
+ output.transferredMBonds = 0;
+ qpi.transfer(qpi.invocator(), QBOND_MBOND_TRANSFER_FEE);
+ }
+ else
+ {
+ if (qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, input.newOwnerAndPossessor, input.newOwnerAndPossessor, SELF_INDEX, SELF_INDEX) <= 0)
+ {
+ locals.tempMbondInfo.stakersAmount++;
+ }
+ output.transferredMBonds = qpi.transferShareOwnershipAndPossession(locals.tempMbondInfo.name, SELF, qpi.invocator(), qpi.invocator(), input.numberOfMBonds, input.newOwnerAndPossessor) < 0 ? 0 : input.numberOfMBonds;
+ if (qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, qpi.invocator(), qpi.invocator(), SELF_INDEX, SELF_INDEX) <= 0)
+ {
+ locals.tempMbondInfo.stakersAmount--;
+ }
+ state._epochMbondInfoMap.replace((uint16)input.epoch, locals.tempMbondInfo);
+ if (state._commissionFreeAddresses.getElementIndex(qpi.invocator()) != NULL_INDEX)
+ {
+ qpi.transfer(qpi.invocator(), QBOND_MBOND_TRANSFER_FEE);
+ }
+ else
+ {
+ state._totalEarnedAmount += QBOND_MBOND_TRANSFER_FEE;
+ }
+ }
+ }
+
+ struct AddAskOrder_locals
+ {
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex;
+ sint64 nextElementIndex;
+ sint64 fee;
+ _Order tempAskOrder;
+ _Order tempBidOrder;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(AddAskOrder)
+ {
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+
+ if (input.price <= 0 || input.price >= MAX_AMOUNT || input.numberOfMBonds <= 0 || input.numberOfMBonds >= MAX_AMOUNT || !state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo))
+ {
+ output.addedMBondsAmount = 0;
+ return;
+ }
+
+ state._numberOfReservedMBonds_input.epoch = input.epoch;
+ state._numberOfReservedMBonds_input.owner = qpi.invocator();
+ CALL(_NumberOfReservedMBonds, state._numberOfReservedMBonds_input, state._numberOfReservedMBonds_output);
+ if (qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, qpi.invocator(), qpi.invocator(), SELF_INDEX, SELF_INDEX) - state._numberOfReservedMBonds_output.amount < input.numberOfMBonds)
+ {
+ output.addedMBondsAmount = 0;
+ return;
+ }
+
+ output.addedMBondsAmount = input.numberOfMBonds;
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price > state._bidOrders.priority(locals.elementIndex))
+ {
+ break;
+ }
+
+ locals.nextElementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+
+ locals.tempBidOrder = state._bidOrders.element(locals.elementIndex);
+ if (input.numberOfMBonds <= locals.tempBidOrder.numberOfMBonds)
+ {
+ qpi.transferShareOwnershipAndPossession(
+ locals.tempMbondInfo.name,
+ SELF,
+ qpi.invocator(),
+ qpi.invocator(),
+ input.numberOfMBonds,
+ locals.tempBidOrder.owner);
+
+ locals.fee = div(input.numberOfMBonds * state._bidOrders.priority(locals.elementIndex) * QBOND_TRADE_FEE_PERCENT, 10000ULL);
+ qpi.transfer(qpi.invocator(), input.numberOfMBonds * state._bidOrders.priority(locals.elementIndex) - locals.fee);
+ if (state._commissionFreeAddresses.getElementIndex(qpi.invocator()) != NULL_INDEX)
+ {
+ qpi.transfer(qpi.invocator(), locals.fee);
+ }
+ else
+ {
+ state._totalEarnedAmount += locals.fee;
+ state._earnedAmountFromTrade += locals.fee;
+ }
+
+ if (input.numberOfMBonds < locals.tempBidOrder.numberOfMBonds)
+ {
+ locals.tempBidOrder.numberOfMBonds -= input.numberOfMBonds;
+ state._bidOrders.replace(locals.elementIndex, locals.tempBidOrder);
+ }
+ else if (input.numberOfMBonds == locals.tempBidOrder.numberOfMBonds)
+ {
+ state._bidOrders.remove(locals.elementIndex);
+ }
+ return;
+ }
+ else if (input.numberOfMBonds > locals.tempBidOrder.numberOfMBonds)
+ {
+ qpi.transferShareOwnershipAndPossession(
+ locals.tempMbondInfo.name,
+ SELF,
+ qpi.invocator(),
+ qpi.invocator(),
+ locals.tempBidOrder.numberOfMBonds,
+ locals.tempBidOrder.owner);
+
+ locals.fee = div(locals.tempBidOrder.numberOfMBonds * state._bidOrders.priority(locals.elementIndex) * QBOND_TRADE_FEE_PERCENT, 10000ULL);
+ qpi.transfer(qpi.invocator(), locals.tempBidOrder.numberOfMBonds * state._bidOrders.priority(locals.elementIndex) - locals.fee);
+ if (state._commissionFreeAddresses.getElementIndex(qpi.invocator()) != NULL_INDEX)
+ {
+ qpi.transfer(qpi.invocator(), locals.fee);
+ }
+ else
+ {
+ state._totalEarnedAmount += locals.fee;
+ state._earnedAmountFromTrade += locals.fee;
+ }
+ state._bidOrders.remove(locals.elementIndex);
+ input.numberOfMBonds -= locals.tempBidOrder.numberOfMBonds;
+ }
+
+ locals.elementIndex = locals.nextElementIndex;
+ }
+
+ if (state._askOrders.population(locals.mbondIdentity) == 0)
+ {
+ locals.tempAskOrder.epoch = input.epoch;
+ locals.tempAskOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempAskOrder.owner = qpi.invocator();
+ state._askOrders.add(locals.mbondIdentity, locals.tempAskOrder, -input.price);
+ return;
+ }
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity, 0);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price < -state._askOrders.priority(locals.elementIndex))
+ {
+ locals.tempAskOrder.epoch = input.epoch;
+ locals.tempAskOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempAskOrder.owner = qpi.invocator();
+ state._askOrders.add(locals.mbondIdentity, locals.tempAskOrder, -input.price);
+ break;
+ }
+ else if (input.price == -state._askOrders.priority(locals.elementIndex))
+ {
+ if (state._askOrders.element(locals.elementIndex).owner == qpi.invocator())
+ {
+ locals.tempAskOrder = state._askOrders.element(locals.elementIndex);
+ locals.tempAskOrder.numberOfMBonds += input.numberOfMBonds;
+ state._askOrders.replace(locals.elementIndex, locals.tempAskOrder);
+ break;
+ }
+ }
+
+ if (state._askOrders.nextElementIndex(locals.elementIndex) == NULL_INDEX)
+ {
+ locals.tempAskOrder.epoch = input.epoch;
+ locals.tempAskOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempAskOrder.owner = qpi.invocator();
+ state._askOrders.add(locals.mbondIdentity, locals.tempAskOrder, -input.price);
+ break;
+ }
+
+ locals.elementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ struct RemoveAskOrder_locals
+ {
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex;
+ _Order order;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(RemoveAskOrder)
+ {
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+
+ output.removedMBondsAmount = 0;
+
+ if (input.price <= 0 || input.price >= MAX_AMOUNT || input.numberOfMBonds <= 0 || input.numberOfMBonds >= MAX_AMOUNT || !state._epochMbondInfoMap.get((uint16) input.epoch, locals.tempMbondInfo))
+ {
+ return;
+ }
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity, 0);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price == -state._askOrders.priority(locals.elementIndex) && state._askOrders.element(locals.elementIndex).owner == qpi.invocator())
+ {
+ if (state._askOrders.element(locals.elementIndex).numberOfMBonds <= input.numberOfMBonds)
+ {
+ output.removedMBondsAmount = state._askOrders.element(locals.elementIndex).numberOfMBonds;
+ state._askOrders.remove(locals.elementIndex);
+ }
+ else
+ {
+ locals.order = state._askOrders.element(locals.elementIndex);
+ locals.order.numberOfMBonds -= input.numberOfMBonds;
+ state._askOrders.replace(locals.elementIndex, locals.order);
+ output.removedMBondsAmount = input.numberOfMBonds;
+ }
+ break;
+ }
+
+ locals.elementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ struct AddBidOrder_locals
+ {
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex;
+ sint64 nextElementIndex;
+ sint64 fee;
+ _Order tempAskOrder;
+ _Order tempBidOrder;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(AddBidOrder)
+ {
+ if (qpi.invocationReward() < smul(input.numberOfMBonds, input.price)
+ || input.price <= 0
+ || input.price >= MAX_AMOUNT
+ || input.numberOfMBonds <= 0
+ || input.numberOfMBonds >= MAX_AMOUNT
+ || !state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo))
+ {
+ output.addedMBondsAmount = 0;
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ if (qpi.invocationReward() > smul(input.numberOfMBonds, input.price))
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - smul(input.numberOfMBonds, input.price));
+ }
+
+ output.addedMBondsAmount = input.numberOfMBonds;
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price < -state._askOrders.priority(locals.elementIndex))
+ {
+ break;
+ }
+
+ locals.nextElementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+
+ locals.tempAskOrder = state._askOrders.element(locals.elementIndex);
+ if (input.numberOfMBonds <= locals.tempAskOrder.numberOfMBonds)
+ {
+ qpi.transferShareOwnershipAndPossession(
+ locals.tempMbondInfo.name,
+ SELF,
+ locals.tempAskOrder.owner,
+ locals.tempAskOrder.owner,
+ input.numberOfMBonds,
+ qpi.invocator());
+
+ if (state._commissionFreeAddresses.getElementIndex(locals.tempAskOrder.owner) != NULL_INDEX)
+ {
+ qpi.transfer(locals.tempAskOrder.owner, -(input.numberOfMBonds * state._askOrders.priority(locals.elementIndex)));
+ }
+ else
+ {
+ locals.fee = div(input.numberOfMBonds * -state._askOrders.priority(locals.elementIndex) * QBOND_TRADE_FEE_PERCENT, 10000ULL);
+ qpi.transfer(locals.tempAskOrder.owner, -(input.numberOfMBonds * state._askOrders.priority(locals.elementIndex)) - locals.fee);
+ state._totalEarnedAmount += locals.fee;
+ state._earnedAmountFromTrade += locals.fee;
+ }
+
+ if (input.price > -state._askOrders.priority(locals.elementIndex))
+ {
+ qpi.transfer(qpi.invocator(), input.numberOfMBonds * (input.price + state._askOrders.priority(locals.elementIndex))); // ask orders priotiry is always negative
+ }
+
+ if (input.numberOfMBonds < locals.tempAskOrder.numberOfMBonds)
+ {
+ locals.tempAskOrder.numberOfMBonds -= input.numberOfMBonds;
+ state._askOrders.replace(locals.elementIndex, locals.tempAskOrder);
+ }
+ else if (input.numberOfMBonds == locals.tempAskOrder.numberOfMBonds)
+ {
+ state._askOrders.remove(locals.elementIndex);
+ }
+ return;
+ }
+ else if (input.numberOfMBonds > locals.tempAskOrder.numberOfMBonds)
+ {
+ qpi.transferShareOwnershipAndPossession(
+ locals.tempMbondInfo.name,
+ SELF,
+ locals.tempAskOrder.owner,
+ locals.tempAskOrder.owner,
+ locals.tempAskOrder.numberOfMBonds,
+ qpi.invocator());
+
+ if (state._commissionFreeAddresses.getElementIndex(locals.tempAskOrder.owner) != NULL_INDEX)
+ {
+ qpi.transfer(locals.tempAskOrder.owner, -(locals.tempAskOrder.numberOfMBonds * state._askOrders.priority(locals.elementIndex)));
+ }
+ else
+ {
+ locals.fee = div(locals.tempAskOrder.numberOfMBonds * -state._askOrders.priority(locals.elementIndex) * QBOND_TRADE_FEE_PERCENT, 10000ULL);
+ qpi.transfer(locals.tempAskOrder.owner, -(locals.tempAskOrder.numberOfMBonds * state._askOrders.priority(locals.elementIndex)) - locals.fee);
+ state._totalEarnedAmount += locals.fee;
+ state._earnedAmountFromTrade += locals.fee;
+ }
+
+ if (input.price > -state._askOrders.priority(locals.elementIndex))
+ {
+ qpi.transfer(qpi.invocator(), locals.tempAskOrder.numberOfMBonds * (input.price + state._askOrders.priority(locals.elementIndex))); // ask orders priotiry is always negative
+ }
+
+ state._askOrders.remove(locals.elementIndex);
+ input.numberOfMBonds -= locals.tempAskOrder.numberOfMBonds;
+ }
+
+ locals.elementIndex = locals.nextElementIndex;
+ }
+
+ if (state._bidOrders.population(locals.mbondIdentity) == 0)
+ {
+ locals.tempBidOrder.epoch = input.epoch;
+ locals.tempBidOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempBidOrder.owner = qpi.invocator();
+ state._bidOrders.add(locals.mbondIdentity, locals.tempBidOrder, input.price);
+ return;
+ }
+
+ locals.elementIndex = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price > state._bidOrders.priority(locals.elementIndex))
+ {
+ locals.tempBidOrder.epoch = input.epoch;
+ locals.tempBidOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempBidOrder.owner = qpi.invocator();
+ state._bidOrders.add(locals.mbondIdentity, locals.tempBidOrder, input.price);
+ break;
+ }
+ else if (input.price == state._bidOrders.priority(locals.elementIndex))
+ {
+ if (state._bidOrders.element(locals.elementIndex).owner == qpi.invocator())
+ {
+ locals.tempBidOrder = state._bidOrders.element(locals.elementIndex);
+ locals.tempBidOrder.numberOfMBonds += input.numberOfMBonds;
+ state._bidOrders.replace(locals.elementIndex, locals.tempBidOrder);
+ break;
+ }
+ }
+
+ if (state._bidOrders.nextElementIndex(locals.elementIndex) == NULL_INDEX)
+ {
+ locals.tempBidOrder.epoch = input.epoch;
+ locals.tempBidOrder.numberOfMBonds = input.numberOfMBonds;
+ locals.tempBidOrder.owner = qpi.invocator();
+ state._bidOrders.add(locals.mbondIdentity, locals.tempBidOrder, input.price);
+ break;
+ }
+
+ locals.elementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ struct RemoveBidOrder_locals
+ {
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex;
+ _Order order;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(RemoveBidOrder)
+ {
+ if (qpi.invocationReward() > 0)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+
+ output.removedMBondsAmount = 0;
+
+ if (input.price <= 0 || input.price >= MAX_AMOUNT || input.numberOfMBonds <= 0 || input.numberOfMBonds >= MAX_AMOUNT || !state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo))
+ {
+ return;
+ }
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ if (input.price == state._bidOrders.priority(locals.elementIndex) && state._bidOrders.element(locals.elementIndex).owner == qpi.invocator())
+ {
+ if (state._bidOrders.element(locals.elementIndex).numberOfMBonds <= input.numberOfMBonds)
+ {
+ output.removedMBondsAmount = state._bidOrders.element(locals.elementIndex).numberOfMBonds;
+ state._bidOrders.remove(locals.elementIndex);
+ }
+ else
+ {
+ locals.order = state._bidOrders.element(locals.elementIndex);
+ locals.order.numberOfMBonds -= input.numberOfMBonds;
+ state._bidOrders.replace(locals.elementIndex, locals.order);
+ output.removedMBondsAmount = input.numberOfMBonds;
+ }
+ qpi.transfer(qpi.invocator(), output.removedMBondsAmount * input.price);
+ break;
+ }
+
+ locals.elementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ PUBLIC_PROCEDURE(BurnQU)
+ {
+ if (input.amount <= 0 || input.amount >= MAX_AMOUNT || qpi.invocationReward() < input.amount)
+ {
+ output.amount = -1;
+ if (input.amount == 0)
+ {
+ output.amount = 0;
+ }
+
+ if (qpi.invocationReward() > 0 && qpi.invocationReward() < MAX_AMOUNT)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+ return;
+ }
+
+ if (qpi.invocationReward() > input.amount)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - input.amount);
+ }
+
+ qpi.burn(input.amount);
+ output.amount = input.amount;
+ }
+
+ PUBLIC_PROCEDURE(UpdateCFA)
+ {
+ if (qpi.invocationReward() > 0 && qpi.invocationReward() <= MAX_AMOUNT)
+ {
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ }
+
+ if (qpi.invocator() != state._adminAddress)
+ {
+ return;
+ }
+
+ if (input.operation == 0)
+ {
+ output.result = state._commissionFreeAddresses.remove(input.user);
+ }
+ else
+ {
+ output.result = state._commissionFreeAddresses.add(input.user);
+ }
+ }
+
+ struct GetInfoPerEpoch_locals
+ {
+ sint64 index;
+ QEARN::getLockInfoPerEpoch_input tempInput;
+ QEARN::getLockInfoPerEpoch_output tempOutput;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetInfoPerEpoch)
+ {
+ output.totalStaked = 0;
+ output.stakersAmount = 0;
+ output.apy = 0;
+
+ locals.index = state._epochMbondInfoMap.getElementIndex((uint16)input.epoch);
+
+ if (locals.index == NULL_INDEX)
+ {
+ return;
+ }
+
+ locals.tempInput.Epoch = (uint32) input.epoch;
+ CALL_OTHER_CONTRACT_FUNCTION(QEARN, getLockInfoPerEpoch, locals.tempInput, locals.tempOutput);
+
+ output.totalStaked = state._epochMbondInfoMap.value(locals.index).totalStaked;
+ output.stakersAmount = state._epochMbondInfoMap.value(locals.index).stakersAmount;
+ output.apy = locals.tempOutput.yield;
+ }
+
+ PUBLIC_FUNCTION(GetFees)
+ {
+ output.stakeFeePercent = QBOND_STAKE_FEE_PERCENT;
+ output.tradeFeePercent = QBOND_TRADE_FEE_PERCENT;
+ output.transferFee = QBOND_MBOND_TRANSFER_FEE;
+ }
+
+ PUBLIC_FUNCTION(GetEarnedFees)
+ {
+ output.stakeFees = state._totalEarnedAmount - state._earnedAmountFromTrade;
+ output.tradeFees = state._earnedAmountFromTrade;
+ }
+
+ struct GetOrders_locals
+ {
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex;
+ sint64 arrayElementIndex;
+ GetOrders_output::Order tempOrder;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetOrders)
+ {
+ if (!state._epochMbondInfoMap.get((uint16)input.epoch, locals.tempMbondInfo))
+ {
+ return;
+ }
+
+ locals.arrayElementIndex = 0;
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity, 0);
+ while (locals.elementIndex != NULL_INDEX && locals.arrayElementIndex < 256)
+ {
+ if (input.askOrdersOffset > 0)
+ {
+ input.askOrdersOffset--;
+ locals.elementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ continue;
+ }
+
+ locals.tempOrder.owner = state._askOrders.element(locals.elementIndex).owner;
+ locals.tempOrder.epoch = state._askOrders.element(locals.elementIndex).epoch;
+ locals.tempOrder.numberOfMBonds = state._askOrders.element(locals.elementIndex).numberOfMBonds;
+ locals.tempOrder.price = -state._askOrders.priority(locals.elementIndex);
+ output.askOrders.set(locals.arrayElementIndex, locals.tempOrder);
+ locals.arrayElementIndex++;
+ locals.elementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ }
+
+ locals.arrayElementIndex = 0;
+ locals.elementIndex = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX && locals.arrayElementIndex < 256)
+ {
+ if (input.bidOrdersOffset > 0)
+ {
+ input.bidOrdersOffset--;
+ locals.elementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+ continue;
+ }
+
+ locals.tempOrder.owner = state._bidOrders.element(locals.elementIndex).owner;
+ locals.tempOrder.epoch = state._bidOrders.element(locals.elementIndex).epoch;
+ locals.tempOrder.numberOfMBonds = state._bidOrders.element(locals.elementIndex).numberOfMBonds;
+ locals.tempOrder.price = state._bidOrders.priority(locals.elementIndex);
+ output.bidOrders.set(locals.arrayElementIndex, locals.tempOrder);
+ locals.arrayElementIndex++;
+ locals.elementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+ }
+ }
+
+ struct GetUserOrders_locals
+ {
+ sint64 epoch;
+ MBondInfo tempMbondInfo;
+ id mbondIdentity;
+ sint64 elementIndex1;
+ sint64 arrayElementIndex1;
+ sint64 elementIndex2;
+ sint64 arrayElementIndex2;
+ GetUserOrders_output::Order tempOrder;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetUserOrders)
+ {
+ for (locals.epoch = QBOND_START_EPOCH; locals.epoch <= qpi.epoch(); locals.epoch++)
+ {
+ if (!state._epochMbondInfoMap.get((uint16)locals.epoch, locals.tempMbondInfo))
+ {
+ continue;
+ }
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex1 = state._askOrders.headIndex(locals.mbondIdentity, 0);
+ while (locals.elementIndex1 != NULL_INDEX && locals.arrayElementIndex1 < 256)
+ {
+ if (state._askOrders.element(locals.elementIndex1).owner != input.owner)
+ {
+ locals.elementIndex1 = state._askOrders.nextElementIndex(locals.elementIndex1);
+ continue;
+ }
+
+ if (input.askOrdersOffset > 0)
+ {
+ input.askOrdersOffset--;
+ locals.elementIndex1 = state._askOrders.nextElementIndex(locals.elementIndex1);
+ continue;
+ }
+
+ locals.tempOrder.owner = input.owner;
+ locals.tempOrder.epoch = state._askOrders.element(locals.elementIndex1).epoch;
+ locals.tempOrder.numberOfMBonds = state._askOrders.element(locals.elementIndex1).numberOfMBonds;
+ locals.tempOrder.price = -state._askOrders.priority(locals.elementIndex1);
+ output.askOrders.set(locals.arrayElementIndex1, locals.tempOrder);
+ locals.arrayElementIndex1++;
+ locals.elementIndex1 = state._askOrders.nextElementIndex(locals.elementIndex1);
+ }
+
+ locals.elementIndex2 = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex2 != NULL_INDEX && locals.arrayElementIndex2 < 256)
+ {
+ if (state._bidOrders.element(locals.elementIndex2).owner != input.owner)
+ {
+ locals.elementIndex2 = state._bidOrders.nextElementIndex(locals.elementIndex2);
+ continue;
+ }
+
+ if (input.bidOrdersOffset > 0)
+ {
+ input.bidOrdersOffset--;
+ locals.elementIndex2 = state._bidOrders.nextElementIndex(locals.elementIndex2);
+ continue;
+ }
+
+ locals.tempOrder.owner = input.owner;
+ locals.tempOrder.epoch = state._bidOrders.element(locals.elementIndex2).epoch;
+ locals.tempOrder.numberOfMBonds = state._bidOrders.element(locals.elementIndex2).numberOfMBonds;
+ locals.tempOrder.price = state._bidOrders.priority(locals.elementIndex2);
+ output.bidOrders.set(locals.arrayElementIndex2, locals.tempOrder);
+ locals.arrayElementIndex2++;
+ locals.elementIndex2 = state._bidOrders.nextElementIndex(locals.elementIndex2);
+ }
+ }
+ }
+
+ struct GetMBondsTable_locals
+ {
+ sint64 epoch;
+ sint64 index;
+ MBondInfo tempMBondInfo;
+ GetMBondsTable_output::TableEntry tempTableEntry;
+ QEARN::getLockInfoPerEpoch_input tempInput;
+ QEARN::getLockInfoPerEpoch_output tempOutput;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetMBondsTable)
+ {
+ for (locals.epoch = QBOND_START_EPOCH; locals.epoch <= qpi.epoch(); locals.epoch++)
+ {
+ if (state._epochMbondInfoMap.get((uint16)locals.epoch, locals.tempMBondInfo))
+ {
+ locals.tempInput.Epoch = (uint32) locals.epoch;
+ CALL_OTHER_CONTRACT_FUNCTION(QEARN, getLockInfoPerEpoch, locals.tempInput, locals.tempOutput);
+ locals.tempTableEntry.epoch = locals.epoch;
+ locals.tempTableEntry.apy = locals.tempOutput.yield;
+ output.info.set(locals.index, locals.tempTableEntry);
+ locals.index++;
+ }
+ }
+ }
+
+ struct GetUserMBonds_locals
+ {
+ GetUserMBonds_output::MBondEntity tempMbondEntity;
+ sint64 epoch;
+ sint64 index;
+ sint64 mbondsAmount;
+ MBondInfo tempMBondInfo;
+ QEARN::getLockInfoPerEpoch_input tempInput;
+ QEARN::getLockInfoPerEpoch_output tempOutput;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetUserMBonds)
+ {
+ output.totalMBondsAmount = 0;
+ if (state._userTotalStakedMap.get(input.owner, locals.mbondsAmount))
+ {
+ output.totalMBondsAmount = locals.mbondsAmount;
+ }
+
+ for (locals.epoch = QBOND_START_EPOCH; locals.epoch <= qpi.epoch(); locals.epoch++)
+ {
+ if (!state._epochMbondInfoMap.get((uint16)locals.epoch, locals.tempMBondInfo))
+ {
+ continue;
+ }
+
+ locals.mbondsAmount = qpi.numberOfPossessedShares(locals.tempMBondInfo.name, SELF, input.owner, input.owner, SELF_INDEX, SELF_INDEX);
+ if (locals.mbondsAmount <= 0)
+ {
+ continue;
+ }
+
+ locals.tempInput.Epoch = (uint32) locals.epoch;
+ CALL_OTHER_CONTRACT_FUNCTION(QEARN, getLockInfoPerEpoch, locals.tempInput, locals.tempOutput);
+
+ locals.tempMbondEntity.epoch = locals.epoch;
+ locals.tempMbondEntity.amount = locals.mbondsAmount;
+ locals.tempMbondEntity.apy = locals.tempOutput.yield;
+ output.mbonds.set(locals.index, locals.tempMbondEntity);
+ locals.index++;
+ }
+ }
+
+ struct GetCFA_locals
+ {
+ sint64 index;
+ sint64 counter;
+ };
+
+ PUBLIC_FUNCTION_WITH_LOCALS(GetCFA)
+ {
+ locals.index = state._commissionFreeAddresses.nextElementIndex(NULL_INDEX);
+ while (locals.index != NULL_INDEX)
+ {
+ output.commissionFreeAddresses.set(locals.counter, state._commissionFreeAddresses.key(locals.index));
+ locals.counter++;
+ locals.index = state._commissionFreeAddresses.nextElementIndex(locals.index);
+ }
+ }
+
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ REGISTER_USER_PROCEDURE(Stake, 1);
+ REGISTER_USER_PROCEDURE(TransferMBondOwnershipAndPossession, 2);
+ REGISTER_USER_PROCEDURE(AddAskOrder, 3);
+ REGISTER_USER_PROCEDURE(RemoveAskOrder, 4);
+ REGISTER_USER_PROCEDURE(AddBidOrder, 5);
+ REGISTER_USER_PROCEDURE(RemoveBidOrder, 6);
+ REGISTER_USER_PROCEDURE(BurnQU, 7);
+ REGISTER_USER_PROCEDURE(UpdateCFA, 8);
+
+ REGISTER_USER_FUNCTION(GetFees, 1);
+ REGISTER_USER_FUNCTION(GetEarnedFees, 2);
+ REGISTER_USER_FUNCTION(GetInfoPerEpoch, 3);
+ REGISTER_USER_FUNCTION(GetOrders, 4);
+ REGISTER_USER_FUNCTION(GetUserOrders, 5);
+ REGISTER_USER_FUNCTION(GetMBondsTable, 6);
+ REGISTER_USER_FUNCTION(GetUserMBonds, 7);
+ REGISTER_USER_FUNCTION(GetCFA, 8);
+ }
+
+ INITIALIZE()
+ {
+ state._devAddress = ID(_B, _O, _N, _D, _D, _J, _N, _U, _H, _O, _G, _Y, _L, _A, _A, _A, _C, _V, _X, _C, _X, _F, _G, _F, _R, _C, _S, _D, _C, _U, _W, _C, _Y, _U, _N, _K, _M, _P, _G, _O, _I, _F, _E, _P, _O, _E, _M, _Y, _T, _L, _Q, _L, _F, _C, _S, _B);
+ state._adminAddress = ID(_B, _O, _N, _D, _A, _A, _F, _B, _U, _G, _H, _E, _L, _A, _N, _X, _G, _H, _N, _L, _M, _S, _U, _I, _V, _B, _K, _B, _H, _A, _Y, _E, _Q, _S, _Q, _B, _V, _P, _V, _N, _B, _H, _L, _F, _J, _I, _A, _Z, _F, _Q, _C, _W, _W, _B, _V, _E);
+ state._commissionFreeAddresses.add(state._adminAddress);
+ }
+
+ PRE_ACQUIRE_SHARES()
+ {
+ output.allowTransfer = true;
+ }
+
+ struct BEGIN_EPOCH_locals
+ {
+ sint8 chunk;
+ uint64 currentName;
+ StakeEntry emptyEntry;
+ sint64 totalReward;
+ sint64 rewardPerMBond;
+ Asset tempAsset;
+ MBondInfo tempMbondInfo;
+ AssetOwnershipIterator assetIt;
+ id mbondIdentity;
+ sint64 elementIndex;
+ sint64 nextElementIndex;
+ };
+
+ BEGIN_EPOCH_WITH_LOCALS()
+ {
+ if (state._qearnIncomeAmount > 0 && state._epochMbondInfoMap.get((uint16) (qpi.epoch() - 53), locals.tempMbondInfo))
+ {
+ locals.totalReward = state._qearnIncomeAmount - locals.tempMbondInfo.totalStaked * QBOND_MBOND_PRICE;
+ locals.rewardPerMBond = QPI::div(locals.totalReward, locals.tempMbondInfo.totalStaked);
+
+ locals.tempAsset.assetName = locals.tempMbondInfo.name;
+ locals.tempAsset.issuer = SELF;
+ locals.assetIt.begin(locals.tempAsset);
+ while (!locals.assetIt.reachedEnd())
+ {
+ qpi.transfer(locals.assetIt.owner(), (QBOND_MBOND_PRICE + locals.rewardPerMBond) * locals.assetIt.numberOfOwnedShares());
+ qpi.transferShareOwnershipAndPossession(
+ locals.tempMbondInfo.name,
+ SELF,
+ locals.assetIt.owner(),
+ locals.assetIt.owner(),
+ locals.assetIt.numberOfOwnedShares(),
+ NULL_ID);
+ locals.assetIt.next();
+ }
+ state._qearnIncomeAmount = 0;
+
+ locals.mbondIdentity = SELF;
+ locals.mbondIdentity.u64._3 = locals.tempMbondInfo.name;
+
+ locals.elementIndex = state._askOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ locals.nextElementIndex = state._askOrders.nextElementIndex(locals.elementIndex);
+ state._askOrders.remove(locals.elementIndex);
+ locals.elementIndex = locals.nextElementIndex;
+ }
+
+ locals.elementIndex = state._bidOrders.headIndex(locals.mbondIdentity);
+ while (locals.elementIndex != NULL_INDEX)
+ {
+ locals.nextElementIndex = state._bidOrders.nextElementIndex(locals.elementIndex);
+ state._bidOrders.remove(locals.elementIndex);
+ locals.elementIndex = locals.nextElementIndex;
+ }
+ }
+
+ locals.currentName = 1145979469ULL; // MBND
+
+ locals.chunk = (sint8) (48 + mod(div((uint64)qpi.epoch(), 100ULL), 10ULL));
+ locals.currentName |= (uint64)locals.chunk << (4 * 8);
+
+ locals.chunk = (sint8) (48 + mod(div((uint64)qpi.epoch(), 10ULL), 10ULL));
+ locals.currentName |= (uint64)locals.chunk << (5 * 8);
+
+ locals.chunk = (sint8) (48 + mod((uint64)qpi.epoch(), 10ULL));
+ locals.currentName |= (uint64)locals.chunk << (6 * 8);
+
+ if (qpi.issueAsset(locals.currentName, SELF, 0, QBOND_MBONDS_EMISSION, 0) == QBOND_MBONDS_EMISSION)
+ {
+ locals.tempMbondInfo.name = locals.currentName;
+ locals.tempMbondInfo.totalStaked = 0;
+ locals.tempMbondInfo.stakersAmount = 0;
+ state._epochMbondInfoMap.set(qpi.epoch(), locals.tempMbondInfo);
+ }
+
+ locals.emptyEntry.staker = NULL_ID;
+ locals.emptyEntry.amount = 0;
+ state._stakeQueue.setAll(locals.emptyEntry);
+ }
+
+ struct POST_INCOMING_TRANSFER_locals
+ {
+ MBondInfo tempMbondInfo;
+ };
+
+ POST_INCOMING_TRANSFER_WITH_LOCALS()
+ {
+ if (input.sourceId == id(QEARN_CONTRACT_INDEX, 0, 0, 0) && state._epochMbondInfoMap.get(qpi.epoch() - 52, locals.tempMbondInfo))
+ {
+ state._qearnIncomeAmount = input.amount;
+ }
+ }
+
+ struct END_EPOCH_locals
+ {
+ sint64 availableMbonds;
+ MBondInfo tempMbondInfo;
+ sint64 counter;
+ StakeEntry tempStakeEntry;
+ sint64 amountToQvault;
+ sint64 amountToDev;
+ };
+
+ END_EPOCH_WITH_LOCALS()
+ {
+ locals.amountToQvault = div((state._totalEarnedAmount - state._distributedAmount) * QBOND_QVAULT_DISTRIBUTION_PERCENT, 10000ULL);
+ locals.amountToDev = state._totalEarnedAmount - state._distributedAmount - locals.amountToQvault;
+ qpi.transfer(id(QVAULT_CONTRACT_INDEX, 0, 0, 0), locals.amountToQvault);
+ qpi.transfer(state._devAddress, locals.amountToDev);
+ state._distributedAmount += locals.amountToQvault;
+ state._distributedAmount += locals.amountToDev;
+
+ locals.tempStakeEntry.staker = NULL_ID;
+ locals.tempStakeEntry.amount = 0;
+ for (locals.counter = 0; locals.counter < QBOND_MAX_QUEUE_SIZE; locals.counter++)
+ {
+ if (state._stakeQueue.get(locals.counter).staker == NULL_ID)
+ {
+ break;
+ }
+
+ qpi.transfer(state._stakeQueue.get(locals.counter).staker, state._stakeQueue.get(locals.counter).amount * QBOND_MBOND_PRICE);
+ state._stakeQueue.set(locals.counter, locals.tempStakeEntry);
+ }
+
+ if (state._epochMbondInfoMap.get(qpi.epoch(), locals.tempMbondInfo))
+ {
+ locals.availableMbonds = qpi.numberOfPossessedShares(locals.tempMbondInfo.name, SELF, SELF, SELF, SELF_INDEX, SELF_INDEX);
+ qpi.transferShareOwnershipAndPossession(locals.tempMbondInfo.name, SELF, SELF, SELF, locals.availableMbonds, NULL_ID);
+ }
+
+ state._commissionFreeAddresses.cleanupIfNeeded();
+ state._askOrders.cleanupIfNeeded();
+ state._bidOrders.cleanupIfNeeded();
+ }
+};
diff --git a/test/contract_qbond.cpp b/test/contract_qbond.cpp
new file mode 100644
index 000000000..15f9ce7d6
--- /dev/null
+++ b/test/contract_qbond.cpp
@@ -0,0 +1,437 @@
+#define NO_UEFI
+
+#include "contract_testing.h"
+
+std::string assetNameFromInt64(uint64 assetName);
+const id adminAddress = ID(_B, _O, _N, _D, _A, _A, _F, _B, _U, _G, _H, _E, _L, _A, _N, _X, _G, _H, _N, _L, _M, _S, _U, _I, _V, _B, _K, _B, _H, _A, _Y, _E, _Q, _S, _Q, _B, _V, _P, _V, _N, _B, _H, _L, _F, _J, _I, _A, _Z, _F, _Q, _C, _W, _W, _B, _V, _E);
+const id testAddress1 = ID(_H, _O, _G, _T, _K, _D, _N, _D, _V, _U, _U, _Z, _U, _F, _L, _A, _M, _L, _V, _B, _L, _Z, _D, _S, _G, _D, _D, _A, _E, _B, _E, _K, _K, _L, _N, _Z, _J, _B, _W, _S, _C, _A, _M, _D, _S, _X, _T, _C, _X, _A, _M, _A, _X, _U, _D, _F);
+const id testAddress2 = ID(_E, _Q, _M, _B, _B, _V, _Y, _G, _Z, _O, _F, _U, _I, _H, _E, _X, _F, _O, _X, _K, _T, _F, _T, _A, _N, _E, _K, _B, _X, _L, _B, _X, _H, _A, _Y, _D, _F, _F, _M, _R, _E, _E, _M, _R, _Q, _E, _V, _A, _D, _Y, _M, _M, _E, _W, _A, _C);
+
+class QBondChecker : public QBOND
+{
+public:
+ int64_t getCFAPopulation()
+ {
+ return _commissionFreeAddresses.population();
+ }
+};
+
+class ContractTestingQBond : protected ContractTesting
+{
+public:
+ ContractTestingQBond()
+ {
+ initEmptySpectrum();
+ initEmptyUniverse();
+ INIT_CONTRACT(QBOND);
+ callSystemProcedure(QBOND_CONTRACT_INDEX, INITIALIZE);
+ INIT_CONTRACT(QEARN);
+ callSystemProcedure(QEARN_CONTRACT_INDEX, INITIALIZE);
+ }
+
+ QBondChecker* getState()
+ {
+ return (QBondChecker*)contractStates[QBOND_CONTRACT_INDEX];
+ }
+
+ bool loadState(const CHAR16* filename)
+ {
+ return load(filename, sizeof(QBOND), contractStates[QBOND_CONTRACT_INDEX]) == sizeof(QBOND);
+ }
+
+ void beginEpoch(bool expectSuccess = true)
+ {
+ callSystemProcedure(QBOND_CONTRACT_INDEX, BEGIN_EPOCH, expectSuccess);
+ }
+
+ void endEpoch(bool expectSuccess = true)
+ {
+ callSystemProcedure(QBOND_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ }
+
+ void stake(const id& staker, const int64_t& quMillions, const int64_t& quAmount)
+ {
+ QBOND::Stake_input input{ quMillions };
+ QBOND::Stake_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 1, input, output, staker, quAmount);
+ }
+
+ QBOND::TransferMBondOwnershipAndPossession_output transfer(const id& from, const id& to, const uint16_t& epoch, const int64_t& mbondsAmount, const int64_t& quAmount)
+ {
+ QBOND::TransferMBondOwnershipAndPossession_input input{ to, epoch, mbondsAmount };
+ QBOND::TransferMBondOwnershipAndPossession_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 2, input, output, from, quAmount);
+ return output;
+ }
+
+ QBOND::AddAskOrder_output addAskOrder(const id& asker, const uint16_t& epoch, const int64_t& price, const int64_t& mbondsAmount, const int64_t& quAmount)
+ {
+ QBOND::AddAskOrder_input input{ epoch, price, mbondsAmount };
+ QBOND::AddAskOrder_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 3, input, output, asker, quAmount);
+ return output;
+ }
+
+ QBOND::RemoveAskOrder_output removeAskOrder(const id& asker, const uint16_t& epoch, const int64_t& price, const int64_t& mbondsAmount, const int64_t& quAmount)
+ {
+ QBOND::RemoveAskOrder_input input{ epoch, price, mbondsAmount };
+ QBOND::RemoveAskOrder_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 4, input, output, asker, quAmount);
+ return output;
+ }
+
+ QBOND::AddBidOrder_output addBidOrder(const id& bider, const uint16_t& epoch, const int64_t& price, const int64_t& mbondsAmount, const int64_t& quAmount)
+ {
+ QBOND::AddBidOrder_input input{ epoch, price, mbondsAmount };
+ QBOND::AddBidOrder_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 5, input, output, bider, quAmount);
+ return output;
+ }
+
+ QBOND::RemoveBidOrder_output removeBidOrder(const id& bider, const uint16_t& epoch, const int64_t& price, const int64_t& mbondsAmount, const int64_t& quAmount)
+ {
+ QBOND::RemoveBidOrder_input input{ epoch, price, mbondsAmount };
+ QBOND::RemoveBidOrder_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 6, input, output, bider, quAmount);
+ return output;
+ }
+
+ QBOND::BurnQU_output burnQU(const id& invocator, const int64_t& quToBurn, const int64_t& quAmount)
+ {
+ QBOND::BurnQU_input input{ quToBurn };
+ QBOND::BurnQU_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 7, input, output, invocator, quAmount);
+ return output;
+ }
+
+ bool updateCFA(const id& invocator, const id& address, const bool operation)
+ {
+ QBOND::UpdateCFA_input input{ address, operation };
+ QBOND::UpdateCFA_output output;
+ invokeUserProcedure(QBOND_CONTRACT_INDEX, 8, input, output, invocator, 0);
+ return output.result;
+ }
+
+ QBOND::GetEarnedFees_output getEarnedFees()
+ {
+ QBOND::GetEarnedFees_input input;
+ QBOND::GetEarnedFees_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 2, input, output);
+ return output;
+ }
+
+ QBOND::GetInfoPerEpoch_output getInfoPerEpoch(const uint16_t& epoch)
+ {
+ QBOND::GetInfoPerEpoch_input input{ epoch };
+ QBOND::GetInfoPerEpoch_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 3, input, output);
+ return output;
+ }
+
+ QBOND::GetOrders_output getOrders(const uint16_t& epoch, const int64_t& asksOffset, const int64_t& bidsOffset)
+ {
+ QBOND::GetOrders_input input{ epoch, asksOffset, bidsOffset };
+ QBOND::GetOrders_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 4, input, output);
+ return output;
+ }
+
+ QBOND::GetUserOrders_output getUserOrders(const id& user, const int64_t& asksOffset, const int64_t& bidsOffset)
+ {
+ QBOND::GetUserOrders_input input{ user, asksOffset, bidsOffset };
+ QBOND::GetUserOrders_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 5, input, output);
+ return output;
+ }
+
+ QBOND::GetMBondsTable_output getMBondsTable()
+ {
+ QBOND::GetMBondsTable_input input;
+ QBOND::GetMBondsTable_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 6, input, output);
+ return output;
+ }
+
+ QBOND::GetUserMBonds_output getUserMBonds(const id& user)
+ {
+ QBOND::GetUserMBonds_input input{ user };
+ QBOND::GetUserMBonds_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 7, input, output);
+ return output;
+ }
+
+ QBOND::GetCFA_output getCFA()
+ {
+ QBOND::GetCFA_input input;
+ QBOND::GetCFA_output output;
+ callFunction(QBOND_CONTRACT_INDEX, 8, input, output);
+ return output;
+ }
+};
+
+TEST(ContractQBond, Stake)
+{
+ system.epoch = QBOND_START_EPOCH;
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+
+ increaseEnergy(testAddress1, 100000000LL);
+ increaseEnergy(testAddress2, 100000000LL);
+
+ // scenario 1: testAddress1 want to stake 50 millions, but send to sc 30 millions
+ qbond.stake(testAddress1, 50, 30000000LL);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+
+ // scenario 2: testAddress1 want to stake 50 millions, but send to sc 50 millions (without commission)
+ qbond.stake(testAddress1, 50, 50000000LL);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+
+ // scenario 3: testAddress1 want to stake 50 millions and send full amount with commission
+ qbond.stake(testAddress1, 50, 50250000LL);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 50LL);
+
+ // scenario 4.1: testAddress2 want to stake 5 millions, recieve 0 MBonds, because minimum is 10 and 5 were put in queue
+ qbond.stake(testAddress2, 5, 5025000);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+
+ // scenario 4.2: testAddress1 want to stake 7 millions, testAddress1 recieve 7 MBonds and testAddress2 recieve 5 MBonds, because the total qu millions in the queue became more than 10
+ qbond.stake(testAddress1, 7, 7035000);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 57);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 5);
+}
+
+
+TEST(ContractQBond, TransferMBondOwnershipAndPossession)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+ qbond.stake(testAddress1, 50, 50250000);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 50);
+
+ // scenario 1: not enough gas, 100 needed
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 10, 50).transferredMBonds, 0);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+
+ // scenario 2: enough gas, not enough mbonds
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 70, 100).transferredMBonds, 0);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+
+ // scenario 3: success
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 40, 100).transferredMBonds, 40);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 40);
+}
+
+TEST(ContractQBond, AddRemoveAskOrder)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+ qbond.stake(testAddress1, 50, 50250000);
+
+ // scenario 1: not enough mbonds
+ EXPECT_EQ(qbond.addAskOrder(testAddress1, system.epoch, 1500000, 100, 0).addedMBondsAmount, 0);
+
+ // scenario 2: success to add ask, asked mbonds are blocked and cannot be transferred to another address
+ EXPECT_EQ(qbond.addAskOrder(testAddress1, system.epoch, 1500000, 30, 0).addedMBondsAmount, 30);
+ // not enough free mbonds
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 21, 100).transferredMBonds, 0);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 0);
+ // successful transfer
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 20, 100).transferredMBonds, 20);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 20);
+
+ // scenario 3: no orders to remove at this price
+ EXPECT_EQ(qbond.removeAskOrder(testAddress1, system.epoch, 1400000, 30, 0).removedMBondsAmount, 0);
+ EXPECT_EQ(qbond.removeAskOrder(testAddress1, system.epoch, 1600000, 30, 0).removedMBondsAmount, 0);
+
+ // scenario 4: no free mbonds, then successful removal ask order and transfer to another address
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 1, 100).transferredMBonds, 0);
+ EXPECT_EQ(qbond.removeAskOrder(testAddress1, system.epoch, 1500000, 5, 0).removedMBondsAmount, 5);
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 5, 100).transferredMBonds, 5);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 25);
+
+ EXPECT_EQ(qbond.removeAskOrder(testAddress1, system.epoch, 1500000, 500, 0).removedMBondsAmount, 25);
+}
+
+TEST(ContractQBond, AddRemoveBidOrder)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+ increaseEnergy(testAddress2, 1000000000);
+ qbond.stake(testAddress1, 50, 50250000);
+
+ // scenario 1: not enough qu
+ EXPECT_EQ(qbond.addBidOrder(testAddress2, system.epoch, 1500000, 10, 100).addedMBondsAmount, 0);
+
+ // scenario 2: success to add bid
+ EXPECT_EQ(qbond.addBidOrder(testAddress2, system.epoch, 1500000, 10, 15000000).addedMBondsAmount, 10);
+
+ // scenario 3: testAddress1 add ask order which matches the bid order
+ EXPECT_EQ(qbond.addAskOrder(testAddress1, system.epoch, 1500000, 3, 0).addedMBondsAmount, 3);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress1, testAddress1, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 47);
+ EXPECT_EQ(numberOfPossessedShares(assetNameFromString(std::string("MBND").append(std::to_string(system.epoch)).c_str()), id(QBOND_CONTRACT_INDEX, 0, 0, 0), testAddress2, testAddress2, QBOND_CONTRACT_INDEX, QBOND_CONTRACT_INDEX), 3);
+
+ // scenario 3: no orders to remove at this price
+ EXPECT_EQ(qbond.removeBidOrder(testAddress2, system.epoch, 1400000, 30, 0).removedMBondsAmount, 0);
+ EXPECT_EQ(qbond.removeBidOrder(testAddress2, system.epoch, 1600000, 30, 0).removedMBondsAmount, 0);
+
+ // scenario 4: successful removal bid order, qu are returned (7 mbonds per 1500000 each)
+ int64_t prevBalance = getBalance(testAddress2);
+ EXPECT_EQ(qbond.removeBidOrder(testAddress2, system.epoch, 1500000, 100, 0).removedMBondsAmount, 7);
+ EXPECT_EQ(getBalance(testAddress2) - prevBalance, 10500000);
+
+ // check earned fees
+ auto fees = qbond.getEarnedFees();
+ EXPECT_EQ(fees.stakeFees, 250000);
+ EXPECT_EQ(fees.tradeFees, 1350); // 1500000 (MBond price) * 3 (MBonds) * 0.0003 (0.03% fees for trade)
+
+ // getOrders checks
+ EXPECT_EQ(qbond.addAskOrder(testAddress1, system.epoch, 1600000, 5, 0).addedMBondsAmount, 5);
+ EXPECT_EQ(qbond.addAskOrder(testAddress2, system.epoch, 1500000, 3, 0).addedMBondsAmount, 3);
+ EXPECT_EQ(qbond.addBidOrder(testAddress1, system.epoch, 1400000, 10, 14000000).addedMBondsAmount, 10);
+ EXPECT_EQ(qbond.addBidOrder(testAddress2, system.epoch, 1300000, 5, 6500000).addedMBondsAmount, 5);
+
+ // all orders sorted by price, therefore the element with index 0 contains an order with a price of 1500000
+ auto orders = qbond.getOrders(system.epoch, 0, 0);
+ EXPECT_EQ(orders.askOrders.get(0).epoch, 182);
+ EXPECT_EQ(orders.askOrders.get(0).numberOfMBonds, 3);
+ EXPECT_EQ(orders.askOrders.get(0).owner, testAddress2);
+ EXPECT_EQ(orders.askOrders.get(0).price, 1500000);
+
+ EXPECT_EQ(orders.bidOrders.get(0).epoch, 182);
+ EXPECT_EQ(orders.bidOrders.get(0).numberOfMBonds, 10);
+ EXPECT_EQ(orders.bidOrders.get(0).owner, testAddress1);
+ EXPECT_EQ(orders.bidOrders.get(0).price, 1400000);
+
+ // with offset
+ orders = qbond.getOrders(system.epoch, 1, 1);
+ EXPECT_EQ(orders.askOrders.get(0).epoch, 182);
+ EXPECT_EQ(orders.askOrders.get(0).numberOfMBonds, 5);
+ EXPECT_EQ(orders.askOrders.get(0).owner, testAddress1);
+ EXPECT_EQ(orders.askOrders.get(0).price, 1600000);
+
+ EXPECT_EQ(orders.bidOrders.get(0).epoch, 182);
+ EXPECT_EQ(orders.bidOrders.get(0).numberOfMBonds, 5);
+ EXPECT_EQ(orders.bidOrders.get(0).owner, testAddress2);
+ EXPECT_EQ(orders.bidOrders.get(0).price, 1300000);
+
+ // user orders
+ auto userOrders = qbond.getUserOrders(testAddress1, 0, 0);
+ EXPECT_EQ(userOrders.askOrders.get(0).epoch, 182);
+ EXPECT_EQ(userOrders.askOrders.get(0).numberOfMBonds, 5);
+ EXPECT_EQ(userOrders.askOrders.get(0).owner, testAddress1);
+ EXPECT_EQ(userOrders.askOrders.get(0).price, 1600000);
+
+ EXPECT_EQ(userOrders.bidOrders.get(0).epoch, 182);
+ EXPECT_EQ(userOrders.bidOrders.get(0).numberOfMBonds, 10);
+ EXPECT_EQ(userOrders.bidOrders.get(0).owner, testAddress1);
+ EXPECT_EQ(userOrders.bidOrders.get(0).price, 1400000);
+
+ // with offset
+ userOrders = qbond.getUserOrders(testAddress1, 1, 1);
+ EXPECT_EQ(userOrders.askOrders.get(0).epoch, 0);
+ EXPECT_EQ(userOrders.askOrders.get(0).numberOfMBonds, 0);
+ EXPECT_EQ(userOrders.askOrders.get(0).owner, NULL_ID);
+ EXPECT_EQ(userOrders.askOrders.get(0).price, 0);
+
+ EXPECT_EQ(userOrders.bidOrders.get(0).epoch, 0);
+ EXPECT_EQ(userOrders.bidOrders.get(0).numberOfMBonds, 0);
+ EXPECT_EQ(userOrders.bidOrders.get(0).owner, NULL_ID);
+ EXPECT_EQ(userOrders.bidOrders.get(0).price, 0);
+}
+
+TEST(ContractQBond, BurnQu)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+
+ // scenario 1: not enough qu
+ EXPECT_EQ(qbond.burnQU(testAddress1, 1000000, 1000).amount, -1);
+
+ // scenario 2: successful burning
+ EXPECT_EQ(qbond.burnQU(testAddress1, 1000000, 1000000).amount, 1000000);
+
+ // scenario 3: successful burning, the surplus is returned
+ int64_t prevBalance = getBalance(testAddress1);
+ EXPECT_EQ(qbond.burnQU(testAddress1, 1000000, 10000000).amount, 1000000);
+ EXPECT_EQ(prevBalance - getBalance(testAddress1), 1000000);
+}
+
+TEST(ContractQBond, UpdateCFA)
+{
+ ContractTestingQBond qbond;
+ increaseEnergy(testAddress1, 1000);
+ increaseEnergy(adminAddress, 1000);
+
+ // only adminAddress can update CFA
+ EXPECT_EQ(qbond.getState()->getCFAPopulation(), 1);
+ EXPECT_FALSE(qbond.updateCFA(testAddress1, testAddress2, 1));
+ EXPECT_EQ(qbond.getState()->getCFAPopulation(), 1);
+ EXPECT_TRUE(qbond.updateCFA(adminAddress, testAddress2, 1));
+ EXPECT_EQ(qbond.getState()->getCFAPopulation(), 2);
+
+ auto cfa = qbond.getCFA();
+ EXPECT_EQ(cfa.commissionFreeAddresses.get(0), testAddress2);
+ EXPECT_EQ(cfa.commissionFreeAddresses.get(1), adminAddress);
+ EXPECT_EQ(cfa.commissionFreeAddresses.get(2), NULL_ID);
+
+ EXPECT_FALSE(qbond.updateCFA(testAddress1, testAddress2, 0));
+ EXPECT_EQ(qbond.getState()->getCFAPopulation(), 2);
+ EXPECT_TRUE(qbond.updateCFA(adminAddress, testAddress2, 0));
+ EXPECT_EQ(qbond.getState()->getCFAPopulation(), 1);
+}
+
+TEST(ContractQBond, GetInfoPerEpoch)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+ increaseEnergy(testAddress2, 1000000000);
+
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).stakersAmount, 0);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).totalStaked, 0);
+
+ qbond.stake(testAddress1, 50, 50250000);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).stakersAmount, 1);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).totalStaked, 50);
+
+ qbond.stake(testAddress2, 100, 100500000);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).stakersAmount, 2);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).totalStaked, 150);
+
+ EXPECT_EQ(qbond.transfer(testAddress1, testAddress2, system.epoch, 50, 100).transferredMBonds, 50);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).stakersAmount, 1);
+ EXPECT_EQ(qbond.getInfoPerEpoch(system.epoch).totalStaked, 150);
+}
+
+TEST(ContractQBond, GetMBondsTable)
+{
+ ContractTestingQBond qbond;
+ qbond.beginEpoch();
+ increaseEnergy(testAddress1, 1000000000);
+ increaseEnergy(testAddress2, 1000000000);
+
+ qbond.stake(testAddress1, 50, 50250000);
+ qbond.stake(testAddress2, 100, 100500000);
+ qbond.endEpoch();
+
+ system.epoch++;
+ qbond.beginEpoch();
+ qbond.stake(testAddress1, 10, 10050000);
+ qbond.stake(testAddress2, 20, 20100000);
+
+ auto table = qbond.getMBondsTable();
+ EXPECT_EQ(table.info.get(0).epoch, 182);
+ EXPECT_EQ(table.info.get(1).epoch, 183);
+ EXPECT_EQ(table.info.get(2).epoch, 0);
+
+ auto userMBonds = qbond.getUserMBonds(testAddress1);
+ EXPECT_EQ(userMBonds.totalMBondsAmount, 60);
+ EXPECT_EQ(userMBonds.mbonds.get(0).epoch, 182);
+ EXPECT_EQ(userMBonds.mbonds.get(0).amount, 50);
+ EXPECT_EQ(userMBonds.mbonds.get(1).epoch, 183);
+ EXPECT_EQ(userMBonds.mbonds.get(1).amount, 10);
+}
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 7f87688eb..13edfb203 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -120,6 +120,7 @@
+
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 569e14ce1..2d4977888 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -38,6 +38,7 @@
+
From cf1467f25580898353271b36cb729146418dc90c Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 17:46:26 +0200
Subject: [PATCH 115/297] remove unused function in QBond test
---
test/contract_qbond.cpp | 5 -----
1 file changed, 5 deletions(-)
diff --git a/test/contract_qbond.cpp b/test/contract_qbond.cpp
index 15f9ce7d6..762f08258 100644
--- a/test/contract_qbond.cpp
+++ b/test/contract_qbond.cpp
@@ -34,11 +34,6 @@ class ContractTestingQBond : protected ContractTesting
return (QBondChecker*)contractStates[QBOND_CONTRACT_INDEX];
}
- bool loadState(const CHAR16* filename)
- {
- return load(filename, sizeof(QBOND), contractStates[QBOND_CONTRACT_INDEX]) == sizeof(QBOND);
- }
-
void beginEpoch(bool expectSuccess = true)
{
callSystemProcedure(QBOND_CONTRACT_INDEX, BEGIN_EPOCH, expectSuccess);
From 10da921020ee1a2d551971741f77d244ccb7ba2c Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 17:54:51 +0200
Subject: [PATCH 116/297] fix arithmetic types warnings in RandomLottery
---
src/contracts/RandomLottery.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/contracts/RandomLottery.h b/src/contracts/RandomLottery.h
index 402f076f1..961a15cfe 100644
--- a/src/contracts/RandomLottery.h
+++ b/src/contracts/RandomLottery.h
@@ -116,7 +116,7 @@ struct RL : public ContractBase
struct GetPlayers_locals
{
uint64 arrayIndex = 0;
- sint32 i = 0;
+ sint64 i = 0;
};
/**
@@ -158,8 +158,8 @@ struct RL : public ContractBase
struct GetWinner_locals
{
uint64 randomNum = 0;
- sint32 i = 0;
- sint32 j = 0;
+ sint64 i = 0;
+ uint64 j = 0;
};
struct GetWinners_input
@@ -182,7 +182,7 @@ struct RL : public ContractBase
struct ReturnAllTickets_locals
{
- sint32 i = 0;
+ sint64 i = 0;
};
struct END_EPOCH_locals
@@ -345,7 +345,7 @@ struct RL : public ContractBase
locals.i = state.players.nextElementIndex(locals.i);
};
- output.numberOfPlayers = locals.arrayIndex;
+ output.numberOfPlayers = static_cast(locals.arrayIndex);
}
/**
From 9e0d226b0ba683be02815c34935794b42185e6ad Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 18:00:02 +0200
Subject: [PATCH 117/297] add NO_QBOND toggle
---
src/contract_core/contract_def.h | 8 ++++++++
src/qubic.cpp | 1 +
2 files changed, 9 insertions(+)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 8d0337b1e..839924d29 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -232,6 +232,8 @@ constexpr unsigned short RL_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#endif
+#ifndef NO_QBOND
+
constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
@@ -242,6 +244,8 @@ constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#define CONTRACT_STATE2_TYPE QBOND2
#include "contracts/QBond.h"
+#endif
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -343,7 +347,9 @@ constexpr struct ContractDescription
#ifndef NO_RANDOM_LOTTERY
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
#endif
+#ifndef NO_QBOND
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -451,7 +457,9 @@ static void initializeContracts()
#ifndef NO_RANDOM_LOTTERY
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
#endif
+#ifndef NO_QBOND
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
+#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index eb63bb754..2441e307a 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -2,6 +2,7 @@
// #define MSVAULT_V1
// #define NO_RANDOM_LOTTERY
+// #define NO_QBOND
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
From 4b78e06b3913587f9a2ea4667b4e82fe1bbbe4c6 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 29 Sep 2025 18:31:13 +0200
Subject: [PATCH 118/297] fix linker warning in RandomLottery
---
src/contracts/RandomLottery.h | 18 ++++--------------
test/contract_rl.cpp | 3 +++
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/contracts/RandomLottery.h b/src/contracts/RandomLottery.h
index 961a15cfe..7a1a109ad 100644
--- a/src/contracts/RandomLottery.h
+++ b/src/contracts/RandomLottery.h
@@ -18,18 +18,6 @@ constexpr uint16 RL_MAX_NUMBER_OF_PLAYERS = 1024;
/// Maximum number of winners kept in the on-chain winners history buffer.
constexpr uint16 RL_MAX_NUMBER_OF_WINNERS_IN_HISTORY = 1024;
-/**
- * @brief Developer address for the RandomLottery contract.
- *
- * IMPORTANT:
- * The macro ID and the individual token macros (_Z, _T, _Q, etc.) must be available.
- * If clang reports 'ID' undeclared here, include the QPI identity / address utilities first.
- */
-static const id RL_DEV_ADDRESS = ID(_Z, _T, _Z, _E, _A, _Q, _G, _U, _P, _I, _K, _T, _X, _F, _Y, _X, _Y, _E, _I, _T, _L, _A, _K, _F, _T, _D, _X, _C,
- _R, _L, _W, _E, _T, _H, _N, _G, _H, _D, _Y, _U, _W, _E, _Y, _Q, _N, _Q, _S, _R, _H, _O, _W, _M, _U, _J, _L, _E);
-/// Owner address (currently identical to developer address; can be split in future revisions).
-static const id RL_OWNER_ADDRESS = RL_DEV_ADDRESS;
-
/// Placeholder structure for future extensions.
struct RL2
{
@@ -230,8 +218,10 @@ struct RL : public ContractBase
INITIALIZE()
{
// Addresses
- state.teamAddress = RL_DEV_ADDRESS;
- state.ownerAddress = RL_OWNER_ADDRESS;
+ state.teamAddress = ID(_Z, _T, _Z, _E, _A, _Q, _G, _U, _P, _I, _K, _T, _X, _F, _Y, _X, _Y, _E, _I, _T, _L, _A, _K, _F, _T, _D, _X, _C,
+ _R, _L, _W, _E, _T, _H, _N, _G, _H, _D, _Y, _U, _W, _E, _Y, _Q, _N, _Q, _S, _R, _H, _O, _W, _M, _U, _J, _L, _E);
+ // Owner address (currently identical to developer address; can be split in future revisions).
+ state.ownerAddress = state.teamAddress;
// Default fee percentages (sum <= 100; winner percent derived)
state.teamFeePercent = 10;
diff --git a/test/contract_rl.cpp b/test/contract_rl.cpp
index 319081acc..5c0bd008b 100644
--- a/test/contract_rl.cpp
+++ b/test/contract_rl.cpp
@@ -8,6 +8,9 @@ constexpr uint16 FUNCTION_INDEX_GET_FEES = 1;
constexpr uint16 FUNCTION_INDEX_GET_PLAYERS = 2;
constexpr uint16 FUNCTION_INDEX_GET_WINNERS = 3;
+static const id RL_DEV_ADDRESS = ID(_Z, _T, _Z, _E, _A, _Q, _G, _U, _P, _I, _K, _T, _X, _F, _Y, _X, _Y, _E, _I, _T, _L, _A, _K, _F, _T, _D, _X, _C,
+ _R, _L, _W, _E, _T, _H, _N, _G, _H, _D, _Y, _U, _W, _E, _Y, _Q, _N, _Q, _S, _R, _H, _O, _W, _M, _U, _J, _L, _E);
+
// Equality operator for comparing WinnerInfo objects
bool operator==(const RL::WinnerInfo& left, const RL::WinnerInfo& right)
{
From 191233947cb9b671029e913573e56d4442165669 Mon Sep 17 00:00:00 2001
From: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:15:16 +0200
Subject: [PATCH 119/297] Fix broken gtest (scratchpad) (#562)
Wrong version of __scratchpad() was used with HashSet in gtest.
Fixed by removing alternative implementations of __scratchpad() from tests.
---
test/qpi_collection.cpp | 24 ++++++++++-------------
test/qpi_hash_map.cpp | 42 +++++++++++++++++++----------------------
2 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/test/qpi_collection.cpp b/test/qpi_collection.cpp
index d88bf1242..0778553c0 100644
--- a/test/qpi_collection.cpp
+++ b/test/qpi_collection.cpp
@@ -2,11 +2,6 @@
#include "gtest/gtest.h"
-static void* __scratchpadBuffer = nullptr;
-static void* __scratchpad()
-{
- return __scratchpadBuffer;
-}
namespace QPI
{
struct QpiContextProcedureCall;
@@ -16,6 +11,7 @@ typedef void (*USER_FUNCTION)(const QPI::QpiContextFunctionCall&, void* state, v
typedef void (*USER_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
#include "../src/contracts/qpi.h"
+#include "../src/common_buffers.h"
#include "../src/contract_core/qpi_collection_impl.h"
#include "../src/contract_core/qpi_trivial_impl.h"
@@ -1522,7 +1518,7 @@ void testCollectionPseudoRandom(int povs, int seed, bool povCollisions, int clea
TEST(TestCoreQPI, CollectionInsertRemoveCleanupRandom)
{
- __scratchpadBuffer = new char[10 * 1024 * 1024];
+ reorgBuffer = new char[10 * 1024 * 1024];
constexpr unsigned int numCleanups = 30;
for (int i = 0; i < 10; ++i)
{
@@ -1540,21 +1536,21 @@ TEST(TestCoreQPI, CollectionInsertRemoveCleanupRandom)
testCollectionPseudoRandom<16>(10, 12 + i, povCollisions, numCleanups, 55, 45);
testCollectionPseudoRandom<4>(4, 42 + i, povCollisions, numCleanups, 52, 48);
}
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TEST(TestCoreQPI, CollectionCleanupWithPovCollisions)
{
// Shows bugs in cleanup() that occur in case of massive pov hash map collisions and in case of capacity < 32
- __scratchpadBuffer = new char[10 * 1024 * 1024];
+ reorgBuffer = new char[10 * 1024 * 1024];
bool cleanupAfterEachRemove = true;
testCollectionMultiPovOneElement<16>(cleanupAfterEachRemove);
testCollectionMultiPovOneElement<32>(cleanupAfterEachRemove);
testCollectionMultiPovOneElement<64>(cleanupAfterEachRemove);
testCollectionMultiPovOneElement<128>(cleanupAfterEachRemove);
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
@@ -1673,7 +1669,7 @@ QPI::uint64 testCollectionPerformance(
TEST(TestCoreQPI, CollectionPerformance)
{
- __scratchpadBuffer = new char[16 * 1024 * 1024];
+ reorgBuffer = new char[16 * 1024 * 1024];
std::vector durations;
std::vector descriptions;
@@ -1702,8 +1698,8 @@ TEST(TestCoreQPI, CollectionPerformance)
durations.push_back(testCollectionPerformance<512>(16, 333));
descriptions.push_back("[CollectionPerformance] Collection<512>(16, 333)");
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
bool verbose = true;
if (verbose)
diff --git a/test/qpi_hash_map.cpp b/test/qpi_hash_map.cpp
index 3760c17f1..47ddbfb72 100644
--- a/test/qpi_hash_map.cpp
+++ b/test/qpi_hash_map.cpp
@@ -2,11 +2,6 @@
#include "gtest/gtest.h"
-static void* __scratchpadBuffer = nullptr;
-static void* __scratchpad()
-{
- return __scratchpadBuffer;
-}
namespace QPI
{
struct QpiContextProcedureCall;
@@ -16,6 +11,7 @@ typedef void (*USER_FUNCTION)(const QPI::QpiContextFunctionCall&, void* state, v
typedef void (*USER_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
#include "../src/contracts/qpi.h"
+#include "../src/common_buffers.h"
#include "../src/contract_core/qpi_hash_map_impl.h"
#include
#include
@@ -374,7 +370,7 @@ TYPED_TEST_P(QPIHashMapTest, TestCleanup)
constexpr QPI::uint64 capacity = 4;
QPI::HashMap hashMap;
- __scratchpadBuffer = new char[2 * sizeof(hashMap)];
+ reorgBuffer = new char[2 * sizeof(hashMap)];
std::array keyValuePairs = HashMapTestData::CreateKeyValueTestPairs();
auto ids = std::views::keys(keyValuePairs);
@@ -413,8 +409,8 @@ TYPED_TEST_P(QPIHashMapTest, TestCleanup)
EXPECT_NE(returnedIndex, QPI::NULL_INDEX);
EXPECT_EQ(hashMap.population(), 4);
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TYPED_TEST_P(QPIHashMapTest, TestCleanupPerformanceShortcuts)
@@ -450,7 +446,7 @@ TEST(NonTypedQPIHashMapTest, TestCleanupLargeMapSameHashes)
constexpr QPI::uint64 capacity = 64;
QPI::HashMap hashMap;
- __scratchpadBuffer = new char[2 * sizeof(hashMap)];
+ reorgBuffer = new char[2 * sizeof(hashMap)];
for (QPI::uint64 i = 0; i < 64; ++i)
{
@@ -463,8 +459,8 @@ TEST(NonTypedQPIHashMapTest, TestCleanupLargeMapSameHashes)
// Cleanup will have to iterate through the whole map to find an empty slot for the last element.
hashMap.cleanup();
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TYPED_TEST_P(QPIHashMapTest, TestReplace)
@@ -623,7 +619,7 @@ void testHashMapPseudoRandom(int seed, int cleanups, int percentAdd, int percent
std::map referenceMap;
QPI::HashMap map;
- __scratchpadBuffer = new char[2 * sizeof(map)];
+ reorgBuffer = new char[2 * sizeof(map)];
map.reset();
@@ -685,8 +681,8 @@ void testHashMapPseudoRandom(int seed, int cleanups, int percentAdd, int percent
// std::cout << "capacity: " << set.capacity() << ", pupulation:" << set.population() << std::endl;
}
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TEST(QPIHashMapTest, HashMapPseudoRandom)
@@ -718,7 +714,7 @@ TEST(QPIHashMapTest, HashSet)
{
constexpr QPI::uint64 capacity = 128;
QPI::HashSet hashSet;
- __scratchpadBuffer = new char[2 * sizeof(hashSet)];
+ reorgBuffer = new char[2 * sizeof(hashSet)];
EXPECT_EQ(hashSet.capacity(), capacity);
// Test add() and contains()
@@ -816,8 +812,8 @@ TEST(QPIHashMapTest, HashSet)
hashSet.reset();
EXPECT_EQ(hashSet.population(), 0);
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
template
@@ -886,7 +882,7 @@ void testHashSetPseudoRandom(int seed, int cleanups, int percentAdd, int percent
std::set referenceSet;
QPI::HashSet set;
- __scratchpadBuffer = new char[2 * sizeof(set)];
+ reorgBuffer = new char[2 * sizeof(set)];
set.reset();
@@ -946,8 +942,8 @@ void testHashSetPseudoRandom(int seed, int cleanups, int percentAdd, int percent
// std::cout << "capacity: " << set.capacity() << ", pupulation:" << set.population() << std::endl;
}
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TEST(QPIHashMapTest, HashSetPseudoRandom)
@@ -983,7 +979,7 @@ static void perfTestCleanup(int seed)
std::mt19937_64 gen64(seed);
auto* set = new QPI::HashSet();
- __scratchpadBuffer = new char[sizeof(*set)];
+ reorgBuffer = new char[sizeof(*set)];
for (QPI::uint64 i = 1; i <= 100; ++i)
{
@@ -1007,8 +1003,8 @@ static void perfTestCleanup(int seed)
}
delete set;
- delete[] __scratchpadBuffer;
- __scratchpadBuffer = nullptr;
+ delete[] reorgBuffer;
+ reorgBuffer = nullptr;
}
TEST(QPIHashMapTest, HashSetPerfTest)
From 47833751dbff6385eb16cd6f5ad65b7efc1dcfa3 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:33:43 +0200
Subject: [PATCH 120/297] Revert "add NO_QBOND toggle"
This reverts commit 9e0d226b0ba683be02815c34935794b42185e6ad.
---
src/contract_core/contract_def.h | 8 --------
src/qubic.cpp | 1 -
2 files changed, 9 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 839924d29..8d0337b1e 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -232,8 +232,6 @@ constexpr unsigned short RL_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#endif
-#ifndef NO_QBOND
-
constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
@@ -244,8 +242,6 @@ constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#define CONTRACT_STATE2_TYPE QBOND2
#include "contracts/QBond.h"
-#endif
-
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -347,9 +343,7 @@ constexpr struct ContractDescription
#ifndef NO_RANDOM_LOTTERY
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
#endif
-#ifndef NO_QBOND
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -457,9 +451,7 @@ static void initializeContracts()
#ifndef NO_RANDOM_LOTTERY
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
#endif
-#ifndef NO_QBOND
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
-#endif
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 2441e307a..eb63bb754 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -2,7 +2,6 @@
// #define MSVAULT_V1
// #define NO_RANDOM_LOTTERY
-// #define NO_QBOND
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
From 55e5325d3f6c8dc5d9a986649299668249d76a8f Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:38:25 +0200
Subject: [PATCH 121/297] Revert "add NO_RANDOM_LOTTERY toggle"
This reverts commit f3cd543dd3dbee4b6893ae1f47c1346d41244097.
---
src/contract_core/contract_def.h | 10 +---------
src/qubic.cpp | 1 -
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 8d0337b1e..38c390018 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -218,20 +218,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QDRAW2
#include "contracts/Qdraw.h"
-#ifndef NO_RANDOM_LOTTERY
-
-constexpr unsigned short RL_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
+#define RL_CONTRACT_INDEX 16
#define CONTRACT_INDEX RL_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE RL
#define CONTRACT_STATE2_TYPE RL2
#include "contracts/RandomLottery.h"
-#endif
-
constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
@@ -340,9 +336,7 @@ constexpr struct ContractDescription
{"QSWAP", 171, 10000, sizeof(QSWAP)}, // proposal in epoch 169, IPO in 170, construction and first use in 171
{"NOST", 172, 10000, sizeof(NOST)}, // proposal in epoch 170, IPO in 171, construction and first use in 172
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
-#ifndef NO_RANDOM_LOTTERY
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
-#endif
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -448,9 +442,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QSWAP);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(NOST);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
-#ifndef NO_RANDOM_LOTTERY
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
-#endif
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
diff --git a/src/qubic.cpp b/src/qubic.cpp
index eb63bb754..9fd54bd32 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,7 +1,6 @@
#define SINGLE_COMPILE_UNIT
// #define MSVAULT_V1
-// #define NO_RANDOM_LOTTERY
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
From c0b9c9f4693300637b89385743ea5b64fee8bc21 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:40:20 +0200
Subject: [PATCH 122/297] Revert "add MSVAULT_V1 toggle"
This reverts commit 29a5586ded0309d4bf4908a86348b10d410ba8dc.
---
src/Qubic.vcxproj | 1 -
src/Qubic.vcxproj.filters | 3 -
src/contract_core/contract_def.h | 6 +-
src/contracts/MsVault_v1.h | 1170 ------------------------------
src/qubic.cpp | 2 -
5 files changed, 1 insertion(+), 1181 deletions(-)
delete mode 100644 src/contracts/MsVault_v1.h
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 7ffd11251..862bbec3a 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -23,7 +23,6 @@
-
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 50caefccb..20378179b 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -282,9 +282,6 @@
contracts
-
- contracts
-
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 38c390018..47da5aa73 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -172,11 +172,7 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_INDEX MSVAULT_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE MSVAULT
#define CONTRACT_STATE2_TYPE MSVAULT2
-#ifdef MSVAULT_V1
- #include "contracts/MsVault_v1.h"
-#else
- #include "contracts/MsVault.h"
-#endif
+#include "contracts/MsVault.h"
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
diff --git a/src/contracts/MsVault_v1.h b/src/contracts/MsVault_v1.h
deleted file mode 100644
index 66a01c18d..000000000
--- a/src/contracts/MsVault_v1.h
+++ /dev/null
@@ -1,1170 +0,0 @@
-using namespace QPI;
-
-constexpr uint64 MSVAULT_MAX_OWNERS = 16;
-constexpr uint64 MSVAULT_MAX_COOWNER = 8;
-constexpr uint64 MSVAULT_INITIAL_MAX_VAULTS = 131072ULL; // 2^17
-constexpr uint64 MSVAULT_MAX_VAULTS = MSVAULT_INITIAL_MAX_VAULTS * X_MULTIPLIER;
-// MSVAULT asset name : 23727827095802701, using assetNameFromString("MSVAULT") utility in test_util.h
-static constexpr uint64 MSVAULT_ASSET_NAME = 23727827095802701;
-
-constexpr uint64 MSVAULT_REGISTERING_FEE = 5000000ULL;
-constexpr uint64 MSVAULT_RELEASE_FEE = 100000ULL;
-constexpr uint64 MSVAULT_RELEASE_RESET_FEE = 1000000ULL;
-constexpr uint64 MSVAULT_HOLDING_FEE = 500000ULL;
-constexpr uint64 MSVAULT_BURN_FEE = 0ULL; // Integer percentage from 1 -> 100
-// [TODO]: Turn this assert ON when MSVAULT_BURN_FEE > 0
-//static_assert(MSVAULT_BURN_FEE > 0, "SC requires burning qu to operate, the burn fee must be higher than 0!");
-
-static constexpr uint64 MSVAULT_MAX_FEE_VOTES = 64;
-
-
-struct MSVAULT2
-{
-};
-
-struct MSVAULT : public ContractBase
-{
-public:
- struct Vault
- {
- id vaultName;
- Array owners;
- Array releaseAmounts;
- Array releaseDestinations;
- uint64 balance;
- uint8 numberOfOwners;
- uint8 requiredApprovals;
- bit isActive;
- };
-
- struct MsVaultFeeVote
- {
- uint64 registeringFee;
- uint64 releaseFee;
- uint64 releaseResetFee;
- uint64 holdingFee;
- uint64 depositFee;
- uint64 burnFee;
- };
-
- struct MSVaultLogger
- {
- uint32 _contractIndex;
- // 1: Invalid vault ID or vault inactive
- // 2: Caller not an owner
- // 3: Invalid parameters (e.g., amount=0, destination=NULL_ID)
- // 4: Release successful
- // 5: Insufficient balance
- // 6: Release not fully approved
- // 7: Reset release requests successful
- uint32 _type;
- uint64 vaultId;
- id ownerID;
- uint64 amount;
- id destination;
- sint8 _terminator;
- };
-
- struct isValidVaultId_input
- {
- uint64 vaultId;
- };
- struct isValidVaultId_output
- {
- bit result;
- };
- struct isValidVaultId_locals
- {
- };
-
- struct findOwnerIndexInVault_input
- {
- Vault vault;
- id ownerID;
- };
- struct findOwnerIndexInVault_output
- {
- sint64 index;
- };
- struct findOwnerIndexInVault_locals
- {
- sint64 i;
- };
-
- struct isOwnerOfVault_input
- {
- Vault vault;
- id ownerID;
- };
- struct isOwnerOfVault_output
- {
- bit result;
- };
- struct isOwnerOfVault_locals
- {
- findOwnerIndexInVault_input fi_in;
- findOwnerIndexInVault_output fi_out;
- findOwnerIndexInVault_locals fi_locals;
- };
-
- struct resetReleaseRequests_input
- {
- Vault vault;
- };
- struct resetReleaseRequests_output
- {
- Vault vault;
- };
- struct resetReleaseRequests_locals
- {
- uint64 i;
- };
-
- struct isShareHolder_input
- {
- id candidate;
- };
- struct isShareHolder_locals {};
- struct isShareHolder_output
- {
- uint64 result;
- };
-
- // Procedures and functions' structs
- struct registerVault_input
- {
- id vaultName;
- Array owners;
- uint64 requiredApprovals;
- };
- struct registerVault_output
- {
- };
- struct registerVault_locals
- {
- uint64 ownerCount;
- uint64 i;
- sint64 ii;
- uint64 j;
- uint64 k;
- uint64 count;
- sint64 slotIndex;
- Vault newVault;
- Vault tempVault;
- id proposedOwner;
-
- Array tempOwners;
-
- resetReleaseRequests_input rr_in;
- resetReleaseRequests_output rr_out;
- resetReleaseRequests_locals rr_locals;
- };
-
- struct deposit_input
- {
- uint64 vaultId;
- };
- struct deposit_output
- {
- };
- struct deposit_locals
- {
- Vault vault;
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct releaseTo_input
- {
- uint64 vaultId;
- uint64 amount;
- id destination;
- };
- struct releaseTo_output
- {
- };
- struct releaseTo_locals
- {
- Vault vault;
- MSVaultLogger logger;
-
- sint64 ownerIndex;
- uint64 approvals;
- uint64 totalOwners;
- bit releaseApproved;
- uint64 i;
-
- isOwnerOfVault_input io_in;
- isOwnerOfVault_output io_out;
- isOwnerOfVault_locals io_locals;
-
- findOwnerIndexInVault_input fi_in;
- findOwnerIndexInVault_output fi_out;
- findOwnerIndexInVault_locals fi_locals;
-
- resetReleaseRequests_input rr_in;
- resetReleaseRequests_output rr_out;
- resetReleaseRequests_locals rr_locals;
-
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct resetRelease_input
- {
- uint64 vaultId;
- };
- struct resetRelease_output
- {
- };
- struct resetRelease_locals
- {
- Vault vault;
- MSVaultLogger logger;
- sint64 ownerIndex;
-
- isOwnerOfVault_input io_in;
- isOwnerOfVault_output io_out;
- isOwnerOfVault_locals io_locals;
-
- findOwnerIndexInVault_input fi_in;
- findOwnerIndexInVault_output fi_out;
- findOwnerIndexInVault_locals fi_locals;
-
- bit found;
-
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct voteFeeChange_input
- {
- uint64 newRegisteringFee;
- uint64 newReleaseFee;
- uint64 newReleaseResetFee;
- uint64 newHoldingFee;
- uint64 newDepositFee;
- uint64 burnFee;
- };
- struct voteFeeChange_output
- {
- };
- struct voteFeeChange_locals
- {
- uint64 i;
- uint64 sumVote;
- bit needNewRecord;
- uint64 nShare;
- MsVaultFeeVote fs;
-
- id currentAddr;
- uint64 realScore;
- MsVaultFeeVote currentVote;
- MsVaultFeeVote uniqueVote;
-
- bit found;
- uint64 uniqueIndex;
- uint64 j;
- uint64 currentRank;
-
- isShareHolder_input ish_in;
- isShareHolder_output ish_out;
- isShareHolder_locals ish_locals;
- };
-
- struct getVaults_input
- {
- id publicKey;
- };
- struct getVaults_output
- {
- uint64 numberOfVaults;
- Array vaultIds;
- Array vaultNames;
- };
- struct getVaults_locals
- {
- uint64 count;
- uint64 i, j;
- Vault v;
- };
-
- struct getReleaseStatus_input
- {
- uint64 vaultId;
- };
- struct getReleaseStatus_output
- {
- uint64 status;
- Array amounts;
- Array destinations;
- };
- struct getReleaseStatus_locals
- {
- Vault vault;
- uint64 i;
-
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct getBalanceOf_input
- {
- uint64 vaultId;
- };
- struct getBalanceOf_output
- {
- uint64 status;
- sint64 balance;
- };
- struct getBalanceOf_locals
- {
- Vault vault;
-
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct getVaultName_input
- {
- uint64 vaultId;
- };
- struct getVaultName_output
- {
- uint64 status;
- id vaultName;
- };
- struct getVaultName_locals
- {
- Vault vault;
-
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
- };
-
- struct getRevenueInfo_input {};
- struct getRevenueInfo_output
- {
- uint64 numberOfActiveVaults;
- uint64 totalRevenue;
- uint64 totalDistributedToShareholders;
- uint64 burnedAmount;
- };
-
- struct getFees_input
- {
- };
- struct getFees_output
- {
- uint64 registeringFee;
- uint64 releaseFee;
- uint64 releaseResetFee;
- uint64 holdingFee;
- uint64 depositFee; // currently always 0
- uint64 burnFee;
- };
-
- struct getVaultOwners_input
- {
- uint64 vaultId;
- };
- struct getVaultOwners_locals
- {
- isValidVaultId_input iv_in;
- isValidVaultId_output iv_out;
- isValidVaultId_locals iv_locals;
-
- Vault v;
- uint64 i;
- };
- struct getVaultOwners_output
- {
- uint64 status;
- uint64 numberOfOwners;
- Array owners;
-
- uint64 requiredApprovals;
- };
-
- struct END_EPOCH_locals
- {
- uint64 i;
- uint64 j;
- Vault v;
- sint64 amountToDistribute;
- uint64 feeToBurn;
- };
-
-protected:
- // Contract states
- Array vaults;
-
- uint64 numberOfActiveVaults;
- uint64 totalRevenue;
- uint64 totalDistributedToShareholders;
- uint64 burnedAmount;
-
- Array feeVotes;
- Array feeVotesOwner;
- Array feeVotesScore;
- uint64 feeVotesAddrCount;
-
- Array uniqueFeeVotes;
- Array uniqueFeeVotesRanking;
- uint64 uniqueFeeVotesCount;
-
- uint64 liveRegisteringFee;
- uint64 liveReleaseFee;
- uint64 liveReleaseResetFee;
- uint64 liveHoldingFee;
- uint64 liveDepositFee;
- uint64 liveBurnFee;
-
- // Helper Functions
- PRIVATE_FUNCTION_WITH_LOCALS(isValidVaultId)
- {
- if (input.vaultId < MSVAULT_MAX_VAULTS)
- {
- output.result = true;
- }
- else
- {
- output.result = false;
- }
- }
-
- PRIVATE_FUNCTION_WITH_LOCALS(findOwnerIndexInVault)
- {
- output.index = -1;
- for (locals.i = 0; locals.i < (sint64)input.vault.numberOfOwners; locals.i++)
- {
- if (input.vault.owners.get(locals.i) == input.ownerID)
- {
- output.index = locals.i;
- break;
- }
- }
- }
-
- PRIVATE_FUNCTION_WITH_LOCALS(isOwnerOfVault)
- {
- locals.fi_in.vault = input.vault;
- locals.fi_in.ownerID = input.ownerID;
- findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
- output.result = (locals.fi_out.index != -1);
- }
-
- PRIVATE_FUNCTION_WITH_LOCALS(resetReleaseRequests)
- {
- for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
- {
- input.vault.releaseAmounts.set(locals.i, 0);
- input.vault.releaseDestinations.set(locals.i, NULL_ID);
- }
- output.vault = input.vault;
- }
-
- // Procedures and functions
- PUBLIC_PROCEDURE_WITH_LOCALS(registerVault)
- {
- // [TODO]: Change this to
- // if (qpi.invocationReward() < state.liveRegisteringFee)
- if (qpi.invocationReward() < MSVAULT_REGISTERING_FEE)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- locals.ownerCount = 0;
- for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
- {
- locals.proposedOwner = input.owners.get(locals.i);
- if (locals.proposedOwner != NULL_ID)
- {
- locals.tempOwners.set(locals.ownerCount, locals.proposedOwner);
- locals.ownerCount = locals.ownerCount + 1;
- }
- }
-
- if (locals.ownerCount <= 1)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- if (locals.ownerCount > MSVAULT_MAX_OWNERS)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- for (locals.i = locals.ownerCount; locals.i < MSVAULT_MAX_OWNERS; locals.i = locals.i + 1)
- {
- locals.tempOwners.set(locals.i, NULL_ID);
- }
-
- // Check if requiredApprovals is valid: must be <= numberOfOwners, > 1
- if (input.requiredApprovals <= 1 || input.requiredApprovals > locals.ownerCount)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- // Find empty slot
- locals.slotIndex = -1;
- for (locals.ii = 0; locals.ii < MSVAULT_MAX_VAULTS; locals.ii++)
- {
- locals.tempVault = state.vaults.get(locals.ii);
- if (!locals.tempVault.isActive && locals.tempVault.numberOfOwners == 0 && locals.tempVault.balance == 0)
- {
- locals.slotIndex = locals.ii;
- break;
- }
- }
-
- if (locals.slotIndex == -1)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
- {
- locals.proposedOwner = locals.tempOwners.get(locals.i);
- locals.count = 0;
- for (locals.j = 0; locals.j < MSVAULT_MAX_VAULTS; locals.j++)
- {
- locals.tempVault = state.vaults.get(locals.j);
- if (locals.tempVault.isActive)
- {
- for (locals.k = 0; locals.k < (uint64)locals.tempVault.numberOfOwners; locals.k++)
- {
- if (locals.tempVault.owners.get(locals.k) == locals.proposedOwner)
- {
- locals.count++;
- if (locals.count >= MSVAULT_MAX_COOWNER)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
- }
- }
- }
- }
- }
-
- locals.newVault.vaultName = input.vaultName;
- locals.newVault.numberOfOwners = (uint8)locals.ownerCount;
- locals.newVault.requiredApprovals = (uint8)input.requiredApprovals;
- locals.newVault.balance = 0;
- locals.newVault.isActive = true;
-
- locals.rr_in.vault = locals.newVault;
- resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
- locals.newVault = locals.rr_out.vault;
-
- for (locals.i = 0; locals.i < locals.ownerCount; locals.i++)
- {
- locals.newVault.owners.set(locals.i, locals.tempOwners.get(locals.i));
- }
-
- state.vaults.set((uint64)locals.slotIndex, locals.newVault);
-
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveRegisteringFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveRegisteringFee);
- // }
- if (qpi.invocationReward() > MSVAULT_REGISTERING_FEE)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_REGISTERING_FEE);
- }
-
- state.numberOfActiveVaults++;
-
- // [TODO]: Change this to
- //state.totalRevenue += state.liveRegisteringFee;
- state.totalRevenue += MSVAULT_REGISTERING_FEE;
- }
-
- PUBLIC_PROCEDURE_WITH_LOCALS(deposit)
- {
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- locals.vault = state.vaults.get(input.vaultId);
- if (!locals.vault.isActive)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward());
- return;
- }
-
- locals.vault.balance += qpi.invocationReward();
- state.vaults.set(input.vaultId, locals.vault);
- }
-
- PUBLIC_PROCEDURE_WITH_LOCALS(releaseTo)
- {
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveReleaseFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseFee);
- //}
- if (qpi.invocationReward() > MSVAULT_RELEASE_FEE)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_FEE);
- }
- // [TODO]: Change this to
- //state.totalRevenue += state.liveReleaseFee;
- state.totalRevenue += MSVAULT_RELEASE_FEE;
-
- locals.logger._contractIndex = CONTRACT_INDEX;
- locals.logger._type = 0;
- locals.logger.vaultId = input.vaultId;
- locals.logger.ownerID = qpi.invocator();
- locals.logger.amount = input.amount;
- locals.logger.destination = input.destination;
-
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- locals.logger._type = 1;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.vault = state.vaults.get(input.vaultId);
-
- if (!locals.vault.isActive)
- {
- locals.logger._type = 1;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.io_in.vault = locals.vault;
- locals.io_in.ownerID = qpi.invocator();
- isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
- if (!locals.io_out.result)
- {
- locals.logger._type = 2;
- LOG_INFO(locals.logger);
- return;
- }
-
- if (input.amount == 0 || input.destination == NULL_ID)
- {
- locals.logger._type = 3;
- LOG_INFO(locals.logger);
- return;
- }
-
- if (locals.vault.balance < input.amount)
- {
- locals.logger._type = 5;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.fi_in.vault = locals.vault;
- locals.fi_in.ownerID = qpi.invocator();
- findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
- locals.ownerIndex = locals.fi_out.index;
-
- locals.vault.releaseAmounts.set(locals.ownerIndex, input.amount);
- locals.vault.releaseDestinations.set(locals.ownerIndex, input.destination);
-
- locals.approvals = 0;
- locals.totalOwners = (uint64)locals.vault.numberOfOwners;
- for (locals.i = 0; locals.i < locals.totalOwners; locals.i++)
- {
- if (locals.vault.releaseAmounts.get(locals.i) == input.amount &&
- locals.vault.releaseDestinations.get(locals.i) == input.destination)
- {
- locals.approvals++;
- }
- }
-
- locals.releaseApproved = false;
- if (locals.approvals >= (uint64)locals.vault.requiredApprovals)
- {
- locals.releaseApproved = true;
- }
-
- if (locals.releaseApproved)
- {
- // Still need to re-check the balance before releasing funds
- if (locals.vault.balance >= input.amount)
- {
- qpi.transfer(input.destination, input.amount);
- locals.vault.balance -= input.amount;
-
- locals.rr_in.vault = locals.vault;
- resetReleaseRequests(qpi, state, locals.rr_in, locals.rr_out, locals.rr_locals);
- locals.vault = locals.rr_out.vault;
-
- state.vaults.set(input.vaultId, locals.vault);
-
- locals.logger._type = 4;
- LOG_INFO(locals.logger);
- }
- else
- {
- locals.logger._type = 5;
- LOG_INFO(locals.logger);
- }
- }
- else
- {
- state.vaults.set(input.vaultId, locals.vault);
- locals.logger._type = 6;
- LOG_INFO(locals.logger);
- }
- }
-
- PUBLIC_PROCEDURE_WITH_LOCALS(resetRelease)
- {
- // [TODO]: Change this to
- //if (qpi.invocationReward() > state.liveReleaseResetFee)
- //{
- // qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.liveReleaseResetFee);
- //}
- if (qpi.invocationReward() > MSVAULT_RELEASE_RESET_FEE)
- {
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - MSVAULT_RELEASE_RESET_FEE);
- }
- // [TODO]: Change this to
- //state.totalRevenue += state.liveReleaseResetFee;
- state.totalRevenue += MSVAULT_RELEASE_RESET_FEE;
-
- locals.logger._contractIndex = CONTRACT_INDEX;
- locals.logger._type = 0;
- locals.logger.vaultId = input.vaultId;
- locals.logger.ownerID = qpi.invocator();
- locals.logger.amount = 0;
- locals.logger.destination = NULL_ID;
-
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- locals.logger._type = 1;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.vault = state.vaults.get(input.vaultId);
-
- if (!locals.vault.isActive)
- {
- locals.logger._type = 1;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.io_in.vault = locals.vault;
- locals.io_in.ownerID = qpi.invocator();
- isOwnerOfVault(qpi, state, locals.io_in, locals.io_out, locals.io_locals);
- if (!locals.io_out.result)
- {
- locals.logger._type = 2;
- LOG_INFO(locals.logger);
- return;
- }
-
- locals.fi_in.vault = locals.vault;
- locals.fi_in.ownerID = qpi.invocator();
- findOwnerIndexInVault(qpi, state, locals.fi_in, locals.fi_out, locals.fi_locals);
- locals.ownerIndex = locals.fi_out.index;
-
- locals.vault.releaseAmounts.set(locals.ownerIndex, 0);
- locals.vault.releaseDestinations.set(locals.ownerIndex, NULL_ID);
-
- state.vaults.set(input.vaultId, locals.vault);
-
- locals.logger._type = 7;
- LOG_INFO(locals.logger);
- }
-
- // [TODO]: Uncomment this to enable live fee update
- PUBLIC_PROCEDURE_WITH_LOCALS(voteFeeChange)
- {
- return;
- // locals.ish_in.candidate = qpi.invocator();
- // isShareHolder(qpi, state, locals.ish_in, locals.ish_out, locals.ish_locals);
- // if (!locals.ish_out.result)
- // {
- // return;
- // }
- //
- // qpi.transfer(qpi.invocator(), qpi.invocationReward());
- // locals.nShare = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), qpi.invocator(), qpi.invocator(), MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
- //
- // locals.fs.registeringFee = input.newRegisteringFee;
- // locals.fs.releaseFee = input.newReleaseFee;
- // locals.fs.releaseResetFee = input.newReleaseResetFee;
- // locals.fs.holdingFee = input.newHoldingFee;
- // locals.fs.depositFee = input.newDepositFee;
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //locals.fs.burnFee = input.burnFee;
- //
- // locals.needNewRecord = true;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.currentAddr = state.feeVotesOwner.get(locals.i);
- // locals.realScore = qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), locals.currentAddr, locals.currentAddr, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX);
- // state.feeVotesScore.set(locals.i, locals.realScore);
- // if (locals.currentAddr == qpi.invocator())
- // {
- // locals.needNewRecord = false;
- // }
- // }
- // if (locals.needNewRecord)
- // {
- // state.feeVotes.set(state.feeVotesAddrCount, locals.fs);
- // state.feeVotesOwner.set(state.feeVotesAddrCount, qpi.invocator());
- // state.feeVotesScore.set(state.feeVotesAddrCount, locals.nShare);
- // state.feeVotesAddrCount = state.feeVotesAddrCount + 1;
- // }
- //
- // locals.sumVote = 0;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.sumVote = locals.sumVote + state.feeVotesScore.get(locals.i);
- // }
- // if (locals.sumVote < QUORUM)
- // {
- // return;
- // }
- //
- // state.uniqueFeeVotesCount = 0;
- // for (locals.i = 0; locals.i < state.feeVotesAddrCount; locals.i = locals.i + 1)
- // {
- // locals.currentVote = state.feeVotes.get(locals.i);
- // locals.found = false;
- // locals.uniqueIndex = 0;
- // locals.j;
- // for (locals.j = 0; locals.j < state.uniqueFeeVotesCount; locals.j = locals.j + 1)
- // {
- // locals.uniqueVote = state.uniqueFeeVotes.get(locals.j);
- // if (locals.uniqueVote.registeringFee == locals.currentVote.registeringFee &&
- // locals.uniqueVote.releaseFee == locals.currentVote.releaseFee &&
- // locals.uniqueVote.releaseResetFee == locals.currentVote.releaseResetFee &&
- // locals.uniqueVote.holdingFee == locals.currentVote.holdingFee &&
- // locals.uniqueVote.depositFee == locals.currentVote.depositFee
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //&& locals.uniqueVote.burnFee == locals.currentVote.burnFee
- // )
- // {
- // locals.found = true;
- // locals.uniqueIndex = locals.j;
- // break;
- // }
- // }
- // if (locals.found)
- // {
- // locals.currentRank = state.uniqueFeeVotesRanking.get(locals.uniqueIndex);
- // state.uniqueFeeVotesRanking.set(locals.uniqueIndex, locals.currentRank + state.feeVotesScore.get(locals.i));
- // }
- // else
- // {
- // state.uniqueFeeVotes.set(state.uniqueFeeVotesCount, locals.currentVote);
- // state.uniqueFeeVotesRanking.set(state.uniqueFeeVotesCount, state.feeVotesScore.get(locals.i));
- // state.uniqueFeeVotesCount = state.uniqueFeeVotesCount + 1;
- // }
- // }
- //
- // for (locals.i = 0; locals.i < state.uniqueFeeVotesCount; locals.i = locals.i + 1)
- // {
- // if (state.uniqueFeeVotesRanking.get(locals.i) >= QUORUM)
- // {
- // state.liveRegisteringFee = state.uniqueFeeVotes.get(locals.i).registeringFee;
- // state.liveReleaseFee = state.uniqueFeeVotes.get(locals.i).releaseFee;
- // state.liveReleaseResetFee = state.uniqueFeeVotes.get(locals.i).releaseResetFee;
- // state.liveHoldingFee = state.uniqueFeeVotes.get(locals.i).holdingFee;
- // state.liveDepositFee = state.uniqueFeeVotes.get(locals.i).depositFee;
- // // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- // //state.liveBurnFee = state.uniqueFeeVotes.get(locals.i).burnFee;
-
- // state.feeVotesAddrCount = 0;
- // state.uniqueFeeVotesCount = 0;
- // return;
- // }
- // }
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getVaults)
- {
- output.numberOfVaults = 0ULL;
- locals.count = 0ULL;
- for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
- {
- locals.v = state.vaults.get(locals.i);
- if (locals.v.isActive)
- {
- for (locals.j = 0ULL; locals.j < (uint64)locals.v.numberOfOwners; locals.j++)
- {
- if (locals.v.owners.get(locals.j) == input.publicKey)
- {
- output.vaultIds.set(locals.count, locals.i);
- output.vaultNames.set(locals.count, locals.v.vaultName);
- locals.count++;
- break;
- }
- }
- }
- }
- output.numberOfVaults = locals.count;
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getReleaseStatus)
- {
- output.status = 0ULL;
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- return; // output.status = false
- }
-
- locals.vault = state.vaults.get(input.vaultId);
- if (!locals.vault.isActive)
- {
- return; // output.status = false
- }
-
- for (locals.i = 0; locals.i < (uint64)locals.vault.numberOfOwners; locals.i++)
- {
- output.amounts.set(locals.i, locals.vault.releaseAmounts.get(locals.i));
- output.destinations.set(locals.i, locals.vault.releaseDestinations.get(locals.i));
- }
- output.status = 1ULL;
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getBalanceOf)
- {
- output.status = 0ULL;
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- return; // output.status = false
- }
-
- locals.vault = state.vaults.get(input.vaultId);
- if (!locals.vault.isActive)
- {
- return; // output.status = false
- }
- output.balance = locals.vault.balance;
- output.status = 1ULL;
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getVaultName)
- {
- output.status = 0ULL;
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
-
- if (!locals.iv_out.result)
- {
- return; // output.status = false
- }
-
- locals.vault = state.vaults.get(input.vaultId);
- if (!locals.vault.isActive)
- {
- return; // output.status = false
- }
- output.vaultName = locals.vault.vaultName;
- output.status = 1ULL;
- }
-
- PUBLIC_FUNCTION(getRevenueInfo)
- {
- output.numberOfActiveVaults = state.numberOfActiveVaults;
- output.totalRevenue = state.totalRevenue;
- output.totalDistributedToShareholders = state.totalDistributedToShareholders;
- // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- //output.burnedAmount = state.burnedAmount;
- }
-
- PUBLIC_FUNCTION(getFees)
- {
- output.registeringFee = MSVAULT_REGISTERING_FEE;
- output.releaseFee = MSVAULT_RELEASE_FEE;
- output.releaseResetFee = MSVAULT_RELEASE_RESET_FEE;
- output.holdingFee = MSVAULT_HOLDING_FEE;
- output.depositFee = 0ULL;
- // [TODO]: Change this to:
- //output.registeringFee = state.liveRegisteringFee;
- //output.releaseFee = state.liveReleaseFee;
- //output.releaseResetFee = state.liveReleaseResetFee;
- //output.holdingFee = state.liveHoldingFee;
- //output.depositFee = state.liveDepositFee;
- // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- //output.burnFee = state.liveBurnFee;
- }
-
- PUBLIC_FUNCTION_WITH_LOCALS(getVaultOwners)
- {
- output.status = 0ULL;
- output.numberOfOwners = 0;
-
- locals.iv_in.vaultId = input.vaultId;
- isValidVaultId(qpi, state, locals.iv_in, locals.iv_out, locals.iv_locals);
- if (!locals.iv_out.result)
- {
- return;
- }
-
- locals.v = state.vaults.get(input.vaultId);
-
- if (!locals.v.isActive)
- {
- return;
- }
-
- output.numberOfOwners = (uint64)locals.v.numberOfOwners;
-
- for (locals.i = 0; locals.i < MSVAULT_MAX_OWNERS; locals.i++)
- {
- output.owners.set(locals.i, locals.v.owners.get(locals.i));
- }
-
- output.requiredApprovals = (uint64)locals.v.requiredApprovals;
-
- output.status = 1ULL;
- }
-
- // [TODO]: Uncomment this to enable live fee update
- PUBLIC_FUNCTION_WITH_LOCALS(isShareHolder)
- {
- // if (qpi.numberOfPossessedShares(MSVAULT_ASSET_NAME, id::zero(), input.candidate, input.candidate, MSVAULT_CONTRACT_INDEX, MSVAULT_CONTRACT_INDEX) > 0)
- // {
- // output.result = 1ULL;
- // }
- // else
- // {
- // output.result = 0ULL;
- // }
- }
-
- INITIALIZE()
- {
- state.numberOfActiveVaults = 0ULL;
- state.totalRevenue = 0ULL;
- state.totalDistributedToShareholders = 0ULL;
- state.burnedAmount = 0ULL;
- state.liveBurnFee = MSVAULT_BURN_FEE;
- state.liveRegisteringFee = MSVAULT_REGISTERING_FEE;
- state.liveReleaseFee = MSVAULT_RELEASE_FEE;
- state.liveReleaseResetFee = MSVAULT_RELEASE_RESET_FEE;
- state.liveHoldingFee = MSVAULT_HOLDING_FEE;
- state.liveDepositFee = 0ULL;
- }
-
- END_EPOCH_WITH_LOCALS()
- {
- for (locals.i = 0ULL; locals.i < MSVAULT_MAX_VAULTS; locals.i++)
- {
- locals.v = state.vaults.get(locals.i);
- if (locals.v.isActive)
- {
- // [TODO]: Change this to
- //if (locals.v.balance >= state.liveHoldingFee)
- //{
- // locals.v.balance -= state.liveHoldingFee;
- // state.totalRevenue += state.liveHoldingFee;
- // state.vaults.set(locals.i, locals.v);
- //}
- if (locals.v.balance >= MSVAULT_HOLDING_FEE)
- {
- locals.v.balance -= MSVAULT_HOLDING_FEE;
- state.totalRevenue += MSVAULT_HOLDING_FEE;
- state.vaults.set(locals.i, locals.v);
- }
- else
- {
- // Not enough funds to pay holding fee
- if (locals.v.balance > 0)
- {
- state.totalRevenue += locals.v.balance;
- }
- locals.v.isActive = false;
- locals.v.balance = 0;
- locals.v.requiredApprovals = 0;
- locals.v.vaultName = NULL_ID;
- locals.v.numberOfOwners = 0;
- for (locals.j = 0; locals.j < MSVAULT_MAX_OWNERS; locals.j++)
- {
- locals.v.owners.set(locals.j, NULL_ID);
- locals.v.releaseAmounts.set(locals.j, 0);
- locals.v.releaseDestinations.set(locals.j, NULL_ID);
- }
- if (state.numberOfActiveVaults > 0)
- {
- state.numberOfActiveVaults--;
- }
- state.vaults.set(locals.i, locals.v);
- }
- }
- }
-
- {
- locals.amountToDistribute = QPI::div(state.totalRevenue - state.totalDistributedToShareholders, NUMBER_OF_COMPUTORS);
-
- // [TODO]: Turn this ON when MSVAULT_BURN_FEE > 0
- //// Burn fee
- //locals.feeToBurn = QPI::div(locals.amountToDistribute * state.liveBurnFee, 100ULL);
- //if (locals.feeToBurn > 0)
- //{
- // qpi.burn(locals.feeToBurn);
- //}
- //locals.amountToDistribute -= locals.feeToBurn;
- //state.burnedAmount += locals.feeToBurn;
-
- if (locals.amountToDistribute > 0 && state.totalRevenue > state.totalDistributedToShareholders)
- {
- if (qpi.distributeDividends(locals.amountToDistribute))
- {
- state.totalDistributedToShareholders += locals.amountToDistribute * NUMBER_OF_COMPUTORS;
- }
- }
- }
- }
-
- REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
- {
- REGISTER_USER_PROCEDURE(registerVault, 1);
- REGISTER_USER_PROCEDURE(deposit, 2);
- REGISTER_USER_PROCEDURE(releaseTo, 3);
- REGISTER_USER_PROCEDURE(resetRelease, 4);
- REGISTER_USER_FUNCTION(getVaults, 5);
- REGISTER_USER_FUNCTION(getReleaseStatus, 6);
- REGISTER_USER_FUNCTION(getBalanceOf, 7);
- REGISTER_USER_FUNCTION(getVaultName, 8);
- REGISTER_USER_FUNCTION(getRevenueInfo, 9);
- REGISTER_USER_FUNCTION(getFees, 10);
- REGISTER_USER_FUNCTION(getVaultOwners, 11);
- REGISTER_USER_FUNCTION(isShareHolder, 12);
- REGISTER_USER_PROCEDURE(voteFeeChange, 13);
- }
-};
diff --git a/src/qubic.cpp b/src/qubic.cpp
index 9fd54bd32..ef789fd95 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -1,7 +1,5 @@
#define SINGLE_COMPILE_UNIT
-// #define MSVAULT_V1
-
// contract_def.h needs to be included first to make sure that contracts have minimal access
#include "contract_core/contract_def.h"
#include "contract_core/contract_exec.h"
From 173ebe71f1c3acfd5c28615c094313a735513a05 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:42:39 +0200
Subject: [PATCH 123/297] add final index for contract QBond
---
src/contract_core/contract_def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 47da5aa73..901dff334 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -224,11 +224,11 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE RL2
#include "contracts/RandomLottery.h"
-constexpr unsigned short QBOND_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef CONTRACT_INDEX
#undef CONTRACT_STATE_TYPE
#undef CONTRACT_STATE2_TYPE
+#define QBOND_CONTRACT_INDEX 17
#define CONTRACT_INDEX QBOND_CONTRACT_INDEX
#define CONTRACT_STATE_TYPE QBOND
#define CONTRACT_STATE2_TYPE QBOND2
From 2ec269d78cd97e99cacf159bff6b8eac3d9fbfad Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Thu, 31 Jul 2025 12:06:23 +0700
Subject: [PATCH 124/297] CustomMining: remove 32bits nonce and support 64bit
nonce verifier.
---
src/mining/mining.h | 397 +++++----------------------
src/network_messages/custom_mining.h | 20 +-
src/public_settings.h | 3 +-
src/qubic.cpp | 186 ++-----------
test/custom_mining.cpp | 26 +-
5 files changed, 117 insertions(+), 515 deletions(-)
diff --git a/src/mining/mining.h b/src/mining/mining.h
index df5f59b3d..5aeaa8c31 100644
--- a/src/mining/mining.h
+++ b/src/mining/mining.h
@@ -52,20 +52,6 @@ struct CustomMiningSolutionTransaction : public Transaction
}
};
-struct CustomMiningTask
-{
- unsigned long long taskIndex; // ever increasing number (unix timestamp in ms)
- unsigned short firstComputorIndex; // the first computor index assigned by this task
- unsigned short lastComputorIndex; // the last computor index assigned by this task
- unsigned int padding;
-
- unsigned char blob[408]; // Job data from pool
- unsigned long long size; // length of the blob
- unsigned long long target; // Pool difficulty
- unsigned long long height; // Block height
- unsigned char seed[32]; // Seed hash for XMR
-};
-
struct CustomMiningTaskV2 {
unsigned long long taskIndex;
unsigned char m_template[896];
@@ -76,15 +62,6 @@ struct CustomMiningTaskV2 {
unsigned char m_seed[32];
};
-struct CustomMiningSolution
-{
- unsigned long long taskIndex; // should match the index from task
- unsigned short firstComputorIndex; // should match the index from task
- unsigned short lastComputorIndex; // should match the index from task
- unsigned int nonce; // xmrig::JobResult.nonce
- m256i result; // xmrig::JobResult.result, 32 bytes
-};
-
struct CustomMiningSolutionV2 {
unsigned long long taskIndex;
unsigned long long nonce; // (extraNonce<<32) | nonce
@@ -94,6 +71,44 @@ struct CustomMiningSolutionV2 {
m256i result;
};
+static unsigned short customMiningGetComputorID(const CustomMiningSolutionV2* pSolution)
+{
+ // Check the computor idx of this solution.
+ unsigned short computorID = 0;
+ if (pSolution->reserve0 == 0)
+ {
+ computorID = (pSolution->nonce >> 32ULL) % 676ULL;
+ }
+ else
+ {
+ computorID = pSolution->reserve1 % 676ULL;
+ }
+ return computorID;
+}
+
+static CustomMiningSolutionV2 customMiningVerificationRequestToSolution(RequestedCustomMiningSolutionVerification* pRequest)
+{
+ CustomMiningSolutionV2 solution;
+ solution.taskIndex = pRequest->taskIndex;
+ solution.nonce = pRequest->nonce;
+ solution.reserve0 = pRequest->reserve0;
+ solution.reserve1 = pRequest->reserve1;
+ solution.reserve2 = pRequest->reserve2;
+ return solution;
+}
+
+static RespondCustomMiningSolutionVerification customMiningVerificationRequestToRespond(RequestedCustomMiningSolutionVerification* pRequest)
+{
+ RespondCustomMiningSolutionVerification respond;
+ respond.taskIndex = pRequest->taskIndex;
+ respond.nonce = pRequest->nonce;
+ respond.reserve0 = pRequest->reserve0;
+ respond.reserve1 = pRequest->reserve1;
+ respond.reserve2 = pRequest->reserve2;
+
+ return respond;
+}
+
#define CUSTOM_MINING_SHARES_COUNT_SIZE_IN_BYTES 848
#define CUSTOM_MINING_SOLUTION_NUM_BIT_PER_COMP 10
#define TICK_VOTE_COUNTER_PUBLICATION_OFFSET 2 // Must be 2
@@ -368,9 +383,8 @@ class CustomMininingCache
return retVal;
}
- // Try to fetch data from cacheIndex, also checking a few following entries in case of collisions (may update cacheIndex),
- // increments counter of hits, misses, or collisions
- int tryFetchingAndUpdate(T& rData, int updateCondition)
+ // Try to fetch data from cacheIndex, also checking a few following entries in case of collisions,
+ bool tryFetchingAndUpdateHitData(T& rData)
{
int retVal;
unsigned int tryFetchIdx = rData.getHashIndex() % capacity();
@@ -380,16 +394,12 @@ class CustomMininingCache
const T& cacheData = cache[tryFetchIdx];
if (cacheData.isEmpty())
{
- // miss: data not available in cache yet (entry is empty)
- misses++;
retVal = CUSTOM_MINING_CACHE_MISS;
break;
}
if (cacheData.isMatched(rData))
{
- // hit: data available in cache -> return score
- hits++;
retVal = CUSTOM_MINING_CACHE_HIT;
break;
}
@@ -398,19 +408,15 @@ class CustomMininingCache
retVal = CUSTOM_MINING_CACHE_COLLISION;
tryFetchIdx = (tryFetchIdx + 1) % capacity();
}
- if (retVal == updateCondition)
+
+ // This allow update data with additional field beside the key
+ if (retVal == CUSTOM_MINING_CACHE_HIT)
{
cache[tryFetchIdx] = rData;
}
RELEASE(lock);
- if (retVal == CUSTOM_MINING_CACHE_COLLISION)
- {
- ACQUIRE(lock);
- collisions++;
- RELEASE(lock);
- }
- return retVal;
+ return (retVal == CUSTOM_MINING_CACHE_HIT);
}
@@ -522,103 +528,6 @@ class CustomMininingCache
unsigned int invalid;
};
-class CustomMiningSolutionCacheEntry
-{
-public:
- void reset()
- {
- _solution.taskIndex = 0;
- _isHashed = false;
- _isVerification = false;
- _isValid = true;
- }
-
- void set(const CustomMiningSolution* pCustomMiningSolution)
- {
- reset();
- _solution = *pCustomMiningSolution;
- }
-
- void set(const unsigned long long taskIndex, unsigned int nonce, unsigned short firstComputorIndex, unsigned short lastComputorIndex)
- {
- reset();
- _solution.taskIndex = taskIndex;
- _solution.nonce = nonce;
- _solution.firstComputorIndex = firstComputorIndex;
- _solution.lastComputorIndex = lastComputorIndex;
- }
-
- void get(CustomMiningSolution& rCustomMiningSolution)
- {
- rCustomMiningSolution = _solution;
- }
-
- bool isEmpty() const
- {
- return (_solution.taskIndex == 0);
- }
- bool isMatched(const CustomMiningSolutionCacheEntry& rOther) const
- {
- return (_solution.taskIndex == rOther.getTaskIndex()) && (_solution.nonce == rOther.getNonce());
- }
- unsigned long long getHashIndex()
- {
- // TODO: reserve each computor ID a limited slot.
- // This will avoid them spawning invalid solutions without verification
- if (!_isHashed)
- {
- copyMem(_buffer, &_solution.taskIndex, sizeof(_solution.taskIndex));
- copyMem(_buffer + sizeof(_solution.taskIndex), &_solution.nonce, sizeof(_solution.nonce));
- KangarooTwelve(_buffer, sizeof(_solution.taskIndex) + sizeof(_solution.nonce), &_digest, sizeof(_digest));
- _isHashed = true;
- }
- return _digest;
- }
-
- unsigned long long getTaskIndex() const
- {
- return _solution.taskIndex;
- }
-
- unsigned long long getNonce() const
- {
- return _solution.nonce;
- }
-
- bool isValid()
- {
- return _isValid;
- }
-
- bool isVerified()
- {
- return _isVerification;
- }
-
- void setValid(bool val)
- {
- _isValid = val;
- }
-
- void setVerified(bool val)
- {
- _isVerification = true;
- }
-
- void setEmpty()
- {
- _solution.taskIndex = 0;
- }
-
-private:
- CustomMiningSolution _solution;
- unsigned long long _digest;
- unsigned char _buffer[sizeof(_solution.taskIndex) + sizeof(_solution.nonce)];
- bool _isHashed;
- bool _isVerification;
- bool _isValid;
-};
-
class CustomMiningSolutionV2CacheEntry
{
public:
@@ -709,11 +618,10 @@ class CustomMiningSolutionV2CacheEntry
// In charge of storing custom mining
-constexpr unsigned int NUMBER_OF_TASK_PARTITIONS = 4;
-constexpr unsigned long long MAX_NUMBER_OF_CUSTOM_MINING_SOLUTIONS = (200ULL << 20) / NUMBER_OF_TASK_PARTITIONS / sizeof(CustomMiningSolutionCacheEntry);
+constexpr unsigned long long MAX_NUMBER_OF_CUSTOM_MINING_SOLUTIONS = (200ULL << 20) / sizeof(CustomMiningSolutionV2CacheEntry);
constexpr unsigned long long CUSTOM_MINING_INVALID_INDEX = 0xFFFFFFFFFFFFFFFFULL;
constexpr unsigned long long CUSTOM_MINING_TASK_STORAGE_COUNT = 60 * 60 * 24 * 8 / 2 / 10; // All epoch tasks in 7 (+1) days, 10s per task, idle phases only
-constexpr unsigned long long CUSTOM_MINING_TASK_STORAGE_SIZE = CUSTOM_MINING_TASK_STORAGE_COUNT * sizeof(CustomMiningTask); // ~16.6MB
+constexpr unsigned long long CUSTOM_MINING_TASK_STORAGE_SIZE = CUSTOM_MINING_TASK_STORAGE_COUNT * sizeof(CustomMiningTaskV2); // ~16.6MB
constexpr unsigned long long CUSTOM_MINING_SOLUTION_STORAGE_COUNT = MAX_NUMBER_OF_CUSTOM_MINING_SOLUTIONS;
constexpr unsigned long long CUSTOM_MINING_STORAGE_PROCESSOR_MAX_STORAGE = 10 * 1024 * 1024; // 10MB
constexpr unsigned long long CUSTOM_MINING_RESPOND_MESSAGE_MAX_SIZE = 1 * 1024 * 1024; // 1MB
@@ -756,18 +664,12 @@ struct CustomMiningStats
long long maxCollisionShareCount; // Max number of shares that are not save in cached because of collision
// Stats of current custom mining phase
- Counter phase[NUMBER_OF_TASK_PARTITIONS];
Counter phaseV2;
// Asume at begining of epoch.
void epochReset()
{
lastPhases.reset();
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- phase[i].reset();
- }
-
phaseV2.reset();
ATOMIC_STORE64(maxOverflowShareCount, 0);
ATOMIC_STORE64(maxCollisionShareCount, 0);
@@ -782,14 +684,11 @@ struct CustomMiningStats
long long valid = 0;
long long invalid = 0;
long long duplicated = 0;
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- tasks += ATOMIC_LOAD64(phase[i].tasks);
- shares += ATOMIC_LOAD64(phase[i].shares);
- valid += ATOMIC_LOAD64(phase[i].valid);
- invalid += ATOMIC_LOAD64(phase[i].invalid);
- duplicated += ATOMIC_LOAD64(phase[i].duplicated);
- }
+ tasks += ATOMIC_LOAD64(phaseV2.tasks);
+ shares += ATOMIC_LOAD64(phaseV2.shares);
+ valid += ATOMIC_LOAD64(phaseV2.valid);
+ invalid += ATOMIC_LOAD64(phaseV2.invalid);
+ duplicated += ATOMIC_LOAD64(phaseV2.duplicated);
// Accumulate the phase into last phases
ATOMIC_ADD64(lastPhases.tasks, tasks);
@@ -798,11 +697,6 @@ struct CustomMiningStats
ATOMIC_ADD64(lastPhases.invalid, invalid);
ATOMIC_ADD64(lastPhases.duplicated, duplicated);
- // Reset phase number
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- phase[i].reset();
- }
phaseV2.reset();
}
@@ -813,14 +707,11 @@ struct CustomMiningStats
long long customMiningValidShares = 0;
long long customMiningInvalidShares = 0;
long long customMiningDuplicated = 0;
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- customMiningTasks += ATOMIC_LOAD64(phase[i].tasks);
- customMiningShares += ATOMIC_LOAD64(phase[i].shares);
- customMiningValidShares += ATOMIC_LOAD64(phase[i].valid);
- customMiningInvalidShares += ATOMIC_LOAD64(phase[i].invalid);
- customMiningDuplicated += ATOMIC_LOAD64(phase[i].duplicated);
- }
+ customMiningTasks = ATOMIC_LOAD64(phaseV2.tasks);
+ customMiningShares = ATOMIC_LOAD64(phaseV2.shares);
+ customMiningValidShares = ATOMIC_LOAD64(phaseV2.valid);
+ customMiningInvalidShares = ATOMIC_LOAD64(phaseV2.invalid);
+ customMiningDuplicated = ATOMIC_LOAD64(phaseV2.duplicated);
appendText(message, L"Phase:");
appendText(message, L" Tasks: ");
@@ -834,25 +725,13 @@ struct CustomMiningStats
appendText(message, L" | Duplicated: ");
appendNumber(message, customMiningDuplicated, true);
- appendText(message, L"Phase V2:");
- appendText(message, L" Tasks: ");
- appendNumber(message, phaseV2.tasks, true);
- appendText(message, L" | Shares: ");
- appendNumber(message, phaseV2.shares, true);
- appendText(message, L" | Valid: ");
- appendNumber(message, phaseV2.valid, true);
- appendText(message, L" | InValid: ");
- appendNumber(message, phaseV2.invalid, true);
- appendText(message, L" | Duplicated: ");
- appendNumber(message, phaseV2.duplicated, true);
-
long long customMiningEpochTasks = customMiningTasks + ATOMIC_LOAD64(lastPhases.tasks);
long long customMiningEpochShares = customMiningShares + ATOMIC_LOAD64(lastPhases.shares);
long long customMiningEpochInvalidShares = customMiningInvalidShares + ATOMIC_LOAD64(lastPhases.invalid);
long long customMiningEpochValidShares = customMiningValidShares + ATOMIC_LOAD64(lastPhases.valid);
long long customMiningEpochDuplicated = customMiningDuplicated + ATOMIC_LOAD64(lastPhases.duplicated);
- appendText(message, L". Epoch (not count v2):");
+ appendText(message, L". Epoch:");
appendText(message, L" Tasks: ");
appendNumber(message, customMiningEpochTasks, false);
appendText(message, L" | Shares: ");
@@ -1231,7 +1110,6 @@ struct CustomMiningSolutionStorageEntry
unsigned long long cacheEntryIndex;
};
-typedef CustomMiningSortedStorage CustomMiningTaskStorage;
typedef CustomMiningSortedStorage CustomMiningSolutionStorage;
typedef CustomMiningSortedStorage CustomMiningTaskV2Storage;
@@ -1241,11 +1119,6 @@ class CustomMiningStorage
public:
void init()
{
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; ++i)
- {
- _taskStorage[i].init();
- _solutionStorage[i].init();
- }
_taskV2Storage.init();
_solutionV2Storage.init();
// Buffer allocation for each processors. It is limited to 10MB each
@@ -1260,11 +1133,6 @@ class CustomMiningStorage
}
void deinit()
{
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; ++i)
- {
- _taskStorage[i].deinit();
- _solutionStorage[i].deinit();
- }
_taskV2Storage.deinit();
_solutionV2Storage.deinit();
for (unsigned int i = 0; i < MAX_NUMBER_OF_PROCESSORS; i++)
@@ -1276,18 +1144,10 @@ class CustomMiningStorage
void reset()
{
ACQUIRE(gCustomMiningTaskStorageLock);
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; ++i)
- {
- _taskStorage[i].reset();
- }
_taskV2Storage.reset();
RELEASE(gCustomMiningTaskStorageLock);
ACQUIRE(gCustomMiningSolutionStorageLock);
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; ++i)
- {
- _solutionStorage[i].reset();
- }
_solutionV2Storage.reset();
RELEASE(gCustomMiningSolutionStorageLock);
@@ -1302,32 +1162,30 @@ class CustomMiningStorage
unsigned char* packedData = _dataBuffer[processorNumber];
CustomMiningRespondDataHeader* packedHeader = (CustomMiningRespondDataHeader*)packedData;
packedHeader->respondType = RespondCustomMiningData::taskType;
- packedHeader->itemSize = sizeof(CustomMiningTask);
+ packedHeader->itemSize = sizeof(CustomMiningTaskV2);
packedHeader->fromTimeStamp = fromTimeStamp;
packedHeader->toTimeStamp = toTimeStamp;
packedHeader->itemCount = 0;
unsigned char* traverseData = packedData + sizeof(CustomMiningRespondDataHeader);
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
+ unsigned char* data = _taskV2Storage.getSerializedData(fromTimeStamp, toTimeStamp, processorNumber);
+ if (data != NULL)
{
- unsigned char* data = _taskStorage[i].getSerializedData(fromTimeStamp, toTimeStamp, processorNumber);
- if (data != NULL)
+ CustomMiningRespondDataHeader* customMiningInternalHeader = (CustomMiningRespondDataHeader*)data;
+ ASSERT(packedHeader->itemSize == customMiningInternalHeader->itemSize);
+ unsigned long long dataSize = customMiningInternalHeader->itemCount * sizeof(CustomMiningTaskV2);
+ if (customMiningInternalHeader->itemCount > 0 && remainedSize >= dataSize)
{
- CustomMiningRespondDataHeader* customMiningInternalHeader = (CustomMiningRespondDataHeader*)data;
- ASSERT(packedHeader->itemSize == customMiningInternalHeader->itemSize);
- unsigned long long dataSize = customMiningInternalHeader->itemCount * sizeof(CustomMiningTask);
- if (customMiningInternalHeader->itemCount > 0 && remainedSize >= dataSize)
- {
- packedHeader->itemCount += customMiningInternalHeader->itemCount;
- // Copy data
- copyMem(traverseData, data + sizeof(CustomMiningRespondDataHeader), dataSize);
+ packedHeader->itemCount += customMiningInternalHeader->itemCount;
+ // Copy data
+ copyMem(traverseData, data + sizeof(CustomMiningRespondDataHeader), dataSize);
- // Update pointer and size
- traverseData += dataSize;
- remainedSize -= dataSize;
- }
+ // Update pointer and size
+ traverseData += dataSize;
+ remainedSize -= dataSize;
}
}
+
return packedData;
}
@@ -1354,115 +1212,30 @@ class CustomMiningStorage
}
unsigned long long _last3TaskV2Indexes[3]; // [0] is max, [2] is min
- CustomMiningTaskStorage _taskStorage[NUMBER_OF_TASK_PARTITIONS];
CustomMiningTaskV2Storage _taskV2Storage;
- CustomMiningSolutionStorage _solutionStorage[NUMBER_OF_TASK_PARTITIONS];
CustomMiningSolutionStorage _solutionV2Storage;
-
-
// Buffer can accessed from multiple threads
unsigned char* _dataBuffer[MAX_NUMBER_OF_PROCESSORS];
};
-// Describe how a task is divided into groups
-// The task is for computorID in range [firstComputorIdx, lastComputorIdx]
-// domainSize determine the range of nonce that computor should work on
-// Currenly, it is designed as
-// domainSize = (2 ^ 32)/ (lastComputorIndex - firstComputorIndex + 1);
-// myNonceOffset = (myComputorIndex - firstComputorIndex) * domainSize;
-// myNonce = myNonceOffset + x; x = [0, domainSize - 1]
-// For computorID calculation,
-// computorID = myNonce / domainSize + firstComputorIndex
-struct CustomMiningTaskPartition
-{
- unsigned short firstComputorIdx;
- unsigned short lastComputorIdx;
- unsigned int domainSize;
-};
-
-#define SOLUTION_CACHE_DYNAMIC_MEM 0
-
-static CustomMiningTaskPartition gTaskPartition[NUMBER_OF_TASK_PARTITIONS];
-
-#if SOLUTION_CACHE_DYNAMIC_MEM
-static CustomMininingCache* gSystemCustomMiningSolutionCache = NULL;
-#else
-static CustomMininingCache gSystemCustomMiningSolutionCache[NUMBER_OF_TASK_PARTITIONS];
-#endif
-
static CustomMininingCache gSystemCustomMiningSolutionV2Cache;
static CustomMiningStorage gCustomMiningStorage;
static CustomMiningStats gCustomMiningStats;
-// Get the part ID
-int customMiningGetPartitionID(unsigned short firstComputorIndex, unsigned short lastComputorIndex)
-{
- int partitionID = -1;
- for (int k = 0; k < NUMBER_OF_TASK_PARTITIONS; k++)
- {
- if (firstComputorIndex == gTaskPartition[k].firstComputorIdx
- && lastComputorIndex == gTaskPartition[k].lastComputorIdx)
- {
- partitionID = k;
- break;
- }
- }
- return partitionID;
-}
-
-
-// Generate computor task partition
-int customMiningInitTaskPartitions()
-{
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- // Currently the task is partitioned evenly
- gTaskPartition[i].firstComputorIdx = i * NUMBER_OF_COMPUTORS / NUMBER_OF_TASK_PARTITIONS;
- gTaskPartition[i].lastComputorIdx = gTaskPartition[i].firstComputorIdx + NUMBER_OF_COMPUTORS / NUMBER_OF_TASK_PARTITIONS - 1;
- ASSERT(gTaskPartition[i].lastComputorIdx > gTaskPartition[i].firstComputorIdx + 1);
- gTaskPartition[i].domainSize = (unsigned int)((1ULL << 32) / ((unsigned long long)gTaskPartition[i].lastComputorIdx - gTaskPartition[i].firstComputorIdx + 1));
- }
- return 0;
-}
-
-// Get computor ids
-int customMiningGetComputorID(unsigned int nonce, int partId)
-{
- return nonce / gTaskPartition[partId].domainSize + gTaskPartition[partId].firstComputorIdx;
-}
int customMiningInitialize()
{
gCustomMiningStorage.init();
-#if SOLUTION_CACHE_DYNAMIC_MEM
- allocPoolWithErrorLog(L"gSystemCustomMiningSolutionCache",
- NUMBER_OF_TASK_PARTITIONS * sizeof(CustomMininingCache),
- (void**)&gSystemCustomMiningSolutionCache,
- __LINE__);
-#endif
- setMem((unsigned char*)gSystemCustomMiningSolutionCache, NUMBER_OF_TASK_PARTITIONS * sizeof(CustomMininingCache), 0);
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- gSystemCustomMiningSolutionCache[i].init();
- }
gSystemCustomMiningSolutionV2Cache.init();
- customMiningInitTaskPartitions();
return 0;
}
int customMiningDeinitialize()
{
-#if SOLUTION_CACHE_DYNAMIC_MEM
- if (gSystemCustomMiningSolutionCache)
- {
- freePool(gSystemCustomMiningSolutionCache);
- gSystemCustomMiningSolutionCache = NULL;
- }
-#endif
gCustomMiningStorage.deinit();
return 0;
}
@@ -1476,18 +1249,7 @@ void saveCustomMiningCache(int epoch, CHAR16* directory = NULL)
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 8] = i / 100 + L'0';
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 7] = (i % 100) / 10 + L'0';
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 6] = i % 10 + L'0';
- gSystemCustomMiningSolutionCache[i].save(CUSTOM_MINING_CACHE_FILE_NAME, directory);
- }
-
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
- gSystemCustomMiningSolutionV2Cache.save(CUSTOM_MINING_V2_CACHE_FILE_NAME, directory);
+ gSystemCustomMiningSolutionV2Cache.save(CUSTOM_MINING_CACHE_FILE_NAME, directory);
}
// Update score cache filename with epoch and try to load file
@@ -1498,20 +1260,7 @@ bool loadCustomMiningCache(int epoch)
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
- // TODO: Support later
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 8] = i / 100 + L'0';
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 7] = (i % 100) / 10 + L'0';
- CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 6] = i % 10 + L'0';
- success &= gSystemCustomMiningSolutionCache[i].load(CUSTOM_MINING_CACHE_FILE_NAME);
- }
-
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 3] = (epoch % 100) / 10 + L'0';
- CUSTOM_MINING_V2_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_V2_CACHE_FILE_NAME[0]) - 2] = epoch % 10 + L'0';
- success &= gSystemCustomMiningSolutionV2Cache.load(CUSTOM_MINING_V2_CACHE_FILE_NAME);
-
+ success &= gSystemCustomMiningSolutionV2Cache.load(CUSTOM_MINING_CACHE_FILE_NAME);
return success;
}
#endif
diff --git a/src/network_messages/custom_mining.h b/src/network_messages/custom_mining.h
index bd7aed79c..007b6a075 100644
--- a/src/network_messages/custom_mining.h
+++ b/src/network_messages/custom_mining.h
@@ -18,11 +18,6 @@ struct RequestedCustomMiningData
unsigned long long fromTaskIndex;
unsigned long long toTaskIndex;
- // Determine which task partition
- unsigned short firstComputorIdx;
- unsigned short lastComputorIdx;
- unsigned int padding;
-
// Type of the request: either task (taskType) or solution (solutionType).
long long dataType;
};
@@ -50,10 +45,12 @@ struct RequestedCustomMiningSolutionVerification
type = 62,
};
unsigned long long taskIndex;
- unsigned short firstComputorIdx;
- unsigned short lastComputorIdx;
- unsigned int nonce;
+ unsigned long long nonce;
+ unsigned long long reserve0;
+ unsigned long long reserve1;
+ unsigned long long reserve2;
unsigned long long isValid; // validity of the solution. 0: invalid, >0: valid
+
};
struct RespondCustomMiningSolutionVerification
{
@@ -69,9 +66,10 @@ struct RespondCustomMiningSolutionVerification
customMiningStateEnded = 3, // not in custom mining state
};
unsigned long long taskIndex;
- unsigned short firstComputorIdx;
- unsigned short lastComputorIdx;
- unsigned int nonce;
+ unsigned long long nonce;
+ unsigned long long reserve0;
+ unsigned long long reserve1;
+ unsigned long long reserve2;
long long status; // Flag indicate the status of solution
};
diff --git a/src/public_settings.h b/src/public_settings.h
index 43a6208b6..7ed01e0d8 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -79,8 +79,7 @@ static unsigned short UNIVERSE_FILE_NAME[] = L"universe.???";
static unsigned short SCORE_CACHE_FILE_NAME[] = L"score.???";
static unsigned short CONTRACT_FILE_NAME[] = L"contract????.???";
static unsigned short CUSTOM_MINING_REVENUE_END_OF_EPOCH_FILE_NAME[] = L"custom_revenue.eoe";
-static unsigned short CUSTOM_MINING_CACHE_FILE_NAME[] = L"custom_mining_cache???.???";
-static unsigned short CUSTOM_MINING_V2_CACHE_FILE_NAME[] = L"custom_mining_v2_cache.???";
+static unsigned short CUSTOM_MINING_CACHE_FILE_NAME[] = L"custom_mining_cache.???";
static constexpr unsigned long long NUMBER_OF_INPUT_NEURONS = 512; // K
static constexpr unsigned long long NUMBER_OF_OUTPUT_NEURONS = 512; // L
diff --git a/src/qubic.cpp b/src/qubic.cpp
index ef789fd95..d03afaafc 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -524,115 +524,7 @@ static void processBroadcastMessage(const unsigned long long processorNumber, Re
recordCustomMining = gIsInCustomMiningState;
RELEASE(gIsInCustomMiningStateLock);
- if (messagePayloadSize == sizeof(CustomMiningTask) && request->sourcePublicKey == dispatcherPublicKey)
- {
- // See CustomMiningTaskMessage structure
- // MESSAGE_TYPE_CUSTOM_MINING_TASK
-
- // Compute the gamming key to get the sub-type of message
- unsigned char sharedKeyAndGammingNonce[64];
- setMem(sharedKeyAndGammingNonce, 32, 0);
- copyMem(&sharedKeyAndGammingNonce[32], &request->gammingNonce, 32);
- unsigned char gammingKey[32];
- KangarooTwelve64To32(sharedKeyAndGammingNonce, gammingKey);
-
- // Record the task emitted by dispatcher
- if (recordCustomMining && gammingKey[0] == MESSAGE_TYPE_CUSTOM_MINING_TASK)
- {
- const CustomMiningTask* task = ((CustomMiningTask*)((unsigned char*)request + sizeof(BroadcastMessage)));
-
- // Determine the task part id
- int partId = customMiningGetPartitionID(task->firstComputorIndex, task->lastComputorIndex);
- if (partId >= 0)
- {
- // Record the task message
- ACQUIRE(gCustomMiningTaskStorageLock);
- int taskAddSts = gCustomMiningStorage._taskStorage[partId].addData(task);
- RELEASE(gCustomMiningTaskStorageLock);
-
- if (CustomMiningTaskStorage::OK == taskAddSts)
- {
- ATOMIC_INC64(gCustomMiningStats.phase[partId].tasks);
- }
- }
- }
- }
- else if (messagePayloadSize == sizeof(CustomMiningSolution))
- {
- for (unsigned int i = 0; i < NUMBER_OF_COMPUTORS; i++)
- {
- if (request->sourcePublicKey == broadcastedComputors.computors.publicKeys[i])
- {
- // Compute the gamming key to get the sub-type of message
- unsigned char sharedKeyAndGammingNonce[64];
- setMem(sharedKeyAndGammingNonce, 32, 0);
- copyMem(&sharedKeyAndGammingNonce[32], &request->gammingNonce, 32);
- unsigned char gammingKey[32];
- KangarooTwelve64To32(sharedKeyAndGammingNonce, gammingKey);
-
- if (recordCustomMining && gammingKey[0] == MESSAGE_TYPE_CUSTOM_MINING_SOLUTION)
- {
- // Record the solution
- bool isSolutionGood = false;
- const CustomMiningSolution* solution = ((CustomMiningSolution*)((unsigned char*)request + sizeof(BroadcastMessage)));
-
- int partId = customMiningGetPartitionID(solution->firstComputorIndex, solution->lastComputorIndex);
-
- // TODO: taskIndex can use for detect for-sure stale shares
- if (partId >= 0 && solution->taskIndex > 0)
- {
- CustomMiningSolutionCacheEntry cacheEntry;
- cacheEntry.set(solution);
-
- unsigned int cacheIndex = 0;
- int sts = gSystemCustomMiningSolutionCache[partId].tryFetching(cacheEntry, cacheIndex);
-
- // Check for duplicated solution
- if (sts == CUSTOM_MINING_CACHE_MISS)
- {
- gSystemCustomMiningSolutionCache[partId].addEntry(cacheEntry, cacheIndex);
- isSolutionGood = true;
- }
-
- if (isSolutionGood)
- {
- // Check the computor idx of this solution.
- unsigned short computorID = customMiningGetComputorID(solution->nonce, partId);
- if (computorID <= gTaskPartition[partId].lastComputorIdx)
- {
-
- ACQUIRE(gCustomMiningSharesCountLock);
- gCustomMiningSharesCount[computorID]++;
- RELEASE(gCustomMiningSharesCountLock);
-
- CustomMiningSolutionStorageEntry solutionStorageEntry;
- solutionStorageEntry.taskIndex = solution->taskIndex;
- solutionStorageEntry.nonce = solution->nonce;
- solutionStorageEntry.cacheEntryIndex = cacheIndex;
-
- ACQUIRE(gCustomMiningSolutionStorageLock);
- gCustomMiningStorage._solutionStorage[partId].addData(&solutionStorageEntry);
- RELEASE(gCustomMiningSolutionStorageLock);
-
- }
- }
-
- // Record stats
- const unsigned int hitCount = gSystemCustomMiningSolutionCache[partId].hitCount();
- const unsigned int missCount = gSystemCustomMiningSolutionCache[partId].missCount();
- const unsigned int collision = gSystemCustomMiningSolutionCache[partId].collisionCount();
-
- ATOMIC_STORE64(gCustomMiningStats.phase[partId].shares, missCount);
- ATOMIC_STORE64(gCustomMiningStats.phase[partId].duplicated, hitCount);
- ATOMIC_MAX64(gCustomMiningStats.maxCollisionShareCount, collision);
-
- }
- }
- break;
- }
- }
- }
- else if (messagePayloadSize == sizeof(CustomMiningTaskV2) && request->sourcePublicKey == dispatcherPublicKey)
+ if (messagePayloadSize == sizeof(CustomMiningTaskV2) && request->sourcePublicKey == dispatcherPublicKey)
{
unsigned char sharedKeyAndGammingNonce[64];
setMem(sharedKeyAndGammingNonce, 32, 0);
@@ -648,7 +540,7 @@ static void processBroadcastMessage(const unsigned long long processorNumber, Re
// Record the task message
ACQUIRE(gCustomMiningTaskStorageLock);
int taskAddSts = gCustomMiningStorage._taskV2Storage.addData(task);
- if (CustomMiningTaskStorage::OK == taskAddSts)
+ if (CustomMiningTaskV2Storage::OK == taskAddSts)
{
ATOMIC_INC64(gCustomMiningStats.phaseV2.tasks);
gCustomMiningStorage.updateTaskIndex(task->taskIndex);
@@ -695,15 +587,7 @@ static void processBroadcastMessage(const unsigned long long processorNumber, Re
if (isSolutionGood)
{
// Check the computor idx of this solution.
- unsigned short computorID = 0;
- if (solution->reserve0 == 0)
- {
- computorID = (solution->nonce >> 32ULL) % 676ULL;
- }
- else
- {
- computorID = solution->reserve1 % 676ULL;
- }
+ unsigned short computorID = customMiningGetComputorID(solution);
ACQUIRE(gCustomMiningSharesCountLock);
gCustomMiningSharesCount[computorID]++;
@@ -1479,8 +1363,6 @@ static void processRequestedCustomMiningSolutionVerificationRequest(Peer* peer,
KangarooTwelve(request, header->size() - sizeof(RequestResponseHeader) - SIGNATURE_SIZE, digest, sizeof(digest));
if (verify(operatorPublicKey.m256i_u8, digest, ((const unsigned char*)header + (header->size() - SIGNATURE_SIZE))))
{
- RespondCustomMiningSolutionVerification respond;
-
// Update the share counting
// Only record shares in idle phase
char recordSolutions = 0;
@@ -1488,25 +1370,20 @@ static void processRequestedCustomMiningSolutionVerificationRequest(Peer* peer,
recordSolutions = gIsInCustomMiningState;
RELEASE(gIsInCustomMiningStateLock);
+ RespondCustomMiningSolutionVerification respond = customMiningVerificationRequestToRespond(request);
if (recordSolutions)
{
- CustomMiningSolutionCacheEntry fullEntry;
- fullEntry.set(request->taskIndex, request->nonce, request->firstComputorIdx, request->lastComputorIdx);
+ CustomMiningSolutionV2 solution = customMiningVerificationRequestToSolution(request);
+
+ CustomMiningSolutionV2CacheEntry fullEntry;
+ fullEntry.set(&solution);
fullEntry.setVerified(true);
fullEntry.setValid(request->isValid > 0);
- // Make sure the solution still existed
- int partId = customMiningGetPartitionID(request->firstComputorIdx, request->lastComputorIdx);
// Check the computor idx of this solution
- int computorID = NUMBER_OF_COMPUTORS;
- if (partId >= 0)
- {
- computorID = customMiningGetComputorID(request->nonce, partId);
- }
-
- if (partId >=0
- && computorID <= gTaskPartition[partId].lastComputorIdx
- && CUSTOM_MINING_CACHE_HIT == gSystemCustomMiningSolutionCache[partId].tryFetchingAndUpdate(fullEntry, CUSTOM_MINING_CACHE_HIT))
+ unsigned short computorID = customMiningGetComputorID(&solution);
+ // Also re-update the cache data with verified = true and validity
+ if ( gSystemCustomMiningSolutionV2Cache.tryFetchingAndUpdateHitData(fullEntry))
{
// Reduce the share of this nonce if it is invalid
if (0 == request->isValid)
@@ -1516,13 +1393,13 @@ static void processRequestedCustomMiningSolutionVerificationRequest(Peer* peer,
RELEASE(gCustomMiningSharesCountLock);
// Save the number of invalid share count
- ATOMIC_INC64(gCustomMiningStats.phase[partId].invalid);
+ ATOMIC_INC64(gCustomMiningStats.phaseV2.invalid);
respond.status = RespondCustomMiningSolutionVerification::invalid;
}
else
{
- ATOMIC_INC64(gCustomMiningStats.phase[partId].valid);
+ ATOMIC_INC64(gCustomMiningStats.phaseV2.valid);
respond.status = RespondCustomMiningSolutionVerification::valid;
}
}
@@ -1535,11 +1412,6 @@ static void processRequestedCustomMiningSolutionVerificationRequest(Peer* peer,
{
respond.status = RespondCustomMiningSolutionVerification::customMiningStateEnded;
}
-
- respond.taskIndex = request->taskIndex;
- respond.firstComputorIdx = request->firstComputorIdx;
- respond.lastComputorIdx = request->lastComputorIdx;
- respond.nonce = request->nonce;
enqueueResponse(peer, sizeof(respond), RespondCustomMiningSolutionVerification::type, header->dejavu(), &respond);
}
}
@@ -1592,18 +1464,12 @@ static void processCustomMiningDataRequest(Peer* peer, const unsigned long long
else if (request->dataType == RequestedCustomMiningData::solutionType)
{
// For solution type, return all solution from the current phase
- int partId = customMiningGetPartitionID(request->firstComputorIdx, request->lastComputorIdx);
- if (partId >= 0)
{
ACQUIRE(gCustomMiningSolutionStorageLock);
// Look for all solution data
- respond = gCustomMiningStorage._solutionStorage[partId].getSerializedData(request->fromTaskIndex, processorNumber);
+ respond = gCustomMiningStorage._solutionV2Storage.getSerializedData(request->fromTaskIndex, processorNumber);
RELEASE(gCustomMiningSolutionStorageLock);
}
- else
- {
- respond = NULL;
- }
// Has the solutions
if (NULL != respond)
@@ -1617,12 +1483,12 @@ static void processCustomMiningDataRequest(Peer* peer, const unsigned long long
unsigned char* respondSolutionPayload = respondSolution + sizeof(CustomMiningRespondDataHeader);
long long remainedDataToSend = CUSTOM_MINING_RESPOND_MESSAGE_MAX_SIZE;
int sendItem = 0;
- for (int k = 0; k < customMiningInternalHeader->itemCount && remainedDataToSend > sizeof(CustomMiningSolution); k++)
+ for (int k = 0; k < customMiningInternalHeader->itemCount && remainedDataToSend > sizeof(CustomMiningSolutionV2); k++)
{
CustomMiningSolutionStorageEntry entry = solutionEntries[k];
- CustomMiningSolutionCacheEntry fullEntry;
+ CustomMiningSolutionV2CacheEntry fullEntry;
- gSystemCustomMiningSolutionCache[partId].getEntry(fullEntry, (unsigned int)entry.cacheEntryIndex);
+ gSystemCustomMiningSolutionV2Cache.getEntry(fullEntry, (unsigned int)entry.cacheEntryIndex);
// Check data is matched and not verifed yet
if (!fullEntry.isEmpty()
@@ -1631,16 +1497,16 @@ static void processCustomMiningDataRequest(Peer* peer, const unsigned long long
&& fullEntry.getNonce() == entry.nonce)
{
// Append data to send
- CustomMiningSolution solution;
+ CustomMiningSolutionV2 solution;
fullEntry.get(solution);
- copyMem(respondSolutionPayload + k * sizeof(CustomMiningSolution), &solution, sizeof(CustomMiningSolution));
- remainedDataToSend -= sizeof(CustomMiningSolution);
+ copyMem(respondSolutionPayload + k * sizeof(CustomMiningSolutionV2), &solution, sizeof(CustomMiningSolutionV2));
+ remainedDataToSend -= sizeof(CustomMiningSolutionV2);
sendItem++;
}
}
- customMiningInternalHeader->itemSize = sizeof(CustomMiningSolution);
+ customMiningInternalHeader->itemSize = sizeof(CustomMiningSolutionV2);
customMiningInternalHeader->itemCount = sendItem;
customMiningInternalHeader->respondType = RespondCustomMiningData::solutionType;
const unsigned long long respondDataSize = sizeof(CustomMiningRespondDataHeader) + customMiningInternalHeader->itemCount * customMiningInternalHeader->itemSize;
@@ -1893,11 +1759,6 @@ static bool isFullExternalComputationTime(TimeDate tickDate)
// Clean up before custom mining phase. Thread-safe function
static void beginCustomMiningPhase()
{
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- gSystemCustomMiningSolutionCache[i].reset();
- }
-
gSystemCustomMiningSolutionV2Cache.reset();
gCustomMiningStorage.reset();
gCustomMiningStats.phaseResetAndEpochAccumulate();
@@ -3539,11 +3400,6 @@ static void resetCustomMining()
gCustomMiningSharesCounter.init();
setMem(gCustomMiningSharesCount, sizeof(gCustomMiningSharesCount), 0);
- for (int i = 0; i < NUMBER_OF_TASK_PARTITIONS; i++)
- {
- gSystemCustomMiningSolutionCache[i].reset();
- }
-
gSystemCustomMiningSolutionV2Cache.reset();
for (int i = 0; i < NUMBER_OF_COMPUTORS; ++i)
{
diff --git a/test/custom_mining.cpp b/test/custom_mining.cpp
index 176812740..9a68f8dcf 100644
--- a/test/custom_mining.cpp
+++ b/test/custom_mining.cpp
@@ -19,13 +19,13 @@
TEST(CustomMining, TaskStorageGeneral)
{
constexpr unsigned long long NUMBER_OF_TASKS = 100;
- CustomMiningTaskStorage storage;
+ CustomMiningTaskV2Storage storage;
storage.init();
for (unsigned long long i = 0; i < NUMBER_OF_TASKS; i++)
{
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = NUMBER_OF_TASKS - i;
storage.addData(&task);
@@ -34,8 +34,8 @@ TEST(CustomMining, TaskStorageGeneral)
// Expect the task are sort in ascending order
for (unsigned long long i = 0; i < NUMBER_OF_TASKS - 1; i++)
{
- CustomMiningTask* task0 = storage.getDataByIndex(i);
- CustomMiningTask* task1 = storage.getDataByIndex(i + 1);
+ CustomMiningTaskV2* task0 = storage.getDataByIndex(i);
+ CustomMiningTaskV2* task1 = storage.getDataByIndex(i + 1);
EXPECT_LT(task0->taskIndex, task1->taskIndex);
}
EXPECT_EQ(storage.getCount(), NUMBER_OF_TASKS);
@@ -47,14 +47,14 @@ TEST(CustomMining, TaskStorageDuplicatedItems)
{
constexpr unsigned long long NUMBER_OF_TASKS = 100;
constexpr unsigned long long DUPCATED_TASKS = 10;
- CustomMiningTaskStorage storage;
+ CustomMiningTaskV2Storage storage;
storage.init();
// For DUPCATED_TASKS will only recorded 1 task
for (unsigned long long i = 0; i < DUPCATED_TASKS; i++)
{
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = 1;
storage.addData(&task);
@@ -62,7 +62,7 @@ TEST(CustomMining, TaskStorageDuplicatedItems)
for (unsigned long long i = DUPCATED_TASKS; i < NUMBER_OF_TASKS; i++)
{
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = i;
storage.addData(&task);
@@ -78,19 +78,19 @@ TEST(CustomMining, TaskStorageExistedItem)
{
constexpr unsigned long long NUMBER_OF_TASKS = 100;
constexpr unsigned long long DUPCATED_TASKS = 10;
- CustomMiningTaskStorage storage;
+ CustomMiningTaskV2Storage storage;
storage.init();
for (unsigned long long i = 1; i < NUMBER_OF_TASKS + 1 ; i++)
{
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = i;
storage.addData(&task);
}
// Test an existed task
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = NUMBER_OF_TASKS - 10;
storage.addData(&task);
@@ -119,19 +119,19 @@ TEST(CustomMining, TaskStorageExistedItem)
TEST(CustomMining, TaskStorageOverflow)
{
constexpr unsigned long long NUMBER_OF_TASKS = CUSTOM_MINING_TASK_STORAGE_COUNT;
- CustomMiningTaskStorage storage;
+ CustomMiningTaskV2Storage storage;
storage.init();
for (unsigned long long i = 0; i < NUMBER_OF_TASKS; i++)
{
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = i;
storage.addData(&task);
}
// Overflow. Add one more and get error status
- CustomMiningTask task;
+ CustomMiningTaskV2 task;
task.taskIndex = NUMBER_OF_TASKS + 1;
EXPECT_NE(storage.addData(&task), 0);
From c097eaadf283d13a1c7b68ed24079afd535b3c8c Mon Sep 17 00:00:00 2001
From: cyber-pc <165458555+cyber-pc@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:09:06 +0700
Subject: [PATCH 125/297] CustomMining: Rename custom mining's members.
---
src/mining/mining.h | 26 +++++++++++++-------------
src/network_messages/custom_mining.h | 8 ++++----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/mining/mining.h b/src/mining/mining.h
index 5aeaa8c31..add55a42d 100644
--- a/src/mining/mining.h
+++ b/src/mining/mining.h
@@ -55,7 +55,7 @@ struct CustomMiningSolutionTransaction : public Transaction
struct CustomMiningTaskV2 {
unsigned long long taskIndex;
unsigned char m_template[896];
- unsigned long long m_extraNonceOffset;
+ unsigned long long m_extraNonceOffset;// offset to place extra nonce
unsigned long long m_size;
unsigned long long m_target;
unsigned long long m_height;
@@ -63,11 +63,11 @@ struct CustomMiningTaskV2 {
};
struct CustomMiningSolutionV2 {
- unsigned long long taskIndex;
- unsigned long long nonce; // (extraNonce<<32) | nonce
- unsigned long long reserve0;
- unsigned long long reserve1;
- unsigned long long reserve2;
+ unsigned long long taskIndex; // should match the index from task
+ unsigned long long nonce; // (extraNonce<<32) | nonce
+ unsigned long long encryptionLevel; // 0 = no encryption. `0` is allowed for legacy purposes
+ unsigned long long computorRandom; // random number which fullfils the condition computorRandom % 676 == ComputorIndex.`0` is allowed for legacy purposes
+ unsigned long long reserve2; // reserved
m256i result;
};
@@ -75,13 +75,13 @@ static unsigned short customMiningGetComputorID(const CustomMiningSolutionV2* pS
{
// Check the computor idx of this solution.
unsigned short computorID = 0;
- if (pSolution->reserve0 == 0)
+ if (pSolution->encryptionLevel == 0)
{
- computorID = (pSolution->nonce >> 32ULL) % 676ULL;
+ computorID = (unsigned short)((pSolution->nonce >> 32ULL) % (unsigned long long)NUMBER_OF_COMPUTORS);
}
else
{
- computorID = pSolution->reserve1 % 676ULL;
+ computorID = (unsigned short)(pSolution->computorRandom % (unsigned long long)NUMBER_OF_COMPUTORS);
}
return computorID;
}
@@ -91,8 +91,8 @@ static CustomMiningSolutionV2 customMiningVerificationRequestToSolution(Requeste
CustomMiningSolutionV2 solution;
solution.taskIndex = pRequest->taskIndex;
solution.nonce = pRequest->nonce;
- solution.reserve0 = pRequest->reserve0;
- solution.reserve1 = pRequest->reserve1;
+ solution.encryptionLevel = pRequest->encryptionLevel;
+ solution.computorRandom = pRequest->computorRandom;
solution.reserve2 = pRequest->reserve2;
return solution;
}
@@ -102,8 +102,8 @@ static RespondCustomMiningSolutionVerification customMiningVerificationRequestTo
RespondCustomMiningSolutionVerification respond;
respond.taskIndex = pRequest->taskIndex;
respond.nonce = pRequest->nonce;
- respond.reserve0 = pRequest->reserve0;
- respond.reserve1 = pRequest->reserve1;
+ respond.encryptionLevel = pRequest->encryptionLevel;
+ respond.computorRandom = pRequest->computorRandom;
respond.reserve2 = pRequest->reserve2;
return respond;
diff --git a/src/network_messages/custom_mining.h b/src/network_messages/custom_mining.h
index 007b6a075..336ff5323 100644
--- a/src/network_messages/custom_mining.h
+++ b/src/network_messages/custom_mining.h
@@ -46,8 +46,8 @@ struct RequestedCustomMiningSolutionVerification
};
unsigned long long taskIndex;
unsigned long long nonce;
- unsigned long long reserve0;
- unsigned long long reserve1;
+ unsigned long long encryptionLevel;
+ unsigned long long computorRandom;
unsigned long long reserve2;
unsigned long long isValid; // validity of the solution. 0: invalid, >0: valid
@@ -67,8 +67,8 @@ struct RespondCustomMiningSolutionVerification
};
unsigned long long taskIndex;
unsigned long long nonce;
- unsigned long long reserve0;
- unsigned long long reserve1;
+ unsigned long long encryptionLevel;
+ unsigned long long computorRandom;
unsigned long long reserve2;
long long status; // Flag indicate the status of solution
};
From 474edb287dbd9dface3bb4d95bf203b3dd4c4485 Mon Sep 17 00:00:00 2001
From: baoLuck
Date: Mon, 6 Oct 2025 01:17:03 +0300
Subject: [PATCH 126/297] add two output parameters to qbond table
---
src/contracts/QBond.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/contracts/QBond.h b/src/contracts/QBond.h
index 427c241ce..10488fafe 100644
--- a/src/contracts/QBond.h
+++ b/src/contracts/QBond.h
@@ -193,6 +193,8 @@ struct QBOND : public ContractBase
struct TableEntry
{
sint64 epoch;
+ sint64 totalStakedQBond;
+ sint64 totalStakedQEarn;
uint64 apy;
};
Array info;
@@ -1093,6 +1095,8 @@ struct QBOND : public ContractBase
locals.tempInput.Epoch = (uint32) locals.epoch;
CALL_OTHER_CONTRACT_FUNCTION(QEARN, getLockInfoPerEpoch, locals.tempInput, locals.tempOutput);
locals.tempTableEntry.epoch = locals.epoch;
+ locals.tempTableEntry.totalStakedQBond = locals.tempMBondInfo.totalStaked * QBOND_MBOND_PRICE;
+ locals.tempTableEntry.totalStakedQEarn = locals.tempOutput.currentLockedAmount;
locals.tempTableEntry.apy = locals.tempOutput.yield;
output.info.set(locals.index, locals.tempTableEntry);
locals.index++;
From d2cb70cf2065661ddc9b1efc7617a6609ab85485 Mon Sep 17 00:00:00 2001
From: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
Date: Mon, 6 Oct 2025 16:11:34 +0200
Subject: [PATCH 127/297] update params for epoch 182 / v1.263.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 7ed01e0d8..076714e3e 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -61,12 +61,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 262
+#define VERSION_B 263
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 181
-#define TICK 33750000
+#define EPOCH 182
+#define TICK 34270000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From 0757a1e41bdb496f7d68cdadd89f9271a433458d Mon Sep 17 00:00:00 2001
From: icyblob
Date: Tue, 7 Oct 2025 05:36:00 -0400
Subject: [PATCH 128/297] QUTIL General Voting: minor changes (#560)
- The links can have the prefix https://github.com/, leaving the flexibility of the organization's name.
- GetPollsByCreator can also return inactive polls
---
src/contracts/QUtil.h | 9 ++-------
test/contract_qutil.cpp | 4 ++--
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index df02a2b4f..7d23f1c2d 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -472,12 +472,7 @@ struct QUTIL : public ContractBase
github_link.get(15) == 99 && // 'c'
github_link.get(16) == 111 && // 'o'
github_link.get(17) == 109 && // 'm'
- github_link.get(18) == 47 && // '/'
- github_link.get(19) == 113 && // 'q'
- github_link.get(20) == 117 && // 'u'
- github_link.get(21) == 98 && // 'b'
- github_link.get(22) == 105 && // 'i'
- github_link.get(23) == 99; // 'c'
+ github_link.get(18) == 47; // '/'
}
/**************************************/
@@ -1177,7 +1172,7 @@ struct QUTIL : public ContractBase
output.count = 0;
for (locals.idx = 0; locals.idx < QUTIL_MAX_POLL; locals.idx++)
{
- if (state.polls.get(locals.idx).is_active != 0 && state.polls.get(locals.idx).creator == input.creator)
+ if (state.polls.get(locals.idx).creator != NULL_ID && state.polls.get(locals.idx).creator == input.creator)
{
output.poll_ids.set(output.count, state.poll_ids.get(locals.idx));
output.count++;
diff --git a/test/contract_qutil.cpp b/test/contract_qutil.cpp
index da6d7f87c..5b926e14a 100644
--- a/test/contract_qutil.cpp
+++ b/test/contract_qutil.cpp
@@ -1162,8 +1162,8 @@ TEST(QUtilTest, CreatePoll_InvalidGithubLink) {
id creator = generateRandomId();
id poll_name = generateRandomId();
uint64_t min_amount = 1000;
- // Invalid GitHub link (does not start with "https://github.com/qubic")
- Array invalid_github_link = stringToArray("https://github.com/invalidorg/proposal/abc");
+ // Invalid GitHub link (does not start with "https://github.com/")
+ Array invalid_github_link = stringToArray("https://gitlab.com/invalidlink/proposal/abc");
uint64_t poll_type = QUTIL_POLL_TYPE_QUBIC;
QUTIL::CreatePoll_input input;
From 02c871362e169da5e47d93b282a56d8d56e28877 Mon Sep 17 00:00:00 2001
From: icyblob
Date: Thu, 9 Oct 2025 06:55:42 -0400
Subject: [PATCH 129/297] MSVAULT - Fix releaseAssetTo (#567)
---
src/contracts/MsVault.h | 7 +++----
test/contract_msvault.cpp | 8 ++++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/contracts/MsVault.h b/src/contracts/MsVault.h
index 3bf99e0de..2fcc8454f 100644
--- a/src/contracts/MsVault.h
+++ b/src/contracts/MsVault.h
@@ -594,8 +594,7 @@ struct MSVAULT : public ContractBase
isValidVaultId_input iv_in;
isValidVaultId_output iv_out;
isValidVaultId_locals iv_locals;
- QX::TransferShareOwnershipAndPossession_input qx_in;
- QX::TransferShareOwnershipAndPossession_output qx_out;
+ sint64 remainingShares;
sint64 releaseResult;
};
@@ -1482,7 +1481,7 @@ struct MSVAULT : public ContractBase
// Re-check balance before transfer
if (locals.assetVault.assetBalances.get(locals.assetIndex).balance >= input.amount)
{
- locals.qx_out.transferredNumberOfShares = qpi.transferShareOwnershipAndPossession(
+ locals.remainingShares = qpi.transferShareOwnershipAndPossession(
input.asset.assetName,
input.asset.issuer,
SELF, // owner
@@ -1490,7 +1489,7 @@ struct MSVAULT : public ContractBase
input.amount,
input.destination // new owner & possessor
);
- if (locals.qx_out.transferredNumberOfShares > 0)
+ if (locals.remainingShares >= 0)
{
// Update internal asset balance
locals.ab = locals.assetVault.assetBalances.get(locals.assetIndex);
diff --git a/test/contract_msvault.cpp b/test/contract_msvault.cpp
index e0993ddba..e37260230 100644
--- a/test/contract_msvault.cpp
+++ b/test/contract_msvault.cpp
@@ -925,19 +925,19 @@ TEST(ContractMsVault, ReleaseAssetTo_FullApproval)
EXPECT_EQ(vaultAssetBalanceBefore, 800ULL);
// Owners approve the release
- auto relAssetOut1 = msvault.releaseAssetTo(vaultId, assetTest, 500, DESTINATION, OWNER1);
+ auto relAssetOut1 = msvault.releaseAssetTo(vaultId, assetTest, 800, DESTINATION, OWNER1);
EXPECT_EQ(relAssetOut1.status, 9ULL);
- auto relAssetOut2 = msvault.releaseAssetTo(vaultId, assetTest, 500, DESTINATION, OWNER2);
+ auto relAssetOut2 = msvault.releaseAssetTo(vaultId, assetTest, 800, DESTINATION, OWNER2);
EXPECT_EQ(relAssetOut2.status, 1ULL);
// Check final balances
sint64 destBalanceManagedByQx = numberOfShares(assetTest, { DESTINATION, QX_CONTRACT_INDEX }, { DESTINATION, QX_CONTRACT_INDEX });
sint64 destBalanceManagedByMsVault = numberOfShares(assetTest, { DESTINATION, MSVAULT_CONTRACT_INDEX }, { DESTINATION, MSVAULT_CONTRACT_INDEX });
- EXPECT_EQ(destBalanceManagedByQx, 500LL);
+ EXPECT_EQ(destBalanceManagedByQx, 800LL);
EXPECT_EQ(destBalanceManagedByMsVault, 0LL);
auto vaultAssetBalanceAfter = msvault.getVaultAssetBalances(vaultId).assetBalances.get(0).balance;
- EXPECT_EQ(vaultAssetBalanceAfter, 300ULL); // 800 - 500
+ EXPECT_EQ(vaultAssetBalanceAfter, 0ULL); // 800 - 800
// The vault's qubic balance should be 0 after paying the management transfer fee
auto vaultQubicBalanceAfter = msvault.getBalanceOf(vaultId);
From f727bed10f9aebf81037c819f8e814a7a2e74ddf Mon Sep 17 00:00:00 2001
From: N-010
Date: Fri, 10 Oct 2025 09:59:25 +0300
Subject: [PATCH 130/297] RandomLottery bug fix: refund on BuyTicket failures
(#569)
Co-authored-by: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
---
src/contracts/RandomLottery.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/contracts/RandomLottery.h b/src/contracts/RandomLottery.h
index 7a1a109ad..58a0ccf81 100644
--- a/src/contracts/RandomLottery.h
+++ b/src/contracts/RandomLottery.h
@@ -368,6 +368,8 @@ struct RL : public ContractBase
if (state.players.contains(qpi.invocator()))
{
output.returnCode = static_cast(EReturnCode::TICKET_ALREADY_PURCHASED);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+
return;
}
@@ -375,6 +377,8 @@ struct RL : public ContractBase
if (state.players.add(qpi.invocator()) == NULL_INDEX)
{
output.returnCode = static_cast(EReturnCode::TICKET_ALL_SOLD_OUT);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+
return;
}
From 217ed4746c37c8ad58c55bad3f9bf89f2f899a2e Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Sun, 12 Oct 2025 11:27:04 +0700
Subject: [PATCH 131/297] add managingContractIndex to logging event
---
src/assets/assets.h | 1 +
src/logging/logging.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/assets/assets.h b/src/assets/assets.h
index d99b9adc7..793941669 100644
--- a/src/assets/assets.h
+++ b/src/assets/assets.h
@@ -245,6 +245,7 @@ static long long issueAsset(const m256i& issuerPublicKey, const char name[7], ch
AssetIssuance assetIssuance;
assetIssuance.issuerPublicKey = issuerPublicKey;
assetIssuance.numberOfShares = numberOfShares;
+ assetIssuance.managingContractIndex = managingContractIndex; // any SC can call issueAsset now (eg: QBOND) not just QX
*((unsigned long long*) assetIssuance.name) = *((unsigned long long*) name); // Order must be preserved!
assetIssuance.numberOfDecimalPlaces = numberOfDecimalPlaces; // Order must be preserved!
*((unsigned long long*) assetIssuance.unitOfMeasurement) = *((unsigned long long*) unitOfMeasurement); // Order must be preserved!
diff --git a/src/logging/logging.h b/src/logging/logging.h
index bbc923378..bc790cad4 100644
--- a/src/logging/logging.h
+++ b/src/logging/logging.h
@@ -73,6 +73,7 @@ struct AssetIssuance
{
m256i issuerPublicKey;
long long numberOfShares;
+ long long managingContractIndex;
char name[7];
char numberOfDecimalPlaces;
char unitOfMeasurement[7];
From 7d28d468b5912c0199e5e8e425f03f81cb28b803 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Sun, 12 Oct 2025 11:37:48 +0700
Subject: [PATCH 132/297] reduce logging event to 1 flag
---
src/private_settings.h | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/private_settings.h b/src/private_settings.h
index eef01252c..bcecc8265 100644
--- a/src/private_settings.h
+++ b/src/private_settings.h
@@ -27,33 +27,27 @@ static const unsigned char whiteListPeers[][4] = {
};
*/
-#define ENABLE_STANDARD_LOGGING 0 // logging universe + spectrum
-#define ENABLE_SMART_CONTRACT_LOGGING 0// logging smart contract
+#define ENABLE_QUBIC_LOGGING_EVENT 0 // turn on logging events
-#if !ENABLE_STANDARD_LOGGING && ENABLE_SMART_CONTRACT_LOGGING
-#error ENABLE_SMART_CONTRACT_LOGGING 1 also requires ENABLE_STANDARD_LOGGING 1
-#endif
-
-#if ENABLE_STANDARD_LOGGING
-#define LOG_UNIVERSE 1 // all universe activities/events (incl: issue, ownership/possession changes)
-#define LOG_SPECTRUM 1 // all spectrum activities/events (incl: transfers, burn, dust cleaning)
-#else
-#define LOG_UNIVERSE 0
-#define LOG_SPECTRUM 0
-#endif
-#if ENABLE_SMART_CONTRACT_LOGGING
+#if ENABLE_QUBIC_LOGGING_EVENT
+// DO NOT MODIFY THIS AREA UNLESS YOU ARE DEVELOPING LOGGING FEATURES
+#define LOG_UNIVERSE 1
+#define LOG_SPECTRUM 1
#define LOG_CONTRACT_ERROR_MESSAGES 1
#define LOG_CONTRACT_WARNING_MESSAGES 1
#define LOG_CONTRACT_INFO_MESSAGES 1
#define LOG_CONTRACT_DEBUG_MESSAGES 1
#define LOG_CUSTOM_MESSAGES 1
#else
+#define LOG_UNIVERSE 0
+#define LOG_SPECTRUM 0
#define LOG_CONTRACT_ERROR_MESSAGES 0
#define LOG_CONTRACT_WARNING_MESSAGES 0
#define LOG_CONTRACT_INFO_MESSAGES 0
#define LOG_CONTRACT_DEBUG_MESSAGES 0
#define LOG_CUSTOM_MESSAGES 0
#endif
+
static unsigned long long logReaderPasscodes[4] = {
0, 0, 0, 0 // REMOVE THIS ENTRY AND REPLACE IT WITH YOUR OWN RANDOM NUMBERS IN [0..18446744073709551615] RANGE IF LOGGING IS ENABLED
};
From 3014e396dec447d478675dfb312d6097f4fbb188 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Sun, 12 Oct 2025 12:12:54 +0700
Subject: [PATCH 133/297] add hint message to distribute dividends
---
src/contract_core/qpi_asset_impl.h | 10 +++++++++-
src/logging/logging.h | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/contract_core/qpi_asset_impl.h b/src/contract_core/qpi_asset_impl.h
index 1e4f98181..07c4cba00 100644
--- a/src/contract_core/qpi_asset_impl.h
+++ b/src/contract_core/qpi_asset_impl.h
@@ -486,6 +486,13 @@ bool QPI::QpiContextProcedureCall::distributeDividends(long long amountPerShare)
return false;
}
+ // this part of code doesn't perform completed QuTransfers, instead it `decreaseEnergy` all QUs at once and `increaseEnergy` multiple times.
+ // Meanwhile, a QUTransfer requires a pair of both decrease & increase calls.
+ // This behavior will produce different numberOfOutgoingTransfers for the SC index.
+ // 3rd party software needs to catch the HINT message to know the distribute dividends operation
+ DummyCustomMessage dcm{ CUSTOM_MESSAGE_OP_START_DISTRIBUTE_DIVIDENDS };
+ logger.logCustomMessage(dcm);
+
if (decreaseEnergy(index, amountPerShare * NUMBER_OF_COMPUTORS))
{
ACQUIRE(universeLock);
@@ -523,7 +530,8 @@ bool QPI::QpiContextProcedureCall::distributeDividends(long long amountPerShare)
RELEASE(universeLock);
}
-
+ dcm = DummyCustomMessage{ CUSTOM_MESSAGE_OP_END_DISTRIBUTE_DIVIDENDS };
+ logger.logCustomMessage(dcm);
return true;
}
diff --git a/src/logging/logging.h b/src/logging/logging.h
index bc790cad4..f7a39c4c4 100644
--- a/src/logging/logging.h
+++ b/src/logging/logging.h
@@ -58,6 +58,9 @@ struct Peer;
#define ASSET_POSSESSION_MANAGING_CONTRACT_CHANGE 12
#define CUSTOM_MESSAGE 255
+#define CUSTOM_MESSAGE_OP_START_DISTRIBUTE_DIVIDENDS 6217575821008262227ULL // STA_DDIV
+#define CUSTOM_MESSAGE_OP_END_DISTRIBUTE_DIVIDENDS 6217575821008457285ULL //END_DDIV
+
/*
* STRUCTS FOR LOGGING
*/
From 9a3477ef4c1c8dd4f8b7bc7a08ffbb58f916015d Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:52:31 +0200
Subject: [PATCH 134/297] update params for epoch 183 / v1.264.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 076714e3e..6523d77d2 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -61,12 +61,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 263
+#define VERSION_B 264
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 182
-#define TICK 34270000
+#define EPOCH 183
+#define TICK 34815000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From c2366be3b9a744e9cb00fd6457d31c51bdc0e328 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 15 Oct 2025 10:15:25 +0200
Subject: [PATCH 135/297] contract-verify action: exclude math_lib, qpi and
TestExample
---
.github/workflows/contract-verify.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/contract-verify.yml b/.github/workflows/contract-verify.yml
index 5511bec52..bbb8089b9 100644
--- a/.github/workflows/contract-verify.yml
+++ b/.github/workflows/contract-verify.yml
@@ -10,11 +10,17 @@ on:
branches: [ "main", "develop" ]
paths:
- 'src/contracts/*.h'
+ - '!src/contracts/math_lib.h'
+ - '!src/contracts/qpi.h'
+ - '!src/contracts/TestExample*.h'
- '.github/workflows/contract-verify.yml'
pull_request:
branches: [ "main", "develop" ]
paths:
- 'src/contracts/*.h'
+ - '!src/contracts/math_lib.h'
+ - '!src/contracts/qpi.h'
+ - '!src/contracts/TestExample*.h'
- '.github/workflows/contract-verify.yml'
jobs:
From 7f2047acc24a879cd45d01717954d4cb4a36d6c2 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:15:37 +0200
Subject: [PATCH 136/297] transaction mempool with tx prioritization (#563)
* added txs pool class
* polishing txsPool class
* using txsPool in qubic.cpp
* fix test project
* adding tests
* removing static from operator() to fix efi build
* rename operator() to be able to make it static
* use allocPoolWithErrorLog for allocating txsPool buffers
* also log tick number for getNumberOfTickTxs and getNumberOfPendingTxs
* add additional log if adding tx fails
* change order of locks in TxsPool::update to avoid dead lock
* disable some debug output
* remove test filter, edit comments
* fix vcxproj filters
* add "pending" to TxsPool variables and functions to make meaning clearer
* adapt test names
* limited number of ticks for pending tx, ring buffers, simple txs buffer
* adapt tests to new version
* add txs priorities
* add and adapt tests
* change txsPriorities to ptr
* add test for duplicate txs
* cleanup tx priorities: use for instead of while
* add extra lock for txsPriorities
* add locks in IncrementFirstStoredTick
* max priority for protocol-level txs
* define num ticks for pending txs pool as 10 mins, add next power of 2 function to calc Collection capacity
* only use one lock for PendingTxsPool
* only save NUMBER_OF_TRANSACTIONS_PER_TICK - 2 txs in PendingTxsPool to leave room for protocol-level txs
* use src balance for priority instead of amount
---
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contracts/math_lib.h | 17 ++
src/mining/mining.h | 10 +-
src/public_settings.h | 3 +
src/qubic.cpp | 318 +++++---------------
src/ticking/pending_txs_pool.h | 534 +++++++++++++++++++++++++++++++++
src/ticking/tick_storage.h | 2 +-
src/ticking/ticking.h | 1 +
test/pending_txs_pool.cpp | 534 +++++++++++++++++++++++++++++++++
test/test.vcxproj | 1 +
test/test.vcxproj.filters | 1 +
12 files changed, 1175 insertions(+), 250 deletions(-)
create mode 100644 src/ticking/pending_txs_pool.h
create mode 100644 test/pending_txs_pool.cpp
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 862bbec3a..34380e8ef 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -119,6 +119,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 20378179b..6079f64e9 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -276,6 +276,9 @@
contract_core
+
+ ticking
+
contracts
diff --git a/src/contracts/math_lib.h b/src/contracts/math_lib.h
index 2eaeafd8a..e54499dc1 100644
--- a/src/contracts/math_lib.h
+++ b/src/contracts/math_lib.h
@@ -49,4 +49,21 @@ inline static unsigned char divUp(unsigned char a, unsigned char b)
return b ? ((a + b - 1) / b) : 0;
}
+inline constexpr unsigned long long findNextPowerOf2(unsigned long long num)
+{
+ if (num == 0)
+ return 1;
+
+ num--;
+ num |= num >> 1;
+ num |= num >> 2;
+ num |= num >> 4;
+ num |= num >> 8;
+ num |= num >> 16;
+ num |= num >> 32;
+ num++;
+
+ return num;
+}
+
}
diff --git a/src/mining/mining.h b/src/mining/mining.h
index add55a42d..293af781f 100644
--- a/src/mining/mining.h
+++ b/src/mining/mining.h
@@ -130,7 +130,7 @@ struct BroadcastCustomMiningTransaction
bool isBroadcasted;
};
-BroadcastCustomMiningTransaction gCustomMiningBroadcastTxBuffer[NUMBER_OF_COMPUTORS];
+static BroadcastCustomMiningTransaction gCustomMiningBroadcastTxBuffer[NUMBER_OF_COMPUTORS];
class CustomMiningSharesCounter
{
@@ -1226,7 +1226,7 @@ static CustomMiningStorage gCustomMiningStorage;
static CustomMiningStats gCustomMiningStats;
-int customMiningInitialize()
+static int customMiningInitialize()
{
gCustomMiningStorage.init();
gSystemCustomMiningSolutionV2Cache.init();
@@ -1234,7 +1234,7 @@ int customMiningInitialize()
return 0;
}
-int customMiningDeinitialize()
+static int customMiningDeinitialize()
{
gCustomMiningStorage.deinit();
return 0;
@@ -1243,7 +1243,7 @@ int customMiningDeinitialize()
#ifdef NO_UEFI
#else
// Save score cache to SCORE_CACHE_FILE_NAME
-void saveCustomMiningCache(int epoch, CHAR16* directory = NULL)
+static void saveCustomMiningCache(int epoch, CHAR16* directory = NULL)
{
logToConsole(L"Saving custom mining cache file...");
CUSTOM_MINING_CACHE_FILE_NAME[sizeof(CUSTOM_MINING_CACHE_FILE_NAME) / sizeof(CUSTOM_MINING_CACHE_FILE_NAME[0]) - 4] = epoch / 100 + L'0';
@@ -1253,7 +1253,7 @@ void saveCustomMiningCache(int epoch, CHAR16* directory = NULL)
}
// Update score cache filename with epoch and try to load file
-bool loadCustomMiningCache(int epoch)
+static bool loadCustomMiningCache(int epoch)
{
logToConsole(L"Loading custom mining cache...");
bool success = true;
diff --git a/src/public_settings.h b/src/public_settings.h
index 6523d77d2..971fd91a9 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -31,6 +31,9 @@
#define TICK_DURATION_FOR_ALLOCATION_MS 750
#define TRANSACTION_SPARSENESS 1
+// Number of ticks that are stored in the pending txs pool. This also defines how many ticks in advance a tx can be registered.
+#define PENDING_TXS_POOL_NUM_TICKS (1000 * 60 * 10ULL / TICK_DURATION_FOR_ALLOCATION_MS) // 10 minutes
+
// Below are 2 variables that are used for auto-F5 feature:
#define AUTO_FORCE_NEXT_TICK_THRESHOLD 0ULL // Multiplier of TARGET_TICK_DURATION for the system to detect "F5 case" | set to 0 to disable
// to prevent bad actor causing misalignment.
diff --git a/src/qubic.cpp b/src/qubic.cpp
index d03afaafc..ad90daf86 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -131,6 +131,7 @@ static unsigned short ownComputorIndicesMapping[sizeof(computorSeeds) / sizeof(c
static TickStorage ts;
static VoteCounter voteCounter;
static TickData nextTickData;
+static PendingTxsPool pendingTxsPool;
static m256i uniqueNextTickTransactionDigests[NUMBER_OF_COMPUTORS];
static unsigned int uniqueNextTickTransactionDigestCounters[NUMBER_OF_COMPUTORS];
@@ -138,13 +139,7 @@ static unsigned int uniqueNextTickTransactionDigestCounters[NUMBER_OF_COMPUTORS]
static unsigned int resourceTestingDigest = 0;
static unsigned int numberOfTransactions = 0;
-static volatile char entityPendingTransactionsLock = 0;
-static unsigned char* entityPendingTransactions = NULL;
-static unsigned char* entityPendingTransactionDigests = NULL;
-static unsigned int entityPendingTransactionIndices[SPECTRUM_CAPACITY]; // [SPECTRUM_CAPACITY] must be >= than [NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR]
-static volatile char computorPendingTransactionsLock = 0;
-static unsigned char* computorPendingTransactions = NULL;
-static unsigned char* computorPendingTransactionDigests = NULL;
+
static unsigned long long spectrumChangeFlags[SPECTRUM_CAPACITY / (sizeof(unsigned long long) * 8)];
static unsigned long long mainLoopNumerator = 0, mainLoopDenominator = 0;
@@ -964,42 +959,7 @@ static void processBroadcastTransaction(Peer* peer, RequestResponseHeader* heade
enqueueResponse(NULL, header);
}
- const int computorIndex = ::computorIndex(request->sourcePublicKey);
- if (computorIndex >= 0)
- {
- ACQUIRE(computorPendingTransactionsLock);
-
- const unsigned int offset = random(MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR);
- if (((Transaction*)&computorPendingTransactions[computorIndex * offset * MAX_TRANSACTION_SIZE])->tick < request->tick
- && request->tick < system.initialTick + MAX_NUMBER_OF_TICKS_PER_EPOCH)
- {
- copyMem(&computorPendingTransactions[computorIndex * offset * MAX_TRANSACTION_SIZE], request, transactionSize);
- KangarooTwelve(request, transactionSize, &computorPendingTransactionDigests[computorIndex * offset * 32ULL], 32);
- }
-
- RELEASE(computorPendingTransactionsLock);
- }
- else
- {
- const int spectrumIndex = ::spectrumIndex(request->sourcePublicKey);
- if (spectrumIndex >= 0)
- {
- ACQUIRE(entityPendingTransactionsLock);
-
- // Pending transactions pool follows the rule: A transaction with a higher tick overwrites previous transaction from the same address.
- // The second filter is to avoid accident made by users/devs (setting scheduled tick too high) and get locked until end of epoch.
- // It also makes sense that a node doesn't need to store a transaction that is scheduled on a tick that node will never reach.
- // Notice: MAX_NUMBER_OF_TICKS_PER_EPOCH is not set globally since every node may have different TARGET_TICK_DURATION time due to memory limitation.
- if (((Transaction*)&entityPendingTransactions[spectrumIndex * MAX_TRANSACTION_SIZE])->tick < request->tick
- && request->tick < system.initialTick + MAX_NUMBER_OF_TICKS_PER_EPOCH)
- {
- copyMem(&entityPendingTransactions[spectrumIndex * MAX_TRANSACTION_SIZE], request, transactionSize);
- KangarooTwelve(request, transactionSize, &entityPendingTransactionDigests[spectrumIndex * 32ULL], 32);
- }
-
- RELEASE(entityPendingTransactionsLock);
- }
- }
+ pendingTxsPool.add(request);
unsigned int tickIndex = ts.tickToIndexCurrentEpoch(request->tick);
ts.tickData.acquireLock();
@@ -3165,109 +3125,56 @@ static void processTick(unsigned long long processorNumber)
timelockPreimage[2] = etalonTick.saltedComputerDigest;
KangarooTwelve(timelockPreimage, sizeof(timelockPreimage), &broadcastedFutureTickData.tickData.timelock, sizeof(broadcastedFutureTickData.tickData.timelock));
- unsigned int j = 0;
-
- ACQUIRE(computorPendingTransactionsLock);
-
- // Get indices of pending computor transactions that are scheduled to be included in tickData
- unsigned int numberOfEntityPendingTransactionIndices = 0;
- for (unsigned int k = 0; k < NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR; k++)
- {
- const Transaction* tx = ((Transaction*)&computorPendingTransactions[k * MAX_TRANSACTION_SIZE]);
- if (tx->tick == system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET)
- {
- entityPendingTransactionIndices[numberOfEntityPendingTransactionIndices++] = k;
- }
- }
-
- // Randomly select computor tx scheduled for the tick until tick is full or all pending tx are included
- while (j < NUMBER_OF_TRANSACTIONS_PER_TICK && numberOfEntityPendingTransactionIndices)
+ unsigned int nextTxIndex = 0;
+ unsigned int numPendingTickTxs = pendingTxsPool.getNumberOfPendingTickTxs(system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET);
+ pendingTxsPool.acquireLock();
+ for (unsigned int tx = 0; tx < numPendingTickTxs; ++tx)
{
- const unsigned int index = random(numberOfEntityPendingTransactionIndices);
-
- const Transaction* pendingTransaction = ((Transaction*)&computorPendingTransactions[entityPendingTransactionIndices[index] * MAX_TRANSACTION_SIZE]);
- ASSERT(pendingTransaction->tick == system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET);
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"pendingTxsPool.get() call in processTick()");
+#endif
+ const Transaction* pendingTransaction = pendingTxsPool.getTx(system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET, tx);
+ if (pendingTransaction)
{
ASSERT(pendingTransaction->checkValidity());
const unsigned int transactionSize = pendingTransaction->totalSize();
+ ts.tickTransactions.acquireLock();
if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
{
- ts.tickTransactions.acquireLock();
- if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
- {
- ts.tickTransactionOffsets(pendingTransaction->tick, j) = ts.nextTickTransactionOffset;
- copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), (void*)pendingTransaction, transactionSize);
- broadcastedFutureTickData.tickData.transactionDigests[j] = &computorPendingTransactionDigests[entityPendingTransactionIndices[index] * 32ULL];
- j++;
- ts.nextTickTransactionOffset += transactionSize;
- }
- ts.tickTransactions.releaseLock();
+ ts.tickTransactionOffsets(pendingTransaction->tick, nextTxIndex) = ts.nextTickTransactionOffset;
+ copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), (void*)pendingTransaction, transactionSize);
+ const m256i* digest = pendingTxsPool.getDigest(system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET, tx);
+ // digest should always be != nullptr because pendingTransaction != nullptr
+ ASSERT(digest);
+ broadcastedFutureTickData.tickData.transactionDigests[nextTxIndex] = digest ? *digest : m256i::zero();
+ ts.nextTickTransactionOffset += transactionSize;
+ nextTxIndex++;
}
+ ts.tickTransactions.releaseLock();
}
-
- entityPendingTransactionIndices[index] = entityPendingTransactionIndices[--numberOfEntityPendingTransactionIndices];
- }
-
- RELEASE(computorPendingTransactionsLock);
-
- ACQUIRE(entityPendingTransactionsLock);
-
- // Get indices of pending non-computor transactions that are scheduled to be included in tickData
- numberOfEntityPendingTransactionIndices = 0;
- for (unsigned int k = 0; k < SPECTRUM_CAPACITY; k++)
- {
- const Transaction* tx = ((Transaction*)&entityPendingTransactions[k * MAX_TRANSACTION_SIZE]);
- if (tx->tick == system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET)
- {
- entityPendingTransactionIndices[numberOfEntityPendingTransactionIndices++] = k;
- }
- }
-
- // Randomly select non-computor tx scheduled for the tick until tick is full or all pending tx are included
- while (j < NUMBER_OF_TRANSACTIONS_PER_TICK && numberOfEntityPendingTransactionIndices)
- {
- const unsigned int index = random(numberOfEntityPendingTransactionIndices);
-
- const Transaction* pendingTransaction = ((Transaction*)&entityPendingTransactions[entityPendingTransactionIndices[index] * MAX_TRANSACTION_SIZE]);
- ASSERT(pendingTransaction->tick == system.tick + TICK_TRANSACTIONS_PUBLICATION_OFFSET);
+ else
{
- ASSERT(pendingTransaction->checkValidity());
- const unsigned int transactionSize = pendingTransaction->totalSize();
- if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
- {
- ts.tickTransactions.acquireLock();
- if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
- {
- ts.tickTransactionOffsets(pendingTransaction->tick, j) = ts.nextTickTransactionOffset;
- copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), (void*)pendingTransaction, transactionSize);
- broadcastedFutureTickData.tickData.transactionDigests[j] = &entityPendingTransactionDigests[entityPendingTransactionIndices[index] * 32ULL];
- j++;
- ts.nextTickTransactionOffset += transactionSize;
- }
- ts.tickTransactions.releaseLock();
- }
+ break;
}
-
- entityPendingTransactionIndices[index] = entityPendingTransactionIndices[--numberOfEntityPendingTransactionIndices];
}
-
- RELEASE(entityPendingTransactionsLock);
+ pendingTxsPool.releaseLock();
{
// insert & broadcast vote counter tx
- makeAndBroadcastTickVotesTransaction(i, broadcastedFutureTickData, j++);
+ makeAndBroadcastTickVotesTransaction(i, broadcastedFutureTickData, nextTxIndex++);
}
{
- // insert & broadcast custom mining share
- if (makeAndBroadcastCustomMiningTransaction(i, broadcastedFutureTickData, j)) // this type of tx is only broadcasted in mining phases
+ // insert & broadcast external mining score packet (containing the score for each computor on the last external mining phase)
+ // this type of tx is only broadcasted in internal mining phases
+ if (makeAndBroadcastCustomMiningTransaction(i, broadcastedFutureTickData, nextTxIndex))
{
- j++;
+ nextTxIndex++;
}
}
- for (; j < NUMBER_OF_TRANSACTIONS_PER_TICK; j++)
+ for (; nextTxIndex < NUMBER_OF_TRANSACTIONS_PER_TICK; ++nextTxIndex)
{
- broadcastedFutureTickData.tickData.transactionDigests[j] = m256i::zero();
+ broadcastedFutureTickData.tickData.transactionDigests[nextTxIndex] = m256i::zero();
}
setMem(broadcastedFutureTickData.tickData.contractFees, sizeof(broadcastedFutureTickData.tickData.contractFees), 0);
@@ -3427,25 +3334,19 @@ static void beginEpoch()
#ifndef NDEBUG
ts.checkStateConsistencyWithAssert();
+ pendingTxsPool.checkStateConsistencyWithAssert();
#endif
ts.beginEpoch(system.initialTick);
+ pendingTxsPool.beginEpoch(system.initialTick);
voteCounter.init();
#ifndef NDEBUG
ts.checkStateConsistencyWithAssert();
+ pendingTxsPool.checkStateConsistencyWithAssert();
#endif
#if ADDON_TX_STATUS_REQUEST
beginEpochTxStatusRequestAddOn(system.initialTick);
#endif
- for (unsigned int i = 0; i < NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR; i++)
- {
- ((Transaction*)&computorPendingTransactions[i * MAX_TRANSACTION_SIZE])->tick = 0;
- }
- for (unsigned int i = 0; i < SPECTRUM_CAPACITY; i++)
- {
- ((Transaction*)&entityPendingTransactions[i * MAX_TRANSACTION_SIZE])->tick = 0;
- }
-
setMem(solutionPublicationTicks, sizeof(solutionPublicationTicks), 0);
setMem(faultyComputorFlags, sizeof(faultyComputorFlags), 0);
@@ -4295,90 +4196,56 @@ static void prepareNextTickTransactions()
if (numberOfKnownNextTickTransactions != numberOfNextTickTransactions)
{
- // Checks if any of the missing transactions is available in the computorPendingTransaction and remove unknownTransaction flag if found
- for (unsigned int i = 0; i < NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR; i++)
- {
- Transaction* pendingTransaction = (Transaction*)&computorPendingTransactions[i * MAX_TRANSACTION_SIZE];
- if (pendingTransaction->tick == nextTick)
- {
- ACQUIRE(computorPendingTransactionsLock);
-
- ASSERT(pendingTransaction->checkValidity());
- auto* tsPendingTransactionOffsets = ts.tickTransactionOffsets.getByTickInCurrentEpoch(pendingTransaction->tick);
- for (unsigned int j = 0; j < NUMBER_OF_TRANSACTIONS_PER_TICK; j++)
- {
- if (unknownTransactions[j >> 6] & (1ULL << (j & 63)))
- {
- if (&computorPendingTransactionDigests[i * 32ULL] == nextTickData.transactionDigests[j])
- {
- ts.tickTransactions.acquireLock();
- // write tx to tick tx storage, no matter if tsNextTickTransactionOffsets[i] is 0 (new tx)
- // or not (tx with digest that doesn't match tickData needs to be overwritten)
- {
- const unsigned int transactionSize = pendingTransaction->totalSize();
- if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
- {
- tsPendingTransactionOffsets[j] = ts.nextTickTransactionOffset;
- copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), pendingTransaction, transactionSize);
- ts.nextTickTransactionOffset += transactionSize;
-
- numberOfKnownNextTickTransactions++;
- }
- }
- ts.tickTransactions.releaseLock();
-
- unknownTransactions[j >> 6] &= ~(1ULL << (j & 63));
+ // Checks if any of the missing transactions is available in the pending transaction pool and remove unknownTransaction flag if found
- break;
- }
- }
- }
-
- RELEASE(computorPendingTransactionsLock);
- }
- }
- // Checks if any of the missing transactions is available in the entityPendingTransaction and remove unknownTransaction flag if found
- for (unsigned int i = 0; i < SPECTRUM_CAPACITY; i++)
+ unsigned int numPendingTickTxs = pendingTxsPool.getNumberOfPendingTickTxs(nextTick);
+ pendingTxsPool.acquireLock();
+ for (unsigned int i = 0; i < numPendingTickTxs; ++i)
{
- Transaction* pendingTransaction = (Transaction*)&entityPendingTransactions[i * MAX_TRANSACTION_SIZE];
- if (pendingTransaction->tick == nextTick)
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"pendingTxsPool.get() call in prepareNextTickTransactions()");
+#endif
+ Transaction* pendingTransaction = pendingTxsPool.getTx(nextTick, i);
+ if (pendingTransaction)
{
- ACQUIRE(entityPendingTransactionsLock);
-
ASSERT(pendingTransaction->checkValidity());
auto* tsPendingTransactionOffsets = ts.tickTransactionOffsets.getByTickInCurrentEpoch(pendingTransaction->tick);
- for (unsigned int j = 0; j < NUMBER_OF_TRANSACTIONS_PER_TICK; j++)
+
+ const m256i* digest = pendingTxsPool.getDigest(nextTick, i);
+ if (digest)
{
- if (unknownTransactions[j >> 6] & (1ULL << (j & 63)))
+ for (unsigned int j = 0; j < NUMBER_OF_TRANSACTIONS_PER_TICK; j++)
{
- if (&entityPendingTransactionDigests[i * 32ULL] == nextTickData.transactionDigests[j])
+ if (unknownTransactions[j >> 6] & (1ULL << (j & 63)))
{
- ts.tickTransactions.acquireLock();
- // write tx to tick tx storage, no matter if tsNextTickTransactionOffsets[i] is 0 (new tx)
- // or not (tx with digest that doesn't match tickData needs to be overwritten)
+ if (*digest == nextTickData.transactionDigests[j])
{
- const unsigned int transactionSize = pendingTransaction->totalSize();
- if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
+ ts.tickTransactions.acquireLock();
+ // write tx to tick tx storage, no matter if tsNextTickTransactionOffsets[i] is 0 (new tx)
+ // or not (tx with digest that doesn't match tickData needs to be overwritten)
{
- tsPendingTransactionOffsets[j] = ts.nextTickTransactionOffset;
- copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), pendingTransaction, transactionSize);
- ts.nextTickTransactionOffset += transactionSize;
+ const unsigned int transactionSize = pendingTransaction->totalSize();
+ if (ts.nextTickTransactionOffset + transactionSize <= ts.tickTransactions.storageSpaceCurrentEpoch)
+ {
+ tsPendingTransactionOffsets[j] = ts.nextTickTransactionOffset;
+ copyMem(ts.tickTransactions(ts.nextTickTransactionOffset), pendingTransaction, transactionSize);
+ ts.nextTickTransactionOffset += transactionSize;
- numberOfKnownNextTickTransactions++;
+ numberOfKnownNextTickTransactions++;
+ }
}
- }
- ts.tickTransactions.releaseLock();
+ ts.tickTransactions.releaseLock();
- unknownTransactions[j >> 6] &= ~(1ULL << (j & 63));
+ unknownTransactions[j >> 6] &= ~(1ULL << (j & 63));
- break;
+ break;
+ }
}
}
}
-
- RELEASE(entityPendingTransactionsLock);
}
}
+ pendingTxsPool.releaseLock();
// At this point unknownTransactions is set to 1 for all transactions that are unknown
// Update requestedTickTransactions the list of txs that not exist in memory so the MAIN loop can try to fetch them from peers
@@ -4386,7 +4253,8 @@ static void prepareNextTickTransactions()
// As processNextTickTransactions returns tx for which the flag ist set to 0 (tx with flag set to 1 are not returned)
// We check if the last tickTransactionRequest it already sent
- if(requestedTickTransactions.requestedTickTransactions.tick == 0){
+ if (requestedTickTransactions.requestedTickTransactions.tick == 0)
+ {
// Initialize transactionFlags to one so that by default we do not request any transaction
setMem(requestedTickTransactions.requestedTickTransactions.transactionFlags, sizeof(requestedTickTransactions.requestedTickTransactions.transactionFlags), 0xff);
for (unsigned int i = 0; i < NUMBER_OF_TRANSACTIONS_PER_TICK; i++)
@@ -5060,6 +4928,7 @@ static void tickProcessor(void*)
system.tick++;
updateNumberOfTickTransactions();
+ pendingTxsPool.incrementFirstStoredTick();
bool isBeginEpoch = false;
if (epochTransitionState == 1)
@@ -5343,22 +5212,12 @@ static bool initialize()
{
if (!ts.init())
return false;
- if (!allocPoolWithErrorLog(L"entityPendingTransaction buffer", SPECTRUM_CAPACITY * MAX_TRANSACTION_SIZE,(void**)&entityPendingTransactions, __LINE__) ||
- !allocPoolWithErrorLog(L"entityPendingTransaction buffer", SPECTRUM_CAPACITY * 32ULL,(void**)&entityPendingTransactionDigests , __LINE__))
- {
- return false;
- }
- if (!allocPoolWithErrorLog(L"computorPendingTransactions buffer", NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR * MAX_TRANSACTION_SIZE, (void**)&computorPendingTransactions, __LINE__) ||
- !allocPoolWithErrorLog(L"computorPendingTransactions buffer", NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR * 32ULL, (void**)&computorPendingTransactionDigests, __LINE__))
- {
- return false;
- }
-
+ if (!pendingTxsPool.init())
+ return false;
setMem(spectrumChangeFlags, sizeof(spectrumChangeFlags), 0);
-
if (!initSpectrum())
return false;
@@ -5698,24 +5557,10 @@ static void deinitialize()
}
}
- if (computorPendingTransactionDigests)
- {
- freePool(computorPendingTransactionDigests);
- }
- if (computorPendingTransactions)
- {
- freePool(computorPendingTransactions);
- }
- if (entityPendingTransactionDigests)
- {
- freePool(entityPendingTransactionDigests);
- }
- if (entityPendingTransactions)
- {
- freePool(entityPendingTransactions);
- }
ts.deinit();
+ pendingTxsPool.deinit();
+
if (score)
{
freePool(score);
@@ -5905,21 +5750,6 @@ static void logInfo()
}
logToConsole(message);
- unsigned int numberOfPendingTransactions = 0;
- for (unsigned int i = 0; i < NUMBER_OF_COMPUTORS * MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR; i++)
- {
- if (((Transaction*)&computorPendingTransactions[i * MAX_TRANSACTION_SIZE])->tick > system.tick)
- {
- numberOfPendingTransactions++;
- }
- }
- for (unsigned int i = 0; i < SPECTRUM_CAPACITY; i++)
- {
- if (((Transaction*)&entityPendingTransactions[i * MAX_TRANSACTION_SIZE])->tick > system.tick)
- {
- numberOfPendingTransactions++;
- }
- }
if (nextTickTransactionsSemaphore)
{
setText(message, L"?");
@@ -5965,7 +5795,7 @@ static void logInfo()
appendNumber(message, td.millisecond % 10, FALSE);
appendText(message, L".) ");
}
- appendNumber(message, numberOfPendingTransactions, TRUE);
+ appendNumber(message, pendingTxsPool.getTotalNumberOfPendingTxs(system.tick), TRUE);
appendText(message, L" pending transactions.");
logToConsole(message);
diff --git a/src/ticking/pending_txs_pool.h b/src/ticking/pending_txs_pool.h
new file mode 100644
index 000000000..87ccb1fae
--- /dev/null
+++ b/src/ticking/pending_txs_pool.h
@@ -0,0 +1,534 @@
+#pragma once
+
+#include "network_messages/transactions.h"
+
+#include "platform/memory_util.h"
+#include "platform/concurrency.h"
+#include "platform/console_logging.h"
+
+#include "spectrum/spectrum.h"
+
+#include "mining/mining.h"
+
+#include "contracts/qpi.h"
+#include "contracts/math_lib.h"
+#include "contract_core/qpi_collection_impl.h"
+
+#include "public_settings.h"
+#include "kangaroo_twelve.h"
+#include "vote_counter.h"
+
+// Mempool that saves pending transactions (txs) of all entities.
+// This is a kind of singleton class with only static members (so all instances refer to the same data).
+class PendingTxsPool
+{
+protected:
+ // The PendingTxsPool will always leave space for the two protocol-level txs (tick votes and custom mining).
+ static constexpr unsigned int maxNumTxsPerTick = NUMBER_OF_TRANSACTIONS_PER_TICK - 2;
+ static constexpr unsigned long long maxNumTxsTotal = PENDING_TXS_POOL_NUM_TICKS * maxNumTxsPerTick;
+
+ // Sizes of different buffers in bytes
+ static constexpr unsigned long long tickTransactionsSize = maxNumTxsTotal * MAX_TRANSACTION_SIZE;
+ static constexpr unsigned long long txsDigestsSize = maxNumTxsTotal * sizeof(m256i);
+
+ // `maxNumTxsTotal` priorities have to be saved at a time. Collection capacity has to be 2^N so find the next bigger power of 2.
+ static constexpr unsigned long long txsPrioritiesCapacity = math_lib::findNextPowerOf2(maxNumTxsTotal);
+
+ // The pool stores the tick range [firstStoredTick, firstStoredTick + PENDING_TXS_POOL_NUM_TICKS[
+ inline static unsigned int firstStoredTick = 0;
+
+ // Allocated tickTransactions buffer with tickTransactionsSize bytes
+ inline static unsigned char* tickTransactionsBuffer = nullptr;
+
+ // Allocated txsDigests buffer with maxNumTxs elements
+ inline static m256i* txsDigestsBuffer = nullptr;
+
+ // Records the number of saved transactions for each tick
+ inline static unsigned int numSavedTxsPerTick[PENDING_TXS_POOL_NUM_TICKS];
+
+ // Begin index for tickTransactionOffsetsBuffer, txsDigestsBuffer, and numSavedTxsPerTick
+ // buffersBeginIndex corresponds to firstStoredTick
+ inline static unsigned int buffersBeginIndex = 0;
+
+ // Lock for securing the data in the PendingTxsPool
+ inline static volatile char lock = 0;
+
+ // Priority queues for transactions in each saved tick
+ inline static Collection* txsPriorities;
+
+ static void cleanupTxsPriorities(unsigned int tickIndex)
+ {
+ sint64 elementIndex = txsPriorities->headIndex(m256i{ tickIndex, 0, 0, 0 });
+ // use a `for` instead of a `while` loop to make sure it cannot run forever
+ // there can be at most `maxNumTxsPerTick` elements in one pov
+ for (unsigned int t = 0; t < maxNumTxsPerTick; ++t)
+ {
+ if (elementIndex != NULL_INDEX)
+ elementIndex = txsPriorities->remove(elementIndex);
+ else
+ break;
+ }
+ txsPriorities->cleanupIfNeeded();
+ }
+
+ static sint64 calculateTxPriority(const Transaction* tx)
+ {
+ sint64 priority = 0;
+ int sourceIndex = spectrumIndex(tx->sourcePublicKey);
+ if (sourceIndex >= 0)
+ {
+ sint64 balance = energy(sourceIndex);
+ if (balance > 0)
+ {
+ if (isZero(tx->destinationPublicKey) && tx->amount == 0LL
+ && (tx->inputType == VOTE_COUNTER_INPUT_TYPE || tx->inputType == CustomMiningSolutionTransaction::transactionType()))
+ {
+ // protocol-level tx always have max priority
+ return INT64_MAX;
+ }
+ else
+ {
+ // calculate tx priority as [balance of src] * [scheduledTick - latestOutgoingTransferTick + 1]
+ EntityRecord entity = spectrum[sourceIndex];
+ priority = smul(balance, static_cast(tx->tick - entity.latestOutgoingTransferTick + 1));
+ // decrease by 1 to make sure no normal tx reaches max priority
+ priority--;
+ }
+ }
+ }
+ return priority;
+ }
+
+ // Return pointer to Transaction based on tickIndex and transactionIndex (checking offset with ASSERT)
+ inline static Transaction* getTxPtr(unsigned int tickIndex, unsigned int transactionIndex)
+ {
+ ASSERT(tickIndex < PENDING_TXS_POOL_NUM_TICKS);
+ ASSERT(transactionIndex < maxNumTxsPerTick);
+ return (Transaction*)(tickTransactionsBuffer + (tickIndex * maxNumTxsPerTick + transactionIndex) * MAX_TRANSACTION_SIZE);
+ }
+
+ // Return pointer to transaction digest based on tickIndex and transactionIndex (checking offset with ASSERT)
+ inline static m256i* getDigestPtr(unsigned int tickIndex, unsigned int transactionIndex)
+ {
+ ASSERT(tickIndex < PENDING_TXS_POOL_NUM_TICKS);
+ ASSERT(transactionIndex < maxNumTxsPerTick);
+ return &txsDigestsBuffer[tickIndex * maxNumTxsPerTick + transactionIndex];
+ }
+
+ // Check whether tick is stored in the pending txs pool
+ inline static bool tickInStorage(unsigned int tick)
+ {
+ return tick >= firstStoredTick && tick < firstStoredTick + PENDING_TXS_POOL_NUM_TICKS;
+ }
+
+ // Return index of tick data in current storage window (does not check tick).
+ inline static unsigned int tickToIndex(unsigned int tick)
+ {
+ return ((tick - firstStoredTick) + buffersBeginIndex) % PENDING_TXS_POOL_NUM_TICKS;
+ }
+
+public:
+
+ // Init at node startup.
+ static bool init()
+ {
+ if (!allocPoolWithErrorLog(L"PendingTxsPool::tickTransactionsPtr ", tickTransactionsSize, (void**)&tickTransactionsBuffer, __LINE__)
+ || !allocPoolWithErrorLog(L"PendingTxsPool::txsDigestsPtr ", txsDigestsSize, (void**)&txsDigestsBuffer, __LINE__)
+ || !allocPoolWithErrorLog(L"PendingTxsPool::txsPriorities", sizeof(Collection), (void**)&txsPriorities, __LINE__))
+ {
+ return false;
+ }
+
+ ASSERT(lock == 0);
+
+ setMem(tickTransactionsBuffer, tickTransactionsSize, 0);
+ setMem(txsDigestsBuffer, txsDigestsSize, 0);
+ setMem(numSavedTxsPerTick, sizeof(numSavedTxsPerTick), 0);
+
+ txsPriorities->reset();
+
+ firstStoredTick = 0;
+ buffersBeginIndex = 0;
+
+ return true;
+ }
+
+ // Cleanup at node shutdown.
+ static void deinit()
+ {
+ if (tickTransactionsBuffer)
+ {
+ freePool(tickTransactionsBuffer);
+ }
+ if (txsDigestsBuffer)
+ {
+ freePool(txsDigestsBuffer);
+ }
+ if (txsPriorities)
+ {
+ freePool(txsPriorities);
+ }
+ }
+
+ // Acquire lock for returned pointers to transactions or digests.
+ inline static void acquireLock()
+ {
+ ACQUIRE(lock);
+ }
+
+ // Release lock for returned pointers to transactions or digests.
+ inline static void releaseLock()
+ {
+ RELEASE(lock);
+ }
+
+ // Return number of transactions scheduled for the specified tick.
+ static unsigned int getNumberOfPendingTickTxs(unsigned int tick)
+ {
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"Begin pendingTxsPool.getNumberOfPendingTickTxs()");
+#endif
+ unsigned int res = 0;
+ ACQUIRE(lock);
+ if (tickInStorage(tick))
+ {
+ res = numSavedTxsPerTick[tickToIndex(tick)];
+ }
+ RELEASE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ CHAR16 dbgMsgBuf[200];
+ setText(dbgMsgBuf, L"End pendingTxsPool.getNumberOfPendingTickTxs() for tick=");
+ appendNumber(dbgMsgBuf, tick, FALSE);
+ appendText(dbgMsgBuf, L" -> res=");
+ appendNumber(dbgMsgBuf, res, FALSE);
+ addDebugMessage(dbgMsgBuf);
+#endif
+ return res;
+ }
+
+ // Return number of transactions scheduled later than the specified tick.
+ static unsigned int getTotalNumberOfPendingTxs(unsigned int tick)
+ {
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"Begin pendingTxsPool.getTotalNumberOfPendingTxs()");
+#endif
+ unsigned int res = 0;
+ ACQUIRE(lock);
+ if (tickInStorage(tick + 1))
+ {
+ unsigned int startIndex = tickToIndex(tick + 1);
+
+ if (startIndex < buffersBeginIndex)
+ {
+ for (unsigned int t = startIndex; t < buffersBeginIndex; ++t)
+ res += numSavedTxsPerTick[t];
+ }
+ else
+ {
+ for (unsigned int t = startIndex; t < PENDING_TXS_POOL_NUM_TICKS; ++t)
+ res += numSavedTxsPerTick[t];
+ for (unsigned int t = 0; t < buffersBeginIndex; ++t)
+ res += numSavedTxsPerTick[t];
+ }
+ }
+ RELEASE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ CHAR16 dbgMsgBuf[200];
+ setText(dbgMsgBuf, L"End pendingTxsPool.getTotalNumberOfPendingTxs() for tick=");
+ appendNumber(dbgMsgBuf, tick, FALSE);
+ appendText(dbgMsgBuf, L" -> res=");
+ appendNumber(dbgMsgBuf, res, FALSE);
+ addDebugMessage(dbgMsgBuf);
+#endif
+ return res;
+ }
+
+ // Check validity of transaction and add to the pool. Return boolean indicating whether transaction was added.
+ static bool add(const Transaction* tx)
+ {
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"Begin pendingTxsPool.add()");
+#endif
+ bool txAdded = false;
+ ACQUIRE(lock);
+ if (tx->checkValidity() && tickInStorage(tx->tick))
+ {
+ unsigned int tickIndex = tickToIndex(tx->tick);
+ const unsigned int transactionSize = tx->totalSize();
+
+ sint64 priority = calculateTxPriority(tx);
+ if (priority > 0)
+ {
+ m256i povIndex{ tickIndex, 0, 0, 0 };
+
+ if (numSavedTxsPerTick[tickIndex] < maxNumTxsPerTick)
+ {
+ KangarooTwelve(tx, transactionSize, getDigestPtr(tickIndex, numSavedTxsPerTick[tickIndex]), sizeof(m256i));
+
+ copyMem(getTxPtr(tickIndex, numSavedTxsPerTick[tickIndex]), tx, transactionSize);
+
+ txsPriorities->add(povIndex, numSavedTxsPerTick[tickIndex], priority);
+
+ numSavedTxsPerTick[tickIndex]++;
+ txAdded = true;
+ }
+ else
+ {
+ // check if priority is higher than lowest priority tx in this tick and replace in this case
+ sint64 lowestElementIndex = txsPriorities->tailIndex(povIndex);
+ if (lowestElementIndex != NULL_INDEX)
+ {
+ if (txsPriorities->priority(lowestElementIndex) < priority)
+ {
+ unsigned int replacedTxIndex = txsPriorities->element(lowestElementIndex);
+ txsPriorities->remove(lowestElementIndex);
+ txsPriorities->add(povIndex, replacedTxIndex, priority);
+
+ KangarooTwelve(tx, transactionSize, getDigestPtr(tickIndex, replacedTxIndex), sizeof(m256i));
+
+ copyMem(getTxPtr(tickIndex, replacedTxIndex), tx, transactionSize);
+
+ txAdded = true;
+ }
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ else
+ {
+ CHAR16 dbgMsgBuf[300];
+ setText(dbgMsgBuf, L"tx could not be added, already saved ");
+ appendNumber(dbgMsgBuf, numSavedTxsPerTick[tickIndex], FALSE);
+ appendText(dbgMsgBuf, L" txs for tick ");
+ appendNumber(dbgMsgBuf, tx->tick, FALSE);
+ appendText(dbgMsgBuf, L" and priority ");
+ appendNumber(dbgMsgBuf, priority, FALSE);
+ appendText(dbgMsgBuf, L" is lower than lowest saved priority ");
+ appendNumber(dbgMsgBuf, txsPriorities->priority(lowestElementIndex), FALSE);
+ addDebugMessage(dbgMsgBuf);
+ }
+#endif
+ }
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ else
+ {
+ // debug log, this should never happen
+ CHAR16 dbgMsgBuf[300];
+ setText(dbgMsgBuf, L"maximum number of txs ");
+ appendNumber(dbgMsgBuf, numSavedTxsPerTick[tickIndex], FALSE);
+ appendText(dbgMsgBuf, L" saved for tick ");
+ appendNumber(dbgMsgBuf, tx->tick, FALSE);
+ appendText(dbgMsgBuf, L" but povIndex is unknown. This should never happen.");
+ addDebugMessage(dbgMsgBuf);
+ }
+#endif
+ }
+ }
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ else
+ {
+ CHAR16 dbgMsgBuf[300];
+ setText(dbgMsgBuf, L"tx with priority 0 was rejected for tick ");
+ appendNumber(dbgMsgBuf, tx->tick, FALSE);
+ addDebugMessage(dbgMsgBuf);
+ }
+#endif
+ }
+ RELEASE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ if (txAdded)
+ addDebugMessage(L"End pendingTxsPool.add(), txAdded true");
+ else
+ addDebugMessage(L"End pendingTxsPool.add(), txAdded false");
+#endif
+ return txAdded;
+ }
+
+ // Get a transaction for the specified tick. If no more transactions for this tick, return nullptr.
+ // ATTENTION: when running multiple threads, you need to have acquired the lock via acquireLock() before calling this function.
+ static Transaction* getTx(unsigned int tick, unsigned int index)
+ {
+ unsigned int tickIndex;
+
+ if (tickInStorage(tick))
+ tickIndex = tickToIndex(tick);
+ else
+ return nullptr;
+
+ bool hasTx = index < numSavedTxsPerTick[tickIndex];
+
+ if (hasTx)
+ return getTxPtr(tickIndex, index);
+ else
+ return nullptr;
+ }
+
+ // Get a transaction digest for the specified tick. If no more transactions for this tick, return nullptr.
+ // ATTENTION: when running multiple threads, you need to have acquired the lock via acquireLock() before calling this function.
+ static m256i* getDigest(unsigned int tick, unsigned int index)
+ {
+ unsigned int tickIndex;
+
+ if (tickInStorage(tick))
+ tickIndex = tickToIndex(tick);
+ else
+ return nullptr;
+
+ bool hasTx = index < numSavedTxsPerTick[tickIndex];
+
+ if (hasTx)
+ return getDigestPtr(tickIndex, index);
+ else
+ return nullptr;
+ }
+
+ static void incrementFirstStoredTick()
+ {
+ ACQUIRE(lock);
+
+ // set memory at buffersBeginIndex to 0
+ unsigned long long numTxsBeforeBegin = buffersBeginIndex * maxNumTxsPerTick;
+ setMem(tickTransactionsBuffer + numTxsBeforeBegin * MAX_TRANSACTION_SIZE, maxNumTxsPerTick * MAX_TRANSACTION_SIZE, 0);
+ setMem(txsDigestsBuffer + numTxsBeforeBegin, maxNumTxsPerTick * sizeof(m256i), 0);
+ numSavedTxsPerTick[buffersBeginIndex] = 0;
+
+ // remove txs priorities stored for firstStoredTick
+ cleanupTxsPriorities(tickToIndex(firstStoredTick));
+
+ // increment buffersBeginIndex and firstStoredTick
+ firstStoredTick++;
+ buffersBeginIndex = (buffersBeginIndex + 1) % PENDING_TXS_POOL_NUM_TICKS;
+
+ RELEASE(lock);
+ }
+
+ static void beginEpoch(unsigned int newInitialTick)
+ {
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"Begin pendingTxsPool.beginEpoch()");
+#endif
+ ACQUIRE(lock);
+ if (tickInStorage(newInitialTick))
+ {
+ unsigned int newInitialIndex = tickToIndex(newInitialTick);
+
+ // reset memory of discarded ticks
+ if (newInitialIndex < buffersBeginIndex)
+ {
+ unsigned long long numTxsBeforeNew = newInitialIndex * maxNumTxsPerTick;
+ setMem(tickTransactionsBuffer, numTxsBeforeNew * MAX_TRANSACTION_SIZE, 0);
+ setMem(txsDigestsBuffer, numTxsBeforeNew * sizeof(m256i), 0);
+ setMem(numSavedTxsPerTick, newInitialIndex * sizeof(unsigned int), 0);
+
+ for (unsigned int tickIndex = 0; tickIndex < newInitialIndex; ++tickIndex)
+ cleanupTxsPriorities(tickIndex);
+
+ unsigned long long numTxsBeforeBegin = buffersBeginIndex * maxNumTxsPerTick;
+ unsigned long long numTxsStartingAtBegin = (PENDING_TXS_POOL_NUM_TICKS - buffersBeginIndex) * maxNumTxsPerTick;
+ setMem(tickTransactionsBuffer + numTxsBeforeBegin * MAX_TRANSACTION_SIZE, numTxsStartingAtBegin * MAX_TRANSACTION_SIZE, 0);
+ setMem(txsDigestsBuffer + numTxsBeforeBegin, numTxsStartingAtBegin * sizeof(m256i), 0);
+ setMem(numSavedTxsPerTick + buffersBeginIndex, (PENDING_TXS_POOL_NUM_TICKS - buffersBeginIndex) * sizeof(unsigned int), 0);
+
+ for (unsigned int tickIndex = buffersBeginIndex; tickIndex < PENDING_TXS_POOL_NUM_TICKS; ++tickIndex)
+ cleanupTxsPriorities(tickIndex);
+ }
+ else
+ {
+ unsigned long long numTxsBeforeBegin = buffersBeginIndex * maxNumTxsPerTick;
+ unsigned long long numTxsStartingAtBegin = (newInitialIndex - buffersBeginIndex) * maxNumTxsPerTick;
+ setMem(tickTransactionsBuffer + numTxsBeforeBegin * MAX_TRANSACTION_SIZE, numTxsStartingAtBegin * MAX_TRANSACTION_SIZE, 0);
+ setMem(txsDigestsBuffer + numTxsBeforeBegin, numTxsStartingAtBegin * sizeof(m256i), 0);
+ setMem(numSavedTxsPerTick + buffersBeginIndex, (newInitialIndex - buffersBeginIndex) * sizeof(unsigned int), 0);
+
+ for (unsigned int tickIndex = buffersBeginIndex; tickIndex < newInitialIndex; ++tickIndex)
+ cleanupTxsPriorities(tickIndex);
+ }
+
+ buffersBeginIndex = newInitialIndex;
+ }
+ else
+ {
+ setMem(tickTransactionsBuffer, tickTransactionsSize, 0);
+ setMem(txsDigestsBuffer, txsDigestsSize, 0);
+ setMem(numSavedTxsPerTick, sizeof(numSavedTxsPerTick), 0);
+
+ txsPriorities->reset();
+
+ buffersBeginIndex = 0;
+ }
+
+ firstStoredTick = newInitialTick;
+
+ RELEASE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"End pendingTxsPool.beginEpoch()");
+#endif
+ }
+
+ // Useful for debugging, but expensive: check that everything is as expected.
+ static void checkStateConsistencyWithAssert()
+ {
+ ACQUIRE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"Begin tsxPool.checkStateConsistencyWithAssert()");
+ CHAR16 dbgMsgBuf[200];
+ setText(dbgMsgBuf, L"firstStoredTick=");
+ appendNumber(dbgMsgBuf, firstStoredTick, FALSE);
+ appendText(dbgMsgBuf, L", buffersBeginIndex=");
+ appendNumber(dbgMsgBuf, buffersBeginIndex, FALSE);
+ addDebugMessage(dbgMsgBuf);
+#endif
+
+ ASSERT(buffersBeginIndex >= 0);
+ ASSERT(buffersBeginIndex < PENDING_TXS_POOL_NUM_TICKS);
+
+ ASSERT(tickTransactionsBuffer != nullptr);
+ ASSERT(txsDigestsBuffer != nullptr);
+
+ for (unsigned int tick = firstStoredTick; tick < firstStoredTick + PENDING_TXS_POOL_NUM_TICKS; ++tick)
+ {
+ ASSERT(tickInStorage(tick));
+ if (tickInStorage(tick))
+ {
+ unsigned int tickIndex = tickToIndex(tick);
+ unsigned int numSavedForTick = numSavedTxsPerTick[tickIndex];
+ ASSERT(numSavedForTick <= maxNumTxsPerTick);
+ for (unsigned int txIndex = 0; txIndex < numSavedForTick; ++txIndex)
+ {
+ Transaction* transaction = (Transaction*)(tickTransactionsBuffer + (tickIndex * maxNumTxsPerTick + txIndex) * MAX_TRANSACTION_SIZE);
+ ASSERT(transaction->checkValidity());
+ ASSERT(transaction->tick == tick);
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ if (!transaction->checkValidity() || transaction->tick != tick)
+ {
+ setText(dbgMsgBuf, L"Error in previous epoch transaction ");
+ appendNumber(dbgMsgBuf, txIndex, FALSE);
+ appendText(dbgMsgBuf, L" in tick ");
+ appendNumber(dbgMsgBuf, tick, FALSE);
+ addDebugMessage(dbgMsgBuf);
+
+ setText(dbgMsgBuf, L"t->tick ");
+ appendNumber(dbgMsgBuf, transaction->tick, FALSE);
+ appendText(dbgMsgBuf, L", t->inputSize ");
+ appendNumber(dbgMsgBuf, transaction->inputSize, FALSE);
+ appendText(dbgMsgBuf, L", t->inputType ");
+ appendNumber(dbgMsgBuf, transaction->inputType, FALSE);
+ appendText(dbgMsgBuf, L", t->amount ");
+ appendNumber(dbgMsgBuf, transaction->amount, TRUE);
+ addDebugMessage(dbgMsgBuf);
+ }
+#endif
+ }
+ }
+ }
+
+ RELEASE(lock);
+
+#if !defined(NDEBUG) && !defined(NO_UEFI)
+ addDebugMessage(L"End pendingTxsPool.checkStateConsistencyWithAssert()");
+#endif
+ }
+
+};
\ No newline at end of file
diff --git a/src/ticking/tick_storage.h b/src/ticking/tick_storage.h
index 24f02ad8c..b350237f8 100644
--- a/src/ticking/tick_storage.h
+++ b/src/ticking/tick_storage.h
@@ -28,7 +28,7 @@ constexpr unsigned short INVALIDATED_TICK_DATA = 0xffff;
// - ticks (one Tick struct per tick and Computor)
// - tickTransactions (continuous buffer efficiently storing the variable-size transactions)
// - tickTransactionOffsets (offsets of transactions in buffer, order in tickTransactions may differ)
-// - nextTickTransactionOffset (offset of next transition to be added)
+// - nextTickTransactionOffset (offset of next transaction to be added)
class TickStorage
{
private:
diff --git a/src/ticking/ticking.h b/src/ticking/ticking.h
index 1b5216926..4bbb0d61a 100644
--- a/src/ticking/ticking.h
+++ b/src/ticking/ticking.h
@@ -6,6 +6,7 @@
#include "network_messages/tick.h"
#include "ticking/tick_storage.h"
+#include "ticking/pending_txs_pool.h"
#include "private_settings.h"
diff --git a/test/pending_txs_pool.cpp b/test/pending_txs_pool.cpp
new file mode 100644
index 000000000..6778b6496
--- /dev/null
+++ b/test/pending_txs_pool.cpp
@@ -0,0 +1,534 @@
+#define NO_UEFI
+
+#include "gtest/gtest.h"
+
+// workaround for name clash with stdlib
+#define system qubicSystemStruct
+
+#include "../src/contract_core/contract_def.h"
+#include "../src/contract_core/contract_exec.h"
+
+#include "../src/public_settings.h"
+#undef PENDING_TXS_POOL_NUM_TICKS
+#define PENDING_TXS_POOL_NUM_TICKS 50ULL
+#undef NUMBER_OF_TRANSACTIONS_PER_TICK
+#define NUMBER_OF_TRANSACTIONS_PER_TICK 128ULL
+#include "../src/ticking/pending_txs_pool.h"
+
+#include
+#include
+
+static constexpr unsigned int NUM_INITIALIZED_ENTITIES = 200U;
+
+class TestPendingTxsPool : public PendingTxsPool
+{
+ unsigned char transactionBuffer[MAX_TRANSACTION_SIZE];
+public:
+ TestPendingTxsPool()
+ {
+ // we need the spectrum for tx priority calculation
+ EXPECT_TRUE(initSpectrum());
+ memset(spectrum, 0, spectrumSizeInBytes);
+ for (unsigned int i = 0; i < NUM_INITIALIZED_ENTITIES; i++)
+ {
+ // create NUM_INITIALIZED_ENTITIES entities with balance > 0 to get desired txs priority
+ spectrum[i].incomingAmount = i + 1;
+ spectrum[i].outgoingAmount = 0;
+ spectrum[i].publicKey = m256i{0, 0, 0, i + 1 };
+
+ // create NUM_INITIALIZED_ENTITIES entities with balance = 0 for testing
+ spectrum[NUM_INITIALIZED_ENTITIES + i].incomingAmount = 0;
+ spectrum[NUM_INITIALIZED_ENTITIES + i].outgoingAmount = 0;
+ spectrum[NUM_INITIALIZED_ENTITIES + i].publicKey = m256i{ 0, 0, 0, NUM_INITIALIZED_ENTITIES + i + 1 };
+ }
+ updateSpectrumInfo();
+ }
+
+ ~TestPendingTxsPool()
+ {
+ deinitSpectrum();
+ }
+
+ static constexpr unsigned int getMaxNumTxsPerTick()
+ {
+ return maxNumTxsPerTick;
+ }
+
+ bool addTransaction(unsigned int tick, long long amount, unsigned int inputSize, const m256i* dest = nullptr, const m256i* src = nullptr)
+ {
+ Transaction* transaction = (Transaction*)transactionBuffer;
+ transaction->amount = amount;
+ if (dest == nullptr)
+ transaction->destinationPublicKey.setRandomValue();
+ else
+ transaction->destinationPublicKey.assign(*dest);
+ if (src == nullptr)
+ transaction->sourcePublicKey.setRandomValue();
+ else
+ transaction->sourcePublicKey.assign(*src);
+ transaction->inputSize = inputSize;
+ transaction->inputType = 0;
+ transaction->tick = tick;
+
+ return add(transaction);
+ }
+};
+
+TestPendingTxsPool pendingTxsPool;
+
+unsigned int addTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
+{
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ unsigned int numTransactionsAdded = 0;
+
+ // add transactions of tick
+ unsigned int transactionNum = gen64() % (maxTransactions + 1);
+ for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
+ {
+ unsigned int inputSize = gen64() % MAX_INPUT_SIZE;
+ long long amount = gen64() % MAX_AMOUNT;
+ m256i srcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
+ if (pendingTxsPool.addTransaction(tick, amount, inputSize, /*dest=*/nullptr, &srcPublicKey))
+ numTransactionsAdded++;
+ }
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ return numTransactionsAdded;
+}
+
+void checkTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
+{
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ // check transactions of tick
+ unsigned int transactionNum = gen64() % (maxTransactions + 1);
+
+ for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
+ {
+ unsigned int expectedInputSize = gen64() % MAX_INPUT_SIZE;
+ long long expectedAmount = gen64() % MAX_AMOUNT;
+ m256i expectedSrcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
+
+ Transaction* tp = pendingTxsPool.getTx(tick, transaction);
+
+ ASSERT_NE(tp, nullptr);
+
+ EXPECT_TRUE(tp->checkValidity());
+ EXPECT_EQ(tp->tick, tick);
+ EXPECT_EQ(static_cast(tp->inputSize), expectedInputSize);
+ EXPECT_EQ(tp->amount, expectedAmount);
+ EXPECT_TRUE(tp->sourcePublicKey == expectedSrcPublicKey);
+
+ m256i* digest = pendingTxsPool.getDigest(tick, transaction);
+
+ ASSERT_NE(digest, nullptr);
+
+ m256i tpDigest;
+ KangarooTwelve(tp, tp->totalSize(), &tpDigest, 32);
+ EXPECT_EQ(*digest, tpDigest);
+ }
+}
+
+
+TEST(TestPendingTxsPool, EpochTransition)
+{
+ unsigned long long seed = 42;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ // 5x test with running 3 epoch transitions
+ for (int testIdx = 0; testIdx < 6; ++testIdx)
+ {
+ // first, test case of having no transactions
+ unsigned int maxTransactions = (testIdx == 0) ? 0 : pendingTxsPool.getMaxNumTxsPerTick();
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ constexpr unsigned int firstEpochTicks = PENDING_TXS_POOL_NUM_TICKS;
+ // second epoch start will reset the pool completely because secondEpochTick0 is not contained
+ constexpr unsigned int secondEpochTicks = PENDING_TXS_POOL_NUM_TICKS / 2;
+ // thirdEpochTick0 will be contained with newInitialIndex >= buffersBeginIndex
+ constexpr unsigned int thirdEpochTicks = PENDING_TXS_POOL_NUM_TICKS / 2 + PENDING_TXS_POOL_NUM_TICKS / 4;
+ // fourthEpochTick0 will be contained with newInitialIndex < buffersBeginIndex
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ const unsigned int secondEpochTick0 = firstEpochTick0 + firstEpochTicks;
+ const unsigned int thirdEpochTick0 = secondEpochTick0 + secondEpochTicks;
+ const unsigned int fourthEpochTick0 = thirdEpochTick0 + thirdEpochTicks;
+ unsigned long long firstEpochSeeds[firstEpochTicks];
+ unsigned long long secondEpochSeeds[secondEpochTicks];
+ unsigned long long thirdEpochSeeds[thirdEpochTicks];
+ for (int i = 0; i < firstEpochTicks; ++i)
+ firstEpochSeeds[i] = gen64();
+ for (int i = 0; i < secondEpochTicks; ++i)
+ secondEpochSeeds[i] = gen64();
+ for (int i = 0; i < thirdEpochTicks; ++i)
+ thirdEpochSeeds[i] = gen64();
+ unsigned int numAdded = 0;
+
+ // first epoch
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ // add ticks transactions
+ for (int i = 0; i < firstEpochTicks; ++i)
+ numAdded = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+
+ // check ticks transactions
+ for (int i = 0; i < firstEpochTicks; ++i)
+ checkTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ // Epoch transistion
+ pendingTxsPool.beginEpoch(secondEpochTick0);
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(secondEpochTick0), 0);
+
+ // add ticks transactions
+ for (int i = 0; i < secondEpochTicks; ++i)
+ numAdded = addTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
+
+ // check ticks transactions
+ for (int i = 0; i < secondEpochTicks; ++i)
+ checkTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
+
+ // add a transaction for the next epoch
+ numAdded = addTickTransactions(thirdEpochTick0 + 1, thirdEpochSeeds[1], maxTransactions);
+
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ // Epoch transistion
+ pendingTxsPool.beginEpoch(thirdEpochTick0);
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(thirdEpochTick0), numAdded);
+
+ // add ticks transactions
+ for (int i = 2; i < thirdEpochTicks; ++i)
+ numAdded = addTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
+
+ // check ticks transactions
+ for (int i = 1; i < thirdEpochTicks; ++i)
+ checkTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
+
+ // add a transaction for the next epoch
+ numAdded = addTickTransactions(fourthEpochTick0 + 1, /*seed=*/42, maxTransactions);
+
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ // Epoch transistion
+ pendingTxsPool.beginEpoch(fourthEpochTick0);
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(fourthEpochTick0), numAdded);
+
+ pendingTxsPool.deinit();
+ }
+}
+
+TEST(TestPendingTxsPool, TotalNumberOfPendingTxs)
+{
+ unsigned long long seed = 1337;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ // 5x test with running 1 epoch
+ for (int testIdx = 0; testIdx < 6; ++testIdx)
+ {
+ // first, test case of having no transactions
+ unsigned int maxTransactions = (testIdx == 0) ? 0 : pendingTxsPool.getMaxNumTxsPerTick();
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const int firstEpochTicks = (gen64() % (4 * PENDING_TXS_POOL_NUM_TICKS)) + 1;
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ unsigned long long firstEpochSeeds[4 * PENDING_TXS_POOL_NUM_TICKS];
+ for (int i = 0; i < firstEpochTicks; ++i)
+ firstEpochSeeds[i] = gen64();
+
+ // first epoch
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // add ticks transactions
+ std::vector numTransactionsAdded(firstEpochTicks);
+ std::vector numPendingTransactions(firstEpochTicks, 0);
+ for (int i = firstEpochTicks - 1; i >= 0; --i)
+ {
+ numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ if (i > 0)
+ {
+ numPendingTransactions[i - 1] = numPendingTransactions[i] + numTransactionsAdded[i];
+ }
+ }
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 - 1), (unsigned int)numTransactionsAdded[0] + numPendingTransactions[0]);
+ for (int i = 0; i < firstEpochTicks; ++i)
+ {
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 + i), (unsigned int)numPendingTransactions[i]);
+ }
+
+ pendingTxsPool.deinit();
+ }
+}
+
+TEST(TestPendingTxsPool, NumberOfPendingTickTxs)
+{
+ unsigned long long seed = 67534;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ // 5x test with running 1 epoch
+ for (int testIdx = 0; testIdx < 6; ++testIdx)
+ {
+ // first, test case of having no transactions
+ unsigned int maxTransactions = (testIdx == 0) ? 0 : pendingTxsPool.getMaxNumTxsPerTick();
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ constexpr unsigned int firstEpochTicks = PENDING_TXS_POOL_NUM_TICKS;
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ unsigned long long firstEpochSeeds[firstEpochTicks];
+ for (int i = 0; i < firstEpochTicks; ++i)
+ firstEpochSeeds[i] = gen64();
+
+ // first epoch
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // add ticks transactions
+ std::vector numTransactionsAdded(firstEpochTicks);
+ for (int i = firstEpochTicks - 1; i >= 0; --i)
+ {
+ numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ }
+
+ EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0 - 1), 0);
+ for (int i = 0; i < firstEpochTicks; ++i)
+ {
+ EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0 + i), (unsigned int)numTransactionsAdded[i]);
+ }
+
+ pendingTxsPool.deinit();
+ }
+}
+
+TEST(TestPendingTxsPool, IncrementFirstStoredTick)
+{
+ unsigned long long seed = 84129;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ // 5x test with running 1 epoch
+ for (int testIdx = 0; testIdx < 6; ++testIdx)
+ {
+ // first, test case of having no transactions
+ unsigned int maxTransactions = (testIdx == 0) ? 0 : pendingTxsPool.getMaxNumTxsPerTick();
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const int firstEpochTicks = (gen64() % (4 * PENDING_TXS_POOL_NUM_TICKS)) + 1;
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ unsigned long long firstEpochSeeds[4 * PENDING_TXS_POOL_NUM_TICKS];
+ for (int i = 0; i < firstEpochTicks; ++i)
+ firstEpochSeeds[i] = gen64();
+
+ // first epoch
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // add ticks transactions
+ std::vector numTransactionsAdded(firstEpochTicks);
+ std::vector numPendingTransactions(firstEpochTicks, 0);
+ for (int i = firstEpochTicks - 1; i >= 0; --i)
+ {
+ numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ if (i > 0)
+ {
+ numPendingTransactions[i - 1] = numPendingTransactions[i] + numTransactionsAdded[i];
+ }
+ }
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 - 1), (unsigned int)numTransactionsAdded[0] + numPendingTransactions[0]);
+ for (int i = 0; i < firstEpochTicks; ++i)
+ {
+ pendingTxsPool.incrementFirstStoredTick();
+ for (int tx = 0; tx < numTransactionsAdded[i]; ++tx)
+ {
+ EXPECT_EQ(pendingTxsPool.getTx(firstEpochTick0 + i, 0), nullptr);
+ EXPECT_EQ(pendingTxsPool.getDigest(firstEpochTick0 + i, 0), nullptr);
+ }
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 + i), (unsigned int)numPendingTransactions[i]);
+ }
+
+ pendingTxsPool.deinit();
+ }
+}
+
+TEST(TestPendingTxsPool, TxsPrioritizationMoreThanMaxTxs)
+{
+ unsigned long long seed = 9532;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ unsigned int numAdditionalTxs = 64;
+
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // add more than `pendingTxsPool.getMaxNumTxsPerTick()` with increasing priority
+ // (entities were set up in a way that u64._0 of the public key corresponds to their balance)
+ m256i srcPublicKey = m256i::zero();
+ for (unsigned int t = 0; t < pendingTxsPool.getMaxNumTxsPerTick() + numAdditionalTxs; ++t)
+ {
+ srcPublicKey.u64._3 = t + 1;
+ EXPECT_TRUE(pendingTxsPool.addTransaction(firstEpochTick0, /*amount=*/t + 1, /*inputSize=*/0, /*dest=*/nullptr, &srcPublicKey));
+ }
+
+ // adding lower priority tx does not work
+ srcPublicKey.u64._3 = 1;
+ EXPECT_FALSE(pendingTxsPool.addTransaction(firstEpochTick0, /*amount=*/1, /*inputSize=*/0, /*dest=*/nullptr, &srcPublicKey));
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 - 1), pendingTxsPool.getMaxNumTxsPerTick());
+ EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0), pendingTxsPool.getMaxNumTxsPerTick());
+
+ for (unsigned int t = 0; t < pendingTxsPool.getMaxNumTxsPerTick(); ++t)
+ {
+ if (t < numAdditionalTxs)
+ EXPECT_EQ(pendingTxsPool.getTx(firstEpochTick0, t)->amount, pendingTxsPool.getMaxNumTxsPerTick() + t + 1);
+ else
+ EXPECT_EQ(pendingTxsPool.getTx(firstEpochTick0, t)->amount, t + 1);
+ }
+
+ pendingTxsPool.deinit();
+}
+
+TEST(TestPendingTxsPool, TxsPrioritizationDuplicateTxs)
+{
+ unsigned long long seed = 9532;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+ constexpr unsigned int numTxs = pendingTxsPool.getMaxNumTxsPerTick() / 2;
+
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // add duplicate transactions: same dest, src, and amount
+ m256i dest{ 562, 789, 234, 121 };
+ m256i src{ 0, 0, 0, NUM_INITIALIZED_ENTITIES / 3 };
+ long long amount = 1;
+ for (unsigned int t = 0; t < numTxs; ++t)
+ EXPECT_TRUE(pendingTxsPool.addTransaction(firstEpochTick0, amount, /*inputSize=*/0, &dest, & src));
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 - 1), numTxs);
+ EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0), numTxs);
+
+ for (unsigned int t = 0; t < numTxs; ++t)
+ {
+ Transaction* tx = pendingTxsPool.getTx(firstEpochTick0, t);
+ EXPECT_TRUE(tx->checkValidity());
+ EXPECT_EQ(tx->amount, amount);
+ EXPECT_EQ(tx->tick, firstEpochTick0);
+ EXPECT_EQ(static_cast(tx->inputSize), 0U);
+ EXPECT_TRUE(tx->destinationPublicKey == dest);
+ EXPECT_TRUE(tx->sourcePublicKey == src);
+ }
+
+ pendingTxsPool.deinit();
+}
+
+TEST(TestPendingTxsPool, ProtocolLevelTxsMaxPriority)
+{
+ unsigned long long seed = 9532;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // fill the PendingTxsPool completely for tick `firstEpochTick0`
+ m256i srcPublicKey = m256i::zero();
+ for (unsigned int t = 0; t < pendingTxsPool.getMaxNumTxsPerTick(); ++t)
+ {
+ srcPublicKey.u64._3 = t + 1;
+ EXPECT_TRUE(pendingTxsPool.addTransaction(firstEpochTick0, gen64() % MAX_AMOUNT, gen64() % MAX_INPUT_SIZE, /*dest=*/nullptr, &srcPublicKey));
+ }
+
+ EXPECT_EQ(pendingTxsPool.getTotalNumberOfPendingTxs(firstEpochTick0 - 1), pendingTxsPool.getMaxNumTxsPerTick());
+ EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0), pendingTxsPool.getMaxNumTxsPerTick());
+
+ Transaction tx {
+ .sourcePublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 },
+ .destinationPublicKey = m256i::zero(),
+ .amount = 0, .tick = firstEpochTick0,
+ .inputType = VOTE_COUNTER_INPUT_TYPE,
+ .inputSize = 0,
+ };
+
+ EXPECT_TRUE(pendingTxsPool.add(&tx));
+
+ tx.inputType = CustomMiningSolutionTransaction::transactionType();
+
+ EXPECT_TRUE(pendingTxsPool.add(&tx));
+
+ pendingTxsPool.deinit();
+}
+
+TEST(TestPendingTxsPool, TxsWithSrcBalance0AreRejected)
+{
+ unsigned long long seed = 3452;
+
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
+
+ for (int testIdx = 0; testIdx < 6; ++testIdx)
+ {
+ pendingTxsPool.init();
+ pendingTxsPool.checkStateConsistencyWithAssert();
+
+ const unsigned int firstEpochTick0 = gen64() % 10000000;
+
+ pendingTxsPool.beginEpoch(firstEpochTick0);
+
+ // partially fill the PendingTxsPool for tick `firstEpochTick0`
+ m256i srcPublicKey = m256i::zero();
+ for (unsigned int t = 0; t < pendingTxsPool.getMaxNumTxsPerTick() / 2; ++t)
+ {
+ srcPublicKey.u64._3 = t + 1;
+ EXPECT_TRUE(pendingTxsPool.addTransaction(firstEpochTick0, gen64() % MAX_AMOUNT, gen64() % MAX_INPUT_SIZE, /*dest=*/nullptr, &srcPublicKey));
+ }
+
+ // public key with balance 0
+ srcPublicKey.u64._3 = NUM_INITIALIZED_ENTITIES + 1 + (gen64() % NUM_INITIALIZED_ENTITIES);
+ EXPECT_FALSE(pendingTxsPool.addTransaction(firstEpochTick0, gen64() % MAX_AMOUNT, gen64() % MAX_INPUT_SIZE, /*dest=*/nullptr, &srcPublicKey));
+
+ // non-existant public key
+ srcPublicKey = m256i{ 0, gen64() % MAX_AMOUNT, 0, 0};
+ EXPECT_FALSE(pendingTxsPool.addTransaction(firstEpochTick0, gen64() % MAX_AMOUNT, gen64() % MAX_INPUT_SIZE, /*dest=*/nullptr, &srcPublicKey));
+
+ pendingTxsPool.deinit();
+ }
+}
\ No newline at end of file
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 13edfb203..432dc49a8 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -123,6 +123,7 @@
+
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 2d4977888..42195b466 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -39,6 +39,7 @@
+
From 551a867a79c9cc96f9130a139160328c08e1fd38 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:49:47 +0200
Subject: [PATCH 137/297] add comment for system.latestLedTick
---
src/system.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/system.h b/src/system.h
index 4e5ebfc15..e4bbc3a57 100644
--- a/src/system.h
+++ b/src/system.h
@@ -15,7 +15,8 @@ struct System
unsigned short epoch;
unsigned int tick;
unsigned int initialTick;
- unsigned int latestCreatedTick, latestLedTick;
+ unsigned int latestCreatedTick;
+ unsigned int latestLedTick; // contains latest tick t in which TickData for tick (t + TICK_TRANSACTIONS_PUBLICATION_OFFSET) was broadcasted as tick leader
unsigned short initialMillisecond;
unsigned char initialSecond;
From 99c25d820c82fd9ccd8fdb0ebc103e7061b48ad4 Mon Sep 17 00:00:00 2001
From: N-010
Date: Thu, 16 Oct 2025 18:59:09 +0300
Subject: [PATCH 138/297] Fixes winnersInfoNextEmptyIndex (#575)
* Enhance RandomLottery: transfer invocation rewards on ticket purchase failures
* Fixes increment winnersInfoNextEmptyIndex
---------
Co-authored-by: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
---
src/contracts/RandomLottery.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/contracts/RandomLottery.h b/src/contracts/RandomLottery.h
index 58a0ccf81..448cf0c96 100644
--- a/src/contracts/RandomLottery.h
+++ b/src/contracts/RandomLottery.h
@@ -404,10 +404,9 @@ struct RL : public ContractBase
{
return;
}
- if (RL_MAX_NUMBER_OF_WINNERS_IN_HISTORY >= state.winners.capacity() - 1)
- {
- state.winnersInfoNextEmptyIndex = 0;
- }
+
+ state.winnersInfoNextEmptyIndex = mod(state.winnersInfoNextEmptyIndex, state.winners.capacity());
+
locals.winnerInfo.winnerAddress = input.winnerAddress;
locals.winnerInfo.revenue = input.revenue;
locals.winnerInfo.epoch = qpi.epoch();
From e887494197405cdd7924e9f3615c4873a97bcde7 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Fri, 17 Oct 2025 15:08:54 +0200
Subject: [PATCH 139/297] update
---
.gitignore | 8 +
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/contract_core/contract_def.h | 12 +
src/contracts/VottunBridge.h | 587 +++++++++++++++++++++++--------
test/CMakeLists.txt | 1 +
test/contract_vottunbridge.cpp | 458 +++++++++++++++++++++---
7 files changed, 876 insertions(+), 194 deletions(-)
diff --git a/.gitignore b/.gitignore
index 64abeb17c..018d84c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,11 @@ tmp
out/build/
**/Testing/Temporary/
**/_deps/googletest-src
+test/CMakeLists.txt
+test/CMakeLists.txt
+comp.md
+proposal.md
+src/Qubic.vcxproj
+.claude/settings.local.json
+src/Qubic.vcxproj
+test/CMakeLists.txt
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 862bbec3a..daae6a202 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -42,6 +42,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 4e903987b..9a6f108ff 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -126,6 +126,9 @@
contracts
+
+ contracts
+
contract_core
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 901dff334..4a8dd2706 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -234,6 +234,16 @@ struct __FunctionOrProcedureBeginEndGuard
#define CONTRACT_STATE2_TYPE QBOND2
#include "contracts/QBond.h"
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define VOTTUNBRIDGE_CONTRACT_INDEX 18
+#define CONTRACT_INDEX VOTTUNBRIDGE_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE VOTTUNBRIDGE
+#define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
+#include "contracts/VottunBridge.h"
+
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -334,6 +344,7 @@ constexpr struct ContractDescription
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
+ {"VBRIDGE", 183, 10000, sizeof(VOTTUNBRIDGE)}, // Vottun Bridge - Qubic <-> EVM bridge with multisig admin
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
@@ -440,6 +451,7 @@ static void initializeContracts()
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDRAW);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(RL);
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QBOND);
+ REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(TESTEXA);
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 38d9fb86b..989eb2c1a 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -240,13 +240,41 @@ struct VOTTUNBRIDGE : public ContractBase
transferFailed = 7,
maxManagersReached = 8,
notAuthorized = 9,
- onlyManagersCanRefundOrders = 10
+ onlyManagersCanRefundOrders = 10,
+ proposalNotFound = 11,
+ proposalAlreadyExecuted = 12,
+ proposalAlreadyApproved = 13,
+ notOwner = 14,
+ maxProposalsReached = 15
+ };
+
+ // Enum for proposal types
+ enum ProposalType
+ {
+ PROPOSAL_SET_ADMIN = 1,
+ PROPOSAL_ADD_MANAGER = 2,
+ PROPOSAL_REMOVE_MANAGER = 3,
+ PROPOSAL_WITHDRAW_FEES = 4,
+ PROPOSAL_CHANGE_THRESHOLD = 5
+ };
+
+ // Admin proposal structure for multisig
+ struct AdminProposal
+ {
+ uint64 proposalId;
+ uint8 proposalType; // Type from ProposalType enum
+ id targetAddress; // For setAdmin/addManager/removeManager
+ uint64 amount; // For withdrawFees
+ Array approvals; // Array of owner IDs who approved
+ uint8 approvalsCount; // Count of approvals
+ bit executed; // Whether proposal was executed
+ bit active; // Whether proposal is active (not cancelled)
};
public:
// Contract State
- Array orders;
- id admin; // Primary admin address
+ Array orders;
+ id admin; // Primary admin address (deprecated, kept for compatibility)
id feeRecipient; // Specific wallet to receive fees
Array managers; // Managers list
uint64 nextOrderId; // Counter for order IDs
@@ -259,6 +287,13 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 _earnedFeesQubic; // Accumulated fees from Qubic trades
uint64 _distributedFeesQubic; // Fees already distributed to Qubic shareholders
+ // Multisig state
+ Array admins; // List of multisig admins
+ uint8 numberOfAdmins; // Number of active admins
+ uint8 requiredApprovals; // Threshold: number of approvals needed (2 of 3)
+ Array proposals; // Pending admin proposals
+ uint64 nextProposalId; // Counter for proposal IDs
+
// Internal methods for admin/manager permissions
typedef id isAdmin_input;
typedef bit isAdmin_output;
@@ -289,6 +324,27 @@ struct VOTTUNBRIDGE : public ContractBase
output = false;
}
+ typedef id isMultisigAdmin_input;
+ typedef bit isMultisigAdmin_output;
+
+ struct isMultisigAdmin_locals
+ {
+ uint64 i;
+ };
+
+ PRIVATE_FUNCTION_WITH_LOCALS(isMultisigAdmin)
+ {
+ for (locals.i = 0; locals.i < (uint64)state.numberOfAdmins; ++locals.i)
+ {
+ if (state.admins.get(locals.i) == input)
+ {
+ output = true;
+ return;
+ }
+ }
+ output = false;
+ }
+
public:
// Create a new order and lock tokens
struct createOrder_locals
@@ -512,146 +568,417 @@ struct VOTTUNBRIDGE : public ContractBase
output.status = 1; // Error
}
- // Admin Functions
- struct setAdmin_locals
+ // Multisig Proposal Functions
+
+ // Create proposal structures
+ struct createProposal_input
+ {
+ uint8 proposalType; // Type of proposal
+ id targetAddress; // Target address (for setAdmin/addManager/removeManager)
+ uint64 amount; // Amount (for withdrawFees)
+ };
+
+ struct createProposal_output
+ {
+ uint8 status;
+ uint64 proposalId;
+ };
+
+ struct createProposal_locals
+ {
+ EthBridgeLogger log;
+ uint64 i;
+ bit slotFound;
+ AdminProposal newProposal;
+ bit isMultisigAdminResult;
+ };
+
+ // Approve proposal structures
+ struct approveProposal_input
+ {
+ uint64 proposalId;
+ };
+
+ struct approveProposal_output
+ {
+ uint8 status;
+ bit executed;
+ };
+
+ struct approveProposal_locals
{
EthBridgeLogger log;
AddressChangeLogger adminLog;
+ AdminProposal proposal;
+ uint64 i;
+ bit found;
+ bit alreadyApproved;
+ bit isMultisigAdminResult;
+ uint64 proposalIndex;
+ uint64 availableFees;
};
- PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
+ // Get proposal structures
+ struct getProposal_input
+ {
+ uint64 proposalId;
+ };
+
+ struct getProposal_output
+ {
+ uint8 status;
+ AdminProposal proposal;
+ };
+
+ struct getProposal_locals
{
- if (qpi.invocator() != state.admin)
+ uint64 i;
+ };
+
+ // Create a new proposal (only multisig admins can create)
+ PUBLIC_PROCEDURE_WITH_LOCALS(createProposal)
+ {
+ // Verify that the invocator is a multisig admin
+ id invocator = qpi.invocator();
+ CALL(isMultisigAdmin, invocator, locals.isMultisigAdminResult);
+ if (!locals.isMultisigAdminResult)
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
+ EthBridgeError::notOwner,
+ 0,
+ 0,
0 };
LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized; // Error
+ output.status = EthBridgeError::notOwner;
return;
}
- state.admin = input.address;
+ // Validate proposal type
+ if (input.proposalType < PROPOSAL_SET_ADMIN || input.proposalType > PROPOSAL_CHANGE_THRESHOLD)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::invalidAmount, // Reusing error code
+ 0,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::invalidAmount;
+ return;
+ }
- // Logging the admin address has changed
- locals.adminLog = AddressChangeLogger{
- input.address,
- CONTRACT_INDEX,
- 1, // Event code "Admin Changed"
- 0 };
- LOG_INFO(locals.adminLog);
+ // Find an empty slot for the proposal
+ locals.slotFound = false;
+ for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
+ {
+ if (!state.proposals.get(locals.i).active && state.proposals.get(locals.i).proposalId == 0)
+ {
+ locals.slotFound = true;
+ break;
+ }
+ }
+
+ if (!locals.slotFound)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::maxProposalsReached,
+ 0,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::maxProposalsReached;
+ return;
+ }
+
+ // Create the new proposal
+ locals.newProposal.proposalId = state.nextProposalId++;
+ locals.newProposal.proposalType = input.proposalType;
+ locals.newProposal.targetAddress = input.targetAddress;
+ locals.newProposal.amount = input.amount;
+ locals.newProposal.approvalsCount = 1; // Creator automatically approves
+ locals.newProposal.executed = false;
+ locals.newProposal.active = true;
+
+ // Set creator as first approver
+ locals.newProposal.approvals.set(0, qpi.invocator());
+
+ // Store the proposal
+ state.proposals.set(locals.i, locals.newProposal);
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
0, // No error
- 0, // No order ID involved
- 0, // No amount involved
+ locals.newProposal.proposalId,
+ input.amount,
0 };
LOG_INFO(locals.log);
+
output.status = 0; // Success
+ output.proposalId = locals.newProposal.proposalId;
}
- struct addManager_locals
+ // Approve a proposal (only multisig admins can approve)
+ PUBLIC_PROCEDURE_WITH_LOCALS(approveProposal)
{
- EthBridgeLogger log;
- AddressChangeLogger managerLog;
- uint64 i;
- };
+ // Verify that the invocator is a multisig admin
+ id invocator = qpi.invocator();
+ CALL(isMultisigAdmin, invocator, locals.isMultisigAdminResult);
+ if (!locals.isMultisigAdminResult)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notOwner,
+ 0,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notOwner;
+ output.executed = false;
+ return;
+ }
- PUBLIC_PROCEDURE_WITH_LOCALS(addManager)
- {
- if (qpi.invocator() != state.admin)
+ // Find the proposal
+ locals.found = false;
+ for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
+ {
+ locals.proposal = state.proposals.get(locals.i);
+ if (locals.proposal.proposalId == input.proposalId && locals.proposal.active)
+ {
+ locals.found = true;
+ locals.proposalIndex = locals.i;
+ break;
+ }
+ }
+
+ if (!locals.found)
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
+ EthBridgeError::proposalNotFound,
+ input.proposalId,
+ 0,
0 };
LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
+ output.status = EthBridgeError::proposalNotFound;
+ output.executed = false;
return;
}
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ // Check if already executed
+ if (locals.proposal.executed)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::proposalAlreadyExecuted,
+ input.proposalId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::proposalAlreadyExecuted;
+ output.executed = false;
+ return;
+ }
+
+ // Check if this owner has already approved
+ locals.alreadyApproved = false;
+ for (locals.i = 0; locals.i < (uint64)locals.proposal.approvalsCount; ++locals.i)
{
- if (state.managers.get(locals.i) == NULL_ID)
+ if (locals.proposal.approvals.get(locals.i) == qpi.invocator())
{
- state.managers.set(locals.i, input.address);
+ locals.alreadyApproved = true;
+ break;
+ }
+ }
- locals.managerLog = AddressChangeLogger{
- input.address,
+ if (locals.alreadyApproved)
+ {
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::proposalAlreadyApproved,
+ input.proposalId,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::proposalAlreadyApproved;
+ output.executed = false;
+ return;
+ }
+
+ // Add approval
+ locals.proposal.approvals.set((uint64)locals.proposal.approvalsCount, qpi.invocator());
+ locals.proposal.approvalsCount++;
+
+ // Check if threshold reached and execute
+ if (locals.proposal.approvalsCount >= state.requiredApprovals)
+ {
+ // Execute the proposal based on type
+ if (locals.proposal.proposalType == PROPOSAL_SET_ADMIN)
+ {
+ state.admin = locals.proposal.targetAddress;
+ locals.adminLog = AddressChangeLogger{
+ locals.proposal.targetAddress,
CONTRACT_INDEX,
- 2, // Manager added
+ 1, // Admin changed
0 };
- LOG_INFO(locals.managerLog);
+ LOG_INFO(locals.adminLog);
+ }
+ else if (locals.proposal.proposalType == PROPOSAL_ADD_MANAGER)
+ {
+ // Find empty slot in managers
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == NULL_ID)
+ {
+ state.managers.set(locals.i, locals.proposal.targetAddress);
+ locals.adminLog = AddressChangeLogger{
+ locals.proposal.targetAddress,
+ CONTRACT_INDEX,
+ 2, // Manager added
+ 0 };
+ LOG_INFO(locals.adminLog);
+ break;
+ }
+ }
+ }
+ else if (locals.proposal.proposalType == PROPOSAL_REMOVE_MANAGER)
+ {
+ // Find and remove manager
+ for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
+ {
+ if (state.managers.get(locals.i) == locals.proposal.targetAddress)
+ {
+ state.managers.set(locals.i, NULL_ID);
+ locals.adminLog = AddressChangeLogger{
+ locals.proposal.targetAddress,
+ CONTRACT_INDEX,
+ 3, // Manager removed
+ 0 };
+ LOG_INFO(locals.adminLog);
+ break;
+ }
+ }
+ }
+ else if (locals.proposal.proposalType == PROPOSAL_WITHDRAW_FEES)
+ {
+ locals.availableFees = state._earnedFees - state._distributedFees;
+ if (locals.proposal.amount <= locals.availableFees && locals.proposal.amount > 0)
+ {
+ if (qpi.transfer(state.feeRecipient, locals.proposal.amount) >= 0)
+ {
+ state._distributedFees += locals.proposal.amount;
+ }
+ }
+ }
+ else if (locals.proposal.proposalType == PROPOSAL_CHANGE_THRESHOLD)
+ {
+ // Amount field is used to store new threshold
+ if (locals.proposal.amount > 0 && locals.proposal.amount <= (uint64)state.numberOfAdmins)
+ {
+ state.requiredApprovals = (uint8)locals.proposal.amount;
+ }
+ }
+
+ locals.proposal.executed = true;
+ output.executed = true;
+ }
+ else
+ {
+ output.executed = false;
+ }
+
+ // Update the proposal
+ state.proposals.set(locals.proposalIndex, locals.proposal);
+
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ 0, // No error
+ input.proposalId,
+ locals.proposal.approvalsCount,
+ 0 };
+ LOG_INFO(locals.log);
+
+ output.status = 0; // Success
+ }
+
+ // Get proposal details
+ PUBLIC_FUNCTION_WITH_LOCALS(getProposal)
+ {
+ for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
+ {
+ if (state.proposals.get(locals.i).proposalId == input.proposalId)
+ {
+ output.proposal = state.proposals.get(locals.i);
output.status = 0; // Success
return;
}
}
- // No empty slot found
+ output.status = EthBridgeError::proposalNotFound;
+ }
+
+ // Admin Functions
+ struct setAdmin_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger adminLog;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
+ {
+ // DEPRECATED: Use createProposal/approveProposal with PROPOSAL_SET_ADMIN instead
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- EthBridgeError::maxManagersReached,
- 0, // No orderId
- 0, // No amount
+ EthBridgeError::notAuthorized,
+ 0,
+ 0,
0 };
LOG_INFO(locals.log);
- output.status = EthBridgeError::maxManagersReached;
+ output.status = EthBridgeError::notAuthorized;
return;
}
- struct removeManager_locals
+ struct addManager_locals
{
EthBridgeLogger log;
AddressChangeLogger managerLog;
uint64 i;
};
- PUBLIC_PROCEDURE_WITH_LOCALS(removeManager)
+ PUBLIC_PROCEDURE_WITH_LOCALS(addManager)
{
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized; // Error
- return;
- }
-
- for (locals.i = 0; locals.i < state.managers.capacity(); ++locals.i)
- {
- if (state.managers.get(locals.i) == input.address)
- {
- state.managers.set(locals.i, NULL_ID);
+ // DEPRECATED: Use createProposal/approveProposal with PROPOSAL_ADD_MANAGER instead
+ locals.log = EthBridgeLogger{
+ CONTRACT_INDEX,
+ EthBridgeError::notAuthorized,
+ 0,
+ 0,
+ 0 };
+ LOG_INFO(locals.log);
+ output.status = EthBridgeError::notAuthorized;
+ return;
+ }
- locals.managerLog = AddressChangeLogger{
- input.address,
- CONTRACT_INDEX,
- 3, // Manager removed
- 0 };
- LOG_INFO(locals.managerLog);
- output.status = 0; // Success
- return;
- }
- }
+ struct removeManager_locals
+ {
+ EthBridgeLogger log;
+ AddressChangeLogger managerLog;
+ uint64 i;
+ };
+ PUBLIC_PROCEDURE_WITH_LOCALS(removeManager)
+ {
+ // DEPRECATED: Use createProposal/approveProposal with PROPOSAL_REMOVE_MANAGER instead
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID involved
- 0, // No amount involved
+ EthBridgeError::notAuthorized,
+ 0,
+ 0,
0 };
LOG_INFO(locals.log);
- output.status = 0; // Success
+ output.status = EthBridgeError::notAuthorized;
+ return;
}
struct getTotalReceivedTokens_locals
@@ -1128,78 +1455,16 @@ struct VOTTUNBRIDGE : public ContractBase
PUBLIC_PROCEDURE_WITH_LOCALS(withdrawFees)
{
- // Verify that only admin can withdraw fees
- if (qpi.invocator() != state.admin)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0, // No order ID involved
- 0, // No amount involved
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
- // Calculate available fees
- locals.availableFees = state._earnedFees - state._distributedFees;
-
- // Verify that there are sufficient available fees
- if (input.amount > locals.availableFees)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::insufficientLockedTokens, // Reusing this error
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::insufficientLockedTokens;
- return;
- }
-
- // Verify that amount is valid
- if (input.amount == 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::invalidAmount,
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::invalidAmount;
- return;
- }
-
- // Transfer fees to the designated wallet
- if (qpi.transfer(state.feeRecipient, input.amount) < 0)
- {
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::transferFailed,
- 0, // No order ID
- input.amount,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::transferFailed;
- return;
- }
-
- // Update distributed fees counter
- state._distributedFees += input.amount;
-
- // Successful log
+ // DEPRECATED: Use createProposal/approveProposal with PROPOSAL_WITHDRAW_FEES instead
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
- 0, // No error
- 0, // No order ID
- input.amount,
+ EthBridgeError::notAuthorized,
+ 0,
+ 0,
0 };
LOG_INFO(locals.log);
-
- output.status = 0; // Success
+ output.status = EthBridgeError::notAuthorized;
+ return;
}
PUBLIC_FUNCTION(getAdminID)
@@ -1473,7 +1738,8 @@ struct VOTTUNBRIDGE : public ContractBase
REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
REGISTER_USER_FUNCTION(getOrderByDetails, 7);
REGISTER_USER_FUNCTION(getContractInfo, 8);
- REGISTER_USER_FUNCTION(getAvailableFees, 9);
+ REGISTER_USER_FUNCTION(getAvailableFees, 9);
+ REGISTER_USER_FUNCTION(getProposal, 10); // New multisig function
REGISTER_USER_PROCEDURE(createOrder, 1);
REGISTER_USER_PROCEDURE(setAdmin, 2);
@@ -1482,8 +1748,10 @@ struct VOTTUNBRIDGE : public ContractBase
REGISTER_USER_PROCEDURE(completeOrder, 5);
REGISTER_USER_PROCEDURE(refundOrder, 6);
REGISTER_USER_PROCEDURE(transferToContract, 7);
- REGISTER_USER_PROCEDURE(withdrawFees, 8);
- REGISTER_USER_PROCEDURE(addLiquidity, 9);
+ REGISTER_USER_PROCEDURE(withdrawFees, 8);
+ REGISTER_USER_PROCEDURE(addLiquidity, 9);
+ REGISTER_USER_PROCEDURE(createProposal, 10); // New multisig procedure
+ REGISTER_USER_PROCEDURE(approveProposal, 11); // New multisig procedure
}
// Initialize the contract with SECURE ADMIN CONFIGURATION
@@ -1531,5 +1799,24 @@ struct VOTTUNBRIDGE : public ContractBase
state._earnedFeesQubic = 0;
state._distributedFeesQubic = 0;
+
+ // Initialize multisig admins (3 admins, requires 2 approvals)
+ state.numberOfAdmins = 3;
+ state.requiredApprovals = 2; // 2 of 3 threshold
+
+ // Initialize admins array (REPLACE WITH ACTUAL ADMIN ADDRESSES)
+ state.admins.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 1
+ state.admins.set(1, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 2 (REPLACE)
+ state.admins.set(2, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 3 (REPLACE)
+
+ // Initialize remaining admin slots
+ for (locals.i = 3; locals.i < state.admins.capacity(); ++locals.i)
+ {
+ state.admins.set(locals.i, NULL_ID);
+ }
+
+ // Initialize proposals array
+ state.nextProposalId = 1;
+ // Don't initialize proposals array - leave as default (all zeros)
}
};
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6723ec0a1..d429b8716 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,6 +33,7 @@ add_executable(
# contract_qearn.cpp
# contract_qvault.cpp
# contract_qx.cpp
+ contract_vottunbridge.cpp
# kangaroo_twelve.cpp
m256.cpp
math_lib.cpp
diff --git a/test/contract_vottunbridge.cpp b/test/contract_vottunbridge.cpp
index 5c069e255..5974d64cb 100644
--- a/test/contract_vottunbridge.cpp
+++ b/test/contract_vottunbridge.cpp
@@ -123,11 +123,17 @@ TEST_F(VottunBridgeTest, ErrorCodes)
const uint32 ERROR_INSUFFICIENT_FEE = 3;
const uint32 ERROR_ORDER_NOT_FOUND = 4;
const uint32 ERROR_NOT_AUTHORIZED = 9;
+ const uint32 ERROR_PROPOSAL_NOT_FOUND = 11;
+ const uint32 ERROR_NOT_OWNER = 14;
+ const uint32 ERROR_MAX_PROPOSALS_REACHED = 15;
EXPECT_GT(ERROR_INVALID_AMOUNT, 0);
EXPECT_GT(ERROR_INSUFFICIENT_FEE, ERROR_INVALID_AMOUNT);
- EXPECT_LT(ERROR_ORDER_NOT_FOUND, ERROR_INSUFFICIENT_FEE);
+ EXPECT_GT(ERROR_ORDER_NOT_FOUND, ERROR_INSUFFICIENT_FEE); // Fixed: should be GT not LT
EXPECT_GT(ERROR_NOT_AUTHORIZED, ERROR_ORDER_NOT_FOUND);
+ EXPECT_GT(ERROR_PROPOSAL_NOT_FOUND, ERROR_NOT_AUTHORIZED);
+ EXPECT_GT(ERROR_NOT_OWNER, ERROR_PROPOSAL_NOT_FOUND);
+ EXPECT_GT(ERROR_MAX_PROPOSALS_REACHED, ERROR_NOT_OWNER);
}
// Test 8: Mathematical operations
@@ -703,76 +709,117 @@ TEST_F(VottunBridgeFunctionalTest, CompleteOrderFunctionSimulation)
}
}
+// Test 23: Admin Functions with Multisig (UPDATED FOR MULTISIG)
TEST_F(VottunBridgeFunctionalTest, AdminFunctionsSimulation)
{
- // Test setAdmin function
+ // NOTE: Admin functions now require multisig proposals
+ // Old direct calls to setAdmin/addManager/removeManager/withdrawFees are DEPRECATED
+
+ // Test that old admin functions are now disabled
{
- mockContext.setInvocator(TEST_ADMIN); // Current admin
- id newAdmin(150, 0, 0, 0);
+ mockContext.setInvocator(TEST_ADMIN);
- // Check authorization
+ // Old setAdmin function should return notAuthorized (error 9)
bool isCurrentAdmin = (mockContext.mockInvocator == contractState.admin);
- EXPECT_TRUE(isCurrentAdmin);
+ EXPECT_TRUE(isCurrentAdmin); // User is admin
+
+ // But direct setAdmin call should still fail (deprecated)
+ uint8 expectedErrorCode = 9; // notAuthorized
+ EXPECT_EQ(expectedErrorCode, 9);
+ }
+
+ // Test multisig proposal system for admin changes
+ {
+ // Simulate multisig admin 1 creating a proposal
+ id multisigAdmin1 = TEST_ADMIN;
+ id multisigAdmin2(201, 0, 0, 0);
+ id multisigAdmin3(202, 0, 0, 0);
+ id newAdmin(150, 0, 0, 0);
+
+ mockContext.setInvocator(multisigAdmin1);
+
+ // Simulate isMultisigAdmin check
+ bool isMultisigAdminCheck = true; // Assume admin1 is multisig admin
+ EXPECT_TRUE(isMultisigAdminCheck);
- if (isCurrentAdmin)
+ if (isMultisigAdminCheck)
{
- // Simulate admin change
- id oldAdmin = contractState.admin;
- contractState.admin = newAdmin;
+ // Create proposal: PROPOSAL_SET_ADMIN = 1
+ uint8 proposalType = 1; // PROPOSAL_SET_ADMIN
+ uint64 proposalId = 1;
+ uint8 approvalsCount = 1; // Creator auto-approves
- EXPECT_EQ(contractState.admin, newAdmin);
- EXPECT_NE(contractState.admin, oldAdmin);
+ EXPECT_EQ(approvalsCount, 1);
+ EXPECT_LT(approvalsCount, 2); // Threshold not reached yet
- // Update mock context to use new admin for next tests
- mockContext.setInvocator(newAdmin);
+ // Simulate admin2 approving
+ mockContext.setInvocator(multisigAdmin2);
+ approvalsCount++; // Now 2 approvals
+
+ EXPECT_EQ(approvalsCount, 2);
+
+ // Threshold reached (2 of 3), execute proposal
+ if (approvalsCount >= 2)
+ {
+ // Execute: change admin
+ id oldAdmin = contractState.admin;
+ contractState.admin = newAdmin;
+
+ EXPECT_EQ(contractState.admin, newAdmin);
+ EXPECT_NE(contractState.admin, oldAdmin);
+ }
}
}
- // Test addManager function (use new admin)
+ // Test multisig proposal for adding manager
{
+ id multisigAdmin1 = contractState.admin; // Use new admin from previous test
+ id multisigAdmin2(201, 0, 0, 0);
id newManager(160, 0, 0, 0);
- // Check authorization (new admin should be set from previous test)
- bool isCurrentAdmin = (mockContext.mockInvocator == contractState.admin);
- EXPECT_TRUE(isCurrentAdmin);
+ mockContext.setInvocator(multisigAdmin1);
- if (isCurrentAdmin)
- {
- // Simulate finding empty slot (index 1 should be empty)
- bool foundEmptySlot = true; // Simulate finding slot
+ // Create proposal: PROPOSAL_ADD_MANAGER = 2
+ uint8 proposalType = 2;
+ uint64 proposalId = 2;
+ uint8 approvalsCount = 1;
- if (foundEmptySlot)
- {
- contractState.managers[1] = newManager;
- EXPECT_EQ(contractState.managers[1], newManager);
- }
+ // Admin2 approves
+ mockContext.setInvocator(multisigAdmin2);
+ approvalsCount++;
+
+ // Execute: add manager
+ if (approvalsCount >= 2)
+ {
+ contractState.managers[1] = newManager;
+ EXPECT_EQ(contractState.managers[1], newManager);
}
}
- // Test unauthorized access
+ // Test unauthorized access (non-multisig admin)
{
- mockContext.setInvocator(TEST_USER_1); // Regular user
+ mockContext.setInvocator(TEST_USER_1); // Regular user
- bool isCurrentAdmin = (mockContext.mockInvocator == contractState.admin);
- EXPECT_FALSE(isCurrentAdmin);
+ bool isMultisigAdmin = false; // User is not in multisig admins list
+ EXPECT_FALSE(isMultisigAdmin);
- // Should return error code 9 (notAuthorized)
- uint8 expectedErrorCode = isCurrentAdmin ? 0 : 9;
- EXPECT_EQ(expectedErrorCode, 9);
+ // Should return error code 14 (notOwner/notMultisigAdmin)
+ uint8 expectedErrorCode = 14;
+ EXPECT_EQ(expectedErrorCode, 14);
}
}
-// Test 24: Fee withdrawal simulation
+// Test 24: Fee withdrawal simulation (UPDATED FOR MULTISIG)
TEST_F(VottunBridgeFunctionalTest, FeeWithdrawalSimulation)
{
uint64 withdrawAmount = 15000; // Less than available fees
- // Test case 1: Admin withdrawing fees
+ // Test case 1: Multisig admins withdrawing fees via proposal
{
- mockContext.setInvocator(contractState.admin);
+ id multisigAdmin1 = contractState.admin;
+ id multisigAdmin2(201, 0, 0, 0);
- bool isCurrentAdmin = (mockContext.mockInvocator == contractState.admin);
- EXPECT_TRUE(isCurrentAdmin);
+ mockContext.setInvocator(multisigAdmin1);
uint64 availableFees = contractState._earnedFees - contractState._distributedFees;
EXPECT_EQ(availableFees, 20000); // 50000 - 30000
@@ -783,7 +830,17 @@ TEST_F(VottunBridgeFunctionalTest, FeeWithdrawalSimulation)
EXPECT_TRUE(sufficientFees);
EXPECT_TRUE(validAmount);
- if (isCurrentAdmin && sufficientFees && validAmount)
+ // Create proposal: PROPOSAL_WITHDRAW_FEES = 4
+ uint8 proposalType = 4;
+ uint64 proposalId = 3;
+ uint8 approvalsCount = 1; // Creator approves
+
+ // Admin2 approves
+ mockContext.setInvocator(multisigAdmin2);
+ approvalsCount++;
+
+ // Threshold reached, execute withdrawal
+ if (approvalsCount >= 2 && sufficientFees && validAmount)
{
// Simulate fee withdrawal
contractState._distributedFees += withdrawAmount;
@@ -795,7 +852,7 @@ TEST_F(VottunBridgeFunctionalTest, FeeWithdrawalSimulation)
}
}
- // Test case 2: Insufficient fees
+ // Test case 2: Proposal with insufficient fees should not execute
{
uint64 excessiveAmount = 25000; // More than remaining available fees
uint64 currentAvailableFees = contractState._earnedFees - contractState._distributedFees;
@@ -803,10 +860,20 @@ TEST_F(VottunBridgeFunctionalTest, FeeWithdrawalSimulation)
bool sufficientFees = (excessiveAmount <= currentAvailableFees);
EXPECT_FALSE(sufficientFees);
- // Should return error (insufficient fees)
- uint8 expectedErrorCode = sufficientFees ? 0 : 6; // insufficientLockedTokens (reused)
+ // Even with 2 approvals, execution should fail due to insufficient fees
+ // The proposal executes but transfer fails
+ uint8 expectedErrorCode = 6; // insufficientLockedTokens (reused for fees)
EXPECT_EQ(expectedErrorCode, 6);
}
+
+ // Test case 3: Old direct withdrawFees call should fail
+ {
+ mockContext.setInvocator(contractState.admin);
+
+ // Direct call to withdrawFees should return notAuthorized (deprecated)
+ uint8 expectedErrorCode = 9; // notAuthorized
+ EXPECT_EQ(expectedErrorCode, 9);
+ }
}
// Test 25: Order search and retrieval simulation
@@ -1062,11 +1129,314 @@ TEST_F(VottunBridgeTest, TransferFlowValidation)
EXPECT_EQ(order.status, 2);
}
+// MULTISIG ADVANCED TESTS
+
+// Test 28: Multiple simultaneous proposals
+TEST_F(VottunBridgeFunctionalTest, MultipleProposalsSimultaneous)
+{
+ id multisigAdmin1 = TEST_ADMIN;
+ id multisigAdmin2(201, 0, 0, 0);
+ id multisigAdmin3(202, 0, 0, 0);
+
+ // Create 3 different proposals at the same time
+ mockContext.setInvocator(multisigAdmin1);
+
+ // Proposal 1: Add manager
+ uint64 proposal1Id = 1;
+ uint8 proposal1Type = 2; // PROPOSAL_ADD_MANAGER
+ id newManager1(160, 0, 0, 0);
+ uint8 proposal1Approvals = 1; // Creator approves
+
+ EXPECT_EQ(proposal1Approvals, 1);
+
+ // Proposal 2: Withdraw fees
+ uint64 proposal2Id = 2;
+ uint8 proposal2Type = 4; // PROPOSAL_WITHDRAW_FEES
+ uint64 withdrawAmount = 10000;
+ uint8 proposal2Approvals = 1; // Creator approves
+
+ EXPECT_EQ(proposal2Approvals, 1);
+
+ // Proposal 3: Set new admin
+ uint64 proposal3Id = 3;
+ uint8 proposal3Type = 1; // PROPOSAL_SET_ADMIN
+ id newAdmin(150, 0, 0, 0);
+ uint8 proposal3Approvals = 1; // Creator approves
+
+ EXPECT_EQ(proposal3Approvals, 1);
+
+ // Verify all proposals are pending
+ EXPECT_LT(proposal1Approvals, 2); // Not executed yet
+ EXPECT_LT(proposal2Approvals, 2); // Not executed yet
+ EXPECT_LT(proposal3Approvals, 2); // Not executed yet
+
+ // Admin2 approves proposal 1 (add manager)
+ mockContext.setInvocator(multisigAdmin2);
+ proposal1Approvals++;
+
+ EXPECT_EQ(proposal1Approvals, 2); // Threshold reached
+
+ // Execute proposal 1
+ if (proposal1Approvals >= 2)
+ {
+ contractState.managers[1] = newManager1;
+ EXPECT_EQ(contractState.managers[1], newManager1);
+ }
+
+ // Admin3 approves proposal 2 (withdraw fees)
+ mockContext.setInvocator(multisigAdmin3);
+ proposal2Approvals++;
+
+ EXPECT_EQ(proposal2Approvals, 2); // Threshold reached
+
+ // Execute proposal 2
+ uint64 availableFees = contractState._earnedFees - contractState._distributedFees;
+ if (proposal2Approvals >= 2 && withdrawAmount <= availableFees)
+ {
+ contractState._distributedFees += withdrawAmount;
+ EXPECT_EQ(contractState._distributedFees, 30000 + withdrawAmount);
+ }
+
+ // Proposal 3 still pending (only 1 approval)
+ EXPECT_LT(proposal3Approvals, 2);
+
+ // Verify proposals executed independently
+ EXPECT_EQ(contractState.managers[1], newManager1); // Proposal 1 executed
+ EXPECT_EQ(contractState._distributedFees, 40000); // Proposal 2 executed
+ EXPECT_NE(contractState.admin, newAdmin); // Proposal 3 NOT executed
+}
+
+// Test 29: Change threshold proposal
+TEST_F(VottunBridgeFunctionalTest, ChangeThresholdProposal)
+{
+ id multisigAdmin1 = TEST_ADMIN;
+ id multisigAdmin2(201, 0, 0, 0);
+
+ // Initial threshold is 2 (2 of 3)
+ uint8 currentThreshold = 2;
+ uint8 numberOfAdmins = 3;
+
+ EXPECT_EQ(currentThreshold, 2);
+
+ mockContext.setInvocator(multisigAdmin1);
+
+ // Create proposal: PROPOSAL_CHANGE_THRESHOLD = 5
+ uint8 proposalType = 5; // PROPOSAL_CHANGE_THRESHOLD
+ uint64 newThreshold = 3; // Change to 3 of 3 (stored in amount field)
+ uint64 proposalId = 10;
+ uint8 approvalsCount = 1;
+
+ EXPECT_EQ(approvalsCount, 1);
+
+ // Validate new threshold is valid
+ bool validThreshold = (newThreshold > 0 && newThreshold <= numberOfAdmins);
+ EXPECT_TRUE(validThreshold);
+
+ // Admin2 approves
+ mockContext.setInvocator(multisigAdmin2);
+ approvalsCount++;
+
+ EXPECT_EQ(approvalsCount, 2);
+
+ // Execute: change threshold
+ if (approvalsCount >= currentThreshold && validThreshold)
+ {
+ currentThreshold = (uint8)newThreshold;
+ EXPECT_EQ(currentThreshold, 3);
+ }
+
+ // Verify threshold changed
+ EXPECT_EQ(currentThreshold, 3);
+
+ // Now test that threshold 3 is required
+ // Create another proposal
+ mockContext.setInvocator(multisigAdmin1);
+ uint64 newProposalId = 11;
+ uint8 newProposalApprovals = 1;
+
+ // Admin2 approves (now 2 approvals)
+ mockContext.setInvocator(multisigAdmin2);
+ newProposalApprovals++;
+
+ EXPECT_EQ(newProposalApprovals, 2);
+
+ // With new threshold of 3, proposal should NOT execute yet
+ bool shouldExecute = (newProposalApprovals >= currentThreshold);
+ EXPECT_FALSE(shouldExecute);
+
+ // Need one more approval (Admin3)
+ id multisigAdmin3(202, 0, 0, 0);
+ mockContext.setInvocator(multisigAdmin3);
+ newProposalApprovals++;
+
+ EXPECT_EQ(newProposalApprovals, 3);
+
+ // Now it should execute
+ shouldExecute = (newProposalApprovals >= currentThreshold);
+ EXPECT_TRUE(shouldExecute);
+}
+
+// Test 30: Double approval prevention
+TEST_F(VottunBridgeFunctionalTest, DoubleApprovalPrevention)
+{
+ id multisigAdmin1 = TEST_ADMIN;
+ id multisigAdmin2(201, 0, 0, 0);
+
+ mockContext.setInvocator(multisigAdmin1);
+
+ // Create proposal
+ uint8 proposalType = 2; // PROPOSAL_ADD_MANAGER
+ id newManager(160, 0, 0, 0);
+ uint64 proposalId = 20;
+
+ // Simulate proposal creation (admin1 auto-approves)
+ Array approvalsList;
+ uint8 approvalsCount = 0;
+
+ // Admin1 creates and auto-approves
+ approvalsList.set(approvalsCount, multisigAdmin1);
+ approvalsCount++;
+
+ EXPECT_EQ(approvalsCount, 1);
+ EXPECT_EQ(approvalsList.get(0), multisigAdmin1);
+
+ // Admin1 tries to approve AGAIN (should be prevented)
+ bool alreadyApproved = false;
+ for (uint64 i = 0; i < approvalsCount; ++i)
+ {
+ if (approvalsList.get(i) == multisigAdmin1)
+ {
+ alreadyApproved = true;
+ break;
+ }
+ }
+
+ EXPECT_TRUE(alreadyApproved);
+
+ // If already approved, don't increment
+ if (alreadyApproved)
+ {
+ // Return error (proposalAlreadyApproved = 13)
+ uint8 errorCode = 13;
+ EXPECT_EQ(errorCode, 13);
+ }
+ else
+ {
+ // This should NOT happen
+ approvalsCount++;
+ FAIL() << "Admin was able to approve twice!";
+ }
+
+ // Verify count didn't increase
+ EXPECT_EQ(approvalsCount, 1);
+
+ // Admin2 approves (should succeed)
+ mockContext.setInvocator(multisigAdmin2);
+
+ alreadyApproved = false;
+ for (uint64 i = 0; i < approvalsCount; ++i)
+ {
+ if (approvalsList.get(i) == multisigAdmin2)
+ {
+ alreadyApproved = true;
+ break;
+ }
+ }
+
+ EXPECT_FALSE(alreadyApproved); // Admin2 hasn't approved yet
+
+ if (!alreadyApproved)
+ {
+ approvalsList.set(approvalsCount, multisigAdmin2);
+ approvalsCount++;
+ }
+
+ EXPECT_EQ(approvalsCount, 2);
+ EXPECT_EQ(approvalsList.get(1), multisigAdmin2);
+
+ // Threshold reached (2 of 3)
+ bool thresholdReached = (approvalsCount >= 2);
+ EXPECT_TRUE(thresholdReached);
+
+ // Execute proposal
+ if (thresholdReached)
+ {
+ contractState.managers[1] = newManager;
+ EXPECT_EQ(contractState.managers[1], newManager);
+ }
+}
+
+// Test 31: Non-owner trying to create proposal
+TEST_F(VottunBridgeFunctionalTest, NonOwnerProposalRejection)
+{
+ id regularUser = TEST_USER_1;
+ id multisigAdmin1 = TEST_ADMIN;
+
+ mockContext.setInvocator(regularUser);
+
+ // Check if invocator is multisig admin
+ bool isMultisigAdmin = false;
+
+ // Simulate checking against admin list (capacity must be power of 2)
+ Array adminsList;
+ adminsList.set(0, multisigAdmin1);
+ adminsList.set(1, id(201, 0, 0, 0));
+ adminsList.set(2, id(202, 0, 0, 0));
+ adminsList.set(3, NULL_ID); // Unused slot
+
+ uint8 numberOfAdmins = 3;
+ for (uint64 i = 0; i < numberOfAdmins; ++i)
+ {
+ if (adminsList.get(i) == regularUser)
+ {
+ isMultisigAdmin = true;
+ break;
+ }
+ }
+
+ EXPECT_FALSE(isMultisigAdmin);
+
+ // If not admin, reject proposal creation
+ if (!isMultisigAdmin)
+ {
+ uint8 errorCode = 14; // notOwner
+ EXPECT_EQ(errorCode, 14);
+ }
+ else
+ {
+ FAIL() << "Regular user was able to create proposal!";
+ }
+
+ // Verify multisig admin CAN create proposal
+ mockContext.setInvocator(multisigAdmin1);
+
+ isMultisigAdmin = false;
+ for (uint64 i = 0; i < 3; ++i)
+ {
+ if (adminsList.get(i) == multisigAdmin1)
+ {
+ isMultisigAdmin = true;
+ break;
+ }
+ }
+
+ EXPECT_TRUE(isMultisigAdmin);
+
+ if (isMultisigAdmin)
+ {
+ // Proposal created successfully
+ uint64 proposalId = 30;
+ uint8 status = 0; // Success
+ EXPECT_EQ(status, 0);
+ EXPECT_EQ(proposalId, 30);
+ }
+}
+
TEST_F(VottunBridgeTest, StateConsistencyTests)
{
uint64 initialLockedTokens = 1000000;
uint64 orderAmount = 250000;
-
+
uint64 afterTransfer = initialLockedTokens + orderAmount;
EXPECT_EQ(afterTransfer, 1250000);
From fc1298fbb46c2eb027c49ef9c981ebc066900197 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Mon, 20 Oct 2025 10:53:02 +0200
Subject: [PATCH 140/297] fix for testnet
---
src/network_core/peers.h | 1 +
src/private_settings.h | 6 +++---
src/public_settings.h | 29 ++++++++++++++++-------------
src/qubic.cpp | 22 +++++-----------------
4 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/network_core/peers.h b/src/network_core/peers.h
index e483d58f2..cbce9806d 100644
--- a/src/network_core/peers.h
+++ b/src/network_core/peers.h
@@ -420,6 +420,7 @@ static void enqueueResponse(Peer* peer, unsigned int dataSize, unsigned char typ
*/
static bool isBogonAddress(const IPv4Address& address)
{
+ return false;
return (!address.u8[0])
|| (address.u8[0] == 127)
|| (address.u8[0] == 10)
diff --git a/src/private_settings.h b/src/private_settings.h
index bcecc8265..2bebf927d 100644
--- a/src/private_settings.h
+++ b/src/private_settings.h
@@ -4,7 +4,7 @@
// Do NOT share the data of "Private Settings" section with anybody!!!
-#define OPERATOR "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+#define OPERATOR "MEFKYFCDXDUILCAJKOIKWQAPENJDUHSSYPBRWFOTLALILAYWQFDSITJELLHG"
static unsigned char computorSeeds[][55 + 1] = {
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
@@ -49,7 +49,7 @@ static const unsigned char whiteListPeers[][4] = {
#endif
static unsigned long long logReaderPasscodes[4] = {
- 0, 0, 0, 0 // REMOVE THIS ENTRY AND REPLACE IT WITH YOUR OWN RANDOM NUMBERS IN [0..18446744073709551615] RANGE IF LOGGING IS ENABLED
+ 1,2,3,4// REMOVE THIS ENTRY AND REPLACE IT WITH YOUR OWN RANDOM NUMBERS IN [0..18446744073709551615] RANGE IF LOGGING IS ENABLED
};
// Mode for auto save ticks:
@@ -62,4 +62,4 @@ static unsigned long long logReaderPasscodes[4] = {
// Perform state persisting when your node is misaligned will also make your node misaligned after resuming.
// Thus, picking various TICK_STORAGE_AUTOSAVE_TICK_PERIOD numbers across AUX nodes is recommended.
// some suggested prime numbers you can try: 971 977 983 991 997
-#define TICK_STORAGE_AUTOSAVE_TICK_PERIOD 1000
\ No newline at end of file
+#define TICK_STORAGE_AUTOSAVE_TICK_PERIOD 1337
\ No newline at end of file
diff --git a/src/public_settings.h b/src/public_settings.h
index 971fd91a9..5b68399d8 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -7,9 +7,9 @@
// no need to define AVX512 here anymore, just change the project settings to use the AVX512 version
// random seed is now obtained from spectrumDigests
-
+#define TESTNET
#define MAX_NUMBER_OF_PROCESSORS 32
-#define NUMBER_OF_SOLUTION_PROCESSORS 12
+#define NUMBER_OF_SOLUTION_PROCESSORS 2
// Number of buffers available for executing contract functions in parallel; having more means reserving a bit more RAM (+1 = +32 MB)
// and less waiting in request processors if there are more parallel contract function requests. The maximum value that may make sense
@@ -24,18 +24,18 @@
#define TICKS_TO_KEEP_FROM_PRIOR_EPOCH 100
// The tick duration used for timing and scheduling logic.
-#define TARGET_TICK_DURATION 1000
+#define TARGET_TICK_DURATION 7000
// The tick duration used to calculate the size of memory buffers.
// This determines the memory footprint of the application.
-#define TICK_DURATION_FOR_ALLOCATION_MS 750
-#define TRANSACTION_SPARSENESS 1
+#define TICK_DURATION_FOR_ALLOCATION_MS 7000
+#define TRANSACTION_SPARSENESS 4
// Number of ticks that are stored in the pending txs pool. This also defines how many ticks in advance a tx can be registered.
#define PENDING_TXS_POOL_NUM_TICKS (1000 * 60 * 10ULL / TICK_DURATION_FOR_ALLOCATION_MS) // 10 minutes
// Below are 2 variables that are used for auto-F5 feature:
-#define AUTO_FORCE_NEXT_TICK_THRESHOLD 0ULL // Multiplier of TARGET_TICK_DURATION for the system to detect "F5 case" | set to 0 to disable
+#define AUTO_FORCE_NEXT_TICK_THRESHOLD 20ULL // Multiplier of TARGET_TICK_DURATION for the system to detect "F5 case" | set to 0 to disable
// to prevent bad actor causing misalignment.
// depends on actual tick time of the network, operators should set this number randomly in this range [12, 26]
// eg: If AUTO_FORCE_NEXT_TICK_THRESHOLD is 8 and TARGET_TICK_DURATION is 2, then the system will start "auto F5 procedure" after 16 seconds after receveing 451+ votes
@@ -72,8 +72,8 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define TICK 34815000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
-#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
-#define DISPATCHER "XPXYKFLGSWRHRGAUKWFWVXCDVEYAPCPCNUTMUDWFGDYQCWZNJMWFZEEGCFFO"
+#define ARBITRATOR "MEFKYFCDXDUILCAJKOIKWQAPENJDUHSSYPBRWFOTLALILAYWQFDSITJELLHG"
+#define DISPATCHER "DISPAPLNOYSWXCJMZEMFUNCCMMJANGQPYJDSEXZTTBFSUEPYPEKCICADBUCJ"
static unsigned short SYSTEM_FILE_NAME[] = L"system";
static unsigned short SYSTEM_END_OF_EPOCH_FILE_NAME[] = L"system.eoe";
@@ -96,12 +96,15 @@ static constexpr unsigned int SOLUTION_THRESHOLD_DEFAULT = 321;
#define SOLUTION_SECURITY_DEPOSIT 1000000
// Signing difficulty
-#define TARGET_TICK_VOTE_SIGNATURE 0x00095CBEU // around 7000 signing operations per ID
+#define TARGET_TICK_VOTE_SIGNATURE 0x07FFFFFFU // around 7000 signing operations per ID
// include commonly needed definitions
#include "network_messages/common_def.h"
-#define MAX_NUMBER_OF_TICKS_PER_EPOCH (((((60ULL * 60 * 24 * 7 * 1000) / TICK_DURATION_FOR_ALLOCATION_MS) + NUMBER_OF_COMPUTORS - 1) / NUMBER_OF_COMPUTORS) * NUMBER_OF_COMPUTORS)
+#define TESTNET_EPOCH_DURATION 3000
+#define MAX_NUMBER_OF_TICKS_PER_EPOCH (TESTNET_EPOCH_DURATION + 5)
+
+
#define FIRST_TICK_TRANSACTION_OFFSET sizeof(unsigned long long)
#define MAX_TRANSACTION_SIZE (MAX_INPUT_SIZE + sizeof(Transaction) + SIGNATURE_SIZE)
@@ -114,9 +117,9 @@ static_assert(INTERNAL_COMPUTATIONS_INTERVAL >= NUMBER_OF_COMPUTORS, "Internal c
// DoW: Day of the week 0: Sunday, 1 = Monday ...
static unsigned int gFullExternalComputationTimes[][2] =
{
- {0x040C0000U, 0x050C0000U}, // Thu 12:00:00 - Fri 12:00:00
- {0x060C0000U, 0x000C0000U}, // Sat 12:00:00 - Sun 12:00:00
- {0x010C0000U, 0x020C0000U}, // Mon 12:00:00 - Tue 12:00:00
+ {0x040C0000U, 0x040C1E00U}, // Thu 12:00:00 - Fri 12:00:00
+ {0x060C0000U, 0x060C1E00U}, // Sat 12:00:00 - Sun 12:00:00
+ {0x010C0000U, 0x010C1E00U}, // Mon 12:00:00 - Tue 12:00:00
};
#define STACK_SIZE 4194304
diff --git a/src/qubic.cpp b/src/qubic.cpp
index ad90daf86..e5b3c2a05 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -81,7 +81,7 @@
#define MAX_MESSAGE_PAYLOAD_SIZE MAX_TRANSACTION_SIZE
#define MAX_UNIVERSE_SIZE 1073741824
#define MESSAGE_DISSEMINATION_THRESHOLD 1000000000
-#define PORT 21841
+#define PORT 31841
#define SYSTEM_DATA_SAVING_PERIOD 300000ULL
#define TICK_TRANSACTIONS_PUBLICATION_OFFSET 2 // Must be only 2
#define MIN_MINING_SOLUTIONS_PUBLICATION_OFFSET 3 // Must be 3+
@@ -4858,8 +4858,7 @@ static void tickProcessor(void*)
if (tickDataSuits)
{
const int dayIndex = ::dayIndex(etalonTick.year, etalonTick.month, etalonTick.day);
- if ((dayIndex == 738570 + system.epoch * 7 && etalonTick.hour >= 12)
- || dayIndex > 738570 + system.epoch * 7)
+ if (system.tick - system.initialTick >= TESTNET_EPOCH_DURATION)
{
// start seamless epoch transition
epochTransitionState = 1;
@@ -5733,20 +5732,9 @@ static void logInfo()
}
else
{
- const CHAR16 alphabet[26][2] = { L"A", L"B", L"C", L"D", L"E", L"F", L"G", L"H", L"I", L"J", L"K", L"L", L"M", L"N", L"O", L"P", L"Q", L"R", L"S", L"T", L"U", L"V", L"W", L"X", L"Y", L"Z" };
- for (unsigned int i = 0; i < numberOfOwnComputorIndices; i++)
- {
- appendText(message, alphabet[ownComputorIndices[i] / 26]);
- appendText(message, alphabet[ownComputorIndices[i] % 26]);
- if (i < (unsigned int)(numberOfOwnComputorIndices - 1))
- {
- appendText(message, L"+");
- }
- else
- {
- appendText(message, L".");
- }
- }
+ appendText(message, L"[Owning ");
+ appendNumber(message, numberOfOwnComputorIndices, false);
+ appendText(message, L" indices]");
}
logToConsole(message);
From 2b7c69583f14862f5605da37cdebbfa97d49120d Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:03:04 +0200
Subject: [PATCH 141/297] change response type to EndResponse if logging is
disabled
---
src/logging/net_msg_impl.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/logging/net_msg_impl.h b/src/logging/net_msg_impl.h
index 51cea8122..19eb1ef7e 100644
--- a/src/logging/net_msg_impl.h
+++ b/src/logging/net_msg_impl.h
@@ -51,7 +51,7 @@ void qLogger::processRequestLog(unsigned long long processorNumber, Peer* peer,
return;
}
#endif
- enqueueResponse(peer, 0, RespondLog::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
void qLogger::processRequestTxLogInfo(unsigned long long processorNumber, Peer* peer, RequestResponseHeader* header)
@@ -83,7 +83,7 @@ void qLogger::processRequestTxLogInfo(unsigned long long processorNumber, Peer*
return;
}
#endif
- enqueueResponse(peer, 0, ResponseLogIdRangeFromTx::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
void qLogger::processRequestTickTxLogInfo(unsigned long long processorNumber, Peer* peer, RequestResponseHeader* header)
@@ -116,7 +116,7 @@ void qLogger::processRequestTickTxLogInfo(unsigned long long processorNumber, Pe
return;
}
#endif
- enqueueResponse(peer, 0, ResponseAllLogIdRangesFromTick::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
void qLogger::processRequestPrunePageFile(Peer* peer, RequestResponseHeader* header)
@@ -170,7 +170,7 @@ void qLogger::processRequestPrunePageFile(Peer* peer, RequestResponseHeader* hea
return;
}
#endif
- enqueueResponse(peer, 0, ResponsePruningLog::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
void qLogger::processRequestGetLogDigest(Peer* peer, RequestResponseHeader* header)
@@ -190,5 +190,5 @@ void qLogger::processRequestGetLogDigest(Peer* peer, RequestResponseHeader* head
return;
}
#endif
- enqueueResponse(peer, 0, ResponseLogStateDigest::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
\ No newline at end of file
From c6c97ceb46b9516dd10669afda6671e8673d26c7 Mon Sep 17 00:00:00 2001
From: krypdkat <39078779+krypdkat@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:35:11 +0700
Subject: [PATCH 142/297] change response type to EndResponse if logging is not
available
---
src/logging/net_msg_impl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/logging/net_msg_impl.h b/src/logging/net_msg_impl.h
index 19eb1ef7e..9eb60212e 100644
--- a/src/logging/net_msg_impl.h
+++ b/src/logging/net_msg_impl.h
@@ -41,12 +41,12 @@ void qLogger::processRequestLog(unsigned long long processorNumber, Peer* peer,
}
else
{
- enqueueResponse(peer, 0, RespondLog::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
}
else
{
- enqueueResponse(peer, 0, RespondLog::type, header->dejavu(), NULL);
+ enqueueResponse(peer, 0, EndResponse::type, header->dejavu(), NULL);
}
return;
}
From 2d43ad9572e888cad9a44c4374b69956a11a87a5 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:51:58 +0200
Subject: [PATCH 143/297] update params for epoch 184 / v1.265.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index 971fd91a9..f3f7b565b 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -64,12 +64,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 264
+#define VERSION_B 265
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 183
-#define TICK 34815000
+#define EPOCH 184
+#define TICK 35340000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From 9f9abbb3f8278cc88894fe71b33efd95c522b676 Mon Sep 17 00:00:00 2001
From: dkat <39078779+krypdkat@users.noreply.github.com>
Date: Mon, 20 Oct 2025 22:33:02 +0700
Subject: [PATCH 144/297] add managingContractIndex to transferring asset event
(#570)
* add managingContractIndex to transferring asset event
* add missing case
---
src/assets/assets.h | 4 ++++
src/logging/logging.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/src/assets/assets.h b/src/assets/assets.h
index 793941669..964fb4797 100644
--- a/src/assets/assets.h
+++ b/src/assets/assets.h
@@ -516,6 +516,7 @@ static bool transferShareOwnershipAndPossession(int sourceOwnershipIndex, int so
assetOwnershipChange.destinationPublicKey = destinationPublicKey;
assetOwnershipChange.issuerPublicKey = issuance.publicKey;
assetOwnershipChange.numberOfShares = numberOfShares;
+ assetOwnershipChange.managingContractIndex = assets[sourceOwnershipIndex].varStruct.ownership.managingContractIndex;
*((unsigned long long*) & assetOwnershipChange.name) = *((unsigned long long*) & issuance.name); // Order must be preserved!
assetOwnershipChange.numberOfDecimalPlaces = issuance.numberOfDecimalPlaces; // Order must be preserved!
*((unsigned long long*) & assetOwnershipChange.unitOfMeasurement) = *((unsigned long long*) & issuance.unitOfMeasurement); // Order must be preserved!
@@ -526,6 +527,7 @@ static bool transferShareOwnershipAndPossession(int sourceOwnershipIndex, int so
assetPossessionChange.destinationPublicKey = destinationPublicKey;
assetPossessionChange.issuerPublicKey = issuance.publicKey;
assetPossessionChange.numberOfShares = numberOfShares;
+ assetPossessionChange.managingContractIndex = assets[sourcePossessionIndex].varStruct.possession.managingContractIndex;
*((unsigned long long*) & assetPossessionChange.name) = *((unsigned long long*) & issuance.name); // Order must be preserved!
assetPossessionChange.numberOfDecimalPlaces = issuance.numberOfDecimalPlaces; // Order must be preserved!
*((unsigned long long*) & assetPossessionChange.unitOfMeasurement) = *((unsigned long long*) & issuance.unitOfMeasurement); // Order must be preserved!
@@ -594,6 +596,7 @@ static bool transferShareOwnershipAndPossession(int sourceOwnershipIndex, int so
assetOwnershipChange.destinationPublicKey = destinationPublicKey;
assetOwnershipChange.issuerPublicKey = assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.publicKey;
assetOwnershipChange.numberOfShares = numberOfShares;
+ assetOwnershipChange.managingContractIndex = assets[sourceOwnershipIndex].varStruct.ownership.managingContractIndex;
*((unsigned long long*) & assetOwnershipChange.name) = *((unsigned long long*) & assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.name); // Order must be preserved!
assetOwnershipChange.numberOfDecimalPlaces = assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.numberOfDecimalPlaces; // Order must be preserved!
*((unsigned long long*) & assetOwnershipChange.unitOfMeasurement) = *((unsigned long long*) & assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.unitOfMeasurement); // Order must be preserved!
@@ -604,6 +607,7 @@ static bool transferShareOwnershipAndPossession(int sourceOwnershipIndex, int so
assetPossessionChange.destinationPublicKey = destinationPublicKey;
assetPossessionChange.issuerPublicKey = assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.publicKey;
assetPossessionChange.numberOfShares = numberOfShares;
+ assetPossessionChange.managingContractIndex = assets[sourcePossessionIndex].varStruct.possession.managingContractIndex;
*((unsigned long long*) & assetPossessionChange.name) = *((unsigned long long*) & assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.name); // Order must be preserved!
assetPossessionChange.numberOfDecimalPlaces = assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.numberOfDecimalPlaces; // Order must be preserved!
*((unsigned long long*) & assetPossessionChange.unitOfMeasurement) = *((unsigned long long*) & assets[assets[sourceOwnershipIndex].varStruct.ownership.issuanceIndex].varStruct.issuance.unitOfMeasurement); // Order must be preserved!
diff --git a/src/logging/logging.h b/src/logging/logging.h
index f7a39c4c4..771f7a0f2 100644
--- a/src/logging/logging.h
+++ b/src/logging/logging.h
@@ -90,6 +90,7 @@ struct AssetOwnershipChange
m256i destinationPublicKey;
m256i issuerPublicKey;
long long numberOfShares;
+ long long managingContractIndex;
char name[7];
char numberOfDecimalPlaces;
char unitOfMeasurement[7];
@@ -103,6 +104,7 @@ struct AssetPossessionChange
m256i destinationPublicKey;
m256i issuerPublicKey;
long long numberOfShares;
+ long long managingContractIndex;
char name[7];
char numberOfDecimalPlaces;
char unitOfMeasurement[7];
From abf2dc5b596d2cd90d30b2d18160548fe4030a9c Mon Sep 17 00:00:00 2001
From: sergimima
Date: Tue, 21 Oct 2025 07:48:30 +0200
Subject: [PATCH 145/297] admin addresess update
---
src/contracts/VottunBridge.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 989eb2c1a..fa979a7d9 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1806,8 +1806,8 @@ struct VOTTUNBRIDGE : public ContractBase
// Initialize admins array (REPLACE WITH ACTUAL ADMIN ADDRESSES)
state.admins.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 1
- state.admins.set(1, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 2 (REPLACE)
- state.admins.set(2, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 3 (REPLACE)
+ state.admins.set(1, ID(_E, _Q, _M, _B, _B, _V, _Y, _G, _Z, _O, _F, _U, _I, _H, _E, _X, _F, _O, _X, _K, _T, _F, _T, _A, _N, _E, _K, _B, _X, _L, _B, _X, _H, _A, _Y, _D, _F, _F, _M, _R, _E, _E, _M, _R, _Q, _E, _V, _A, _D, _Y, _M, _M, _E, _W, _A, _C, _T, _O, _D, _D)); // Admin 2 (Manager)
+ state.admins.set(2, ID(_H, _Y, _J, _X, _E, _Z, _S, _E, _C, _W, _S, _K, _O, _D, _J, _A, _L, _R, _C, _K, _S, _L, _K, _V, _Y, _U, _E, _B, _M, _A, _H, _D, _O, _D, _Y, _Z, _U, _J, _I, _I, _Y, _D, _P, _A, _G, _F, _K, _L, _M, _O, _T, _H, _T, _J, _X, _E, _B, _E, _W, _M)); // Admin 3 (User)
// Initialize remaining admin slots
for (locals.i = 3; locals.i < state.admins.capacity(); ++locals.i)
From 1152ae2a1089cc6f5ee5d3168f6bfeadd9d609b4 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Tue, 21 Oct 2025 07:50:47 +0200
Subject: [PATCH 146/297] update on addresses
---
src/contracts/VottunBridge.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index fa979a7d9..2e9da12ea 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1806,8 +1806,8 @@ struct VOTTUNBRIDGE : public ContractBase
// Initialize admins array (REPLACE WITH ACTUAL ADMIN ADDRESSES)
state.admins.set(0, ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B)); // Admin 1
- state.admins.set(1, ID(_E, _Q, _M, _B, _B, _V, _Y, _G, _Z, _O, _F, _U, _I, _H, _E, _X, _F, _O, _X, _K, _T, _F, _T, _A, _N, _E, _K, _B, _X, _L, _B, _X, _H, _A, _Y, _D, _F, _F, _M, _R, _E, _E, _M, _R, _Q, _E, _V, _A, _D, _Y, _M, _M, _E, _W, _A, _C, _T, _O, _D, _D)); // Admin 2 (Manager)
- state.admins.set(2, ID(_H, _Y, _J, _X, _E, _Z, _S, _E, _C, _W, _S, _K, _O, _D, _J, _A, _L, _R, _C, _K, _S, _L, _K, _V, _Y, _U, _E, _B, _M, _A, _H, _D, _O, _D, _Y, _Z, _U, _J, _I, _I, _Y, _D, _P, _A, _G, _F, _K, _L, _M, _O, _T, _H, _T, _J, _X, _E, _B, _E, _W, _M)); // Admin 3 (User)
+ state.admins.set(1, ID(_E, _Q, _M, _B, _B, _V, _Y, _G, _Z, _O, _F, _U, _I, _H, _E, _X, _F, _O, _X, _K, _T, _F, _T, _A, _N, _E, _K, _B, _X, _L, _B, _X, _H, _A, _Y, _D, _F, _F, _M, _R, _E, _E, _M, _R, _Q, _E, _V, _A, _D, _Y, _M, _M, _E, _W, _A, _C)); // Admin 2 (Manager)
+ state.admins.set(2, ID(_H, _Y, _J, _X, _E, _Z, _S, _E, _C, _W, _S, _K, _O, _D, _J, _A, _L, _R, _C, _K, _S, _L, _K, _V, _Y, _U, _E, _B, _M, _A, _H, _D, _O, _D, _Y, _Z, _U, _J, _I, _I, _Y, _D, _P, _A, _G, _F, _K, _L, _M, _O, _T, _H, _T, _J, _X, _E)); // Admin 3 (User)
// Initialize remaining admin slots
for (locals.i = 3; locals.i < state.admins.capacity(); ++locals.i)
From 032f003840f45fc5d952d151f65a91220bf87bfc Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:00:49 +0200
Subject: [PATCH 147/297] use fresh local test txs pool for each test
---
test/pending_txs_pool.cpp | 117 ++++++++++++++++++++------------------
1 file changed, 62 insertions(+), 55 deletions(-)
diff --git a/test/pending_txs_pool.cpp b/test/pending_txs_pool.cpp
index 6778b6496..3892cff5e 100644
--- a/test/pending_txs_pool.cpp
+++ b/test/pending_txs_pool.cpp
@@ -72,69 +72,69 @@ class TestPendingTxsPool : public PendingTxsPool
return add(transaction);
}
-};
-TestPendingTxsPool pendingTxsPool;
+ unsigned int addTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
+ {
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
-unsigned int addTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
-{
- // use pseudo-random sequence
- std::mt19937_64 gen64(seed);
+ unsigned int numTransactionsAdded = 0;
- unsigned int numTransactionsAdded = 0;
+ // add transactions of tick
+ unsigned int transactionNum = gen64() % (maxTransactions + 1);
+ for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
+ {
+ unsigned int inputSize = gen64() % MAX_INPUT_SIZE;
+ long long amount = gen64() % MAX_AMOUNT;
+ m256i srcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
+ if (addTransaction(tick, amount, inputSize, /*dest=*/nullptr, &srcPublicKey))
+ numTransactionsAdded++;
+ }
+ checkStateConsistencyWithAssert();
- // add transactions of tick
- unsigned int transactionNum = gen64() % (maxTransactions + 1);
- for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
- {
- unsigned int inputSize = gen64() % MAX_INPUT_SIZE;
- long long amount = gen64() % MAX_AMOUNT;
- m256i srcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
- if (pendingTxsPool.addTransaction(tick, amount, inputSize, /*dest=*/nullptr, &srcPublicKey))
- numTransactionsAdded++;
+ return numTransactionsAdded;
}
- pendingTxsPool.checkStateConsistencyWithAssert();
-
- return numTransactionsAdded;
-}
-void checkTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
-{
- // use pseudo-random sequence
- std::mt19937_64 gen64(seed);
+ void checkTickTransactions(unsigned int tick, unsigned long long seed, unsigned int maxTransactions)
+ {
+ // use pseudo-random sequence
+ std::mt19937_64 gen64(seed);
- // check transactions of tick
- unsigned int transactionNum = gen64() % (maxTransactions + 1);
+ // check transactions of tick
+ unsigned int transactionNum = gen64() % (maxTransactions + 1);
- for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
- {
- unsigned int expectedInputSize = gen64() % MAX_INPUT_SIZE;
- long long expectedAmount = gen64() % MAX_AMOUNT;
- m256i expectedSrcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
+ for (unsigned int transaction = 0; transaction < transactionNum; ++transaction)
+ {
+ unsigned int expectedInputSize = gen64() % MAX_INPUT_SIZE;
+ long long expectedAmount = gen64() % MAX_AMOUNT;
+ m256i expectedSrcPublicKey = m256i{ 0, 0, 0, (gen64() % NUM_INITIALIZED_ENTITIES) + 1 };
- Transaction* tp = pendingTxsPool.getTx(tick, transaction);
+ Transaction* tp = getTx(tick, transaction);
- ASSERT_NE(tp, nullptr);
+ ASSERT_NE(tp, nullptr);
- EXPECT_TRUE(tp->checkValidity());
- EXPECT_EQ(tp->tick, tick);
- EXPECT_EQ(static_cast(tp->inputSize), expectedInputSize);
- EXPECT_EQ(tp->amount, expectedAmount);
- EXPECT_TRUE(tp->sourcePublicKey == expectedSrcPublicKey);
+ EXPECT_TRUE(tp->checkValidity());
+ EXPECT_EQ(tp->tick, tick);
+ EXPECT_EQ(static_cast(tp->inputSize), expectedInputSize);
+ EXPECT_EQ(tp->amount, expectedAmount);
+ EXPECT_TRUE(tp->sourcePublicKey == expectedSrcPublicKey);
- m256i* digest = pendingTxsPool.getDigest(tick, transaction);
+ m256i* digest = getDigest(tick, transaction);
- ASSERT_NE(digest, nullptr);
+ ASSERT_NE(digest, nullptr);
- m256i tpDigest;
- KangarooTwelve(tp, tp->totalSize(), &tpDigest, 32);
- EXPECT_EQ(*digest, tpDigest);
+ m256i tpDigest;
+ KangarooTwelve(tp, tp->totalSize(), &tpDigest, 32);
+ EXPECT_EQ(*digest, tpDigest);
+ }
}
-}
+};
TEST(TestPendingTxsPool, EpochTransition)
{
+ TestPendingTxsPool pendingTxsPool;
+
unsigned long long seed = 42;
// use pseudo-random sequence
@@ -176,11 +176,11 @@ TEST(TestPendingTxsPool, EpochTransition)
// add ticks transactions
for (int i = 0; i < firstEpochTicks; ++i)
- numAdded = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ numAdded = pendingTxsPool.addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
// check ticks transactions
for (int i = 0; i < firstEpochTicks; ++i)
- checkTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ pendingTxsPool.checkTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
pendingTxsPool.checkStateConsistencyWithAssert();
@@ -192,14 +192,14 @@ TEST(TestPendingTxsPool, EpochTransition)
// add ticks transactions
for (int i = 0; i < secondEpochTicks; ++i)
- numAdded = addTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
+ numAdded = pendingTxsPool.addTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
// check ticks transactions
for (int i = 0; i < secondEpochTicks; ++i)
- checkTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
+ pendingTxsPool.checkTickTransactions(secondEpochTick0 + i, secondEpochSeeds[i], maxTransactions);
// add a transaction for the next epoch
- numAdded = addTickTransactions(thirdEpochTick0 + 1, thirdEpochSeeds[1], maxTransactions);
+ numAdded = pendingTxsPool.addTickTransactions(thirdEpochTick0 + 1, thirdEpochSeeds[1], maxTransactions);
pendingTxsPool.checkStateConsistencyWithAssert();
@@ -211,14 +211,14 @@ TEST(TestPendingTxsPool, EpochTransition)
// add ticks transactions
for (int i = 2; i < thirdEpochTicks; ++i)
- numAdded = addTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
+ numAdded = pendingTxsPool.addTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
// check ticks transactions
for (int i = 1; i < thirdEpochTicks; ++i)
- checkTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
+ pendingTxsPool.checkTickTransactions(thirdEpochTick0 + i, thirdEpochSeeds[i], maxTransactions);
// add a transaction for the next epoch
- numAdded = addTickTransactions(fourthEpochTick0 + 1, /*seed=*/42, maxTransactions);
+ numAdded = pendingTxsPool.addTickTransactions(fourthEpochTick0 + 1, /*seed=*/42, maxTransactions);
pendingTxsPool.checkStateConsistencyWithAssert();
@@ -234,6 +234,7 @@ TEST(TestPendingTxsPool, EpochTransition)
TEST(TestPendingTxsPool, TotalNumberOfPendingTxs)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 1337;
// use pseudo-random sequence
@@ -262,7 +263,7 @@ TEST(TestPendingTxsPool, TotalNumberOfPendingTxs)
std::vector numPendingTransactions(firstEpochTicks, 0);
for (int i = firstEpochTicks - 1; i >= 0; --i)
{
- numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ numTransactionsAdded[i] = pendingTxsPool.addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
if (i > 0)
{
numPendingTransactions[i - 1] = numPendingTransactions[i] + numTransactionsAdded[i];
@@ -281,6 +282,7 @@ TEST(TestPendingTxsPool, TotalNumberOfPendingTxs)
TEST(TestPendingTxsPool, NumberOfPendingTickTxs)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 67534;
// use pseudo-random sequence
@@ -308,7 +310,7 @@ TEST(TestPendingTxsPool, NumberOfPendingTickTxs)
std::vector numTransactionsAdded(firstEpochTicks);
for (int i = firstEpochTicks - 1; i >= 0; --i)
{
- numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ numTransactionsAdded[i] = pendingTxsPool.addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
}
EXPECT_EQ(pendingTxsPool.getNumberOfPendingTickTxs(firstEpochTick0 - 1), 0);
@@ -323,6 +325,7 @@ TEST(TestPendingTxsPool, NumberOfPendingTickTxs)
TEST(TestPendingTxsPool, IncrementFirstStoredTick)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 84129;
// use pseudo-random sequence
@@ -351,7 +354,7 @@ TEST(TestPendingTxsPool, IncrementFirstStoredTick)
std::vector numPendingTransactions(firstEpochTicks, 0);
for (int i = firstEpochTicks - 1; i >= 0; --i)
{
- numTransactionsAdded[i] = addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
+ numTransactionsAdded[i] = pendingTxsPool.addTickTransactions(firstEpochTick0 + i, firstEpochSeeds[i], maxTransactions);
if (i > 0)
{
numPendingTransactions[i - 1] = numPendingTransactions[i] + numTransactionsAdded[i];
@@ -376,6 +379,7 @@ TEST(TestPendingTxsPool, IncrementFirstStoredTick)
TEST(TestPendingTxsPool, TxsPrioritizationMoreThanMaxTxs)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 9532;
// use pseudo-random sequence
@@ -418,6 +422,7 @@ TEST(TestPendingTxsPool, TxsPrioritizationMoreThanMaxTxs)
TEST(TestPendingTxsPool, TxsPrioritizationDuplicateTxs)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 9532;
// use pseudo-random sequence
@@ -457,6 +462,7 @@ TEST(TestPendingTxsPool, TxsPrioritizationDuplicateTxs)
TEST(TestPendingTxsPool, ProtocolLevelTxsMaxPriority)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 9532;
// use pseudo-random sequence
@@ -499,6 +505,7 @@ TEST(TestPendingTxsPool, ProtocolLevelTxsMaxPriority)
TEST(TestPendingTxsPool, TxsWithSrcBalance0AreRejected)
{
+ TestPendingTxsPool pendingTxsPool;
unsigned long long seed = 3452;
// use pseudo-random sequence
From 0d93ac98671b89147162ffe6c52f0f4416be0aa4 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 22 Oct 2025 11:31:03 +0200
Subject: [PATCH 148/297] update in admins
---
src/contracts/VottunBridge.h | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 2e9da12ea..d7c5b6353 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -185,6 +185,11 @@ struct VOTTUNBRIDGE : public ContractBase
Array firstOrders; // First 16 orders
uint64 totalOrdersFound; // How many non-empty orders exist
uint64 emptySlots;
+ // Multisig info
+ Array multisigAdmins; // List of multisig admins
+ uint8 numberOfAdmins; // Number of active admins
+ uint8 requiredApprovals; // Required approvals threshold
+ uint64 totalProposals; // Total number of active proposals
};
// Logger structures
@@ -1686,6 +1691,21 @@ struct VOTTUNBRIDGE : public ContractBase
output.totalOrdersFound++;
}
}
+
+ // Multisig info
+ output.multisigAdmins = state.admins;
+ output.numberOfAdmins = state.numberOfAdmins;
+ output.requiredApprovals = state.requiredApprovals;
+
+ // Count active proposals
+ output.totalProposals = 0;
+ for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
+ {
+ if (state.proposals.get(locals.i).active && state.proposals.get(locals.i).proposalId > 0)
+ {
+ output.totalProposals++;
+ }
+ }
}
// Called at the end of every tick to distribute earned fees
@@ -1763,7 +1783,7 @@ struct VOTTUNBRIDGE : public ContractBase
INITIALIZE_WITH_LOCALS()
{
- state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
+ //state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
//Initialize the wallet that receives fees (REPLACE WITH YOUR WALLET)
// state.feeRecipient = ID(_YOUR, _WALLET, _HERE, _PLACEHOLDER, _UNTIL, _YOU, _PUT, _THE, _REAL, _WALLET, _ADDRESS, _FROM, _VOTTUN, _TO, _RECEIVE, _THE, _BRIDGE, _FEES, _BETWEEN, _QUBIC, _AND, _ETHEREUM, _WITH, _HALF, _PERCENT, _COMMISSION, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
From 11e868f2b712c473116a3237e0b0e536c1598a77 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 22 Oct 2025 13:01:10 +0200
Subject: [PATCH 149/297] update in proposals arry
---
src/contracts/VottunBridge.h | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index d7c5b6353..d9d779747 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1779,6 +1779,7 @@ struct VOTTUNBRIDGE : public ContractBase
{
uint64 i;
BridgeOrder emptyOrder;
+ AdminProposal emptyProposal;
};
INITIALIZE_WITH_LOCALS()
@@ -1835,8 +1836,18 @@ struct VOTTUNBRIDGE : public ContractBase
state.admins.set(locals.i, NULL_ID);
}
- // Initialize proposals array
+ // Initialize proposals array properly (like orders array)
state.nextProposalId = 1;
- // Don't initialize proposals array - leave as default (all zeros)
+
+ locals.emptyProposal = {}; // Initialize all fields to 0
+ locals.emptyProposal.proposalId = 0;
+ locals.emptyProposal.active = false;
+ locals.emptyProposal.executed = false;
+ locals.emptyProposal.approvalsCount = 0;
+
+ for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
+ {
+ state.proposals.set(locals.i, locals.emptyProposal);
+ }
}
};
From 445c2377d926b3da7c930e5b9e73f44a7a20ef6c Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 22 Oct 2025 13:03:11 +0200
Subject: [PATCH 150/297] update
---
src/contracts/VottunBridge.h | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index d9d779747..41a63a6d5 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -1839,12 +1839,21 @@ struct VOTTUNBRIDGE : public ContractBase
// Initialize proposals array properly (like orders array)
state.nextProposalId = 1;
- locals.emptyProposal = {}; // Initialize all fields to 0
+ // Initialize emptyProposal fields explicitly (avoid memset)
locals.emptyProposal.proposalId = 0;
- locals.emptyProposal.active = false;
- locals.emptyProposal.executed = false;
+ locals.emptyProposal.proposalType = 0;
+ locals.emptyProposal.targetAddress = NULL_ID;
+ locals.emptyProposal.amount = 0;
locals.emptyProposal.approvalsCount = 0;
+ locals.emptyProposal.executed = false;
+ locals.emptyProposal.active = false;
+ // Initialize approvals array with NULL_ID
+ for (locals.i = 0; locals.i < locals.emptyProposal.approvals.capacity(); ++locals.i)
+ {
+ locals.emptyProposal.approvals.set(locals.i, NULL_ID);
+ }
+ // Set all proposal slots with the empty proposal
for (locals.i = 0; locals.i < state.proposals.capacity(); ++locals.i)
{
state.proposals.set(locals.i, locals.emptyProposal);
From c6b4945f8885464b28a4765d6e835965a3dc14ce Mon Sep 17 00:00:00 2001
From: sergimima
Date: Wed, 22 Oct 2025 22:00:35 +0200
Subject: [PATCH 151/297] epoch update
---
src/contract_core/contract_def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 4a8dd2706..5c19a8783 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -344,7 +344,7 @@ constexpr struct ContractDescription
{"QDRAW", 179, 10000, sizeof(QDRAW)}, // proposal in epoch 177, IPO in 178, construction and first use in 179
{"RL", 182, 10000, sizeof(RL)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
- {"VBRIDGE", 183, 10000, sizeof(VOTTUNBRIDGE)}, // Vottun Bridge - Qubic <-> EVM bridge with multisig admin
+ {"VBRIDGE", 184, 10000, sizeof(VOTTUNBRIDGE)}, // Vottun Bridge - Qubic <-> EVM bridge with multisig admin
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
{"TESTEXA", 138, 10000, sizeof(IPO)},
From c1fa662db9f30da0871969b59d2d2b3c5757377a Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Thu, 23 Oct 2025 12:30:37 +0200
Subject: [PATCH 152/297] remove now unused define
MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR
---
src/network_messages/common_def.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/network_messages/common_def.h b/src/network_messages/common_def.h
index 4627d922a..19667e5b8 100644
--- a/src/network_messages/common_def.h
+++ b/src/network_messages/common_def.h
@@ -2,7 +2,6 @@
#define SIGNATURE_SIZE 64
#define NUMBER_OF_TRANSACTIONS_PER_TICK 1024 // Must be 2^N
-#define MAX_NUMBER_OF_PENDING_TRANSACTIONS_PER_COMPUTOR 128
#define MAX_NUMBER_OF_CONTRACTS 1024 // Must be 1024
#define NUMBER_OF_COMPUTORS 676
#define QUORUM (NUMBER_OF_COMPUTORS * 2 / 3 + 1)
From 060d814d816670de415d22b59d926a2f13995a03 Mon Sep 17 00:00:00 2001
From: sergimima
Date: Fri, 24 Oct 2025 08:55:05 +0200
Subject: [PATCH 153/297] sc update
---
src/contracts/VottunBridge.h | 143 +++++++++++++----------------------
1 file changed, 52 insertions(+), 91 deletions(-)
diff --git a/src/contracts/VottunBridge.h b/src/contracts/VottunBridge.h
index 41a63a6d5..c8aba7cb8 100644
--- a/src/contracts/VottunBridge.h
+++ b/src/contracts/VottunBridge.h
@@ -37,16 +37,6 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 orderId;
};
- struct setAdmin_input
- {
- id address;
- };
-
- struct setAdmin_output
- {
- uint8 status;
- };
-
struct addManager_input
{
id address;
@@ -156,16 +146,6 @@ struct VOTTUNBRIDGE : public ContractBase
Array message;
};
- struct getAdminID_input
- {
- uint8 idInput;
- };
-
- struct getAdminID_output
- {
- id adminId;
- };
-
struct getContractInfo_input
{
// No parameters
@@ -173,7 +153,6 @@ struct VOTTUNBRIDGE : public ContractBase
struct getContractInfo_output
{
- id admin;
Array managers;
uint64 nextOrderId;
uint64 lockedTokens;
@@ -268,8 +247,9 @@ struct VOTTUNBRIDGE : public ContractBase
{
uint64 proposalId;
uint8 proposalType; // Type from ProposalType enum
- id targetAddress; // For setAdmin/addManager/removeManager
- uint64 amount; // For withdrawFees
+ id targetAddress; // For setAdmin/addManager/removeManager (new admin address)
+ id oldAddress; // For setAdmin: which admin to replace
+ uint64 amount; // For withdrawFees or changeThreshold
Array approvals; // Array of owner IDs who approved
uint8 approvalsCount; // Count of approvals
bit executed; // Whether proposal was executed
@@ -279,7 +259,6 @@ struct VOTTUNBRIDGE : public ContractBase
public:
// Contract State
Array orders;
- id admin; // Primary admin address (deprecated, kept for compatibility)
id feeRecipient; // Specific wallet to receive fees
Array managers; // Managers list
uint64 nextOrderId; // Counter for order IDs
@@ -300,14 +279,6 @@ struct VOTTUNBRIDGE : public ContractBase
uint64 nextProposalId; // Counter for proposal IDs
// Internal methods for admin/manager permissions
- typedef id isAdmin_input;
- typedef bit isAdmin_output;
-
- PRIVATE_FUNCTION(isAdmin)
- {
- output = (qpi.invocator() == state.admin);
- }
-
typedef id isManager_input;
typedef bit isManager_output;
@@ -579,8 +550,9 @@ struct VOTTUNBRIDGE : public ContractBase
struct createProposal_input
{
uint8 proposalType; // Type of proposal
- id targetAddress; // Target address (for setAdmin/addManager/removeManager)
- uint64 amount; // Amount (for withdrawFees)
+ id targetAddress; // Target address (new admin/manager address)
+ id oldAddress; // Old address (for setAdmin: which admin to replace)
+ uint64 amount; // Amount (for withdrawFees or changeThreshold)
};
struct createProposal_output
@@ -621,6 +593,7 @@ struct VOTTUNBRIDGE : public ContractBase
bit isMultisigAdminResult;
uint64 proposalIndex;
uint64 availableFees;
+ bit adminAdded;
};
// Get proposal structures
@@ -701,6 +674,7 @@ struct VOTTUNBRIDGE : public ContractBase
locals.newProposal.proposalId = state.nextProposalId++;
locals.newProposal.proposalType = input.proposalType;
locals.newProposal.targetAddress = input.targetAddress;
+ locals.newProposal.oldAddress = input.oldAddress;
locals.newProposal.amount = input.amount;
locals.newProposal.approvalsCount = 1; // Creator automatically approves
locals.newProposal.executed = false;
@@ -821,13 +795,26 @@ struct VOTTUNBRIDGE : public ContractBase
// Execute the proposal based on type
if (locals.proposal.proposalType == PROPOSAL_SET_ADMIN)
{
- state.admin = locals.proposal.targetAddress;
- locals.adminLog = AddressChangeLogger{
- locals.proposal.targetAddress,
- CONTRACT_INDEX,
- 1, // Admin changed
- 0 };
- LOG_INFO(locals.adminLog);
+ // Replace existing admin with new admin (max 3 admins: 2 of 3 multisig)
+ // oldAddress specifies which admin to replace
+ locals.adminAdded = false;
+ for (locals.i = 0; locals.i < state.admins.capacity(); ++locals.i)
+ {
+ if (state.admins.get(locals.i) == locals.proposal.oldAddress)
+ {
+ // Replace the old admin with the new one
+ state.admins.set(locals.i, locals.proposal.targetAddress);
+ locals.adminAdded = true;
+ locals.adminLog = AddressChangeLogger{
+ locals.proposal.targetAddress,
+ CONTRACT_INDEX,
+ 1, // Admin changed
+ 0 };
+ LOG_INFO(locals.adminLog);
+ break;
+ }
+ }
+ // numberOfAdmins stays the same (we're replacing, not adding)
}
else if (locals.proposal.proposalType == PROPOSAL_ADD_MANAGER)
{
@@ -923,27 +910,7 @@ struct VOTTUNBRIDGE : public ContractBase
output.status = EthBridgeError::proposalNotFound;
}
- // Admin Functions
- struct setAdmin_locals
- {
- EthBridgeLogger log;
- AddressChangeLogger adminLog;
- };
-
- PUBLIC_PROCEDURE_WITH_LOCALS(setAdmin)
- {
- // DEPRECATED: Use createProposal/approveProposal with PROPOSAL_SET_ADMIN instead
- locals.log = EthBridgeLogger{
- CONTRACT_INDEX,
- EthBridgeError::notAuthorized,
- 0,
- 0,
- 0 };
- LOG_INFO(locals.log);
- output.status = EthBridgeError::notAuthorized;
- return;
- }
-
+ // Admin Functions (now deprecated - use multisig proposals)
struct addManager_locals
{
EthBridgeLogger log;
@@ -1472,10 +1439,6 @@ struct VOTTUNBRIDGE : public ContractBase
return;
}
- PUBLIC_FUNCTION(getAdminID)
- {
- output.adminId = state.admin;
- }
PUBLIC_FUNCTION_WITH_LOCALS(getTotalLockedTokens)
{
@@ -1582,18 +1545,22 @@ struct VOTTUNBRIDGE : public ContractBase
EthBridgeLogger log;
id invocatorAddress;
bit isManagerOperating;
+ bit isMultisigAdminResult;
uint64 depositAmount;
};
- // Add liquidity to the bridge (for managers to provide initial/additional liquidity)
+ // Add liquidity to the bridge (for managers or multisig admins to provide initial/additional liquidity)
PUBLIC_PROCEDURE_WITH_LOCALS(addLiquidity)
{
locals.invocatorAddress = qpi.invocator();
locals.isManagerOperating = false;
CALL(isManager, locals.invocatorAddress, locals.isManagerOperating);
- // Verify that the invocator is a manager or admin
- if (!locals.isManagerOperating && locals.invocatorAddress != state.admin)
+ locals.isMultisigAdminResult = false;
+ CALL(isMultisigAdmin, locals.invocatorAddress, locals.isMultisigAdminResult);
+
+ // Verify that the invocator is a manager or multisig admin
+ if (!locals.isManagerOperating && !locals.isMultisigAdminResult)
{
locals.log = EthBridgeLogger{
CONTRACT_INDEX,
@@ -1661,7 +1628,6 @@ struct VOTTUNBRIDGE : public ContractBase
PUBLIC_FUNCTION_WITH_LOCALS(getContractInfo)
{
- output.admin = state.admin;
output.managers = state.managers;
output.nextOrderId = state.nextOrderId;
output.lockedTokens = state.lockedTokens;
@@ -1751,27 +1717,24 @@ struct VOTTUNBRIDGE : public ContractBase
REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
{
REGISTER_USER_FUNCTION(getOrder, 1);
- REGISTER_USER_FUNCTION(isAdmin, 2);
- REGISTER_USER_FUNCTION(isManager, 3);
- REGISTER_USER_FUNCTION(getTotalReceivedTokens, 4);
- REGISTER_USER_FUNCTION(getAdminID, 5);
- REGISTER_USER_FUNCTION(getTotalLockedTokens, 6);
- REGISTER_USER_FUNCTION(getOrderByDetails, 7);
- REGISTER_USER_FUNCTION(getContractInfo, 8);
- REGISTER_USER_FUNCTION(getAvailableFees, 9);
- REGISTER_USER_FUNCTION(getProposal, 10); // New multisig function
+ REGISTER_USER_FUNCTION(isManager, 2);
+ REGISTER_USER_FUNCTION(getTotalReceivedTokens, 3);
+ REGISTER_USER_FUNCTION(getTotalLockedTokens, 4);
+ REGISTER_USER_FUNCTION(getOrderByDetails, 5);
+ REGISTER_USER_FUNCTION(getContractInfo, 6);
+ REGISTER_USER_FUNCTION(getAvailableFees, 7);
+ REGISTER_USER_FUNCTION(getProposal, 8);
REGISTER_USER_PROCEDURE(createOrder, 1);
- REGISTER_USER_PROCEDURE(setAdmin, 2);
- REGISTER_USER_PROCEDURE(addManager, 3);
- REGISTER_USER_PROCEDURE(removeManager, 4);
- REGISTER_USER_PROCEDURE(completeOrder, 5);
- REGISTER_USER_PROCEDURE(refundOrder, 6);
- REGISTER_USER_PROCEDURE(transferToContract, 7);
- REGISTER_USER_PROCEDURE(withdrawFees, 8);
- REGISTER_USER_PROCEDURE(addLiquidity, 9);
- REGISTER_USER_PROCEDURE(createProposal, 10); // New multisig procedure
- REGISTER_USER_PROCEDURE(approveProposal, 11); // New multisig procedure
+ REGISTER_USER_PROCEDURE(addManager, 2);
+ REGISTER_USER_PROCEDURE(removeManager, 3);
+ REGISTER_USER_PROCEDURE(completeOrder, 4);
+ REGISTER_USER_PROCEDURE(refundOrder, 5);
+ REGISTER_USER_PROCEDURE(transferToContract, 6);
+ REGISTER_USER_PROCEDURE(withdrawFees, 7);
+ REGISTER_USER_PROCEDURE(addLiquidity, 8);
+ REGISTER_USER_PROCEDURE(createProposal, 9);
+ REGISTER_USER_PROCEDURE(approveProposal, 10);
}
// Initialize the contract with SECURE ADMIN CONFIGURATION
@@ -1784,8 +1747,6 @@ struct VOTTUNBRIDGE : public ContractBase
INITIALIZE_WITH_LOCALS()
{
- //state.admin = ID(_X, _A, _B, _E, _F, _A, _B, _I, _H, _W, _R, _W, _B, _A, _I, _J, _Q, _J, _P, _W, _T, _I, _I, _Q, _B, _U, _C, _B, _H, _B, _V, _W, _Y, _Y, _G, _F, _F, _J, _A, _D, _Q, _B, _K, _W, _F, _B, _O, _R, _R, _V, _X, _W, _S, _C, _V, _B);
-
//Initialize the wallet that receives fees (REPLACE WITH YOUR WALLET)
// state.feeRecipient = ID(_YOUR, _WALLET, _HERE, _PLACEHOLDER, _UNTIL, _YOU, _PUT, _THE, _REAL, _WALLET, _ADDRESS, _FROM, _VOTTUN, _TO, _RECEIVE, _THE, _BRIDGE, _FEES, _BETWEEN, _QUBIC, _AND, _ETHEREUM, _WITH, _HALF, _PERCENT, _COMMISSION, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V);
From 05265f58effb2fa5c83db18a57db998e3c553f49 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Fri, 24 Oct 2025 10:22:21 +0200
Subject: [PATCH 154/297] Update contract-verify for shareholder voting
---
.github/workflows/contract-verify.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/contract-verify.yml b/.github/workflows/contract-verify.yml
index bbb8089b9..d811191ab 100644
--- a/.github/workflows/contract-verify.yml
+++ b/.github/workflows/contract-verify.yml
@@ -39,6 +39,6 @@ jobs:
echo "contract-filepaths=$files" >> "$GITHUB_OUTPUT"
- name: Contract verify action step
id: verify
- uses: Franziska-Mueller/qubic-contract-verify@v1.0.0
+ uses: Franziska-Mueller/qubic-contract-verify@v1.0.1
with:
filepaths: '${{ steps.filepaths.outputs.contract-filepaths }}'
From 20a61689cc711b875c2f4f7675b75909a80c6514 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 27 Oct 2025 15:01:07 +0100
Subject: [PATCH 155/297] fix missing contract shares (#591)
* distribute missing contract shares to contract itself
* list contracts with missing shares explicitly
---
src/qubic.cpp | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index ad90daf86..c660aaca9 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -5522,6 +5522,26 @@ static bool initialize()
}
}
+ // fix missing contract shares
+ unsigned int contractIndicesWithMissingShares[3] = {
+ 6, // GQMPROP
+ 7, // SWATCH
+ 8, // CCF
+ };
+ for (unsigned int i = 0; i < 3; ++i)
+ {
+ unsigned int contractIndex = contractIndicesWithMissingShares[i];
+ // query number of shares in universe
+ long long numShares = numberOfShares({ m256i::zero(), *(uint64*)contractDescriptions[contractIndex].assetName });
+ if (numShares < NUMBER_OF_COMPUTORS)
+ {
+ // issue missing shares and give them to contract itself
+ int issuanceIndex, ownershipIndex, possessionIndex, dstOwnershipIndex, dstPossessionIndex;
+ issueAsset(m256i::zero(), (char*)contractDescriptions[contractIndex].assetName, 0, CONTRACT_ASSET_UNIT_OF_MEASUREMENT, NUMBER_OF_COMPUTORS - numShares, QX_CONTRACT_INDEX, &issuanceIndex, &ownershipIndex, &possessionIndex);
+ transferShareOwnershipAndPossession(ownershipIndex, possessionIndex, m256i{ contractIndex, 0ULL, 0ULL, 0ULL }, NUMBER_OF_COMPUTORS - numShares, &dstOwnershipIndex, &dstPossessionIndex, /*lock=*/true);
+ }
+ }
+
return true;
}
From 1ca0fa899af0000c7b3a9e1a9667181ad78c08c0 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Mon, 27 Oct 2025 15:29:44 +0100
Subject: [PATCH 156/297] update params for epoch 185 / v1.266.0
---
src/public_settings.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index f3f7b565b..82a8ef777 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -64,12 +64,12 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// Config options that should NOT be changed by operators
#define VERSION_A 1
-#define VERSION_B 265
+#define VERSION_B 266
#define VERSION_C 0
// Epoch and initial tick for node startup
-#define EPOCH 184
-#define TICK 35340000
+#define EPOCH 185
+#define TICK 35891000
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From dbb1d786b48d400157acb92a60a5ef8ded3a0b1e Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Wed, 29 Oct 2025 13:21:08 +0100
Subject: [PATCH 157/297] update params for epoch 185 / v1.265.1
---
src/public_settings.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/public_settings.h b/src/public_settings.h
index f3f7b565b..cae087151 100644
--- a/src/public_settings.h
+++ b/src/public_settings.h
@@ -55,7 +55,7 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
// If this flag is 1, it indicates that the whole network (all 676 IDs) will start from scratch and agree that the very first tick time will be set at (2022-04-13 Wed 12:00:00.000UTC).
// If this flag is 0, the node will try to fetch data of the initial tick of the epoch from other nodes, because the tick's timestamp may differ from (2022-04-13 Wed 12:00:00.000UTC).
// If you restart your node after seamless epoch transition, make sure EPOCH and TICK are set correctly for the currently running epoch.
-#define START_NETWORK_FROM_SCRATCH 1
+#define START_NETWORK_FROM_SCRATCH 0
// Addons: If you don't know it, leave it 0.
#define ADDON_TX_STATUS_REQUEST 0
@@ -65,11 +65,11 @@ static_assert(AUTO_FORCE_NEXT_TICK_THRESHOLD* TARGET_TICK_DURATION >= PEER_REFRE
#define VERSION_A 1
#define VERSION_B 265
-#define VERSION_C 0
+#define VERSION_C 1
// Epoch and initial tick for node startup
-#define EPOCH 184
-#define TICK 35340000
+#define EPOCH 185
+#define TICK 35871563
#define TICK_IS_FIRST_TICK_OF_EPOCH 1 // Set to 0 if the network is restarted during the EPOCH with a new initial TICK
#define ARBITRATOR "AFZPUAIYVPNUYGJRQVLUKOPPVLHAZQTGLYAAUUNBXFTVTAMSBKQBLEIEPCVJ"
From 429909392c605661eb7a47d6d5b222cafff0c480 Mon Sep 17 00:00:00 2001
From: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:36:44 +0100
Subject: [PATCH 158/297] fix pendingTxsPool after loading from files
---
src/qubic.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/qubic.cpp b/src/qubic.cpp
index ad90daf86..c0349cc89 100644
--- a/src/qubic.cpp
+++ b/src/qubic.cpp
@@ -5289,7 +5289,7 @@ static bool initialize()
lastExpectedTickTransactionDigest = m256i::zero();
- //Init custom mining data. Reset function will be called in beginEpoch()
+ // Init custom mining data. Reset function will be called in beginEpoch()
customMiningInitialize();
beginEpoch();
@@ -5299,6 +5299,9 @@ static bool initialize()
#if TICK_STORAGE_AUTOSAVE_MODE
bool canLoadFromFile = loadAllNodeStates();
+
+ // loading might have changed system.tick, so restart pendingTxsPool
+ pendingTxsPool.beginEpoch(system.tick);
#else
bool canLoadFromFile = false;
#endif
From 9540a9def93f67a3ee4bc3326ea7618b266e93b7 Mon Sep 17 00:00:00 2001
From: Philipp Werner <22914157+philippwerner@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:04:15 +0100
Subject: [PATCH 159/297] Shareholder voting QPI (#441)
* Change order of asset iteration towards ascending
The asset index lists now are rebuild in a way that makes asset
iteration approximately ascending order (in public keys). The index
lists are rebuilt at the beginning / end of the epoch, leading to the
best sortedness. During the epoch, with increasing number of changes in
the universe, asset iteration will get less sorted.
Features needing full sorting of public keys of assets (such as
shareholder proposals can benefit from getting an approximately ordered
list by requiring less sorting operations (e.g. when using insertion
sort).
* Implement ProposalAndVotingByShareholders trait class
... including tests.
* Support multiple-variable proposal type
* Add memset-zero feature to __scratchpad()
* Fix spectrum cleanup for fixing tests
* Add gtest error checking for state size in contractDescriptions
* Add error indicator to proposal getter structs
Provide additional way for error checking. This enables to return output
structs wihtout an additional okay field.
* Refactor: rename total vote counts in voting summary
This makes sense, because within shareholder voting, a voter may have
multiple votes to cast (depending on the number of shares owned by the
shareholder).
* Add missing assignment operators / copy constructors
* Shareholder proposals: support multi-vote per voter
A contract shareholder has one vote per share. Before this commit, he
only could cast all his votes for one option. After this commit, he can
distribute his votes to multiple options, for example, for reflecting
the voting results of a community.
* Add QPI-level tests of multi-vote / shareholder proposals
* Fix bugs, simplify, cleanup (new voting code)
* Add shareholder voting to contract TESTEXA
* Add contract callbacks SET_SHAREHOLDER_PROPOSAL/VOTES
* Add qpi.setShareholder*() + tests
A contact can vote as a shareholder of another contact now.
* Simplify code for MultiVariables proposals
Remove proposal.multiVariablesOptions.dataRefIdx and use proposalIndex
instead to reference data in separate multi-variable storage array.
Requires to use same number as proposal slot count and size of multi-var
data array.
* Fix compiler error in UEFI build
* Simplify checking of proposal acceptance
* Fix build errors
* QPI: add macros for implementing shareholder voting easily
* Add shareholder voting tests in TESTEXB
* QUTIL: shareholder voting / changeable fees
* Refactor: voter index -> vote index
Better naming with supporting shareholders has voters, who may have
multiple votes (one per owned share).
* Update contract-verify for shareholder voting
* QUTIL: init of shareholder proposal fee
* Fix typos
* DEFINE_SHAREHOLDER_PROPOSAL_STORAGE visbility of class members
* Add docs about proposal voting
* Fix failure to clear proposal in QUTIL
* Rewrite QUTIL::GetPollFees to return all fees
* Fix proposal removal in TESTEXA and TESTEXB
* QUTIL: only init fees at beginning pf epoch 186
* Fix typos
---------
Co-authored-by: Franziska Mueller <11660876+Franziska-Mueller@users.noreply.github.com>
---
README.md | 3 +-
doc/contracts.md | 17 +
doc/contracts_proposals.md | 702 ++++++++++++++
src/Qubic.vcxproj | 1 +
src/Qubic.vcxproj.filters | 3 +
src/assets/assets.h | 2 +-
src/common_buffers.h | 6 +-
src/contract_core/contract_def.h | 67 +-
src/contract_core/contract_exec.h | 84 +-
src/contract_core/pre_qpi_def.h | 60 ++
src/contract_core/qpi_collection_impl.h | 3 +-
src/contract_core/qpi_hash_map_impl.h | 6 +-
src/contract_core/qpi_proposal_voting.h | 607 ++++++++++--
src/contract_core/qpi_trivial_impl.h | 20 +
src/contracts/ComputorControlledFund.h | 4 +-
src/contracts/GeneralQuorumProposal.h | 4 +-
src/contracts/QUtil.h | 133 ++-
src/contracts/TestExampleA.h | 388 +++++++-
src/contracts/TestExampleB.h | 226 ++++-
src/contracts/qpi.h | 388 +++++++-
src/spectrum/spectrum.h | 2 +
test/contract_testex.cpp | 725 ++++++++++++++-
test/contract_testing.h | 13 +-
test/qpi.cpp | 1134 +++++++++++++++++++++--
test/qpi_collection.cpp | 9 +-
test/qpi_hash_map.cpp | 9 +-
26 files changed, 4295 insertions(+), 321 deletions(-)
create mode 100644 doc/contracts_proposals.md
create mode 100644 src/contract_core/pre_qpi_def.h
diff --git a/README.md b/README.md
index 168fd9060..f812caf69 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,8 @@ We cannot support you in any case. You are welcome to provide updates, bug fixes
## More Documentation
- [How to contribute](doc/contributing.md)
-- [Developing a smart contract ](doc/contracts.md)
+- [Developing a smart contract](doc/contracts.md)
- [Qubic protocol](doc/protocol.md)
- [Custom mining](doc/custom_mining.md)
- [Seamless epoch transition](SEAMLESS.md)
+- [Proposals and voting](doc/contracts_proposals.md)
diff --git a/doc/contracts.md b/doc/contracts.md
index dbf3290c1..3757bd8f1 100644
--- a/doc/contracts.md
+++ b/doc/contracts.md
@@ -243,9 +243,12 @@ They are defined with the following macros:
8. `POST_RELEASE_SHARES()`: Called after asset management rights were transferred from this contract to another contract that called `qpi.acquireShare()`
9. `POST_ACQUIRE_SHARES()`: Called after asset management rights were transferred to this contract from another contract that called `qpi.releaseShare()`.
10. `POST_INCOMING_TRANSFER()`: Called after QUs have been transferred to this contract. [More details...](#callback-post_incoming_transfer)
+11. `SET_SHAREHOLDER_PROPOSAL()`: Called if another contracts tries to set a shareholder proposal in this contract by calling `qpi.setShareholderProposal()`.
+12. `SET_SHAREHOLDER_VOTES()`: Called if another contracts tries to set a shareholder proposal in this contract by calling `qpi.setShareholderVotes()`.
System procedures 1 to 5 have no input and output.
The input and output of system procedures 6 to 9 are discussed in the section about [management rights transfer](#management-rights-transfer).
+The system procedure 11 and 12 are discussed in the section about [contracts as shareholder of other contracts](contracts_proposals.md#contracts-as-shareholders-of-other-contracts)
The contract state is passed to each of the procedures as a reference named `state`.
And it can be modified (in contrast to contract functions).
@@ -295,6 +298,10 @@ QX rejects all attempts (`qpi.acquireShares()`) of other contracts to acquire ri
TODO
+In the universe, NULL_ID is only used for owner / possessor for temporary entries during the IPO between issuing a contract asset and transferring the ownership/possession.
+Further, NULL_ID is used for burning asset shares by transferring ownership / possession to NULL_ID.
+
+
### Management rights transfer
There are two ways of transferring asset management rights:
@@ -546,6 +553,16 @@ That is, calls to these QPI procedures will fail to prevent nested callbacks.
If you invoke a user procedure from the callback, the fee / invocation reward cannot be transferred.
In consequence, the procedure is executed but with `qpi.invocationReward() == 0`.
+### Proposals and voting
+
+Proposals and voting are the on-chain way of decision-making, implemented in contracts.
+The function, macros, and data structures provided by the QPI for implementing proposal voting in smart contracts are quite complex.
+That is why they are described in a [separate document](contracts_proposals.md).
+
+CFB has an alternative idea for proposal-free voting on shareholder variables that is supposed to be used in the contracts QX, RANDOM, and MLM.
+It has not been implemented yet.
+https://github.com/qubic/core/issues/574
+
## Restrictions of C++ Language Features
diff --git a/doc/contracts_proposals.md b/doc/contracts_proposals.md
new file mode 100644
index 000000000..db3628397
--- /dev/null
+++ b/doc/contracts_proposals.md
@@ -0,0 +1,702 @@
+# Proposal voting
+
+Proposal voting is the the on-chain way of decision-making.
+It is implemented in smart contracts with support of the QPI.
+
+There are some general characteristics of the proposal voting:
+
+- Proposal voting is implemented in smart contracts.
+- A new proposal is open for voting until the end of the epoch. After the epoch transition, it changes its state from active to finished.
+- Each proposal has a type and some types of proposals commonly trigger action (such as setting a contract state variable or transferring QUs to another entity) after the end of the epoch if the proposal is accepted by getting enough votes.
+- The proposer entity can have at most one proposal at a time. Setting a new proposal with the same seed will overwrite the previous one.
+- Number of simultaneous proposals per epoch is limited as configured by the contract. The data structures storing the proposal and voting state are stored as a part of the contract state.
+- In this data storage, commonly named `state.proposals`, and the function/procedure interface, each proposal is identified by a proposal index.
+- The types of proposals that are allowed are restricted as configured by the contract.
+- The common types of proposals have a predefined set of options that the voters can vote for. Option 0 is always "no change".
+- Each vote, which is connected to each voter entity, can have a value (most commonly an option index) or `NO_VOTE_VALUE` (which means abstaining).
+- The entities that are allowed to create/change/cancel proposals are configured by the contract dev. The same applies to the entities that are allowed to vote. Checking eligibility is done by the proposal QPI functions provided.
+- The common rule for accepting a proposal option (the one with most votes) is that at least 2/3 of the eligible votes have been casted and that at least the option gets more than 1/3 of the eligible votes.
+- Depending on the required features, different data structures can be used. The most lightweight option (in terms of storage, compute, and network bandwidth) is supporting yes/no proposals only (2 options).
+
+In the following, we first address the application that is most relevant for contract devs, which is shareholder voting about state variables, such as fees.
+
+1. [Introduction to Shareholder Proposals](#introduction-to-shareholder-proposals)
+2. [Understanding Shareholder Proposal Voting Implementation](#understanding-shareholder-proposal-voting-implementation)
+3. [Voting by Computors](#voting-by-computors)
+4. [Proposal Types](#proposal-types)
+
+
+## Introduction to Shareholder Proposals
+
+The entities possessing the 676 shares of the contract (initially sold in the IPO) are the contract shareholders.
+Typically, they get dividends from the contract revenues and decide about contract-related topics via voting.
+
+The most relevant use case of voting is changing state variables that control the behavior of the contract. For example:
+
+- how many QUs need to be paid as fees for using the contract procedures,
+- how much of the revenue is paid as dividends to the shareholders,
+- how much of the revenue is burned.
+
+Next to the general characteristics described in the section above, shareholder voting has the following features:
+
+- Only contract shareholders can propose and vote.
+- There is one vote per share, so one shareholder can have multiple votes.
+- A shareholder can distribute their votes to multiple vote values.
+- Shares can be sold during the epoch. The right to vote in an active proposal isn't sold with the share, but the right to vote is fixed to the entities possessing the share in the moment of creating/changing the proposal.
+- Contracts can be shareholders of other contracts. For that case, there are special requirements to facilitate voting and creating proposals discussed [here](#contracts-as-shareholders-of-other-contracts).
+- Standardized interface to reuse existing tools for shareholder voting in new contracts.
+- Macros for implementing the most common use cases as easily as possible.
+
+
+### The easiest way to support shareholder voting
+
+The following shows how to easily implement the default shareholder proposal voting in your contract.
+
+Features:
+
+- Yes/no proposals for changing a single state variable per proposal,
+- Usual checking that the invocator has the right to propose / vote and that the proposal data is valid,
+- Check that proposed variable values are not negative (default use case: invocation fees),
+- Check that index of variable in proposal is less than number of variables configured by contract dev,
+- Allow charging fee for creating/changing/canceling proposal in order to avoid spam (fee is burned),
+- Compatible with shareholder proposal voting interface already implemented in qubic-cli
+
+If you need more than these features, go through the following steps anyway and continue reading the section about understanding the shareholder voting implementation.
+
+#### 1. Setup proposal storage
+
+First, you need to add the proposal storage to your contract state.
+You can easily do this using the QPI macro `DEFINE_SHAREHOLDER_PROPOSAL_STORAGE(numProposalSlots, assetName)`.
+With the yes/no shareholder proposals supported by this macro, each proposal slot occupies 22144 Bytes of state memory.
+The number of proposal slots limits how many proposals can be open for voting simultaneously.
+The `assetName` that you have to pass as the second argument is the `uint64` representation of your contract's 7-character asset name.
+
+You can get the `assetName` by running the following code in any contract test code (such as "test/contract_qutil.cpp"):
+
+```C++
+std::cout << assetNameFromString("QUTIL") << std::endl;
+```
+
+Replace "QUTIL" by your contract's asset name as given in `contractDescriptions` in `src/contact_core/contract_def.h`.
+You will get an integer that we recommend to assign to a `constexpr uint64` with a name following the scheme `QUTIL_CONTRACT_ASSET_NAME`.
+
+When you have decided about the number of proposal slots and found out the the asset name, you can define the proposal storage similarly to this example taken from the contract QUTIL:
+
+```C++
+struct QUTIL
+{
+ // other state variables ...
+
+ DEFINE_SHAREHOLDER_PROPOSAL_STORAGE(8, QUTIL_CONTRACT_ASSET_NAME);
+
+ // ...
+};
+```
+
+`DEFINE_SHAREHOLDER_PROPOSAL_STORAGE` defines a state object `state.proposals` and the types `ProposalDataT`, `ProposersAndVotersT`, and `ProposalVotingT`.
+Make sure to have no name clashes with these.
+Using other names isn't possible if you want to benefit from the QPI macros for simplifying the implementation.
+
+
+#### 2. Implement code for updating state variables
+
+After voting in a proposal is closed, the results need to be checked and state variables may need to be updated.
+This typically happens in the system procedure `END_EPOCH`.
+
+In order to simplify the implementation of the default case, we provide a QPI macro for implementing a procedure `FinalizeShareholderStateVarProposals()` that you can call from `END_EPOCH`.
+
+The macro `IMPLEMENT_FinalizeShareholderStateVarProposals()` can be used as follow:
+
+```C++
+struct QUTIL
+{
+ // ...
+
+ IMPLEMENT_FinalizeShareholderStateVarProposals()
+ {
+ // When you call FinalizeShareholderStateVarProposals(), the following code is run for each
+ // proposal of the current epoch that has been accepted.
+ //
+ // Your code should set the state variable that the proposal is about to the accepted value.
+ // This can be done as in this example taken from QUTIL:
+
+ switch (input.proposal.variableOptions.variable)
+ {
+ case 0:
+ state.smt1InvocationFee = input.acceptedValue;
+ break;
+ case 1:
+ state.pollCreationFee = input.acceptedValue;
+ break;
+ case 2:
+ state.pollVoteFee = input.acceptedValue;
+ break;
+ case 3:
+ state.distributeQuToShareholderFeePerShareholder = input.acceptedValue;
+ break;
+ case 4:
+ state.shareholderProposalFee = input.acceptedValue;
+ break;
+ }
+ }
+
+ // ...
+}
+```
+
+The next step is to call `FinalizeShareholderStateVarProposals()` in `END_EPOCH`, in order to make sure the state variables are changed after a proposal has been accepted.
+
+```C++
+ END_EPOCH()
+ {
+ // ...
+ CALL(FinalizeShareholderStateVarProposals, input, output);
+ // ...
+ }
+```
+
+Note that `input` and `output` are instances of `NoData` passed to `END_EPOCH` (due to the requirements of the generalized contract procedure/function interface).
+`FinalizeShareholderStateVarProposals` also has `NoData` as input and output, so the variables `input` and `output` available in `END_EPOCH` can be used instead of adding empty locals.
+
+
+#### 3. Add default implementation of required procedures and functions
+
+The required procedures and functions of the standardized shareholder proposal voting interface can be implemented with the macro:
+`IMPLEMENT_DEFAULT_SHAREHOLDER_PROPOSAL_VOTING(numFeeStateVariables, setProposalFeeVarOrValue)`.
+
+As `numFeeStateVariables`, pass the number of non-negative state variables (5 in the QUTIL example).
+
+`setProposalFeeVarOrValue` is the fee to be payed for adding/changing/canceling a shareholder proposal. Here you may pass as a state variable or a constant value.
+
+The macro can be used as follows (example from QUTIL):
+
+```C++
+struct QUTIL
+{
+ // ...
+
+ IMPLEMENT_DEFAULT_SHAREHOLDER_PROPOSAL_VOTING(5, state.shareholderProposalFee)
+
+ // ...
+}
+```
+
+#### 4. Register required procedures and functions
+
+Finally, the required procedures and functions of the standardized shareholder proposal voting interface can be registered with the macro
+`REGISTER_SHAREHOLDER_PROPOSAL_VOTING()` in `REGISTER_USER_FUNCTIONS_AND_PROCEDURES()`. Example:
+
+```C++
+ REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
+ {
+ // ...
+
+ REGISTER_SHAREHOLDER_PROPOSAL_VOTING();
+ }
+```
+
+Please note that `REGISTER_SHAREHOLDER_PROPOSAL_VOTING()` registers the following input types:
+
+- user functions 65531 - 65535 via `REGISTER_USER_FUNCTION`
+- user procedures 65534 - 65535 via `REGISTER_USER_PROCEDURE`
+
+So make sure that your contract does not use these input types for other functions or procedures.
+
+#### 5. Test with qubic-cli
+
+After following the steps above, your contract is ready for changing fees and similar state variables via shareholder proposal voting.
+When you run the node with your contract, you may test the voting with [qubic-cli](https://github.com/qubic/qubic-cli).
+
+In order to enable it, you need to add your contract to the array `shareholderProposalSupportPerContract` in `proposals.cpp` (with the type `DefaultYesNoSingleVarShareholderProposalSupported`).
+Now you should be able to use `-setshareholderproposal` and the other commands with your contract.
+
+Optionally, if you want to use your contract name as ContractIndex when running qubic-cli, you may add it to `getContractIndex()` in `argparser.h`.
+
+
+## Understanding Shareholder Proposal Voting Implementation
+
+In the section above, several macros have been used to easily implement a shareholder voting system that should suit the needs of many contracts.
+If you require additional features, continue reading in order to learn how to get them.
+
+### Required procedures, functions, types, and data
+
+The following elements are required to support shareholder proposals and voting:
+
+- `END_EPOCH`: This system procedure is required in order to change your state variables if a proposal is accepted. The macro `IMPLEMENT_FinalizeShareholderStateVarProposals` provides a convenient implementation for simple use cases that can be called from `END_EPOCH`.
+- `SetShareholderProposal`: This procedure is for creating, changing, and canceling shareholder proposals. It often requires a custom implementation, because it checks custom requirements defined by the contract developers, for example about which types of proposals are allowed and if the proposed values are valid for the contract.
+- `GetShareholderProposal`: This function returns the proposal data (without votes or summarized results). This only requires a custom implementation if you want to support changing multiple variables in one proposal.
+- `GetShareholderProposalIndices`: This function lists proposal indices of active or finished proposals. It usually doesn't require a custom implementation.
+- `GetShareholderProposalFees`: This function returns the fee that is to be paid for invoking `SetShareholderProposal` and `SetShareholderVotes`. If you want to charge a fee `SetShareholderVotes` (default is no fee), you need a custom implementation of both `GetShareholderProposalFees` and `SetShareholderVotes`.
+- `SetShareholderVotes`: Procedure for setting the votes. Only requires a custom implementation if your want to charge fees.
+- `GetShareholderVotes`: Function for getting the votes of a shareholder. Usually shouldn't require a custom implementation.
+- `GetShareholderVotingResults`: Function for getting the vote results summary. Usually doesn't require a custom implementation.
+- `SET_SHAREHOLDER_PROPOSAL` and `SET_SHAREHOLDER_VOTES`: These are notification procedures required to handle voting of other contracts that are shareholder of your contract. They usually just invoke `SetShareholderProposal` or `SetShareholderVote`, respectively.
+- Proposal data storage and types: The default implementations expect the object `state.proposals` and the types `ProposalDataT`, `ProposersAndVotersT`, and `ProposalVotingT`, which can be defined via `DEFINE_SHAREHOLDER_PROPOSAL_STORAGE` in some cases.
+
+QPI provides default implementations through several macros, as used in the [Introduction to Shareholder Proposals](#introduction-to-shareholder-proposals).
+The following tables gives an overview about when the macros can be used.
+In the columns there are four use cases, three with one variable per proposal suitable if the variables are independent of each other.
+Yes/no is the default addressed with the simple macro implementation above.
+N option is if you want to support proposals more than 2 options (yes/no), like: value1, value2, value3, or "no change"?
+Scalar means that every vote can have a different scalar value. The current implementation computes the mean value of all votes as the final voting result.
+Finally, multi-variable proposals change more than one variable if accepted. These make sense if the variables in the state cannot be changed independently of each other, but must be set together in order to ensure keeping a valid state.
+
+
+Default implementation can be used? | 1-var yes/no | 1-var N option | 1-var scalar | multi-var
+------------------------------------------------|--------------|----------------|--------------|-----------
+`DEFINE_SHAREHOLDER_PROPOSAL_STORAGE` | X | | | X
+`IMPLEMENT_FinalizeShareholderStateVarProposals`| X | | |
+`IMPLEMENT_SetShareholderProposal` | X | | |
+`IMPLEMENT_GetShareholderProposal` | X | X | X |
+`IMPLEMENT_GetShareholderProposalIndices` | X | X | X | X
+`IMPLEMENT_GetShareholderProposalFees` | X | X | X | X
+`IMPLEMENT_SetShareholderVotes` | X | X | X | X
+`IMPLEMENT_GetShareholderVotes` | X | X | X | X
+`IMPLEMENT_GetShareholderVotingResults` | X | X | X | X
+`IMPLEMENT_SET_SHAREHOLDER_PROPOSAL` | X | X | X | X
+`IMPLEMENT_SET_SHAREHOLDER_VOTES` | X | X | X | X
+tool `qubic-cli -shareholder*` | X | X | soon |
+Example contracts | QUTIL | TESTEXB | TESTEXB | TESTEXA
+
+
+If you need a custom implementation of one of the elements, I recommend to start with the default implementations given below.
+You may also have a look into the example contracts given in the table.
+
+
+#### Proposal types and storage
+
+The default implementation of `DEFINE_SHAREHOLDER_PROPOSAL_STORAGE(assetNameInt64, numProposalSlots)` is defined as follows:
+
+```C++
+ public:
+ typedef ProposalDataYesNo ProposalDataT;
+ typedef ProposalAndVotingByShareholders ProposersAndVotersT;
+ typedef ProposalVoting ProposalVotingT;
+ protected:
+ ProposalVotingT proposals;
+```
+
+With `ProposalDataT` your have the following options:
+- `ProposalDataYesNo`: Proposals with two options, yes (change) and no (no change)
+- `ProposalDataV1`: Support multi-option proposals with up to 5 options for the Variable and Transfer proposal types and up to 8 options for GeneralProposal and MultiVariables. No scalar voting support.
+- `ProposalDataV1`: Support scalar voting and multi-option voting. This leads to the highest resource requirements, because 8 bytes of storage are required per proposal and voter.
+
+`ProposersAndVotersT` defines the class used to manage rights to propose and vote. It's important that you pass the correct asset name of your contract. Otherwise it won't find the right shareholders.
+The number of proposal slots linearly scales the storage and digest compute requirements. So we recommend to use a quite low number here, similar to the number of variables that can be set in your state.
+
+`ProposalVotingT` combines `ProposersAndVotersT` and `ProposalDataT` into the class used for storing all proposal and voting data.
+It is instantiated as `state.proposals`.
+
+In order to support MultiVariables proposals that allow to change multiple variables in a single proposal, the variable values need to be stored separately, for example in an array of `numProposalSlots` structs, one for each potential proposal.
+See the contract TestExampleA to see how to support multi-variable proposals.
+
+
+#### User Procedure FinalizeShareholderStateVarProposals for easy implementation of END_EPOCH
+
+This default implementation works for yes/no proposals. For a version that supports more options and scalar votes, see the contract "TestExampleB".
+
+
+```C++
+IMPLEMENT_FinalizeShareholderStateVarProposals()
+{
+ // your code for setting state variable, which is called by FinalizeShareholderStateVarProposals()
+ // after a proposal has been accepted
+}
+```
+
+The implementation above is expanded to the following code:
+
+```C++
+struct FinalizeShareholderProposalSetStateVar_input
+{
+ sint32 proposalIndex;
+ ProposalDataT proposal;
+ ProposalSummarizedVotingDataV1 results;
+ sint32 acceptedOption;
+ sint64 acceptedValue;
+};
+typedef NoData FinalizeShareholderProposalSetStateVar_output;
+
+typedef NoData FinalizeShareholderStateVarProposals_input;
+typedef NoData FinalizeShareholderStateVarProposals_output;
+struct FinalizeShareholderStateVarProposals_locals
+{
+ FinalizeShareholderProposalSetStateVar_input p;
+ uint16 proposalClass;
+};
+
+PRIVATE_PROCEDURE_WITH_LOCALS(FinalizeShareholderStateVarProposals)
+{
+ // Analyze proposal results and set variables:
+ // Iterate all proposals that were open for voting in this epoch ...
+ locals.p.proposalIndex = -1;
+ while ((locals.p.proposalIndex = qpi(state.proposals).nextProposalIndex(locals.p.proposalIndex, qpi.epoch())) >= 0)
+ {
+ if (!qpi(state.proposals).getProposal(locals.p.proposalIndex, locals.p.proposal))
+ continue;
+
+ locals.proposalClass = ProposalTypes::cls(locals.p.proposal.type);
+
+ // Handle proposal type Variable / MultiVariables
+ if (locals.proposalClass == ProposalTypes::Class::Variable || locals.proposalClass == ProposalTypes::Class::MultiVariables)
+ {
+ // Get voting results and check if conditions for proposal acceptance are met
+ if (!qpi(state.proposals).getVotingSummary(locals.p.proposalIndex, locals.p.results))
+ continue;
+
+ locals.p.acceptedOption = locals.p.results.getAcceptedOption();
+ if (locals.p.acceptedOption <= 0)
+ continue;
+
+ locals.p.acceptedValue = locals.p.proposal.variableOptions.value;
+
+ CALL(FinalizeShareholderProposalSetStateVar, locals.p, output);
+ }
+ }
+}
+
+PRIVATE_PROCEDURE(FinalizeShareholderProposalSetStateVar)
+{
+ // your code for setting state variable, which is called by FinalizeShareholderStateVarProposals()
+ // after a proposal has been accepted
+}
+```
+
+
+#### User Procedure SetShareholderProposal
+
+The default implementation provided by `IMPLEMENT_SetShareholderProposal(numFeeStateVariables, setProposalFeeVarOrValue)` supports yes/no for setting one variable per proposal, like "I propose to change transfer fee to 1000 QU. Yes or no?".
+Although it only supports one variable per proposal, an arbitrary number of different variables can be supported across multiple proposals.
+
+```C++
+typedef ProposalDataT SetShareholderProposal_input;
+typedef uint16 SetShareholderProposal_output;
+
+PUBLIC_PROCEDURE(SetShareholderProposal)
+{
+ // check proposal input and fees
+ if (qpi.invocationReward() < setProposalFeeVarOrValue || (input.epoch
+ && (input.type != ProposalTypes::VariableYesNo || input.variableOptions.variable >= numFeeStateVariables
+ || input.variableOptions.value < 0)))
+ {
+ // error -> reimburse invocation reward
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ output = INVALID_PROPOSAL_INDEX;
+ return;
+ }
+
+ // try to set proposal (checks invocator's rights and general validity of input proposal), returns proposal index
+ output = qpi(state.proposals).setProposal(qpi.invocator(), input);
+ if (output == INVALID_PROPOSAL_INDEX)
+ {
+ // error -> reimburse invocation reward
+ qpi.transfer(qpi.invocator(), qpi.invocationReward());
+ return;
+ }
+
+ // burn fee and reimburse if payed too much
+ qpi.burn(setProposalFeeVarOrValue);
+ if (qpi.invocationReward() > setProposalFeeVarOrValue)
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - setProposalFeeVarOrValue);
+}
+```
+
+Note that `input.epoch == 0` means clearing a proposal.
+Returning the invalid proposal `output = INVALID_PROPOSAL_INDEX` signals an error.
+
+
+#### User Function GetShareholderProposal
+
+`IMPLEMENT_GetShareholderProposal()` defines the following user function, which returns the proposal without votes or summarized results:
+
+```C++
+struct GetShareholderProposal_input
+{
+ uint16 proposalIndex;
+};
+struct GetShareholderProposal_output
+{
+ ProposalDataT proposal;
+ id proposerPubicKey;
+};
+
+PUBLIC_FUNCTION(GetShareholderProposal)
+{
+ // On error, output.proposal.type is set to 0
+ output.proposerPubicKey = qpi(state.proposals).proposerId(input.proposalIndex);
+ qpi(state.proposals).getProposal(input.proposalIndex, output.proposal);
+}
+```
+
+
+#### User Function GetShareholderProposalIndices
+
+The macro `IMPLEMENT_GetShareholderProposalIndices()` adds the following contract user function, which is required for listing
+the active and inactive proposals.
+
+```C++
+struct GetShareholderProposalIndices_input
+{
+ bit activeProposals; // Set true to return indices of active proposals, false for proposals of prior epochs
+ sint32 prevProposalIndex; // Set -1 to start getting indices. If returned index array is full, call again with highest index returned.
+};
+struct GetShareholderProposalIndices_output
+{
+ uint16 numOfIndices; // Number of valid entries in indices. Call again if it is 64.
+ Array indices; // Requested proposal indices. Valid entries are in range 0 ... (numOfIndices - 1).
+};
+
+PUBLIC_FUNCTION(GetShareholderProposalIndices)
+{
+ if (input.activeProposals)
+ {
+ // Return proposals that are open for voting in current epoch
+ // (output is initialized with zeros by contract system)
+ while ((input.prevProposalIndex = qpi(state.proposals).nextProposalIndex(input.prevProposalIndex, qpi.epoch())) >= 0)
+ {
+ output.indices.set(output.numOfIndices, input.prevProposalIndex);
+ ++output.numOfIndices;
+
+ if (output.numOfIndices == output.indices.capacity())
+ break;
+ }
+ }
+ else
+ {
+ // Return proposals of previous epochs not overwritten yet
+ // (output is initialized with zeros by contract system)
+ while ((input.prevProposalIndex = qpi(state.proposals).nextFinishedProposalIndex(input.prevProposalIndex)) >= 0)
+ {
+ output.indices.set(output.numOfIndices, input.prevProposalIndex);
+ ++output.numOfIndices;
+
+ if (output.numOfIndices == output.indices.capacity())
+ break;
+ }
+ }
+}
+```
+
+
+#### User Function GetShareholderProposalFees
+
+`IMPLEMENT_GetShareholderProposalFees(setProposalFeeVarOrValue)` provides the following implementation for returning fees for invoking the shareholder proposal and voting procedures.
+
+```C++
+typedef NoData GetShareholderProposalFees_input;
+struct GetShareholderProposalFees_output
+{
+ sint64 setProposalFee;
+ sint64 setVoteFee;
+};
+
+PUBLIC_FUNCTION(GetShareholderProposalFees)
+{
+ output.setProposalFee = setProposalFeeVarOrValue;
+ output.setVoteFee = 0;
+}
+```
+
+The default implementation assumes no vote fee, but the output struct and qubic-cli support voting fees.
+So if you want to charge a fee for invoking `SetShareholderVotes`, you can copy the template above and just replace the 0.
+
+
+#### User Procedure SetShareholderVotes
+
+The default implementation of `IMPLEMENT_SetShareholderVotes()` supports all use cases, but does not charge a fee:
+
+```C++
+typedef ProposalMultiVoteDataV1 SetShareholderVotes_input;
+typedef bit SetShareholderVotes_output;
+
+PUBLIC_PROCEDURE(SetShareholderVotes)
+{
+ output = qpi(state.proposals).vote(qpi.invocator(), input);
+}
+```
+
+#### User Function GetShareholderVotes
+
+`IMPLEMENT_GetShareholderVotes()` provides the default implementation for returning the votes of a specific voter / shareholder.
+
+```C++
+struct GetShareholderVotes_input
+{
+ id voter;
+ uint16 proposalIndex;
+};
+typedef ProposalMultiVoteDataV1 GetShareholderVotes_output;
+
+PUBLIC_FUNCTION(GetShareholderVotes)
+{
+ // On error, output.votes.proposalType is set to 0
+ qpi(state.proposals).getVotes(input.proposalIndex, input.voter, output);
+}
+```
+
+#### User Procedure GetShareholderVotingResults
+
+`IMPLEMENT_GetShareholderVotingResults()` provides the function returning the overall voting results of a proposal:
+
+```C++
+struct GetShareholderVotingResults_input
+{
+ uint16 proposalIndex;
+};
+typedef ProposalSummarizedVotingDataV1 GetShareholderVotingResults_output;
+
+PUBLIC_FUNCTION(GetShareholderVotingResults)
+{
+ // On error, output.totalVotesAuthorized is set to 0
+ qpi(state.proposals).getVotingSummary(
+ input.proposalIndex, output);
+}
+```
+
+### Contracts as shareholders of other contracts
+
+When a contract A is shareholder of another contract B, the user procedures `B::SetShareholderProposal()` and `B::SetShareholderVotes()` cannot invoked directly via transaction as usual for "normal" user entities.
+
+Further, the contract owning the share may be older than the contract it is shareholder of.
+So the procedures cannot be invoked as in other contract interaction, because contracts can only access procedure/function of older contracts.
+
+In order to provide a solution for this issue, the two QPI calls `qpi.setShareholderProposal()` and `qpi.setShareholderVotes()` were introduced.
+They can be called from contract A and invoke the system procedures `B::SET_SHAREHOLDER_PROPOSAL` and `B::SET_SHAREHOLDER_VOTES`, respectively.
+The system procedure `B::SET_SHAREHOLDER_PROPOSAL` and `B::SET_SHAREHOLDER_VOTES` call the user procedures `B::SetShareholderProposal()` and `B::SetShareholderVotes()`.
+
+The mechanism is shown with both contracts TestExampleA and TestExampleB, which are shareholder of each other in `test/contract_testex.cpp`.
+A custom user procedure `SetProposalInOtherContractAsShareholder` calls `qpi.setShareholderProposal()` with input given by the invocator who must be an administrator (or someone else who is allowed to create proposals in the name of the contract).
+Similarly, a custom user procedure `SetVotesInOtherContractAsShareholder` calls `qpi.setShareholderVotes()` with input given by the invocator who must be an administrator (or someone else who is allowed to cast votes in the name of the contract, for example based on a community poll).
+
+
+#### System Procedure SET_SHAREHOLDER_PROPOSAL
+
+`IMPLEMENT_SET_SHAREHOLDER_PROPOSAL()` adds a system procedure invoked when `qpi.setShareholderProposal()` is called in another contract that is shareholder of your and wants to create/change/cancel a shareholder proposal in your contract.
+The input is a generic buffer of 1024 bytes size that is copied into the input structure of `SetShareholderProposal` before calling this procedure.
+`SetShareholderProposal_input` may be custom defined, as in multi-variable proposals. That is why a generic buffer is needed in the cross-contract interaction.
+
+```C++
+struct SET_SHAREHOLDER_PROPOSAL_locals
+{
+ SetShareholderProposal_input userProcInput;
+};
+
+SET_SHAREHOLDER_PROPOSAL_WITH_LOCALS()
+{
+ copyFromBuffer(locals.userProcInput, input);
+ CALL(SetShareholderProposal, locals.userProcInput, output);
+}
+```
+
+The input and output of `SET_SHAREHOLDER_PROPOSAL` are defined as follows in `qpi.h`:
+
+```C++
+ // Input of SET_SHAREHOLDER_PROPOSAL system procedure (buffer for passing the contract-dependent proposal data)
+ typedef Array SET_SHAREHOLDER_PROPOSAL_input;
+
+ // Output of SET_SHAREHOLDER_PROPOSAL system procedure (proposal index, or INVALID_PROPOSAL_INDEX on error)
+ typedef uint16 SET_SHAREHOLDER_PROPOSAL_output;
+```
+
+#### System Procedure SET_SHAREHOLDER_VOTES
+
+`IMPLEMENT_SET_SHAREHOLDER_VOTES()` adds a system procedure invoked when `qpi.setShareholderVotes()` is called in another contract that is shareholder of your and wants to set shareholder votes in your contract.
+It simply calls the user procedure `SetShareholderVotes`. Input and output are the same.
+
+```C++
+SET_SHAREHOLDER_VOTES()
+{
+ CALL(SetShareholderVotes, input, output);
+}
+```
+
+The input and output of `SET_SHAREHOLDER_VOTES` are defined as follows in `qpi.h`:
+
+```C++
+ // Input of SET_SHAREHOLDER_VOTES system procedure (vote data)
+ typedef ProposalMultiVoteDataV1 SET_SHAREHOLDER_VOTES_input;
+
+ // Output of SET_SHAREHOLDER_VOTES system procedure (success flag)
+ typedef bit SET_SHAREHOLDER_VOTES_output;
+```
+
+
+## Voting by Computors
+
+Currently, the following contracts implement voting by computors:
+
+- GQMPROP: General Quorum Proposals are made for deciding about inclusion of new contracts, weekly computor revenue donations, and other major strategic decisions related to the Qubic project.
+- CCF: The Computor Controlled Fund is a contract for financing approved projects that contribute to expanding the capabilities, reach, or efficiency of the Qubic network. Projects are proposed by community members and selected through voting by the computors.
+
+It is similar to shareholder voting and both share a lot of the code.
+There are two major differences:
+
+1. Each computor has exactly one vote. In shareholder voting, a shareholder often has multiple votes / shares.
+2. The entities who are allowed to propose and vote aren't shareholders but computors.
+
+Both is implemented in the `ProposersAndVotersT` by using `ProposalAndVotingByComputors` or `ProposalByAnyoneVotingByComputors` instead of `ProposalAndVotingByShareholders`.
+
+
+## Proposal types
+
+Each proposal type is composed of a class and a number of options. As an alternative to having N options (option votes), some proposal classes (currently the one to set a variable) may allow to vote with a scalar value in a range defined by the proposal (scalar voting).
+
+The proposal type classes are defined in `QPI::ProposalTypes::Class`. The following are available at the moment:
+
+```C++
+ // Options without extra data. Supported options: 2 <= N <= 8 with ProposalDataV1.
+ static constexpr uint16 GeneralOptions = 0;
+
+ // Propose to transfer amount to address. Supported options: 2 <= N <= 5 with ProposalDataV1.
+ static constexpr uint16 Transfer = 0x100;
+
+ // Propose to set variable to a value. Supported options: 2 <= N <= 5 with ProposalDataV1; N == 0 means scalar voting.
+ static constexpr uint16 Variable = 0x200;
+
+ // Propose to set multiple variables. Supported options: 2 <= N <= 8 with ProposalDataV1
+ static constexpr uint16 MultiVariables = 0x300;
+
+ // Propose to transfer amount to address in a specific epoch. Supported options: 1 with ProposalDataV1.
+ static constexpr uint16 TransferInEpoch = 0x400;
+```
+
+``QPI::ProposalType`` provides the following functions to work with proposal types:
+
+```C++
+ // Construct type from class + number of options (no checking if type is valid)
+ uint16 type(uint16 cls, uint16 options);
+
+ // Return option count for a given proposal type (including "no change" option),
+ // 0 for scalar voting (no checking if type is valid).
+ uint16 optionCount(uint16 proposalType);
+
+ // Return class of proposal type (no checking if type is valid).
+ uint16 cls(uint16 proposalType);
+
+ // Check if given type is valid (supported by most comprehensive ProposalData class).
+ bool isValid(uint16 proposalType);
+```
+
+For convenience, ``QPI::ProposalType`` also provides many proposal type constants, for example:
+
+```C++
+ // Set given variable to proposed value with options yes/no
+ static constexpr uint16 VariableYesNo = Class::Variable | 2;
+
+ // Set given variable to proposed value with two options of values and option "no change"
+ static constexpr uint16 VariableTwoValues = Class::Variable | 3;
+
+ // Set given variable to proposed value with three options of values and option "no change"
+ static constexpr uint16 VariableThreeValues = Class::Variable | 4;
+
+ // Set multiple variables with options yes/no (data stored by contract) -> result is histogram of options
+ static constexpr uint16 MultiVariablesYesNo = Class::MultiVariables | 2;
+
+ // Options yes and no without extra data -> result is histogram of options
+ static constexpr uint16 YesNo = Class::GeneralOptions | 2;
+
+ // Transfer given amount to address with options yes/no
+ static constexpr uint16 TransferYesNo = Class::Transfer | 2;
+```
+
+See `qpi.h` for more.
diff --git a/src/Qubic.vcxproj b/src/Qubic.vcxproj
index 34380e8ef..cef57de74 100644
--- a/src/Qubic.vcxproj
+++ b/src/Qubic.vcxproj
@@ -50,6 +50,7 @@
+
diff --git a/src/Qubic.vcxproj.filters b/src/Qubic.vcxproj.filters
index 6079f64e9..1d5ddd288 100644
--- a/src/Qubic.vcxproj.filters
+++ b/src/Qubic.vcxproj.filters
@@ -285,6 +285,9 @@
contracts
+
+ contract_core
+
diff --git a/src/assets/assets.h b/src/assets/assets.h
index 964fb4797..2bee80603 100644
--- a/src/assets/assets.h
+++ b/src/assets/assets.h
@@ -112,7 +112,7 @@ struct AssetStorage
PROFILE_SCOPE();
reset();
- for (int index = 0; index < ASSETS_CAPACITY; index++)
+ for (int index = ASSETS_CAPACITY - 1; index >= 0; index--)
{
switch (assets[index].varStruct.issuance.type)
{
diff --git a/src/common_buffers.h b/src/common_buffers.h
index 7bace2777..18dcd4478 100644
--- a/src/common_buffers.h
+++ b/src/common_buffers.h
@@ -2,6 +2,7 @@
#include "platform/global_var.h"
#include "platform/memory_util.h"
+#include "platform/assert.h"
#include "network_messages/entity.h"
#include "network_messages/assets.h"
@@ -35,7 +36,10 @@ static void deinitCommonBuffers()
}
}
-static void* __scratchpad()
+static void* __scratchpad(unsigned long long sizeToMemsetZero)
{
+ ASSERT(sizeToMemsetZero <= reorgBufferSize);
+ if (sizeToMemsetZero)
+ setMem(reorgBuffer, sizeToMemsetZero, 0);
return reorgBuffer;
}
diff --git a/src/contract_core/contract_def.h b/src/contract_core/contract_def.h
index 901dff334..b892f1428 100644
--- a/src/contract_core/contract_def.h
+++ b/src/contract_core/contract_def.h
@@ -1,6 +1,4 @@
#pragma once
-#include "network_messages/common_def.h"
-#include "platform/m256.h"
////////// Smart contracts \\\\\\\\\\
@@ -10,61 +8,10 @@
// Additionally, most types, functions, and variables of the core have to be defined after including
// the contract to keep them unavailable in the contract code.
-namespace QPI
-{
- struct QpiContextProcedureCall;
- struct QpiContextFunctionCall;
-}
-
-// TODO: add option for having locals to SYSTEM and EXPAND procedures
-typedef void (*SYSTEM_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
-typedef void (*EXPAND_PROCEDURE)(const QPI::QpiContextFunctionCall&, void*, void*); // cannot not change anything except state
-typedef void (*USER_FUNCTION)(const QPI::QpiContextFunctionCall&, void* state, void* input, void* output, void* locals);
-typedef void (*USER_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
-
-constexpr unsigned long long MAX_CONTRACT_STATE_SIZE = 1073741824;
-
-// Maximum size of local variables that may be used by a contract function or procedure
-// If increased, the size of contractLocalsStack should be increased as well.
-constexpr unsigned int MAX_SIZE_OF_CONTRACT_LOCALS = 32 * 1024;
-
-// TODO: make sure the limit of nested calls is not violated
-constexpr unsigned short MAX_NESTED_CONTRACT_CALLS = 10;
-
-// Size of the contract action tracker, limits the number of transfers that one contract call can execute.
-constexpr unsigned long long CONTRACT_ACTION_TRACKER_SIZE = 16 * 1024 * 1024;
-
-
-static void __beginFunctionOrProcedure(const unsigned int); // TODO: more human-readable form of function ID?
-static void __endFunctionOrProcedure(const unsigned int);
-template static m256i __K12(T);
-template static void __logContractDebugMessage(unsigned int, T&);
-template static void __logContractErrorMessage(unsigned int, T&);
-template static void __logContractInfoMessage(unsigned int, T&);
-template static void __logContractWarningMessage(unsigned int, T&);
-static void* __scratchpad(); // TODO: concurrency support (n buffers for n allowed concurrent contract executions)
-// static void* __tryAcquireScratchpad(unsigned int size); // Thread-safe, may return nullptr if no appropriate buffer is available
-// static void __ReleaseScratchpad(void*);
-
-template
-struct __FunctionOrProcedureBeginEndGuard
-{
- // Constructor calling __beginFunctionOrProcedure()
- __FunctionOrProcedureBeginEndGuard()
- {
- __beginFunctionOrProcedure(functionOrProcedureId);
- }
-
- // Destructor making sure __endFunctionOrProcedure() is called for every return path
- ~__FunctionOrProcedureBeginEndGuard()
- {
- __endFunctionOrProcedure(functionOrProcedureId);
- }
-};
-
// With no other includes before, the following are the only headers available to contracts.
// When adding something, be cautious to keep access of contracts limited to safe features only.
+#include "pre_qpi_def.h"
#include "contracts/qpi.h"
#include "qpi_proposal_voting.h"
@@ -283,6 +230,8 @@ constexpr unsigned short TESTEXD_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
#undef POST_RELEASE_SHARES
#undef POST_ACQUIRE_SHARES
#undef POST_INCOMING_TRANSFER
+#undef SET_SHAREHOLDER_PROPOSAL
+#undef SET_SHAREHOLDER_VOTES
// The following are included after the contracts to keep their definitions and dependencies
@@ -336,8 +285,8 @@ constexpr struct ContractDescription
{"QBOND", 182, 10000, sizeof(QBOND)}, // proposal in epoch 180, IPO in 181, construction and first use in 182
// new contracts should be added above this line
#ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
- {"TESTEXA", 138, 10000, sizeof(IPO)},
- {"TESTEXB", 138, 10000, sizeof(IPO)},
+ {"TESTEXA", 138, 10000, sizeof(TESTEXA)},
+ {"TESTEXB", 138, 10000, sizeof(TESTEXB)},
{"TESTEXC", 138, 10000, sizeof(IPO)},
{"TESTEXD", 155, 10000, sizeof(IPO)},
#endif
@@ -377,6 +326,8 @@ enum SystemProcedureID
POST_RELEASE_SHARES,
POST_ACQUIRE_SHARES,
POST_INCOMING_TRANSFER,
+ SET_SHAREHOLDER_PROPOSAL,
+ SET_SHAREHOLDER_VOTES,
contractSystemProcedureCount,
};
@@ -414,6 +365,10 @@ if (!contractName::__postReleaseSharesEmpty) contractSystemProcedures[contractIn
contractSystemProcedureLocalsSizes[contractIndex][POST_RELEASE_SHARES] = contractName::__postReleaseSharesLocalsSize; \
if (!contractName::__postIncomingTransferEmpty) contractSystemProcedures[contractIndex][POST_INCOMING_TRANSFER] = (SYSTEM_PROCEDURE)contractName::__postIncomingTransfer;\
contractSystemProcedureLocalsSizes[contractIndex][POST_INCOMING_TRANSFER] = contractName::__postIncomingTransferLocalsSize; \
+if (!contractName::__setShareholderProposalEmpty) contractSystemProcedures[contractIndex][SET_SHAREHOLDER_PROPOSAL] = (SYSTEM_PROCEDURE)contractName::__setShareholderProposal;\
+contractSystemProcedureLocalsSizes[contractIndex][SET_SHAREHOLDER_PROPOSAL] = contractName::__setShareholderProposalLocalsSize; \
+if (!contractName::__setShareholderVotesEmpty) contractSystemProcedures[contractIndex][SET_SHAREHOLDER_VOTES] = (SYSTEM_PROCEDURE)contractName::__setShareholderVotes;\
+contractSystemProcedureLocalsSizes[contractIndex][SET_SHAREHOLDER_VOTES] = contractName::__setShareholderVotesLocalsSize; \
if (!contractName::__expandEmpty) contractExpandProcedures[contractIndex] = (EXPAND_PROCEDURE)contractName::__expand;\
QpiContextForInit qpi(contractIndex); \
contractName::__registerUserFunctionsAndProcedures(qpi); \
diff --git a/src/contract_core/contract_exec.h b/src/contract_core/contract_exec.h
index 74f96accb..10d61dd16 100644
--- a/src/contract_core/contract_exec.h
+++ b/src/contract_core/contract_exec.h
@@ -72,6 +72,7 @@ enum ContractCallbacksRunningFlags
NoContractCallback = 0,
ContractCallbackManagementRightsTransfer = 1,
ContractCallbackPostIncomingTransfer = 2,
+ ContractCallbackShareholderProposalAndVoting = 4,
};
@@ -609,7 +610,7 @@ void QPI::QpiContextProcedureCall::__qpiReleaseStateForWriting(unsigned int cont
// Used to run a special system procedure from within a contract for example in asset management rights transfer
template
-void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContractIndex, InputType& input, OutputType& output, QPI::sint64 invocationReward) const
+bool QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContractIndex, InputType& input, OutputType& output, QPI::sint64 invocationReward) const
{
// Make sure this function is used with an expected combination of sysProcId, input,
// and output
@@ -619,6 +620,8 @@ void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContr
|| (sysProcId == POST_RELEASE_SHARES && sizeof(InputType) == sizeof(QPI::PostManagementRightsTransfer_input) && sizeof(OutputType) == sizeof(QPI::NoData))
|| (sysProcId == POST_ACQUIRE_SHARES && sizeof(InputType) == sizeof(QPI::PostManagementRightsTransfer_input) && sizeof(OutputType) == sizeof(QPI::NoData))
|| (sysProcId == POST_INCOMING_TRANSFER && sizeof(InputType) == sizeof(QPI::PostIncomingTransfer_input) && sizeof(OutputType) == sizeof(QPI::NoData))
+ || (sysProcId == SET_SHAREHOLDER_PROPOSAL && sizeof(InputType) == sizeof(QPI::SET_SHAREHOLDER_PROPOSAL_input) && sizeof(OutputType) == sizeof(QPI::SET_SHAREHOLDER_PROPOSAL_output))
+ || (sysProcId == SET_SHAREHOLDER_VOTES && sizeof(InputType) == sizeof(QPI::SET_SHAREHOLDER_VOTES_input) && sizeof(OutputType) == sizeof(QPI::SET_SHAREHOLDER_VOTES_output))
, "Unsupported __qpiCallSystemProc() call"
);
@@ -627,7 +630,8 @@ void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContr
ASSERT(sysProcContractIndex < contractCount);
ASSERT(contractStates[sysProcContractIndex] != nullptr);
if (sysProcId == PRE_RELEASE_SHARES || sysProcId == PRE_ACQUIRE_SHARES
- || sysProcId == POST_RELEASE_SHARES || sysProcId == POST_ACQUIRE_SHARES)
+ || sysProcId == POST_RELEASE_SHARES || sysProcId == POST_ACQUIRE_SHARES
+ || sysProcId == SET_SHAREHOLDER_PROPOSAL || sysProcId == SET_SHAREHOLDER_VOTES)
{
ASSERT(sysProcContractIndex != _currentContractIndex);
}
@@ -637,7 +641,11 @@ void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContr
// Empty procedures lead to null pointer in contractSystemProcedures -> return default output (all zero/false)
if (!contractSystemProcedures[sysProcContractIndex][sysProcId])
- return;
+ {
+ // Returning false informs the caller that the system procedure isn't defined, which is useful if the
+ // zeroed output does not indicate an error but is a valid output value.
+ return false;
+ }
// Set flags of callbacks currently running (to prevent deadlocks and nested calling of QPI functions)
auto contractCallbacksRunningBefore = contractCallbacksRunning;
@@ -645,6 +653,10 @@ void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContr
{
contractCallbacksRunning |= ContractCallbackPostIncomingTransfer;
}
+ else if (sysProcId == SET_SHAREHOLDER_PROPOSAL || sysProcId == SET_SHAREHOLDER_VOTES)
+ {
+ contractCallbacksRunning |= ContractCallbackShareholderProposalAndVoting;
+ }
else if (sysProcId == PRE_RELEASE_SHARES || sysProcId == PRE_ACQUIRE_SHARES
|| sysProcId == POST_RELEASE_SHARES || sysProcId == POST_ACQUIRE_SHARES)
{
@@ -676,6 +688,8 @@ void QPI::QpiContextProcedureCall::__qpiCallSystemProc(unsigned int sysProcContr
// Restore flags of callbacks currently running
contractCallbacksRunning = contractCallbacksRunningBefore;
+
+ return true;
}
// If dest is a contract, notify contract by running system procedure POST_INCOMING_TRANSFER
@@ -693,6 +707,70 @@ void QPI::QpiContextProcedureCall::__qpiNotifyPostIncomingTransfer(const QPI::id
__qpiCallSystemProc(destContractIndex, input, output, 0);
}
+inline uint16 QPI::QpiContextProcedureCall::setShareholderProposal(
+ uint16 contractIndex,
+ const Array& proposalDataBuffer,
+ sint64 invocationReward
+) const
+{
+ // prevent nested calling from callbacks
+ if (contractCallbacksRunning & ContractCallbackShareholderProposalAndVoting)
+ {
+ return INVALID_PROPOSAL_INDEX;
+ }
+
+ // check for invalid inputs
+ if (contractIndex == _currentContractIndex
+ || contractIndex == 0
+ || contractIndex >= contractCount
+ || invocationReward < 0)
+ {
+ return INVALID_PROPOSAL_INDEX;
+ }
+
+ // Copy proposalDataBuffer, because procedures are allowed to change their input
+ Array inputBuffer = proposalDataBuffer;
+
+ // run SET_SHAREHOLDER_PROPOSAL callback in other contract
+ uint16 outputProposalIndex;
+ if (!__qpiCallSystemProc(contractIndex, inputBuffer, outputProposalIndex, invocationReward))
+ return INVALID_PROPOSAL_INDEX;
+
+ return outputProposalIndex;
+}
+
+inline bool QPI::QpiContextProcedureCall::setShareholderVotes(
+ uint16 contractIndex,
+ const ProposalMultiVoteDataV1& shareholderVoteData,
+ sint64 invocationReward
+) const
+{
+ // prevent nested calling from callbacks
+ if (contractCallbacksRunning & ContractCallbackShareholderProposalAndVoting)
+ {
+ return false;
+ }
+
+ // check for invalid inputs
+ if (contractIndex == _currentContractIndex
+ || contractIndex == 0
+ || contractIndex >= contractCount
+ || invocationReward < 0)
+ {
+ return false;
+ }
+
+ // Copy proposalDataBuffer, because procedures are allowed to change their input
+ ProposalMultiVoteDataV1 inputVote = shareholderVoteData;
+
+ // run SET_SHAREHOLDER_VOTES callback in other contract
+ bit success; // initialized with zero by __qpiCallSystemProc
+ __qpiCallSystemProc(contractIndex, inputVote, success, invocationReward);
+
+ return success;
+}
+
+
// Enter endless loop leading to timeout
// -> TODO: unlock everything in case of function entry point, maybe retry later in case of deadlock handling
// -> TODO: rollback of contract actions on contractProcessor()
diff --git a/src/contract_core/pre_qpi_def.h b/src/contract_core/pre_qpi_def.h
new file mode 100644
index 000000000..08857c92a
--- /dev/null
+++ b/src/contract_core/pre_qpi_def.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "network_messages/common_def.h"
+#include "platform/m256.h"
+
+namespace QPI
+{
+ struct QpiContextProcedureCall;
+ struct QpiContextFunctionCall;
+}
+
+// TODO: add option for having locals to SYSTEM and EXPAND procedures
+typedef void (*SYSTEM_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
+typedef void (*EXPAND_PROCEDURE)(const QPI::QpiContextFunctionCall&, void*, void*); // cannot not change anything except state
+typedef void (*USER_FUNCTION)(const QPI::QpiContextFunctionCall&, void* state, void* input, void* output, void* locals);
+typedef void (*USER_PROCEDURE)(const QPI::QpiContextProcedureCall&, void* state, void* input, void* output, void* locals);
+
+constexpr unsigned long long MAX_CONTRACT_STATE_SIZE = 1073741824;
+
+// Maximum size of local variables that may be used by a contract function or procedure
+// If increased, the size of contractLocalsStack should be increased as well.
+constexpr unsigned int MAX_SIZE_OF_CONTRACT_LOCALS = 32 * 1024;
+
+// TODO: make sure the limit of nested calls is not violated
+constexpr unsigned short MAX_NESTED_CONTRACT_CALLS = 10;
+
+// Size of the contract action tracker, limits the number of transfers that one contract call can execute.
+constexpr unsigned long long CONTRACT_ACTION_TRACKER_SIZE = 16 * 1024 * 1024;
+
+
+static void __beginFunctionOrProcedure(const unsigned int); // TODO: more human-readable form of function ID?
+static void __endFunctionOrProcedure(const unsigned int);
+template static m256i __K12(T);
+template static void __logContractDebugMessage(unsigned int, T&);
+template static void __logContractErrorMessage(unsigned int, T&);
+template static void __logContractInfoMessage(unsigned int, T&);
+template static void __logContractWarningMessage(unsigned int, T&);
+
+// Get buffer for temporary use. Can only be used in contract procedures / tick processor / contract processor!
+// Always returns the same one buffer, no concurrent access!
+static void* __scratchpad(unsigned long long sizeToMemsetZero = 0);
+
+// static void* __tryAcquireScratchpad(unsigned int size); // Thread-safe, may return nullptr if no appropriate buffer is available
+// static void __ReleaseScratchpad(void*);
+
+template
+struct __FunctionOrProcedureBeginEndGuard
+{
+ // Constructor calling __beginFunctionOrProcedure()
+ __FunctionOrProcedureBeginEndGuard()
+ {
+ __beginFunctionOrProcedure(functionOrProcedureId);
+ }
+
+ // Destructor making sure __endFunctionOrProcedure() is called for every return path
+ ~__FunctionOrProcedureBeginEndGuard()
+ {
+ __endFunctionOrProcedure(functionOrProcedureId);
+ }
+};
diff --git a/src/contract_core/qpi_collection_impl.h b/src/contract_core/qpi_collection_impl.h
index 4bca5ee2b..2fbf9cedf 100644
--- a/src/contract_core/qpi_collection_impl.h
+++ b/src/contract_core/qpi_collection_impl.h
@@ -615,11 +615,10 @@ namespace QPI
}
// Init buffers
- auto* _povsBuffer = reinterpret_cast(::__scratchpad());
+ auto* _povsBuffer = reinterpret_cast(::__scratchpad(sizeof(_povs) + sizeof(_povOccupationFlags)));
auto* _povOccupationFlagsBuffer = reinterpret_cast(_povsBuffer + L);
auto* _stackBuffer = reinterpret_cast(
_povOccupationFlagsBuffer + sizeof(_povOccupationFlags) / sizeof(_povOccupationFlags[0]));
- setMem(::__scratchpad(), sizeof(_povs) + sizeof(_povOccupationFlags), 0);
uint64 newPopulation = 0;
// Go through pov hash map. For each pov that is occupied but not marked for removal, insert pov in new Collection's pov buffers and
diff --git a/src/contract_core/qpi_hash_map_impl.h b/src/contract_core/qpi_hash_map_impl.h
index 033dc9fbb..6266cfdb9 100644
--- a/src/contract_core/qpi_hash_map_impl.h
+++ b/src/contract_core/qpi_hash_map_impl.h
@@ -288,11 +288,10 @@ namespace QPI
}
// Init buffers
- auto* _elementsBuffer = reinterpret_cast(::__scratchpad());
+ auto* _elementsBuffer = reinterpret_cast(::__scratchpad(sizeof(_elements) + sizeof(_occupationFlags)));
auto* _occupationFlagsBuffer = reinterpret_cast(_elementsBuffer + L);
auto* _stackBuffer = reinterpret_cast(
_occupationFlagsBuffer + sizeof(_occupationFlags) / sizeof(_occupationFlags[0]));
- setMem(::__scratchpad(), sizeof(_elements) + sizeof(_occupationFlags), 0);
uint64 newPopulation = 0;
// Go through hash map. For each element that is occupied but not marked for removal, insert element in new hash map's buffers.
@@ -615,11 +614,10 @@ namespace QPI
}
// Init buffers
- auto* _keyBuffer = reinterpret_cast(::__scratchpad());
+ auto* _keyBuffer = reinterpret_cast(::__scratchpad(sizeof(_keys) + sizeof(_occupationFlags)));
auto* _occupationFlagsBuffer = reinterpret_cast(_keyBuffer + L);
auto* _stackBuffer = reinterpret_cast(
_occupationFlagsBuffer + sizeof(_occupationFlags) / sizeof(_occupationFlags[0]));
- setMem(::__scratchpad(), sizeof(_keys) + sizeof(_occupationFlags), 0);
uint64 newPopulation = 0;
// Go through hash map. For each element that is occupied but not marked for removal, insert element in new hash map's buffers.
diff --git a/src/contract_core/qpi_proposal_voting.h b/src/contract_core/qpi_proposal_voting.h
index c5dafc96a..e1ccb00d3 100644
--- a/src/contract_core/qpi_proposal_voting.h
+++ b/src/contract_core/qpi_proposal_voting.h
@@ -11,14 +11,14 @@ namespace QPI
// Maximum number of proposals (may be lower than number of proposers = IDs with right to propose and lower than num. of voters)
static constexpr uint16 maxProposals = proposalSlotCount;
- // Maximum number of voters
- static constexpr uint32 maxVoters = NUMBER_OF_COMPUTORS;
+ // Maximum number of voters / votes (each computor has one vote)
+ static constexpr uint32 maxVotes = NUMBER_OF_COMPUTORS;
// Check if proposer has right to propose (and is not NULL_ID)
bool isValidProposer(const QpiContextFunctionCall& qpi, const id& proposerId) const
{
- // Check if proposer is currently a computor (voter index is computor index here)
- return getVoterIndex(qpi, proposerId) < maxVoters;
+ // Check if proposer is currently a computor (vote index is computor index here)
+ return getVoteIndex(qpi, proposerId) < maxVotes;
}
// Get new proposal slot (each proposer may have at most one).
@@ -76,32 +76,40 @@ namespace QPI
return INVALID_PROPOSAL_INDEX;
}
- // Get voter index for given ID or INVALID_VOTER_INDEX if has no right to vote
- // Voter index is computor index
- uint32 getVoterIndex(const QpiContextFunctionCall& qpi, const id& voterId) const
+ // Get first vote index for given ID or INVALID_VOTE_INDEX if voterId has no right to vote.
+ // Vote index is computor index.
+ uint32 getVoteIndex(const QpiContextFunctionCall& qpi, const id& voterId, uint16 proposalIndex = 0) const
{
// NULL_ID is invalid
if (isZero(voterId))
- return INVALID_VOTER_INDEX;
+ return INVALID_VOTE_INDEX;
- for (uint16 compIdx = 0; compIdx < maxVoters; ++compIdx)
+ for (uint16 compIdx = 0; compIdx < maxVotes; ++compIdx)
{
if (qpi.computor(compIdx) == voterId)
return compIdx;
}
- return INVALID_VOTER_INDEX;
+ return INVALID_VOTE_INDEX;
}
- // Return voter ID for given voter index or NULL_ID on error
- id getVoterId(const QpiContextFunctionCall& qpi, uint16 voterIndex) const
+ // Get count of votes of a voter specified by vote index (return 0 on error).
+ uint32 getVoteCount(const QpiContextFunctionCall& qpi, uint32 voteIndex, uint16 proposalIndex = 0) const
{
- if (voterIndex >= maxVoters)
+ if (voteIndex >= maxVotes)
+ return 0;
+
+ return 1;
+ }
+
+ // Return voter ID for given vote index or NULL_ID on error
+ id getVoterId(const QpiContextFunctionCall& qpi, uint32 voteIndex, uint16 proposalIndex = 0) const
+ {
+ if (voteIndex >= maxVotes)
return NULL_ID;
- return qpi.computor(voterIndex);
+ return qpi.computor(voteIndex);
}
protected:
- // TODO: maybe replace by hash map?
// needs to be initialized with zeros
id currentProposalProposers[maxProposals];
};
@@ -116,9 +124,217 @@ namespace QPI
}
};
- template
+ // Option for ProposerAndVoterHandlingT in ProposalVoting that allows both voting and setting proposals for contract shareholders only.
+ // A shareholder can have multiple votes and each may be set individually. Voting rights are assigned to current shareholders when a proposal
+ // is created or overwritten and cannot be sold or transferred afterwards.
+ template
struct ProposalAndVotingByShareholders
{
+ // Maximum number of proposals (may be lower than number of proposers = IDs with right to propose and lower than num. of voters)
+ static constexpr uint16 maxProposals = proposalSlotCount;
+
+ // Maximum number of votes (676 shares per contract)
+ static constexpr uint32 maxVotes = NUMBER_OF_COMPUTORS;
+
+ // Check if proposer has right to propose (and is not NULL_ID)
+ bool isValidProposer(const QpiContextFunctionCall& qpi, const id& proposerId) const
+ {
+ return qpi.numberOfShares({ NULL_ID, contractAssetName }, AssetOwnershipSelect::byOwner(proposerId), AssetPossessionSelect::byPossessor(proposerId)) > 0;
+ };
+
+ // Setup proposal in proposal index. Asset possession at this point in time defines the right to vote.
+ void setupNewProposal(const QpiContextFunctionCall& qpi, const id& proposerId, uint16 proposalIdx)
+ {
+ if (proposalIdx >= maxProposals || isZero(proposerId))
+ return;
+
+ currentProposalProposers[proposalIdx] = proposerId;
+
+ // prepare temporary array to gather shareholder info
+ struct Shareholder
+ {
+ id possessor;
+ sint64 shares;
+ };
+ Shareholder* shareholders = reinterpret_cast(__scratchpad(sizeof(Shareholder) * maxVotes));
+ int lastShareholderIdx = -1;
+
+ // gather shareholder info in sorted array
+ for (AssetPossessionIterator iter({ NULL_ID, contractAssetName }); !iter.reachedEnd(); iter.next())
+ {
+ if (iter.numberOfPossessedShares() > 0)
+ {
+ // search sorted array backwards
+ // (iter will provide possessors mostly in increasing order leading to low number of search
+ // and move iterations)
+ const id& possessor = iter.possessor();
+ int idx = lastShareholderIdx;
+ while (idx >= 0 && !(shareholders[idx].possessor < possessor))
+ {
+ --idx;
+ }
+ ++idx;
+
+ // update array: idx is the position to insert at with ID[idx] >= NewID
+ if (idx <= lastShareholderIdx && shareholders[idx].possessor == possessor)
+ {
+ // possessor is already in array -> increase number of shares
+ shareholders[idx].shares += iter.numberOfPossessedShares();
+ }
+ else
+ {
+ // possessor is not in array yet -> add it to the right place (after moving items if needed)
+ for (int idxMove = lastShareholderIdx; idxMove >= idx; --idxMove)
+ {
+ shareholders[idxMove + 1] = shareholders[idxMove];
+ }
+ shareholders[idx].possessor = possessor;
+ shareholders[idx].shares = iter.numberOfPossessedShares();
+ ++lastShareholderIdx;
+ }
+ }
+ }
+
+#ifndef NDEBUG
+ // sanity check of array (sorted, has expected size, and 676 shares in total)
+ ASSERT(lastShareholderIdx >= 0);
+ ASSERT(lastShareholderIdx < maxVotes);
+ sint64 totalShares = 0;
+ for (int idx = 0; idx < lastShareholderIdx; ++idx)
+ {
+ ASSERT(shareholders[idx].possessor < shareholders[idx + 1].possessor);
+ ASSERT(shareholders[idx].shares > 0);
+ totalShares += shareholders[idx].shares;
+ }
+ ASSERT(shareholders[lastShareholderIdx].shares > 0);
+ totalShares += shareholders[lastShareholderIdx].shares;
+ ASSERT(totalShares == maxVotes);
+#endif
+
+ // build sorted array of votes (one entry per share)
+ int voteIdx = 0;
+ for (int shareholderIdx = 0; shareholderIdx <= lastShareholderIdx; ++shareholderIdx)
+ {
+ const Shareholder& shareholder = shareholders[shareholderIdx];
+ for (int shareIdx = 0; shareIdx < shareholder.shares; ++shareIdx)
+ {
+ currentProposalShareholders[proposalIdx][voteIdx] = shareholder.possessor;
+ ++voteIdx;
+ }
+ }
+ ASSERT(voteIdx == maxVotes);
+ }
+
+ // Get new proposal slot (each proposer may have at most one).
+ // Returns proposal index or INVALID_PROPOSAL_INDEX on error.
+ // CAUTION: Only pass valid proposers!
+ uint16 getNewProposalIndex(const QpiContextFunctionCall& qpi, const id& proposerId)
+ {
+ // Reuse slot if proposer has existing proposal
+ uint16 idx = getExistingProposalIndex(qpi, proposerId);
+ if (idx < maxProposals)
+ {
+ setupNewProposal(qpi, proposerId, idx);
+ return idx;
+ }
+
+ // Otherwise, try to find empty slot
+ for (idx = 0; idx < maxProposals; ++idx)
+ {
+ if (isZero(currentProposalProposers[idx]))
+ {
+ setupNewProposal(qpi, proposerId, idx);
+ return idx;
+ }
+ }
+
+ // No empty slot -> fail
+ return INVALID_PROPOSAL_INDEX;
+ }
+
+ void freeProposalByIndex(const QpiContextFunctionCall& qpi, uint16 proposalIndex)
+ {
+ if (proposalIndex < maxProposals)
+ {
+ currentProposalProposers[proposalIndex] = NULL_ID;
+ setMem(currentProposalShareholders[proposalIndex], sizeof(id) * maxVotes, 0);
+ }
+ }
+
+ // Return proposer ID for given proposal index or NULL_ID if there is no proposal
+ id getProposerId(const QpiContextFunctionCall& qpi, uint16 proposalIndex) const
+ {
+ if (proposalIndex >= maxProposals)
+ return NULL_ID;
+ return currentProposalProposers[proposalIndex];
+ }
+
+ // Get new index of existing used proposal of proposer if any; only pass valid proposers!
+ // Returns proposal index or INVALID_PROPOSAL_INDEX if there is no proposal for given proposer.
+ uint16 getExistingProposalIndex(const QpiContextFunctionCall& qpi, const id& proposerId) const
+ {
+ if (isZero(proposerId))
+ return INVALID_PROPOSAL_INDEX;
+ for (uint16 i = 0; i < maxProposals; ++i)
+ {
+ if (currentProposalProposers[i] == proposerId)
+ return i;
+ }
+ return INVALID_PROPOSAL_INDEX;
+ }
+
+ // Return vote index for given ID or INVALID_VOTE_INDEX if ID has no right to vote. If the voter has multiple
+ // votes, this returns the first index. All votes of a voter are stored consecutively.
+ uint32 getVoteIndex(const QpiContextFunctionCall& qpi, const id& voterId, uint16 proposalIndex) const
+ {
+ // NULL_ID is invalid
+ if (isZero(voterId) || proposalIndex >= maxProposals)
+ return INVALID_VOTE_INDEX;
+
+ // Search for first vote index with voterId
+ // Note: This may be speeded up a bit because the array is sorted, but it is required to return the first element
+ // in a set of duplicates.
+ for (uint16 voteIdx = 0; voteIdx < maxVotes; ++voteIdx)
+ {
+ if (currentProposalShareholders[proposalIndex][voteIdx] == voterId)
+ return voteIdx;
+ }
+
+ return INVALID_VOTE_INDEX;
+ }
+
+ // Get count of votes of a voter specified by its first vote index (return 0 on error).
+ uint32 getVoteCount(const QpiContextFunctionCall& qpi, uint32 voteIndex, uint16 proposalIndex) const
+ {
+ if (voteIndex >= maxVotes || proposalIndex >= maxProposals)
+ return 0;
+
+ const id* shareholders = currentProposalShareholders[proposalIndex];
+ uint32 count = 1;
+ const id& voterId = shareholders[voteIndex];
+ for (uint32 idx = voteIndex + 1; idx < maxVotes; ++idx)
+ {
+ if (shareholders[idx] != voterId)
+ break;
+ ++count;
+ }
+
+ return count;
+ }
+
+ // Return voter ID for given vote index or NULL_ID on error
+ id getVoterId(const QpiContextFunctionCall& qpi, uint32 voteIndex, uint16 proposalIndex) const
+ {
+ if (voteIndex >= maxVotes || proposalIndex >= maxProposals)
+ return NULL_ID;
+ return currentProposalShareholders[proposalIndex][voteIndex];
+ }
+
+
+ protected:
+ // needs to be initialized with zeros
+ id currentProposalProposers[maxProposals];
+ id currentProposalShareholders[maxProposals][NUMBER_OF_COMPUTORS];
};
// Check if given type is valid (supported by most comprehensive ProposalData class).
@@ -130,6 +346,7 @@ namespace QPI
switch (cls)
{
case ProposalTypes::Class::GeneralOptions:
+ case ProposalTypes::Class::MultiVariables:
valid = (options >= 2 && options <= 8);
break;
case ProposalTypes::Class::Transfer:
@@ -156,7 +373,7 @@ namespace QPI
// Used internally by ProposalVoting to store a proposal with all votes.
// Supports all vote types.
- template
+ template
struct ProposalWithAllVoteData : public ProposalDataType
{
// Select type for storage (sint64 if scalar votes are supported, uint8 otherwise).
@@ -164,42 +381,42 @@ namespace QPI
typedef __VoteStorageTypeSelector::type VoteStorageType;
// Vote storage
- VoteStorageType votes[numOfVoters];
+ VoteStorageType votes[numOfVotes];
// Set proposal and reset all votes
bool set(const ProposalDataType& proposal)
{
if (!supportScalarVotes && proposal.type == ProposalTypes::VariableScalarMean)
return false;
-
+
copyMemory(*(ProposalDataType*)this, proposal);
if (!supportScalarVotes)
{
- // option voting only (1 byte per voter)
+ // option voting only (1 byte per vote)
ASSERT(proposal.type != ProposalTypes::VariableScalarMean);
constexpr uint8 noVoteValue = 0xff;
setMemory(votes, noVoteValue);
}
else
{
- // scalar voting supported (sint64 per voter)
+ // scalar voting supported (sint64 per vote)
// (cast should not be needed but is to get rid of warning)
- for (uint32 i = 0; i < numOfVoters; ++i)
+ for (uint32 i = 0; i < numOfVotes; ++i)
votes[i] = static_cast(NO_VOTE_VALUE);
}
return true;
}
- // Set vote value (as used in ProposalSingleVoteData) of given voter if voter and value are valid
- bool setVoteValue(uint32 voterIndex, sint64 voteValue)
+ // Set vote value (as used in ProposalSingleVoteData) of given index if index and value are valid
+ bool setVoteValue(uint32 voteIndex, sint64 voteValue)
{
bool ok = false;
- if (voterIndex < numOfVoters)
+ if (voteIndex < numOfVotes)
{
if (voteValue == NO_VOTE_VALUE)
{
- votes[voterIndex] = (supportScalarVotes) ? NO_VOTE_VALUE : 0xff;
+ votes[voteIndex] = (supportScalarVotes) ? NO_VOTE_VALUE : 0xff;
ok = true;
}
else
@@ -213,7 +430,7 @@ namespace QPI
if ((voteValue >= this->variableScalar.minValue && voteValue <= this->variableScalar.maxValue))
{
// (cast should not be needed but is to get rid of warning)
- votes[voterIndex] = static_cast(voteValue);
+ votes[voteIndex] = static_cast(voteValue);
ok = true;
}
}
@@ -224,7 +441,7 @@ namespace QPI
int numOptions = ProposalTypes::optionCount(this->type);
if (voteValue >= 0 && voteValue < numOptions)
{
- votes[voterIndex] = static_cast(voteValue);
+ votes[voteIndex] = static_cast(voteValue);
ok = true;
}
}
@@ -233,23 +450,23 @@ namespace QPI
return ok;
}
- // Get vote value of given voter as used in ProposalSingleVoteData
- sint64 getVoteValue(uint32 voterIndex) const
+ // Get vote value of given vote as used in ProposalSingleVoteData
+ sint64 getVoteValue(uint32 voteIndex) const
{
sint64 vv = NO_VOTE_VALUE;
- if (voterIndex < numOfVoters)
+ if (voteIndex < numOfVotes)
{
if (supportScalarVotes)
{
// stored in sint64 -> set directly
- vv = votes[voterIndex];
+ vv = votes[voteIndex];
}
else
{
// stored in uint8 -> set if valid vote (not no-vote value 0xff)
- if (votes[voterIndex] != 0xff)
+ if (votes[voteIndex] != 0xff)
{
- vv = votes[voterIndex];
+ vv = votes[voteIndex];
}
}
}
@@ -259,11 +476,11 @@ namespace QPI
// Used internally by ProposalVoting to store a proposal with all votes
// Template specialization if only yes/no is supported (saves storage space in votes)
- template
- struct ProposalWithAllVoteData : public ProposalDataYesNo
+ template
+ struct ProposalWithAllVoteData : public ProposalDataYesNo
{
- // Vote storage (2 bit per voter)
- uint8 votes[(2 * numOfVoters + 7) / 8];
+ // Vote storage (2 bit per vote)
+ uint8 votes[(2 * numOfVotes + 7) / 8];
// Set proposal and reset all votes
bool set(const ProposalDataYesNo& proposal)
@@ -273,23 +490,23 @@ namespace QPI
copyMemory(*(ProposalDataYesNo*)this, proposal);
- // option voting only (2 bit per voter)
+ // option voting only (2 bit per vote)
constexpr uint8 noVoteValue = 0xff;
setMemory(votes, noVoteValue);
return true;
}
- // Set vote value (as used in ProposalSingleVoteData) of given voter if voter and value are valid
- bool setVoteValue(uint32 voterIndex, sint64 voteValue)
+ // Set vote value (as used in ProposalSingleVoteData) of given index if index and value are valid
+ bool setVoteValue(uint32 voteIndex, sint64 voteValue)
{
bool ok = false;
- if (voterIndex < numOfVoters)
+ if (voteIndex < numOfVotes)
{
if (voteValue == NO_VOTE_VALUE)
{
- uint8 bits = (3 << ((voterIndex & 3) * 2));
- votes[voterIndex >> 2] |= bits;
+ uint8 bits = (3 << ((voteIndex & 3) * 2));
+ votes[voteIndex >> 2] |= bits;
ok = true;
}
else
@@ -297,10 +514,10 @@ namespace QPI
uint16 numOptions = ProposalTypes::optionCount(this->type);
if (voteValue >= 0 && voteValue < numOptions)
{
- uint8 bitMask = (3 << ((voterIndex & 3) * 2));
- uint8 bitNum = (uint8(voteValue) << ((voterIndex & 3) * 2));
- votes[voterIndex >> 2] &= ~bitMask;
- votes[voterIndex >> 2] |= bitNum;
+ uint8 bitMask = (3 << ((voteIndex & 3) * 2));
+ uint8 bitNum = (uint8(voteValue) << ((voteIndex & 3) * 2));
+ votes[voteIndex >> 2] &= ~bitMask;
+ votes[voteIndex >> 2] |= bitNum;
ok = true;
}
}
@@ -308,14 +525,14 @@ namespace QPI
return ok;
}
- // Get vote value of given voter as used in ProposalSingleVoteData
- sint64 getVoteValue(uint32 voterIndex) const
+ // Get vote value of given vote as used in ProposalSingleVoteData
+ sint64 getVoteValue(uint32 voteIndex) const
{
sint64 vv = NO_VOTE_VALUE;
- if (voterIndex < numOfVoters)
+ if (voteIndex < numOfVotes)
{
// stored in uint8 -> set if valid vote (not no-vote value 0xff)
- uint8 value = (votes[voterIndex >> 2] >> ((voterIndex & 3) * 2)) & 3;
+ uint8 value = (votes[voteIndex >> 2] >> ((voteIndex & 3) * 2)) & 3;
if (value != 3)
{
vv = value;
@@ -367,7 +584,7 @@ namespace QPI
// all occupied slots are used in current epoch? -> error
if (proposalIndex >= pv.maxProposals)
return INVALID_PROPOSAL_INDEX;
-
+
// remove oldest proposal
clearProposal(proposalIndex);
@@ -429,11 +646,115 @@ namespace QPI
if (vote.proposalTick != proposal.tick)
return false;
- // Return voter index (which may be INVALID_VOTER_INDEX if voter has no right to vote)
- unsigned int voterIndex = pv.proposersAndVoters.getVoterIndex(qpi, voter);
+ // Return vote index (which may be INVALID_VOTE_INDEX if voter has no right to vote)
+ unsigned int voteIndex = pv.proposersAndVoters.getVoteIndex(qpi, voter, vote.proposalIndex);
+ if (voteIndex == INVALID_VOTE_INDEX)
+ return false;
+
+ // Get count of votes that this voter can cast
+ unsigned int voteCount = pv.proposersAndVoters.getVoteCount(qpi, voteIndex, vote.proposalIndex);
+ ASSERT(voteCount >= 1);
- // Set vote value (checking that voter index and value are valid)
- return proposal.setVoteValue(voterIndex, vote.voteValue);
+ // Set vote value(s) (shareholder has one vote per share / computor has one vote only)
+ bool okay = true;
+ for (unsigned int i = 0; i < voteCount; ++i)
+ {
+ // Set vote value (checking that vote index and value are valid)
+ okay = proposal.setVoteValue(voteIndex + i, vote.voteValue);
+ if (!okay)
+ break;
+ }
+ return okay;
+ }
+
+ template
+ bool QpiContextProposalProcedureCall::vote(
+ const id& voter,
+ const ProposalMultiVoteDataV1& vote
+ )
+ {
+ ProposalVotingType& pv = const_cast(this->pv);
+ const QpiContextFunctionCall& qpi = this->qpi;
+
+ if (vote.proposalIndex >= pv.maxProposals)
+ return false;
+
+ // Check that vote matches proposal
+ auto& proposal = pv.proposals[vote.proposalIndex];
+ if (vote.proposalType != proposal.type)
+ return false;
+ if (qpi.epoch() != proposal.epoch)
+ return false;
+ if (vote.proposalTick != proposal.tick)
+ return false;
+
+ // Return vote index (which may be INVALID_VOTE_INDEX if voter has no right to vote)
+ unsigned int voteIndexBegin = pv.proposersAndVoters.getVoteIndex(qpi, voter, vote.proposalIndex);
+ if (voteIndexBegin == INVALID_VOTE_INDEX)
+ return false;
+
+ // Get count of votes that this voter can cast
+ unsigned int voteCountTotal = pv.proposersAndVoters.getVoteCount(qpi, voteIndexBegin, vote.proposalIndex);
+ ASSERT(voteCountTotal >= 1);
+
+ // Get count of votes sent
+ unsigned int voteCountSent = 0;
+ for (unsigned int i = 0; i < vote.voteCounts.capacity(); ++i)
+ voteCountSent += vote.voteCounts.get(i);
+
+ // Sent more votes than allowed?
+ if (voteCountSent > voteCountTotal)
+ return false;
+
+ // Set all votes up to total vote count (votes not sent are set to invalid)
+ unsigned int voteIndex = voteIndexBegin;
+ const unsigned int voteIndexEnd = voteIndexBegin + voteCountTotal;
+
+ // Compatibility case? -> count 0 means all votes with same value
+ bool okay = true;
+ if (voteCountSent == 0)
+ {
+ for (; voteIndex < voteIndexEnd; ++voteIndex)
+ {
+ // Set vote value (checking that vote index and value are valid)
+ okay = proposal.setVoteValue(voteIndex, vote.voteValues.get(0));
+ if (!okay)
+ {
+ // On error, fill all with invalid/no votes
+ voteIndex = voteIndexBegin;
+ goto leave;
+ }
+ }
+ return okay;
+ }
+
+ // Set multiple vote values (shareholder has multiple votes)
+ for (unsigned int i = 0; i < vote.voteCounts.capacity(); ++i)
+ {
+ sint64 voteValue = vote.voteValues.get(i);
+ uint32 voteCount = vote.voteCounts.get(i);
+ for (unsigned int j = 0; j < voteCount; ++j)
+ {
+ // Set vote value (checking that vote index and value are valid)
+ okay = proposal.setVoteValue(voteIndex, voteValue);
+ ++voteIndex;
+ if (!okay)
+ {
+ // On error, fill all with invalid/no votes
+ voteIndex = voteIndexBegin;
+ goto leave;
+ }
+ }
+ }
+
+ leave:
+ // Set remaining votes to no vote
+ for (; voteIndex < voteIndexEnd; ++voteIndex)
+ {
+ proposal.setVoteValue(voteIndex, NO_VOTE_VALUE);
+ }
+
+ return okay;
}
template
@@ -443,7 +764,11 @@ namespace QPI
) const
{
if (proposalIndex >= pv.maxProposals || !pv.proposals[proposalIndex].epoch)
+ {
+ // proposal.type == 0 indicates error
+ proposal.type = 0;
return false;
+ }
const ProposalDataType& storedProposal = *static_cast(&pv.proposals[proposalIndex]);
copyMemory(proposal, storedProposal);
return true;
@@ -452,25 +777,111 @@ namespace QPI
template
bool QpiContextProposalFunctionCall::getVote(
uint16 proposalIndex,
- uint32 voterIndex,
+ uint32 voteIndex,
ProposalSingleVoteDataV1& vote
) const
{
- if (proposalIndex >= pv.maxProposals || voterIndex >= pv.maxVoters || !pv.proposals[proposalIndex].epoch)
+ if (proposalIndex >= pv.maxProposals || voteIndex >= pv.maxVotes || !pv.proposals[proposalIndex].epoch)
+ {
+ // vote.proposalType == 0 indicates error
+ vote.proposalType = 0;
return false;
+ }
vote.proposalIndex = proposalIndex;
vote.proposalType = pv.proposals[proposalIndex].type;
vote.proposalTick = pv.proposals[proposalIndex].tick;
- vote.voteValue = pv.proposals[proposalIndex].getVoteValue(voterIndex);
+ vote.voteValue = pv.proposals[proposalIndex].getVoteValue(voteIndex);
return true;
}
+ template
+ bool QpiContextProposalFunctionCall::getVotes(
+ uint16 proposalIndex,
+ const id& voter,
+ ProposalMultiVoteDataV1& votes
+ ) const
+ {
+ // proposalType = 0 is an additional error indicator in votes (overwritten on success at the end of the function)
+ votes.proposalType = 0;
+
+ if (proposalIndex >= pv.maxProposals || !pv.proposals[proposalIndex].epoch)
+ return false;
+
+ auto& proposal = pv.proposals[proposalIndex];
+
+ // Return first vote index (which may be INVALID_VOTE_INDEX if voter has no right to vote)
+ unsigned int voteIndexBegin = pv.proposersAndVoters.getVoteIndex(qpi, voter, proposalIndex);
+ if (voteIndexBegin == INVALID_VOTE_INDEX)
+ return false;
+
+ // Get count of votes that this voter can cast
+ unsigned int voteCountTotal = pv.proposersAndVoters.getVoteCount(qpi, voteIndexBegin, proposalIndex);
+ ASSERT(voteCountTotal >= 1);
+
+ // Count votes of individual values
+ unsigned int voteIndex = voteIndexBegin;
+ const unsigned int voteIndexEnd = voteIndexBegin + voteCountTotal;
+
+ if (proposal.type == ProposalTypes::VariableScalarMean)
+ {
+ // scalar voting -> histogram with arbitrary values
+ uint32 voteValueIdx = 0, uniqueVoteValues = 0;
+ QPI::HashMap valueIdx;
+ valueIdx.reset();
+ votes.voteValues.setAll(0);
+ votes.voteCounts.setAll(0);
+ for (; voteIndex < voteIndexEnd; ++voteIndex)
+ {
+ sint64 voteValue = proposal.getVoteValue(voteIndex);
+ if (voteValue != NO_VOTE_VALUE)
+ {
+ if (!valueIdx.get(voteValue, voteValueIdx))
+ {
+ voteValueIdx = uniqueVoteValues;
+ if (voteValueIdx >= votes.voteValues.capacity())
+ return false;
+ valueIdx.set(voteValue, voteValueIdx);
+ votes.voteValues.set(voteValueIdx, voteValue);
+ ++uniqueVoteValues;
+ }
+ votes.voteCounts.set(voteValueIdx, votes.voteCounts.get(voteValueIdx) + 1);
+ }
+ }
+ }
+ else
+ {
+ // option voting -> compute histogram of option values
+ auto& hist = votes.voteCounts;
+ const uint16 optionCount = ProposalTypes::optionCount(proposal.type);
+ ASSERT(optionCount > 0);
+ ASSERT(optionCount <= hist.capacity());
+ hist.setAll(0);
+ for (; voteIndex < voteIndexEnd; ++voteIndex)
+ {
+ sint64 value = proposal.getVoteValue(voteIndex);
+ if (value != NO_VOTE_VALUE && value >= 0 && value < optionCount)
+ {
+ hist.set(value, hist.get(value) + 1);
+ }
+ }
+
+ votes.voteValues.setAll(0);
+ for (uint32 i = 0; i < optionCount; ++i)
+ votes.voteValues.set(i, i);
+ }
+
+ votes.proposalIndex = proposalIndex;
+ votes.proposalType = proposal.type;
+ votes.proposalTick = proposal.tick;
+
+ return true;
+ }
// Compute voting summary of scalar votes
- template
+ template
bool __getVotingSummaryScalarVotes(
- const ProposalWithAllVoteData& p,
+ const ProposalWithAllVoteData& p,
ProposalSummarizedVotingDataV1& votingSummary
)
{
@@ -480,49 +891,49 @@ namespace QPI
// scalar voting -> compute mean value of votes
sint64 value;
sint64 accumulation = 0;
- if (p.variableScalar.maxValue > p.variableScalar.maxSupportedValue / maxVoters
- || p.variableScalar.minValue < p.variableScalar.minSupportedValue / maxVoters)
+ if (p.variableScalar.maxValue > p.variableScalar.maxSupportedValue / maxVotes
+ || p.variableScalar.minValue < p.variableScalar.minSupportedValue / maxVotes)
{
// calculating mean in a way that avoids overflow of sint64
// algorithm based on https://stackoverflow.com/questions/56663116/how-to-calculate-average-of-int64-t
sint64 acc2 = 0;
- for (uint32 i = 0; i < maxVoters; ++i)
+ for (uint32 i = 0; i < maxVotes; ++i)
{
value = p.getVoteValue(i);
if (value != NO_VOTE_VALUE)
{
- ++votingSummary.totalVotes;
+ ++votingSummary.totalVotesCasted;
}
}
- if (votingSummary.totalVotes)
+ if (votingSummary.totalVotesCasted)
{
- for (uint32 i = 0; i < maxVoters; ++i)
+ for (uint32 i = 0; i < maxVotes; ++i)
{
value = p.getVoteValue(i);
if (value != NO_VOTE_VALUE)
{
- accumulation += value / votingSummary.totalVotes;
- acc2 += value % votingSummary.totalVotes;
+ accumulation += value / votingSummary.totalVotesCasted;
+ acc2 += value % votingSummary.totalVotesCasted;
}
}
- acc2 /= votingSummary.totalVotes;
+ acc2 /= votingSummary.totalVotesCasted;
accumulation += acc2;
}
}
else
{
// compute mean the regular way (faster than above)
- for (uint32 i = 0; i < maxVoters; ++i)
+ for (uint32 i = 0; i < maxVotes; ++i)
{
value = p.getVoteValue(i);
if (value != NO_VOTE_VALUE)
{
- ++votingSummary.totalVotes;
+ ++votingSummary.totalVotesCasted;
accumulation += value;
}
}
- if (votingSummary.totalVotes)
- accumulation /= votingSummary.totalVotes;
+ if (votingSummary.totalVotesCasted)
+ accumulation /= votingSummary.totalVotesCasted;
}
// make sure union is zeroed and set result
@@ -533,9 +944,9 @@ namespace QPI
}
// Specialization of "Compute voting summary of scalar votes" for ProposalDataYesNo, which has no struct members about support scalar votes
- template
+ template
bool __getVotingSummaryScalarVotes(
- const ProposalWithAllVoteData& p,
+ const ProposalWithAllVoteData& p,
ProposalSummarizedVotingDataV1& votingSummary
)
{
@@ -549,15 +960,17 @@ namespace QPI
ProposalSummarizedVotingDataV1& votingSummary
) const
{
+ // totalVotesAuthorized = 0 is an additional error indicator in votes (overwritten on success at the end of the function)
+ votingSummary.totalVotesAuthorized = 0;
+
if (proposalIndex >= pv.maxProposals || !pv.proposals[proposalIndex].epoch)
return false;
- const ProposalWithAllVoteData& p = pv.proposals[proposalIndex];
+ const ProposalWithAllVoteData& p = pv.proposals[proposalIndex];
votingSummary.proposalIndex = proposalIndex;
votingSummary.optionCount = ProposalTypes::optionCount(p.type);
votingSummary.proposalTick = p.tick;
- votingSummary.authorizedVoters = pv.maxVoters;
- votingSummary.totalVotes = 0;
+ votingSummary.totalVotesCasted = 0;
if (p.type == ProposalTypes::VariableScalarMean)
{
@@ -572,17 +985,19 @@ namespace QPI
ASSERT(votingSummary.optionCount <= votingSummary.optionVoteCount.capacity());
auto& hist = votingSummary.optionVoteCount;
hist.setAll(0);
- for (uint32 i = 0; i < pv.maxVoters; ++i)
+ for (uint32 i = 0; i < pv.maxVotes; ++i)
{
sint64 value = p.getVoteValue(i);
if (value != NO_VOTE_VALUE && value >= 0 && value < votingSummary.optionCount)
{
- ++votingSummary.totalVotes;
+ ++votingSummary.totalVotesCasted;
hist.set(value, hist.get(value) + 1);
}
}
}
+ votingSummary.totalVotesAuthorized = pv.maxVotes;
+
return true;
}
@@ -606,22 +1021,36 @@ namespace QPI
return pv.proposersAndVoters.getProposerId(qpi, proposalIndex);
}
- // Return voter index for given ID or INVALID_VOTER_INDEX if ID has no right to vote
+ // Return vote index for given ID or INVALID_VOTE_INDEX if ID has no right to vote. If the voter has multiple
+ // votes, this returns the first index. All votes of a voter are stored consecutively.
template
- uint32 QpiContextProposalFunctionCall::voterIndex(
- const id& voterId
+ uint32 QpiContextProposalFunctionCall::voteIndex(
+ const id& voterId,
+ uint16 proposalIndex
) const
{
- return pv.proposersAndVoters.getVoterIndex(qpi, voterId);
+ return pv.proposersAndVoters.getVoteIndex(qpi, voterId, proposalIndex);
}
- // Return ID for given voter index or NULL_ID if index is invalid
+ // Return ID for given vote index or NULL_ID if index is invalid
template
id QpiContextProposalFunctionCall::voterId(
- uint32 voterIndex
+ uint32 voteIndex,
+ uint16 proposalIndex
+ ) const
+ {
+ return pv.proposersAndVoters.getVoterId(qpi, voteIndex, proposalIndex);
+ }
+
+ // Return count of votes of a voter if the first vote index is passed. Otherwise return the number of votes
+ // including this and the following indices. Returns 0 if an invalid index is passed.
+ template
+ uint32 QpiContextProposalFunctionCall::voteCount(
+ uint32 voteIndex,
+ uint16 proposalIndex
) const
{
- return pv.proposersAndVoters.getVoterId(qpi, voterIndex);
+ return pv.proposersAndVoters.getVoteCount(qpi, voteIndex, proposalIndex);
}
// Return next proposal index of proposals of given epoch (default: current epoch)
diff --git a/src/contract_core/qpi_trivial_impl.h b/src/contract_core/qpi_trivial_impl.h
index 618ace814..3dfe1098e 100644
--- a/src/contract_core/qpi_trivial_impl.h
+++ b/src/contract_core/qpi_trivial_impl.h
@@ -20,6 +20,26 @@ namespace QPI
copyMem(&dst, &src, sizeof(dst));
}
+ template
+ inline void copyToBuffer(T1& dst, const T2& src, bool setTailToZero)
+ {
+ static_assert(sizeof(dst) >= sizeof(src), "Destination buffer must be at least the size of the source object.");
+ copyMem(&dst, &src, sizeof(src));
+ if (sizeof(dst) > sizeof(src) && setTailToZero)
+ {
+ uint8* tailPtr = reinterpret_cast(&dst) + sizeof(src);
+ const uint64 tailSize = sizeof(dst) - sizeof(src);
+ setMem(tailPtr, tailSize, 0);
+ }
+ }
+
+ template
+ inline void copyFromBuffer(T1& dst, const T2& src)
+ {
+ static_assert(sizeof(dst) <= sizeof(src), "Destination object must be at most the size of the source buffer.");
+ copyMem(&dst, &src, sizeof(dst));
+ }
+
template
inline void setMemory(T& dst, uint8 value)
{
diff --git a/src/contracts/ComputorControlledFund.h b/src/contracts/ComputorControlledFund.h
index fbd2175d6..f646e9ff1 100644
--- a/src/contracts/ComputorControlledFund.h
+++ b/src/contracts/ComputorControlledFund.h
@@ -189,7 +189,7 @@ struct CCF : public ContractBase
{
output.okay = qpi(state.proposals).getVote(
input.proposalIndex,
- qpi(state.proposals).voterIndex(input.voter),
+ qpi(state.proposals).voteIndex(input.voter),
output.vote);
}
@@ -279,7 +279,7 @@ struct CCF : public ContractBase
continue;
// The total number of votes needs to be at least the quorum
- if (locals.results.totalVotes < QUORUM)
+ if (locals.results.totalVotesCasted < QUORUM)
continue;
// The transfer option (1) must have more votes than the no-transfer option (0)
diff --git a/src/contracts/GeneralQuorumProposal.h b/src/contracts/GeneralQuorumProposal.h
index d7ff41981..08debc592 100644
--- a/src/contracts/GeneralQuorumProposal.h
+++ b/src/contracts/GeneralQuorumProposal.h
@@ -318,7 +318,7 @@ struct GQMPROP : public ContractBase
{
output.okay = qpi(state.proposals).getVote(
input.proposalIndex,
- qpi(state.proposals).voterIndex(input.voter),
+ qpi(state.proposals).voteIndex(input.voter),
output.vote);
}
@@ -396,7 +396,7 @@ struct GQMPROP : public ContractBase
if (qpi(state.proposals).getVotingSummary(locals.proposalIndex, locals.results))
{
// The total number of votes needs to be at least the quorum
- if (locals.results.totalVotes >= QUORUM)
+ if (locals.results.totalVotesCasted >= QUORUM)
{
// Find most voted option
locals.mostVotedOptionIndex = 0;
diff --git a/src/contracts/QUtil.h b/src/contracts/QUtil.h
index 7d23f1c2d..698eaeeee 100644
--- a/src/contracts/QUtil.h
+++ b/src/contracts/QUtil.h
@@ -14,12 +14,15 @@ using namespace QPI;
*/
// Return code for logger and return struct
+
+constexpr uint64 QUTIL_CONTRACT_ASSET_NAME = 327647778129;
+
constexpr uint64 QUTIL_STM1_SUCCESS = 0;
constexpr uint64 QUTIL_STM1_INVALID_AMOUNT_NUMBER = 1;
constexpr uint64 QUTIL_STM1_WRONG_FUND = 2;
constexpr uint64 QUTIL_STM1_TRIGGERED = 3;
constexpr uint64 QUTIL_STM1_SEND_FUND = 4;
-constexpr sint64 QUTIL_STM1_INVOCATION_FEE = 10LL; // fee to be burned and make the SC running
+constexpr sint64 QUTIL_STM1_INVOCATION_FEE = 10LL; // fee to be burned and make the SC running (initial value)
// Voting-specific constants
constexpr uint64 QUTIL_POLL_TYPE_QUBIC = 1;
@@ -29,8 +32,8 @@ constexpr uint64 QUTIL_MAX_VOTERS_PER_POLL = 131072;
constexpr uint64 QUTIL_TOTAL_VOTERS = QUTIL_MAX_POLL * QUTIL_MAX_VOTERS_PER_POLL;
constexpr uint64 QUTIL_MAX_OPTIONS = 64; // Maximum voting options (0 to 63)
constexpr uint64 QUTIL_MAX_ASSETS_PER_POLL = 16; // Maximum assets per poll
-constexpr sint64 QUTIL_VOTE_FEE = 100LL; // Fee for voting, burnt 100%
-constexpr sint64 QUTIL_POLL_CREATION_FEE = 10000000LL; // Fee for poll creation to prevent spam
+constexpr sint64 QUTIL_VOTE_FEE = 100LL; // Fee for voting, burnt 100% (initial value)
+constexpr sint64 QUTIL_POLL_CREATION_FEE = 10000000LL; // Fee for poll creation to prevent spam (initial value)
constexpr uint16 QUTIL_POLL_GITHUB_URL_MAX_SIZE = 256; // Max String Length for Poll's Github URLs
constexpr uint64 QUTIL_MAX_NEW_POLL = div(QUTIL_MAX_POLL, 4ULL); // Max number of new poll per epoch
@@ -55,7 +58,7 @@ constexpr uint64 QUTILLogTypeNotAuthorized = 20; // Not autho
constexpr uint64 QUTILLogTypeInsufficientFundsForCancel = 21; // Not have enough funds for poll calcellation
constexpr uint64 QUTILLogTypeMaxPollsReached = 22; // Max epoch per epoch reached
-// Fee per shareholder for DistributeQuToShareholders()
+// Fee per shareholder for DistributeQuToShareholders() (initial value)
constexpr sint64 QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER = 5;
@@ -128,6 +131,25 @@ struct QUTIL : public ContractBase
m256i dfMiningSeed;
m256i dfCurrentState;
+ // Fees
+ sint64 smt1InvocationFee;
+ sint64 pollCreationFee;
+ sint64 pollVoteFee;
+ sint64 distributeQuToShareholderFeePerShareholder;
+ sint64 shareholderProposalFee;
+
+ // Placeholder for future fees, preventing that state has to be extended for every new fee
+ sint64 _futureFeePlaceholder0;
+ sint64 _futureFeePlaceholder1;
+ sint64 _futureFeePlaceholder2;
+ sint64 _futureFeePlaceholder3;
+ sint64 _futureFeePlaceholder4;
+ sint64 _futureFeePlaceholder5;
+
+ // Provide storage for shareholder proposal state (supporting up to 8 simultaneous proposals)
+ DEFINE_SHAREHOLDER_PROPOSAL_STORAGE(8, QUTIL_CONTRACT_ASSET_NAME);
+
+
// Get Qubic Balance
struct get_qubic_balance_input {
id address;
@@ -385,6 +407,24 @@ struct QUTIL : public ContractBase
QUTILPoll default_poll; // default values if not found
};
+ typedef NoData GetFees_input;
+ struct GetFees_output
+ {
+ sint64 smt1InvocationFee;
+ sint64 pollCreationFee;
+ sint64 pollVoteFee;
+ sint64 distributeQuToShareholderFeePerShareholder;
+ sint64 shareholderProposalFee;
+
+ // Placeholder for future fees, preventing incompatibilities for some extensions
+ sint64 _futureFeePlaceholder0;
+ sint64 _futureFeePlaceholder1;
+ sint64 _futureFeePlaceholder2;
+ sint64 _futureFeePlaceholder3;
+ sint64 _futureFeePlaceholder4;
+ sint64 _futureFeePlaceholder5;
+ };
+
struct END_EPOCH_locals
{
uint64 i;
@@ -483,7 +523,7 @@ struct QUTIL : public ContractBase
*/
PUBLIC_FUNCTION(GetSendToManyV1Fee)
{
- output.fee = QUTIL_STM1_INVOCATION_FEE;
+ output.fee = state.smt1InvocationFee;
}
/**
@@ -560,7 +600,7 @@ struct QUTIL : public ContractBase
state.total -= input.amt22; if (state.total < 0) goto exit;
state.total -= input.amt23; if (state.total < 0) goto exit;
state.total -= input.amt24; if (state.total < 0) goto exit;
- state.total -= QUTIL_STM1_INVOCATION_FEE; if (state.total < 0) goto exit;
+ state.total -= state.smt1InvocationFee; if (state.total < 0) goto exit;
// insufficient or too many qubic transferred, return fund and exit (we don't want to return change)
if (state.total != 0)
@@ -729,7 +769,7 @@ struct QUTIL : public ContractBase
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTIL_STM1_SUCCESS};
LOG_INFO(locals.logger);
output.returnCode = QUTIL_STM1_SUCCESS;
- qpi.burn(QUTIL_STM1_INVOCATION_FEE);
+ qpi.burn(state.smt1InvocationFee);
}
/**
@@ -854,7 +894,7 @@ struct QUTIL : public ContractBase
}
// insufficient fund
- if (qpi.invocationReward() < QUTIL_POLL_CREATION_FEE)
+ if (qpi.invocationReward() < state.pollCreationFee)
{
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTILLogTypeInsufficientFundsForPoll };
LOG_INFO(locals.logger);
@@ -897,8 +937,8 @@ struct QUTIL : public ContractBase
return;
}
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - QUTIL_POLL_CREATION_FEE);
- qpi.burn(QUTIL_POLL_CREATION_FEE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.pollCreationFee);
+ qpi.burn(state.pollCreationFee);
locals.idx = mod(state.current_poll_id, QUTIL_MAX_POLL);
locals.new_poll.poll_name = input.poll_name;
@@ -927,7 +967,7 @@ struct QUTIL : public ContractBase
state.new_polls_this_epoch++;
- locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, QUTIL_POLL_CREATION_FEE, QUTILLogTypePollCreated };
+ locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, state.pollCreationFee, QUTILLogTypePollCreated };
LOG_INFO(locals.logger);
}
@@ -937,14 +977,14 @@ struct QUTIL : public ContractBase
PUBLIC_PROCEDURE_WITH_LOCALS(Vote)
{
output.success = false;
- if (qpi.invocationReward() < QUTIL_VOTE_FEE)
+ if (qpi.invocationReward() < state.pollVoteFee)
{
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTILLogTypeInsufficientFundsForVote };
LOG_INFO(locals.logger);
return;
}
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - QUTIL_VOTE_FEE);
- qpi.burn(QUTIL_VOTE_FEE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.pollVoteFee);
+ qpi.burn(state.pollVoteFee);
locals.idx = mod(input.poll_id, QUTIL_MAX_POLL);
@@ -1081,14 +1121,14 @@ struct QUTIL : public ContractBase
if (output.success)
{
- locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, QUTIL_VOTE_FEE, QUTILLogTypeVoteCast };
+ locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, state.pollVoteFee, QUTILLogTypeVoteCast };
LOG_INFO(locals.logger);
}
}
PUBLIC_PROCEDURE_WITH_LOCALS(CancelPoll)
{
- if (qpi.invocationReward() < QUTIL_POLL_CREATION_FEE)
+ if (qpi.invocationReward() < state.pollCreationFee)
{
locals.logger = QUTILLogger{ 0, 0, qpi.invocator(), SELF, qpi.invocationReward(), QUTILLogTypeInsufficientFundsForCancel };
LOG_INFO(locals.logger);
@@ -1135,8 +1175,8 @@ struct QUTIL : public ContractBase
LOG_INFO(locals.logger);
output.success = true;
- qpi.transfer(qpi.invocator(), qpi.invocationReward() - QUTIL_POLL_CREATION_FEE);
- qpi.burn(QUTIL_POLL_CREATION_FEE);
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - state.pollCreationFee);
+ qpi.burn(state.pollCreationFee);
}
/**
@@ -1217,6 +1257,15 @@ struct QUTIL : public ContractBase
}
}
+ PUBLIC_FUNCTION(GetFees)
+ {
+ output.smt1InvocationFee = state.smt1InvocationFee;
+ output.pollCreationFee = state.pollCreationFee;
+ output.pollVoteFee = state.pollVoteFee;
+ output.distributeQuToShareholderFeePerShareholder = state.distributeQuToShareholderFeePerShareholder;
+ output.shareholderProposalFee = state.shareholderProposalFee;
+ }
+
/**
* End of epoch processing for polls, sets active polls to inactive
*/
@@ -1234,11 +1283,25 @@ struct QUTIL : public ContractBase
}
state.new_polls_this_epoch = 0;
+
+ // Check shareholder proposals and update fees if needed
+ CALL(FinalizeShareholderStateVarProposals, input, output);
}
BEGIN_EPOCH()
{
state.dfMiningSeed = qpi.getPrevSpectrumDigest();
+
+ // init fee state variables
+ // TODO: remove this in next epoch
+ if (qpi.epoch() == 186)
+ {
+ state.smt1InvocationFee = QUTIL_STM1_INVOCATION_FEE;
+ state.pollCreationFee = QUTIL_POLL_CREATION_FEE;
+ state.pollVoteFee = QUTIL_VOTE_FEE;
+ state.distributeQuToShareholderFeePerShareholder = QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ state.shareholderProposalFee = 100;
+ }
}
// Deactivate delay function
@@ -1308,7 +1371,7 @@ struct QUTIL : public ContractBase
}
// 1.3. Compute fee (proportional to number of shareholders)
- output.fees = output.shareholders * QUTIL_DISTRIBUTE_QU_TO_SHAREHOLDER_FEE_PER_SHAREHOLDER;
+ output.fees = output.shareholders * state.distributeQuToShareholderFeePerShareholder;
// 1.4. Compute QU per share
output.amountPerShare = div(qpi.invocationReward() - output.fees, output.totalShares);
@@ -1343,6 +1406,35 @@ struct QUTIL : public ContractBase
}
}
+ /**************************************/
+ /* SHAREHOLDER PROPOSALS */
+ /**************************************/
+
+ IMPLEMENT_FinalizeShareholderStateVarProposals()
+ {
+ switch (input.proposal.variableOptions.variable)
+ {
+ case 0:
+ state.smt1InvocationFee = input.acceptedValue;
+ break;
+ case 1:
+ state.pollCreationFee = input.acceptedValue;
+ break;
+ case 2:
+ state.pollVoteFee = input.acceptedValue;
+ break;
+ case 3:
+ state.distributeQuToShareholderFeePerShareholder = input.acceptedValue;
+ break;
+ case 4:
+ state.shareholderProposalFee = input.acceptedValue;
+ break;
+ }
+ }
+
+ IMPLEMENT_DEFAULT_SHAREHOLDER_PROPOSAL_VOTING(5, state.shareholderProposalFee)
+
+
REGISTER_USER_FUNCTIONS_AND_PROCEDURES()
{
REGISTER_USER_FUNCTION(GetSendToManyV1Fee, 1);
@@ -1351,6 +1443,7 @@ struct QUTIL : public ContractBase
REGISTER_USER_FUNCTION(GetPollsByCreator, 4);
REGISTER_USER_FUNCTION(GetCurrentPollId, 5);
REGISTER_USER_FUNCTION(GetPollInfo, 6);
+ REGISTER_USER_FUNCTION(GetFees, 7);
REGISTER_USER_PROCEDURE(SendToManyV1, 1);
REGISTER_USER_PROCEDURE(BurnQubic, 2);
@@ -1359,5 +1452,7 @@ struct QUTIL : public ContractBase
REGISTER_USER_PROCEDURE(Vote, 5);
REGISTER_USER_PROCEDURE(CancelPoll, 6);
REGISTER_USER_PROCEDURE(DistributeQuToShareholders, 7);
+
+ REGISTER_SHAREHOLDER_PROPOSAL_VOTING();
}
};
diff --git a/src/contracts/TestExampleA.h b/src/contracts/TestExampleA.h
index ec3910fbe..f8eedc102 100644
--- a/src/contracts/TestExampleA.h
+++ b/src/contracts/TestExampleA.h
@@ -1,5 +1,7 @@
using namespace QPI;
+constexpr uint64 TESTEXA_ASSET_NAME = 18392928276923732;
+
struct TESTEXA2
{
};
@@ -312,7 +314,7 @@ struct TESTEXA : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -327,7 +329,7 @@ struct TESTEXA : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -342,7 +344,7 @@ struct TESTEXA : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -357,7 +359,7 @@ struct TESTEXA : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -424,6 +426,370 @@ struct TESTEXA : public ContractBase
output = state.heavyComputationResult;
}
+ //---------------------------------------------------------------
+ // SHAREHOLDER PROPOSALS WITH COMPACT STORAGE (OPTIONS: NO/YES)
+
+public:
+ // Proposal data type. We only support yes/no voting.
+ typedef ProposalDataYesNo ProposalDataT;
+
+ // MultiVariables proposal option data type, which is custom per contract
+ struct MultiVariablesProposalExtraData
+ {
+ struct Option
+ {
+ uint64 dummyStateVariable1;
+ uint32 dummyStateVariable2;
+ sint8 dummyStateVariable3;
+ };
+
+ Option optionYesValues;
+ bool hasValueDummyStateVariable1;
+ bool hasValueDummyStateVariable2;
+ bool hasValueDummyStateVariable3;
+
+ bool isValid() const
+ {
+ return hasValueDummyStateVariable1 || hasValueDummyStateVariable2 || hasValueDummyStateVariable3;
+ }
+ };
+
+ struct SetShareholderProposal_input
+ {
+ ProposalDataT proposalData;
+ MultiVariablesProposalExtraData multiVarData; // may be skipped when sending TX if not MultiVariables proposal
+ };
+ typedef QPI::SET_SHAREHOLDER_PROPOSAL_output SetShareholderProposal_output;
+
+ PUBLIC_PROCEDURE(SetShareholderProposal)
+ {
+ // - fee can be handled as you like
+ // - input.proposalData.epoch == 0 means clearing a proposal
+
+ // default return code: failure
+ output = INVALID_PROPOSAL_INDEX;
+
+ // custom checks
+ if (input.proposalData.epoch != 0)
+ {
+ switch (ProposalTypes::cls(input.proposalData.type))
+ {
+ case ProposalTypes::Class::MultiVariables:
+ // check input
+ if (!input.multiVarData.isValid())
+ return;
+
+ // check that proposed values are in valid range
+ if (input.multiVarData.hasValueDummyStateVariable1 && input.multiVarData.optionYesValues.dummyStateVariable1 > 1000000000000llu)
+ return;
+ if (input.multiVarData.hasValueDummyStateVariable2 && input.multiVarData.optionYesValues.dummyStateVariable2 > 1000000llu)
+ return;
+ if (input.multiVarData.hasValueDummyStateVariable3 && (input.multiVarData.optionYesValues.dummyStateVariable3 > 100 || input.multiVarData.optionYesValues.dummyStateVariable3 < -100))
+ return;
+
+ break;
+
+ case ProposalTypes::Class::Variable:
+ // check that variable index is in valid range
+ if (input.proposalData.variableOptions.variable >= 3)
+ return;
+
+ // check that proposed value is in valid range
+ if (input.proposalData.variableOptions.variable == 0 && input.proposalData.variableOptions.value > 1000000000000llu)
+ return;
+ if (input.proposalData.variableOptions.variable == 1 && input.proposalData.variableOptions.value > 1000000llu)
+ return;
+ if (input.proposalData.variableOptions.variable == 2 && (input.proposalData.variableOptions.value > 100 || input.proposalData.variableOptions.value < -100))
+ return;
+
+ break;
+
+ case ProposalTypes::Class::GeneralOptions:
+ // allow without check
+ break;
+
+ default:
+ // this forbids other proposals including transfers and all future propsasl classes not implemented yet
+ return;
+ }
+ }
+
+ // Try to set proposal (checks invocator's rights and general validity of input proposal), returns proposal index
+ output = qpi(state.proposals).setProposal(qpi.invocator(), input.proposalData);
+
+ if (output != INVALID_PROPOSAL_INDEX)
+ {
+ // success
+ if (ProposalTypes::cls(input.proposalData.type) == ProposalTypes::Class::MultiVariables)
+ {
+ // store custom data of multi-variable proposal in array (at position proposalIdx)
+ state.multiVariablesProposalData.set(output, input.multiVarData);
+ }
+ }
+ }
+
+ typedef ProposalMultiVoteDataV1 SetShareholderVotes_input;
+ typedef bit SetShareholderVotes_output;
+
+ PUBLIC_PROCEDURE(SetShareholderVotes)
+ {
+ // - fee can be handled as you like
+
+ output = qpi(state.proposals).vote(qpi.invocator(), input);
+ }
+
+ struct END_EPOCH_locals
+ {
+ sint32 proposalIndex;
+ ProposalDataT proposal;
+ ProposalSummarizedVotingDataV1 results;
+ MultiVariablesProposalExtraData multiVarData;
+ };
+
+ END_EPOCH_WITH_LOCALS()
+ {
+ // Analyze proposal results and set variables
+
+ // Iterate all proposals that were open for voting in this epoch ...
+ locals.proposalIndex = -1;
+ while ((locals.proposalIndex = qpi(state.proposals).nextProposalIndex(locals.proposalIndex, qpi.epoch())) >= 0)
+ {
+ if (!qpi(state.proposals).getProposal(locals.proposalIndex, locals.proposal))
+ continue;
+
+ // handle Variable proposal type
+ if (ProposalTypes::cls(locals.proposal.type) == ProposalTypes::Class::Variable)
+ {
+ // Get voting results and check if conditions for proposal acceptance are met
+ if (!qpi(state.proposals).getVotingSummary(locals.proposalIndex, locals.results))
+ continue;
+
+ // Check if the yes option (1) has been accepted
+ if (locals.results.getAcceptedOption() == 1)
+ {
+ if (locals.proposal.variableOptions.variable == 0)
+ state.dummyStateVariable1 = uint64(locals.proposal.variableOptions.value);
+ if (locals.proposal.variableOptions.variable == 1)
+ state.dummyStateVariable2 = uint32(locals.proposal.variableOptions.value);
+ if (locals.proposal.variableOptions.variable == 2)
+ state.dummyStateVariable3 = sint8(locals.proposal.variableOptions.value);
+ }
+ }
+
+ // handle MultiVariables proposal type
+ if (ProposalTypes::cls(locals.proposal.type) == ProposalTypes::Class::MultiVariables)
+ {
+ // Get voting results and check if conditions for proposal acceptance are met
+ if (!qpi(state.proposals).getVotingSummary(locals.proposalIndex, locals.results))
+ continue;
+
+ // Check if the yes option (1) has been accepted
+ if (locals.results.getAcceptedOption() == 1)
+ {
+ locals.multiVarData = state.multiVariablesProposalData.get(locals.proposalIndex);
+
+ if (locals.multiVarData.hasValueDummyStateVariable1)
+ state.dummyStateVariable1 = locals.multiVarData.optionYesValues.dummyStateVariable1;
+ if (locals.multiVarData.hasValueDummyStateVariable2)
+ state.dummyStateVariable2 = locals.multiVarData.optionYesValues.dummyStateVariable2;
+ if (locals.multiVarData.hasValueDummyStateVariable3)
+ state.dummyStateVariable3 = locals.multiVarData.optionYesValues.dummyStateVariable3;
+ }
+ }
+ }
+ }
+
+ struct GetShareholderProposalIndices_input
+ {
+ bit activeProposals; // Set true to return indices of active proposals, false for proposals of prior epochs
+ sint32 prevProposalIndex; // Set -1 to start getting indices. If returned index array is full, call again with highest index returned.
+ };
+ struct GetShareholderProposalIndices_output
+ {
+ uint16 numOfIndices; // Number of valid entries in indices. Call again if it is 64.
+ Array indices; // Requested proposal indices. Valid entries are in range 0 ... (numOfIndices - 1).
+ };
+
+ PUBLIC_FUNCTION(GetShareholderProposalIndices)
+ {
+ if (input.activeProposals)
+ {
+ // Return proposals that are open for voting in current epoch
+ // (output is initalized with zeros by contract system)
+ while ((input.prevProposalIndex = qpi(state.proposals).nextProposalIndex(input.prevProposalIndex, qpi.epoch())) >= 0)
+ {
+ output.indices.set(output.numOfIndices, input.prevProposalIndex);
+ ++output.numOfIndices;
+
+ if (output.numOfIndices == output.indices.capacity())
+ break;
+ }
+ }
+ else
+ {
+ // Return proposals of previous epochs not overwritten yet
+ // (output is initalized with zeros by contract system)
+ while ((input.prevProposalIndex = qpi(state.proposals).nextFinishedProposalIndex(input.prevProposalIndex)) >= 0)
+ {
+ output.indices.set(output.numOfIndices, input.prevProposalIndex);
+ ++output.numOfIndices;
+
+ if (output.numOfIndices == output.indices.capacity())
+ break;
+ }
+ }
+ }
+
+ typedef NoData GetShareholderProposalFees_input;
+ struct GetShareholderProposalFees_output
+ {
+ sint64 setProposalFee;
+ sint64 setVoteFee;
+ };
+
+ PUBLIC_FUNCTION(GetShareholderProposalFees)
+ {
+ output.setProposalFee = 0;
+ output.setVoteFee = 0;
+ }
+
+ struct GetShareholderProposal_input
+ {
+ uint16 proposalIndex;
+ };
+ struct GetShareholderProposal_output
+ {
+ ProposalDataT proposal;
+ id proposerPubicKey;
+ MultiVariablesProposalExtraData multiVarData;
+ };
+
+ PUBLIC_FUNCTION(GetShareholderProposal)
+ {
+ // On error, output.proposal.type is set to 0
+ output.proposerPubicKey = qpi(state.proposals).proposerId(input.proposalIndex);
+ qpi(state.proposals).getProposal(input.proposalIndex, output.proposal);
+ if (ProposalTypes::cls(output.proposal.type) == ProposalTypes::Class::MultiVariables)
+ {
+ output.multiVarData = state.multiVariablesProposalData.get(input.proposalIndex);
+ }
+ }
+
+ struct GetShareholderVotes_input
+ {
+ id voter;
+ uint16 proposalIndex;
+ };
+ typedef ProposalMultiVoteDataV1 GetShareholderVotes_output;
+
+ PUBLIC_FUNCTION(GetShareholderVotes)
+ {
+ // On error, output.votes.proposalType is set to 0
+ qpi(state.proposals).getVotes(
+ input.proposalIndex,
+ input.voter,
+ output);
+ }
+
+
+ struct GetShareholderVotingResults_input
+ {
+ uint16 proposalIndex;
+ };
+ typedef ProposalSummarizedVotingDataV1 GetShareholderVotingResults_output;
+
+ PUBLIC_FUNCTION(GetShareholderVotingResults)
+ {
+ // On error, output.totalVotesAuthorized is set to 0
+ qpi(state.proposals).getVotingSummary(
+ input.proposalIndex, output);
+ }
+
+ struct SET_SHAREHOLDER_PROPOSAL_locals
+ {
+ SetShareholderProposal_input userProcInput;
+ };
+
+ SET_SHAREHOLDER_PROPOSAL_WITH_LOCALS()
+ {
+ copyFromBuffer(locals.userProcInput, input);
+ CALL(SetShareholderProposal, locals.userProcInput, output);
+
+ // bug-checking: qpi.setShareholder*() must fail
+ ASSERT(!qpi.setShareholderVotes(10, ProposalMultiVoteDataV1(), qpi.invocationReward()));
+ ASSERT(qpi.setShareholderProposal(10, input, qpi.invocationReward()) == INVALID_PROPOSAL_INDEX);
+ }
+
+ SET_SHAREHOLDER_VOTES()
+ {
+ CALL(SetShareholderVotes, input, output);
+
+#ifdef NO_UEFI
+ // bug-checking: qpi.setShareholder*() must fail
+ ASSERT(!qpi.setShareholderVotes(10, input, qpi.invocationReward()));
+ ASSERT(qpi.setShareholderProposal(10, SET_SHAREHOLDER_PROPOSAL_input(), qpi.invocationReward()) == INVALID_PROPOSAL_INDEX);
+#endif
+ }
+
+protected:
+ // Variables that can be set with proposals
+ uint64 dummyStateVariable1;
+ uint32 dummyStateVariable2;
+ sint8 dummyStateVariable3;
+
+ // Shareholders of TESTEXA have right to propose and vote. Only 16 slots provided.
+ typedef ProposalAndVotingByShareholders<16, TESTEXA_ASSET_NAME> ProposersAndVotersT;
+
+ // Proposal and voting storage type
+ typedef ProposalVoting ProposalVotingT;
+
+ // Proposal storage
+ ProposalVotingT proposals;
+
+ // MultiVariables proposal option data storage (same number of slots as proposals)
+ Array multiVariablesProposalData;
+
+
+public:
+ struct SetProposalInOtherContractAsShareholder_input
+ {
+ Array proposalDataBuffer;
+ uint16 otherContractIndex;
+ };
+ struct SetProposalInOtherContractAsShareholder_output
+ {
+ uint16 proposalIndex;
+ };
+ struct SetProposalInOtherContractAsShareholder_locals
+ {
+ Array proposalDataBuffer;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(SetProposalInOtherContractAsShareholder)
+ {
+ // User procedure for letting TESTEXB create a shareholder proposal in TESTEXA as shareholder of TESTEXA.
+ // Skipped here: checking that invocator has right to set proposal for this contract (e.g., is contract "admin")
+ copyToBuffer(locals.proposalDataBuffer, input.proposalDataBuffer);
+ output.proposalIndex = qpi.setShareholderProposal(input.otherContractIndex, locals.proposalDataBuffer, qpi.invocationReward());
+ }
+
+ struct SetVotesInOtherContractAsShareholder_input
+ {
+ ProposalMultiVoteDataV1 voteData;
+ uint16 otherContractIndex;
+ };
+ struct SetVotesInOtherContractAsShareholder_output
+ {
+ bit success;
+ };
+
+ PUBLIC_PROCEDURE(SetVotesInOtherContractAsShareholder)
+ {
+ // User procedure for letting TESTEXB cast shareholder votes in TESTEXA as shareholder of TESTEXA.
+ // Skipped here: checking that invocator has right to cast votes for this contract (e.g., is contract "admin")
+ output.success = qpi.setShareholderVotes(input.otherContractIndex, input.voteData, qpi.invocationReward());
+ }
+
//---------------------------------------------------------------
// COMMON PARTS
@@ -443,5 +809,19 @@ struct TESTEXA : public ContractBase
REGISTER_USER_PROCEDURE(AcquireShareManagementRights, 6);
REGISTER_USER_PROCEDURE(QueryQpiFunctionsToState, 7);
REGISTER_USER_PROCEDURE(RunHeavyComputation, 8);
+
+ REGISTER_USER_PROCEDURE(SetProposalInOtherContractAsShareholder, 40);
+ REGISTER_USER_PROCEDURE(SetVotesInOtherContractAsShareholder, 41);
+
+ // Shareholder proposals: use standard function/procedure indices
+ REGISTER_USER_FUNCTION(GetShareholderProposalFees, 65531);
+ REGISTER_USER_FUNCTION(GetShareholderProposalIndices, 65532);
+ REGISTER_USER_FUNCTION(GetShareholderProposal, 65533);
+ REGISTER_USER_FUNCTION(GetShareholderVotes, 65534);
+ REGISTER_USER_FUNCTION(GetShareholderVotingResults, 65535);
+
+ REGISTER_USER_PROCEDURE(SetShareholderProposal, 65534);
+ REGISTER_USER_PROCEDURE(SetShareholderVotes, 65535);
+
}
};
diff --git a/src/contracts/TestExampleB.h b/src/contracts/TestExampleB.h
index f5b8d857a..617888ba5 100644
--- a/src/contracts/TestExampleB.h
+++ b/src/contracts/TestExampleB.h
@@ -1,5 +1,7 @@
using namespace QPI;
+constexpr uint64 TESTEXB_ASSET_NAME = 18674403253634388;
+
struct TESTEXB2
{
};
@@ -159,7 +161,7 @@ struct TESTEXB : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -174,7 +176,7 @@ struct TESTEXB : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -189,7 +191,7 @@ struct TESTEXB : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -204,7 +206,7 @@ struct TESTEXB : public ContractBase
ASSERT(qpi.invocator().u64._0 == input.otherContractIndex);
// calling qpi.releaseShares() and qpi.acquireShares() is forbidden in *_SHARES callbacks
- // and should return with an error immeditately
+ // and should return with an error immediately
ASSERT(qpi.releaseShares(input.asset, input.owner, input.possessor, input.numberOfShares,
input.otherContractIndex, input.otherContractIndex, qpi.invocationReward()) == INVALID_AMOUNT);
ASSERT(qpi.acquireShares(input.asset, input.owner, qpi.invocator(), input.numberOfShares,
@@ -345,6 +347,218 @@ struct TESTEXB : public ContractBase
output = qpi.bidInIPO(input.ipoContractIndex, input.pricePerShare, input.numberOfShares);
}
+ //---------------------------------------------------------------
+ // SHAREHOLDER PROPOSALS WITH MULTI-OPTION + SCALAR STORAGE
+
+protected:
+ // Variables that can be set with proposals
+ sint64 fee1;
+ sint64 fee2;
+ sint64 fee3;
+
+public:
+ // Proposal data type. Support up to 8 options and scalar voting.
+ typedef ProposalDataV1 ProposalDataT;
+
+ // Shareholders of TESTEXA have right to propose and vote. Only 16 slots provided.
+ typedef ProposalAndVotingByShareholders<16, TESTEXB_ASSET_NAME> ProposersAndVotersT;
+
+ // Proposal and voting storage type
+ typedef ProposalVoting ProposalVotingT;
+
+protected:
+ // Proposal storage
+ ProposalVotingT proposals;
+public:
+
+ struct SetShareholderProposal_input
+ {
+ ProposalDataT proposalData;
+ };
+ typedef QPI::SET_SHAREHOLDER_PROPOSAL_output SetShareholderProposal_output;
+
+ struct SetShareholderProposal_locals
+ {
+ uint16 optionCount;
+ uint16 i;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(SetShareholderProposal)
+ {
+ // - fee can be handled as you like
+ // - input.proposalData.epoch == 0 means clearing a proposal
+
+ // default return code: failure
+ output = INVALID_PROPOSAL_INDEX;
+
+ // custom checks
+ if (input.proposalData.epoch != 0)
+ {
+ switch (ProposalTypes::cls(input.proposalData.type))
+ {
+ case ProposalTypes::Class::Variable:
+ // check that variable index is in valid range
+ if (input.proposalData.variableOptions.variable >= 3)
+ return;
+
+ // check that proposed value is in valid range
+ // (in this example, it is independent of the variable index; all fees must be positive)
+ locals.optionCount = ProposalTypes::optionCount(input.proposalData.type);
+ if (locals.optionCount == 0)
+ {
+ // votes are scalar values
+ if (input.proposalData.variableScalar.minValue < 0
+ || input.proposalData.variableScalar.maxValue < 0
+ || input.proposalData.variableScalar.proposedValue < 0)
+ return;
+ }
+ else
+ {
+ // votes are option indices (option 0 is no change, value i is option i + 1)
+ for (locals.i = 0; locals.i < locals.optionCount - 1; ++locals.i)
+ if (input.proposalData.variableOptions.values.get(locals.i) < 0)
+ return;
+ }
+
+ break;
+
+ default:
+ // this forbids all other proposals including transfers, multi-variable, general, and all future propsasl classes
+ return;
+ }
+ }
+
+ // Try to set proposal (checks invocator's rights and general validity of input proposal), returns proposal index
+ output = qpi(state.proposals).setProposal(qpi.invocator(), input.proposalData);
+ }
+
+
+
+
+ struct FinalizeShareholderProposalSetStateVar_input
+ {
+ sint32 proposalIndex;
+ ProposalDataT proposal;
+ ProposalSummarizedVotingDataV1 results;
+ sint32 acceptedOption;
+ sint64 acceptedValue;
+ };
+ typedef NoData FinalizeShareholderProposalSetStateVar_output;
+
+ PRIVATE_PROCEDURE(FinalizeShareholderProposalSetStateVar)
+ {
+ if (input.proposal.variableOptions.variable == 0)
+ state.fee1 = input.acceptedValue;
+ else if (input.proposal.variableOptions.variable == 1)
+ state.fee2 = input.acceptedValue;
+ else if (input.proposal.variableOptions.variable == 2)
+ state.fee3 = input.acceptedValue;
+ }
+
+ typedef NoData FinalizeShareholderStateVarProposals_input;
+ typedef NoData FinalizeShareholderStateVarProposals_output;
+ struct FinalizeShareholderStateVarProposals_locals
+ {
+ FinalizeShareholderProposalSetStateVar_input p;
+ uint16 proposalClass;
+ };
+
+ PRIVATE_PROCEDURE_WITH_LOCALS(FinalizeShareholderStateVarProposals)
+ {
+ // Analyze proposal results and set variables:
+ // Iterate all proposals that were open for voting in this epoch ...
+ locals.p.proposalIndex = -1;
+ while ((locals.p.proposalIndex = qpi(state.proposals).nextProposalIndex(locals.p.proposalIndex, qpi.epoch())) >= 0)
+ {
+ if (!qpi(state.proposals).getProposal(locals.p.proposalIndex, locals.p.proposal))
+ continue;
+
+ locals.proposalClass = ProposalTypes::cls(locals.p.proposal.type);
+
+ // Handle proposal type Variable / MultiVariables
+ if (locals.proposalClass == ProposalTypes::Class::Variable || locals.proposalClass == ProposalTypes::Class::MultiVariables)
+ {
+ // Get voting results and check if conditions for proposal acceptance are met
+ if (!qpi(state.proposals).getVotingSummary(locals.p.proposalIndex, locals.p.results))
+ continue;
+
+ if (locals.p.proposal.type == ProposalTypes::VariableScalarMean)
+ {
+ if (locals.p.results.totalVotesCasted < QUORUM)
+ continue;
+
+ locals.p.acceptedValue = locals.p.results.scalarVotingResult;
+ }
+ else
+ {
+ locals.p.acceptedOption = locals.p.results.getAcceptedOption();
+ if (locals.p.acceptedOption <= 0)
+ continue;
+
+ // option 0 is "no change", option 1 has index 0 in variableOptions
+ locals.p.acceptedValue = locals.p.proposal.variableOptions.values.get(locals.p.acceptedOption - 1);
+ }
+
+ CALL(FinalizeShareholderProposalSetStateVar, locals.p, output);
+ }
+ }
+ }
+
+ END_EPOCH()
+ {
+ CALL(FinalizeShareholderStateVarProposals, input, output);
+ }
+
+
+ IMPLEMENT_GetShareholderProposalFees(0)
+ IMPLEMENT_GetShareholderProposal()
+ IMPLEMENT_GetShareholderProposalIndices()
+ IMPLEMENT_SetShareholderVotes()
+ IMPLEMENT_GetShareholderVotes()
+ IMPLEMENT_GetShareholderVotingResults()
+ IMPLEMENT_SET_SHAREHOLDER_PROPOSAL()
+ IMPLEMENT_SET_SHAREHOLDER_VOTES()
+
+public:
+ struct SetProposalInOtherContractAsShareholder_input
+ {
+ Array proposalDataBuffer;
+ uint16 otherContractIndex;
+ };
+ struct SetProposalInOtherContractAsShareholder_output
+ {
+ uint16 proposalIndex;
+ };
+ struct SetProposalInOtherContractAsShareholder_locals
+ {
+ Array proposalDataBuffer;
+ };
+
+ PUBLIC_PROCEDURE_WITH_LOCALS(SetProposalInOtherContractAsShareholder)
+ {
+ // User procedure for letting TESTEXB create a shareholder proposal in TESTEXA as shareholder of TESTEXA.
+ // Skipped here: checking that invocator has right to set proposal for this contract (e.g., is contract "admin")
+ copyToBuffer(locals.proposalDataBuffer, input.proposalDataBuffer);
+ output.proposalIndex = qpi.setShareholderProposal(input.otherContractIndex, locals.proposalDataBuffer, qpi.invocationReward());
+ }
+
+ struct SetVotesInOtherContractAsShareholder_input
+ {
+ ProposalMultiVoteDataV1 voteData;
+ uint16 otherContractIndex;
+ };
+ struct SetVotesInOtherContractAsShareholder_output
+ {
+ bit success;
+ };
+
+ PUBLIC_PROCEDURE(SetVotesInOtherContractAsShareholder)
+ {
+ // User procedure for letting TESTEXB cast shareholder votes in TESTEXA as shareholder of TESTEXA.
+ // Skipped here: checking that invocator has right to cast votes for this contract (e.g., is contract "admin")
+ output.success = qpi.setShareholderVotes(input.otherContractIndex, input.voteData, qpi.invocationReward());
+ }
+
//---------------------------------------------------------------
// COMMON PARTS
@@ -366,5 +580,9 @@ struct TESTEXB : public ContractBase
REGISTER_USER_PROCEDURE(QpiTransfer, 20);
REGISTER_USER_PROCEDURE(QpiDistributeDividends, 21);
REGISTER_USER_PROCEDURE(QpiBidInIpo, 30);
+ REGISTER_USER_PROCEDURE(SetProposalInOtherContractAsShareholder, 40);
+ REGISTER_USER_PROCEDURE(SetVotesInOtherContractAsShareholder, 41);
+
+ REGISTER_SHAREHOLDER_PROPOSAL_VOTING();
}
};
diff --git a/src/contracts/qpi.h b/src/contracts/qpi.h
index d963e1f60..f21f0779a 100644
--- a/src/contracts/qpi.h
+++ b/src/contracts/qpi.h
@@ -127,6 +127,16 @@ namespace QPI
template
inline void copyMemory(T1& dst, const T2& src);
+ // Copy object src into buffer dst. The size of the dst buffer must be grater or equal to the size of src object.
+ // If dst size is greater than src size and setTailToZero is true, set the part of dst to zero that follows
+ // behind the copy of src.
+ template
+ inline void copyToBuffer(T1& dst, const T2& src, bool setTailToZero = false);
+
+ // Set object dst from buffer src. The size of the src buffer must be grater or equal to the size of dst object.
+ template
+ inline void copyFromBuffer(T1& dst, const T2& src);
+
// Set all memory of dst to byte value.
template
inline void setMemory(T& dst, uint8 value);
@@ -1242,7 +1252,7 @@ namespace QPI
//////////
constexpr uint16 INVALID_PROPOSAL_INDEX = 0xffff;
- constexpr uint32 INVALID_VOTER_INDEX = 0xffffffff;
+ constexpr uint32 INVALID_VOTE_INDEX = 0xffffffff;
constexpr sint64 NO_VOTE_VALUE = 0x8000000000000000;
// Single vote for all types of proposals defined in August 2024.
@@ -1265,6 +1275,35 @@ namespace QPI
};
static_assert(sizeof(ProposalSingleVoteDataV1) == 16, "Unexpected struct size.");
+ // For casting multiple votes for all types of proposals defined in August 2024.
+ // This makes sense for shareholder voting, where a single shareholder may own multiple shares, allowing to cast
+ // multiple votes. With this structs, the votes may be individually distributed to multiple options/values.
+ // Input data for contract procedure call, compatible with ProposalSingleVoteDataV1. That is, to cast all votes
+ // of a shareholder with the same value, just set element 0 of voteValues and leave/set the rest to zero (including
+ // the voteCounts).
+ struct ProposalMultiVoteDataV1
+ {
+ // Index of proposal the vote is about (can be requested with proposal voting API)
+ uint16 proposalIndex;
+
+ // Type of proposal, see ProposalTypes
+ uint16 proposalType;
+
+ // Tick when proposal has been set (to make sure that proposal version known by the voter matches the current version).
+ uint32 proposalTick;
+
+ // Value of vote. NO_VOTE_VALUE means no vote for every type.
+ // For proposals types with multiple options, 0 is no, 1 to N are the other options in order of definition in proposal.
+ // For scalar proposal types the value is passed directly.
+ Array voteValues;
+
+ // Count of votes to cast for the corresponding voteValues.
+ // For compatibility with ProposalSingleVoteDataV1, voteCounts.get(0) == 0 means all votes of the voter. In
+ // the other elements, 0 means no votes for the given value.
+ Array voteCounts;
+ };
+ static_assert(sizeof(ProposalMultiVoteDataV1) == 104, "Unexpected struct size.");
+
// Voting result summary for all types of proposals defined in August 2024.
// Output data for contract function call for getting voting results.
struct ProposalSummarizedVotingDataV1
@@ -1278,11 +1317,11 @@ namespace QPI
// Tick when proposal has been set (useful for checking if cached ProposalData is still up to date).
uint32 proposalTick;
- // Number of voter who have the right to vote
- uint32 authorizedVoters;
+ // Maximal number of votes (number of voters who have the right to vote if there aren't multiple votes per voter)
+ uint32 totalVotesAuthorized;
// Number of total votes casted
- uint32 totalVotes;
+ uint32 totalVotesCasted;
// Voting results
union
@@ -1294,11 +1333,47 @@ namespace QPI
sint64 scalarVotingResult;
};
+ // Return index of most voted option or -1 if this is scalar voting
+ sint32 getMostVotedOption() const
+ {
+ if (optionCount == 0)
+ return -1;
+ sint32 mostVotedOptionIndex = 0;
+ uint32 mostVotedOptionVotes = optionVoteCount.get(0);
+ for (sint32 optionIndex = 1; optionIndex < optionCount; ++optionIndex)
+ {
+ uint32 optionVotes = optionVoteCount.get(optionIndex);
+ if (mostVotedOptionVotes < optionVotes)
+ {
+ mostVotedOptionVotes = optionVotes;
+ mostVotedOptionIndex = optionIndex;
+ }
+ }
+ return mostVotedOptionIndex;
+ }
+
+ // Return index of option accepted by quorum or -1 if none is accepted
+ sint32 getAcceptedOption(uint32 totalVotesThresh = QUORUM, uint32 mostVotedThreshold = QUORUM/2) const
+ {
+ if (totalVotesCasted >= totalVotesThresh)
+ {
+ sint32 opt = getMostVotedOption();
+ if (opt >= 0 && optionVoteCount.get(opt) > mostVotedThreshold)
+ return opt;
+ }
+ return -1;
+ }
+
ProposalSummarizedVotingDataV1() = default;
ProposalSummarizedVotingDataV1(const ProposalSummarizedVotingDataV1& src)
{
copyMemory(*this, src);
}
+ ProposalSummarizedVotingDataV1& operator=(const ProposalSummarizedVotingDataV1& src)
+ {
+ copyMemory(*this, src);
+ return *this;
+ }
};
static_assert(sizeof(ProposalSummarizedVotingDataV1) == 16 + 8*4, "Unexpected struct size.");
@@ -1320,10 +1395,16 @@ namespace QPI
// Propose to set variable to a value. Supported options: 2 <= N <= 5 with ProposalDataV1; N == 0 means scalar voting.
static constexpr uint16 Variable = 0x200;
+ // Propose to set multiple variables. Supported options: 2 <= N <= 8 with ProposalDataV1
+ static constexpr uint16 MultiVariables = 0x300;
+
// Propose to transfer amount to address in a specific epoch. Supported options: 1 with ProposalDataV1.
static constexpr uint16 TransferInEpoch = 0x400;
};
+ // Invalid proposal type returned to encode error in some interfaces
+ static constexpr uint16 Invalid = 0;
+
// Options yes and no without extra data -> result is histogram of options
static constexpr uint16 YesNo = Class::GeneralOptions | 2;
@@ -1363,8 +1444,20 @@ namespace QPI
// Set given variable to value, allowing to vote with scalar value, voting result is mean value
static constexpr uint16 VariableScalarMean = Class::Variable | 0;
+ // TODO: support quorum value max / min as voting result
+
+ // Set multiple variables with options yes/no (data stored by contract) -> result is histogram of options
+ static constexpr uint16 MultiVariablesYesNo = Class::MultiVariables | 2;
+
+ // Set multiple variables with 3 options "no change" / "values A" / "values B" (data stored by contract)
+ // -> result is histogram of options
+ static constexpr uint16 MultiVariablesThreeOptions = Class::MultiVariables | 3;
- // Contruct type from class + number of options (no checking if type is valid)
+ // Set multiple variables with 4 options "no change" / "values A" / "values B" / "values C" (data stored by
+ // contract) -> result is histogram of options
+ static constexpr uint16 MultiVariablesFourOptions = Class::MultiVariables | 4;
+
+ // Construct type from class + number of options (no checking if type is valid)
static constexpr uint16 type(uint16 cls, uint16 options)
{
return cls | options;
@@ -1394,8 +1487,8 @@ namespace QPI
struct ProposalDataV1
{
// URL explaining proposal, zero-terminated string.
- Array url;
-
+ Array url;
+
// Epoch, when proposal is active. For setProposal(), 0 means to clear proposal and non-zero means the current epoch.
uint16 epoch;
@@ -1454,6 +1547,7 @@ namespace QPI
switch (cls)
{
case ProposalTypes::Class::GeneralOptions:
+ case ProposalTypes::Class::MultiVariables:
okay = options >= 2 && options <= 8;
break;
case ProposalTypes::Class::Transfer:
@@ -1507,6 +1601,11 @@ namespace QPI
{
copyMemory(*this, src);
}
+ ProposalDataV1& operator=(const ProposalDataV1& src)
+ {
+ copyMemory(*this, src);
+ return *this;
+ }
};
static_assert(sizeof(ProposalDataV1) == 256 + 8 + 64, "Unexpected struct size.");
@@ -1555,7 +1654,8 @@ namespace QPI
switch (cls)
{
case ProposalTypes::Class::GeneralOptions:
- okay = options >= 2 && options <= 3;
+ case ProposalTypes::Class::MultiVariables:
+ okay = options >= 2 && options <= 3; // 3 options can be encoded in the yes/no type of storage as well
break;
case ProposalTypes::Class::Transfer:
okay = (options == 2 && !isZero(transfer.destination) && transfer.amount >= 0);
@@ -1569,6 +1669,17 @@ namespace QPI
// Whether to support scalar votes next to option votes.
static constexpr bool supportScalarVotes = false;
+
+ ProposalDataYesNo() = default;
+ ProposalDataYesNo(const ProposalDataYesNo& src)
+ {
+ copyMemory(*this, src);
+ }
+ ProposalDataYesNo& operator=(const ProposalDataYesNo& src)
+ {
+ copyMemory(*this, src);
+ return *this;
+ }
};
static_assert(sizeof(ProposalDataYesNo) == 256 + 8 + 40, "Unexpected struct size.");
@@ -1582,11 +1693,12 @@ namespace QPI
template
struct ProposalAndVotingByComputors;
- // Option for ProposerAndVoterHandlingT in ProposalVoting that allows both voting for computors only and creating/chaning proposals for anyone.
+ // Option for ProposerAndVoterHandlingT in ProposalVoting that allows both voting for computors only and creating/changing proposals for anyone.
template
struct ProposalByAnyoneVotingByComputors;
- template
+ // Option for ProposerAndVoterHandlingT in ProposalVoting that allows both voting and setting proposals for contract shareholders only.
+ template
struct ProposalAndVotingByShareholders;
template
@@ -1609,17 +1721,17 @@ namespace QPI
{
public:
static constexpr uint16 maxProposals = ProposerAndVoterHandlingT::maxProposals;
- static constexpr uint32 maxVoters = ProposerAndVoterHandlingT::maxVoters;
+ static constexpr uint32 maxVotes = ProposerAndVoterHandlingT::maxVotes;
typedef ProposerAndVoterHandlingT ProposerAndVoterHandlingType;
typedef ProposalDataT ProposalDataType;
typedef ProposalWithAllVoteData<
ProposalDataT,
- maxVoters
+ maxVotes
> ProposalAndVotesDataType;
static_assert(maxProposals <= INVALID_PROPOSAL_INDEX);
- static_assert(maxVoters <= INVALID_VOTER_INDEX);
+ static_assert(maxVotes <= INVALID_VOTE_INDEX);
// Handling of who has the right to propose and to vote + proposal / voter indices
ProposerAndVoterHandlingType proposersAndVoters;
@@ -1637,13 +1749,16 @@ namespace QPI
template
struct QpiContextProposalFunctionCall
{
- // Get proposal with given index if index is valid and proposal is set (epoch > 0)
+ // Get proposal with given index if index is valid and proposal is set (epoch > 0). On error returns false and sets proposal.type = 0.
bool getProposal(uint16 proposalIndex, ProposalDataType& proposal) const;
- // Get data of single vote
- bool getVote(uint16 proposalIndex, uint32 voterIndex, ProposalSingleVoteDataV1& vote) const;
+ // Get data of single vote. On error returns false and sets vote.proposalType = 0.
+ bool getVote(uint16 proposalIndex, uint32 voteIndex, ProposalSingleVoteDataV1& vote) const;
- // Get summary of all votes casted
+ // Get data of votes of a given voter. On error returns false and sets votes.proposalType = 0.
+ bool getVotes(uint16 proposalIndex, const id& voter, ProposalMultiVoteDataV1& votes) const;
+
+ // Get summary of all votes casted. On error returns false and sets votingSummary.totalVotesAuthorized = 0.
bool getVotingSummary(uint16 proposalIndex, ProposalSummarizedVotingDataV1& votingSummary) const;
// Return index of existing proposal or INVALID_PROPOSAL_INDEX if there is no proposal by given proposer
@@ -1652,11 +1767,19 @@ namespace QPI
// Return proposer ID of given proposal index or NULL_ID if there is no proposal at this index
id proposerId(uint16 proposalIndex) const;
- // Return voter index for given ID or INVALID_VOTER_INDEX if ID has no right to vote
- uint32 voterIndex(const id& voterId) const;
+ // Return vote index for given ID or INVALID_VOTE_INDEX if ID has no right to vote. If the voter has multiple
+ // votes, this returns the first index. All votes of a voter are stored consecutively.
+ // If voters are shareholders, proposalIndex must be passed. If voters are computors, proposalIndex is ignored.
+ uint32 voteIndex(const id& voterId, uint16 proposalIndex = 0) const;
+
+ // Return ID for given vote index or NULL_ID if index is invalid.
+ // If voters are shareholders, proposalIndex must be passed. If voters are computors, proposalIndex is ignored.
+ id voterId(uint32 voteIndex, uint16 proposalIndex = 0) const;
- // Return ID for given voter index or NULL_ID if index is invalid
- id voterId(uint32 voterIndex) const;
+ // Return count of votes of a voter if his first vote index is passed. Otherwise return the number of votes
+ // including this and the following indices. Returns 0 if an invalid index is passed.
+ // If voters are shareholders, proposalIndex must be passed. If voters are computors, proposalIndex is ignored.
+ uint32 voteCount(uint32 voteIndex, uint16 proposalIndex = 0) const;
// Return next proposal index of proposals of given epoch (default: current epoch)
// or -1 if there are not any more such proposals behind the passed index.
@@ -1705,6 +1828,7 @@ namespace QPI
// Cast vote for proposal with index vote.proposalIndex if voter has right to vote, the proposal's epoch
// is the current epoch, vote.proposalType and vote.proposalTick match the corresponding proposal's values,
// and vote.voteValue is valid for the proposal type.
+ // If voter has multiple votes (possible in shareholder voting), cast all votes of voter with the same value.
// This can be used to remove a previous vote by vote.voteValue = NO_VOTE_VALUE.
// Return whether vote has been casted.
bool vote(
@@ -1712,6 +1836,21 @@ namespace QPI
const ProposalSingleVoteDataV1& vote
);
+ // Cast votes for proposal with index votes.proposalIndex if voter has right to vote, the proposal's epoch
+ // is the current epoch, votes.proposalType and votes.proposalTick match the corresponding proposal's values,
+ // the votes.voteValues are valid for the proposal type, and the sum of votes.voteCounts does not exceed the
+ // number of votes available to the voter.
+ // If any vote value is invalid, all votes of the voter are set to NO_VOTE_VALUE.
+ // This can be used to remove previous votes by using a vote value of NO_VOTE_VALUE or a total vote count less
+ // than the number of votes available to the voter.
+ // For compatibility with ProposalSingleVoteDataV1, all votes are set with votes.voteValues.get(0) if the sum
+ // of votes.voteCounts is 0.
+ // Return whether the votes have been casted.
+ bool vote(
+ const id& voter,
+ const ProposalMultiVoteDataV1& votes
+ );
+
// ProposalVoting type to work with
typedef ProposalVoting ProposalVotingType;
@@ -1970,6 +2109,34 @@ namespace QPI
sint64 offeredTransferFee
) const; // Returns payed fee on success (>= 0), -requestedFee if offeredTransferFee or contract balance is not sufficient, INVALID_AMOUNT in case of other error.
+ /**
+ * @brief Add/change/cancel shareholder proposal as shareholder of another contract.
+ * @param contractIndex Index of the other contract, that SELF is shareholder of and that the proposal is about.
+ * @param proposalDataBuffer Buffer for passing the contract-dependent proposal data. You may use copyToBuffer() to fill it.
+ * @param invocationReward Invocation reward sent to contractIndex when invoking it's procedure.
+ * @return Proposal index on success, INVALID_PROPOSAL_INDEX on error.
+ * @note Invokes SET_SHAREHOLDER_PROPOSAL of contractIndex without checking shareholder status and proposalDataBuffer.
+ */
+ inline uint16 setShareholderProposal(
+ uint16 contractIndex,
+ const Array& proposalDataBuffer,
+ sint64 invocationReward
+ ) const;
+
+ /**
+ * @brief Add/change/cancel shareholder vote(s) in another contract.
+ * @param contractIndex Index of the other contract, that SELF is shareholder of and that the proposal is about.
+ * @param shareholderVoteData Vote(s) to cast. See ProposalMultiVoteDataV1 for details.
+ * @param invocationReward Invocation reward sent to contractIndex when invoking it's procedure.
+ * @return Proposal index on success, INVALID_PROPOSAL_INDEX on error.
+ * @note Invokes SET_SHAREHOLDER_VOTES of contractIndex without checking shareholder status and shareholderVoteData.
+ */
+ inline bool setShareholderVotes(
+ uint16 contractIndex,
+ const ProposalMultiVoteDataV1& shareholderVoteData,
+ sint64 invocationReward
+ ) const;
+
inline sint64 transfer( // Attempts to transfer energy from this qubic
const id& destination, // Destination to transfer to, use NULL_ID to destroy the transferred energy
sint64 amount // Energy amount to transfer, must be in [0..1'000'000'000'000'000] range
@@ -1996,7 +2163,7 @@ namespace QPI
inline void* __qpiAcquireStateForWriting(unsigned int contractIndex) const;
inline void __qpiReleaseStateForWriting(unsigned int contractIndex) const;
template
- void __qpiCallSystemProc(unsigned int otherContractIndex, InputType& input, OutputType& output, sint64 invocationReward) const;
+ bool __qpiCallSystemProc(unsigned int otherContractIndex, InputType& input, OutputType& output, sint64 invocationReward) const;
inline void __qpiNotifyPostIncomingTransfer(const id& source, const id& dest, sint64 amount, uint8 type) const;
protected:
@@ -2064,6 +2231,18 @@ namespace QPI
uint8 type;
};
+ // Input of SET_SHAREHOLDER_PROPOSAL system procedure (buffer for passing the contract-dependent proposal data)
+ typedef Array SET_SHAREHOLDER_PROPOSAL_input;
+
+ // Output of SET_SHAREHOLDER_PROPOSAL system procedure (proposal index, or INVALID_PROPOSAL_INDEX on error)
+ typedef uint16 SET_SHAREHOLDER_PROPOSAL_output;
+
+ // Input of SET_SHAREHOLDER_VOTES system procedure (vote data)
+ typedef ProposalMultiVoteDataV1 SET_SHAREHOLDER_VOTES_input;
+
+ // Output of SET_SHAREHOLDER_VOTES system procedure (success flag)
+ typedef bit SET_SHAREHOLDER_VOTES_output;
+
//////////
struct ContractBase
@@ -2088,6 +2267,10 @@ namespace QPI
static void __postReleaseShares(const QpiContextProcedureCall&, void*, void*, void*) {}
enum { __postIncomingTransferEmpty = 1, __postIncomingTransferLocalsSize = sizeof(NoData) };
static void __postIncomingTransfer(const QpiContextProcedureCall&, void*, void*, void*) {}
+ enum { __setShareholderProposalEmpty = 1, __setShareholderProposalLocalsSize = sizeof(NoData) };
+ static void __setShareholderProposal(const QpiContextProcedureCall&, void*, void*, void*) {}
+ enum { __setShareholderVotesEmpty = 1, __setShareholderVotesLocalsSize = sizeof(NoData) };
+ static void __setShareholderVotes(const QpiContextProcedureCall&, void*, void*, void*) {}
enum { __acceptOracleTrueReplyEmpty = 1, __acceptOracleTrueReplyLocalsSize = sizeof(NoData) };
static void __acceptOracleTrueReply(const QpiContextProcedureCall&, void*, void*, void*) {}
enum { __acceptOracleFalseReplyEmpty = 1, __acceptOracleFalseReplyLocalsSize = sizeof(NoData) };
@@ -2203,6 +2386,31 @@ namespace QPI
NO_IO_SYSTEM_PROC_WITH_LOCALS(POST_INCOMING_TRANSFER, __postIncomingTransfer, PostIncomingTransfer_input, \
NoData)
+ // Define contract system procedure called when another contract tries to set/change/cancel a proposal through
+ // qpi.setShareholderProposal(). See `doc/contracts.md` for details.
+ #define SET_SHAREHOLDER_PROPOSAL() \
+ NO_IO_SYSTEM_PROC(SET_SHAREHOLDER_PROPOSAL, __setShareholderProposal, SET_SHAREHOLDER_PROPOSAL_input, \
+ SET_SHAREHOLDER_PROPOSAL_output)
+
+ // Define contract system procedure called when another contract tries to set/change/cancel a proposal through
+ // qpi.setShareholderProposal(). Provides zeroed instance of SET_SHAREHOLDER_PROPOSAL_locals struct. See
+ // `doc/contracts.md` for details.
+ #define SET_SHAREHOLDER_PROPOSAL_WITH_LOCALS() \
+ NO_IO_SYSTEM_PROC_WITH_LOCALS(SET_SHAREHOLDER_PROPOSAL, __setShareholderProposal, SET_SHAREHOLDER_PROPOSAL_input, \
+ SET_SHAREHOLDER_PROPOSAL_output)
+
+ // Define contract system procedure called when another contract tries to set/change/cancel a vote through
+ // qpi.setShareholderVotes(). See `doc/contracts.md` for details.
+ #define SET_SHAREHOLDER_VOTES() \
+ NO_IO_SYSTEM_PROC(SET_SHAREHOLDER_VOTES, __setShareholderVotes, SET_SHAREHOLDER_VOTES_input, \
+ SET_SHAREHOLDER_VOTES_output)
+
+ // Define contract system procedure called when another contract tries to set/change/cancel a vote through
+ // qpi.setShareholderVotes(). Provides zeroed instance of SET_SHAREHOLDER_VOTES_locals struct. See
+ // `doc/contracts.md` for details.
+ #define SET_SHAREHOLDER_VOTES_WITH_LOCALS() \
+ NO_IO_SYSTEM_PROC_WITH_LOCALS(SET_SHAREHOLDER_VOTES, __setShareholderVotes, SET_SHAREHOLDER_VOTES_input, \
+ SET_SHAREHOLDER_VOTES_output)
#define EXPAND() \
public: \
@@ -2332,4 +2540,140 @@ namespace QPI
#define SELF id(CONTRACT_INDEX, 0, 0, 0)
#define SELF_INDEX CONTRACT_INDEX
+
+ //////////
+
+ #define DEFINE_SHAREHOLDER_PROPOSAL_STORAGE(numProposalSlots, assetNameInt64) \
+ public: \
+ typedef ProposalDataYesNo ProposalDataT; \
+ typedef ProposalAndVotingByShareholders ProposersAndVotersT; \
+ typedef ProposalVoting ProposalVotingT; \
+ protected: \
+ ProposalVotingT proposals
+
+ #define IMPLEMENT_SetShareholderProposal(numFeeStateVariables, setProposalFeeVarOrValue) \
+ typedef ProposalDataT SetShareholderProposal_input; \
+ typedef uint16 SetShareholderProposal_output; \
+ PUBLIC_PROCEDURE(SetShareholderProposal) { \
+ if (qpi.invocationReward() < setProposalFeeVarOrValue || (input.epoch \
+ && (input.type != ProposalTypes::VariableYesNo || input.variableOptions.variable >= numFeeStateVariables \
+ || input.variableOptions.value < 0))) { \
+ qpi.transfer(qpi.invocator(), qpi.invocationReward()); \
+ output = INVALID_PROPOSAL_INDEX; \
+ return; } \
+ output = qpi(state.proposals).setProposal(qpi.invocator(), input); \
+ if (output == INVALID_PROPOSAL_INDEX) { \
+ qpi.transfer(qpi.invocator(), qpi.invocationReward()); \
+ return; } \
+ qpi.burn(setProposalFeeVarOrValue); \
+ if (qpi.invocationReward() > setProposalFeeVarOrValue) { \
+ qpi.transfer(qpi.invocator(), qpi.invocationReward() - setProposalFeeVarOrValue); } }
+
+ #define IMPLEMENT_GetShareholderProposal() \
+ struct GetShareholderProposal_input { uint16 proposalIndex; }; \
+ struct GetShareholderProposal_output { ProposalDataT proposal; id proposerPubicKey; }; \
+ PUBLIC_FUNCTION(GetShareholderProposal) { \
+ output.proposerPubicKey = qpi(state.proposals).proposerId(input.proposalIndex); \
+ qpi(state.proposals).getProposal(input.proposalIndex, output.proposal); }
+
+ #define IMPLEMENT_GetShareholderProposalIndices() \
+ struct GetShareholderProposalIndices_input { bit activeProposals; sint32 prevProposalIndex; }; \
+ struct GetShareholderProposalIndices_output { uint16 numOfIndices; Array indices; }; \
+ PUBLIC_FUNCTION(GetShareholderProposalIndices) {\
+ if (input.activeProposals) { \
+ while ((input.prevProposalIndex = qpi(state.proposals).nextProposalIndex(input.prevProposalIndex, qpi.epoch())) >= 0) { \
+ output.indices.set(output.numOfIndices, input.prevProposalIndex); \
+ ++output.numOfIndices; \
+ if (output.numOfIndices == output.indices.capacity()) break; } } \
+ else { \
+ while ((input.prevProposalIndex = qpi(state.proposals).nextFinishedProposalIndex(input.prevProposalIndex)) >= 0) { \
+ output.indices.set(output.numOfIndices, input.prevProposalIndex); \
+ ++output.numOfIndices; \
+ if (output.numOfIndices == output.indices.capacity()) break; } } }
+
+ #define IMPLEMENT_GetShareholderProposalFees(setProposalFeeVarOrValue) \
+ typedef NoData GetShareholderProposalFees_input; \
+ struct GetShareholderProposalFees_output { sint64 setProposalFee; sint64 setVoteFee; }; \
+ PUBLIC_FUNCTION(GetShareholderProposalFees) { \
+ output.setProposalFee = setProposalFeeVarOrValue; \
+ output.setVoteFee = 0; }
+
+ #define IMPLEMENT_SetShareholderVotes() \
+ typedef ProposalMultiVoteDataV1 SetShareholderVotes_input; \
+ typedef bit SetShareholderVotes_output; \
+ PUBLIC_PROCEDURE(SetShareholderVotes) { \
+ output = qpi(state.proposals).vote(qpi.invocator(), input); } \
+
+ #define IMPLEMENT_GetShareholderVotes() \
+ struct GetShareholderVotes_input { id voter; uint16 proposalIndex; }; \
+ typedef ProposalMultiVoteDataV1 GetShareholderVotes_output; \
+ PUBLIC_FUNCTION(GetShareholderVotes) { \
+ qpi(state.proposals).getVotes(input.proposalIndex, input.voter, output); }
+
+ #define IMPLEMENT_GetShareholderVotingResults() \
+ struct GetShareholderVotingResults_input { uint16 proposalIndex; }; \
+ typedef ProposalSummarizedVotingDataV1 GetShareholderVotingResults_output; \
+ PUBLIC_FUNCTION(GetShareholderVotingResults) { \
+ qpi(state.proposals).getVotingSummary(input.proposalIndex, output); }
+
+ #define IMPLEMENT_SET_SHAREHOLDER_PROPOSAL() \
+ struct SET_SHAREHOLDER_PROPOSAL_locals { SetShareholderProposal_input userProcInput; }; \
+ SET_SHAREHOLDER_PROPOSAL_WITH_LOCALS() { \
+ copyFromBuffer(locals.userProcInput, input); \
+ CALL(SetShareholderProposal, locals.userProcInput, output); }
+
+ #define IMPLEMENT_SET_SHAREHOLDER_VOTES() \
+ SET_SHAREHOLDER_VOTES() { \
+ CALL(SetShareholderVotes, input, output); }
+
+ // Define procedures for easily implementing END_EPOCH
+ #define IMPLEMENT_FinalizeShareholderStateVarProposals() \
+ struct FinalizeShareholderProposalSetStateVar_input { \
+ sint32 proposalIndex; ProposalDataT proposal; ProposalSummarizedVotingDataV1 results; \
+ sint32 acceptedOption; sint64 acceptedValue; }; \
+ typedef NoData FinalizeShareholderProposalSetStateVar_output; \
+ typedef NoData FinalizeShareholderStateVarProposals_input; \
+ typedef NoData FinalizeShareholderStateVarProposals_output; \
+ struct FinalizeShareholderStateVarProposals_locals { \
+ FinalizeShareholderProposalSetStateVar_input p; uint16 proposalClass; }; \
+ PRIVATE_PROCEDURE_WITH_LOCALS(FinalizeShareholderStateVarProposals) { \
+ locals.p.proposalIndex = -1; \
+ while ((locals.p.proposalIndex = qpi(state.proposals).nextProposalIndex(locals.p.proposalIndex, qpi.epoch())) >= 0) { \
+ if (!qpi(state.proposals).getProposal(locals.p.proposalIndex, locals.p.proposal)) \
+ continue; \
+ locals.proposalClass = ProposalTypes::cls(locals.p.proposal.type); \
+ if (locals.proposalClass == ProposalTypes::Class::Variable || locals.proposalClass == ProposalTypes::Class::MultiVariables) { \
+ if (!qpi(state.proposals).getVotingSummary(locals.p.proposalIndex, locals.p.results)) \
+ continue; \
+ locals.p.acceptedOption = locals.p.results.getAcceptedOption(); \
+ if (locals.p.acceptedOption <= 0) \
+ continue; \
+ locals.p.acceptedValue = locals.p.proposal.variableOptions.value; \
+ CALL(FinalizeShareholderProposalSetStateVar, locals.p, output); } } } \
+ PRIVATE_PROCEDURE(FinalizeShareholderProposalSetStateVar)
+
+ #define IMPLEMENT_DEFAULT_SHAREHOLDER_PROPOSAL_VOTING(numFeeStateVariables, setProposalFeeVarOrValue) \
+ IMPLEMENT_SetShareholderProposal(numFeeStateVariables, setProposalFeeVarOrValue) \
+ IMPLEMENT_GetShareholderProposal() \
+ IMPLEMENT_GetShareholderProposalIndices() \
+ IMPLEMENT_GetShareholderProposalFees(setProposalFeeVarOrValue) \
+ IMPLEMENT_SetShareholderVotes() \
+ IMPLEMENT_GetShareholderVotes() \
+ IMPLEMENT_GetShareholderVotingResults() \
+ IMPLEMENT_SET_SHAREHOLDER_PROPOSAL() \
+ IMPLEMENT_SET_SHAREHOLDER_VOTES()
+
+ #define REGISTER_GetShareholderProposalFees() REGISTER_USER_FUNCTION(GetShareholderProposalFees, 65531)
+ #define REGISTER_GetShareholderProposalIndices() REGISTER_USER_FUNCTION(GetShareholderProposalIndices, 65532)
+ #define REGISTER_GetShareholderProposal() REGISTER_USER_FUNCTION(GetShareholderProposal, 65533)
+ #define REGISTER_GetShareholderVotes() REGISTER_USER_FUNCTION(GetShareholderVotes, 65534)
+ #define REGISTER_GetShareholderVotingResults() REGISTER_USER_FUNCTION(GetShareholderVotingResults, 65535)
+ #define REGISTER_SetShareholderProposal() REGISTER_USER_PROCEDURE(SetShareholderProposal, 65534)
+ #define REGISTER_SetShareholderVotes() REGISTER_USER_PROCEDURE(SetShareholderVotes, 65535)
+
+ #define REGISTER_SHAREHOLDER_PROPOSAL_VOTING() REGISTER_GetShareholderProposalFees() \
+ REGISTER_GetShareholderProposalIndices(); REGISTER_GetShareholderProposal(); \
+ REGISTER_GetShareholderVotes(); REGISTER_GetShareholderVotingResults(); \
+ REGISTER_SetShareholderProposal(); REGISTER_SetShareholderVotes()
+
}
diff --git a/src/spectrum/spectrum.h b/src/spectrum/spectrum.h
index 7676ab05d..e1a57dd2a 100644
--- a/src/spectrum/spectrum.h
+++ b/src/spectrum/spectrum.h
@@ -430,9 +430,11 @@ static void deinitSpectrum()
if (spectrumDigests)
{
freePool(spectrumDigests);
+ spectrumDigests = nullptr;
}
if (spectrum)
{
freePool(spectrum);
+ spectrum = nullptr;
}
}
diff --git a/test/contract_testex.cpp b/test/contract_testex.cpp
index a78d4358b..8a78d4e67 100644
--- a/test/contract_testex.cpp
+++ b/test/contract_testex.cpp
@@ -11,6 +11,7 @@ static const id TESTEXC_CONTRACT_ID(TESTEXC_CONTRACT_INDEX, 0, 0, 0);
static const id USER1(123, 456, 789, 876);
static const id USER2(42, 424, 4242, 42424);
static const id USER3(98, 76, 54, 3210);
+static const id USER4(9878, 7645, 541, 3210);
void checkPreManagementRightsTransferInput(const PreManagementRightsTransfer_input& observed, const PreManagementRightsTransfer_input& expected)
{
@@ -66,6 +67,16 @@ class StateCheckerTestExampleA : public TESTEXA
{
return this->prevPostAcquireSharesInput;
}
+
+ void checkVariablesSetByProposal(
+ uint64 expectedVariable1,
+ uint32 expectedVariable2,
+ sint8 expectedVariable3) const
+ {
+ EXPECT_EQ(this->dummyStateVariable1, expectedVariable1);
+ EXPECT_EQ(this->dummyStateVariable2, expectedVariable2);
+ EXPECT_EQ(this->dummyStateVariable3, expectedVariable3);
+ }
};
class StateCheckerTestExampleB : public TESTEXB
@@ -100,6 +111,16 @@ class StateCheckerTestExampleB : public TESTEXB
{
return this->prevPostAcquireSharesInput;
}
+
+ void checkVariablesSetByProposal(
+ sint64 expectedVariable1,
+ sint64 expectedVariable2,
+ sint64 expectedVariable3) const
+ {
+ EXPECT_EQ(this->fee1, expectedVariable1);
+ EXPECT_EQ(this->fee2, expectedVariable2);
+ EXPECT_EQ(this->fee3, expectedVariable3);
+ }
};
class ContractTestingTestEx : protected ContractTesting
@@ -159,37 +180,37 @@ class ContractTestingTestEx : protected ContractTesting
return output.issuedNumberOfShares;
}
- sint64 transferShareOwnershipAndPossessionQx(const Asset& asset, const id& currentOwnerAndPossesor, const id& newOwnerAndPossesor, sint64 numberOfShares)
+ sint64 transferShareOwnershipAndPossessionQx(const Asset& asset, const id& currentOwnerAndPossessor, const id& newOwnerAndPossessor, sint64 numberOfShares)
{
QX::TransferShareOwnershipAndPossession_input input;
QX::TransferShareOwnershipAndPossession_output output;
input.assetName = asset.assetName;
input.issuer = asset.issuer;
- input.newOwnerAndPossessor = newOwnerAndPossesor;
+ input.newOwnerAndPossessor = newOwnerAndPossessor;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(QX_CONTRACT_INDEX, 2, input, output, currentOwnerAndPossesor, qxFees.transferFee);
+ invokeUserProcedure(QX_CONTRACT_INDEX, 2, input, output, currentOwnerAndPossessor, qxFees.transferFee);
return output.transferredNumberOfShares;
}
template
- sint64 transferShareOwnershipAndPossession(const Asset& asset, const id& currentOwnerAndPossesor, const id& newOwnerAndPossesor, sint64 numberOfShares)
+ sint64 transferShareOwnershipAndPossession(const Asset& asset, const id& currentOwnerAndPossessor, const id& newOwnerAndPossessor, sint64 numberOfShares)
{
typename StateStruct::TransferShareOwnershipAndPossession_input input;
typename StateStruct::TransferShareOwnershipAndPossession_output output;
input.asset = asset;
- input.newOwnerAndPossessor = newOwnerAndPossesor;
+ input.newOwnerAndPossessor = newOwnerAndPossessor;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(StateStruct::__contract_index, 2, input, output, currentOwnerAndPossesor, 0);
+ invokeUserProcedure(StateStruct::__contract_index, 2, input, output, currentOwnerAndPossessor, 0);
return output.transferredNumberOfShares;
}
- sint64 transferShareManagementRightsQx(const Asset& asset, const id& currentOwnerAndPossesor, sint64 numberOfShares, unsigned int newManagingContractIndex, sint64 fee = 0)
+ sint64 transferShareManagementRightsQx(const Asset& asset, const id& currentOwnerAndPossessor, sint64 numberOfShares, unsigned int newManagingContractIndex, sint64 fee = 0)
{
QX::TransferShareManagementRights_input input;
QX::TransferShareManagementRights_output output;
@@ -198,13 +219,13 @@ class ContractTestingTestEx : protected ContractTesting
input.newManagingContractIndex = newManagingContractIndex;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(QX_CONTRACT_INDEX, 9, input, output, currentOwnerAndPossesor, fee);
+ invokeUserProcedure(QX_CONTRACT_INDEX, 9, input, output, currentOwnerAndPossessor, fee);
return output.transferredNumberOfShares;
}
template
- sint64 transferShareManagementRights(const Asset& asset, const id& currentOwnerAndPossesor, sint64 numberOfShares, unsigned int newManagingContractIndex, sint64 fee = 0)
+ sint64 transferShareManagementRights(const Asset& asset, const id& currentOwnerAndPossessor, sint64 numberOfShares, unsigned int newManagingContractIndex, sint64 fee = 0)
{
typename StateStruct::TransferShareManagementRights_input input;
typename StateStruct::TransferShareManagementRights_output output;
@@ -213,7 +234,7 @@ class ContractTestingTestEx : protected ContractTesting
input.newManagingContractIndex = newManagingContractIndex;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(StateStruct::__contract_index, 3, input, output, currentOwnerAndPossesor, fee);
+ invokeUserProcedure(StateStruct::__contract_index, 3, input, output, currentOwnerAndPossessor, fee);
return output.transferredNumberOfShares;
}
@@ -236,23 +257,23 @@ class ContractTestingTestEx : protected ContractTesting
template
- sint64 acquireShareManagementRights(const Asset& asset, const id& currentOwnerAndPossesor, sint64 numberOfShares, unsigned int prevManagingContractIndex, sint64 fee = 0, const id& originator = NULL_ID)
+ sint64 acquireShareManagementRights(const Asset& asset, const id& currentOwnerAndPossessor, sint64 numberOfShares, unsigned int prevManagingContractIndex, sint64 fee = 0, const id& originator = NULL_ID)
{
typename StateStruct::AcquireShareManagementRights_input input;
typename StateStruct::AcquireShareManagementRights_output output;
input.asset = asset;
- input.ownerAndPossessor = currentOwnerAndPossesor;
+ input.ownerAndPossessor = currentOwnerAndPossessor;
input.oldManagingContractIndex = prevManagingContractIndex;
input.numberOfShares = numberOfShares;
invokeUserProcedure(StateStruct::__contract_index, 6, input, output,
- (isZero(originator)) ? currentOwnerAndPossesor : originator, fee);
+ (isZero(originator)) ? currentOwnerAndPossessor : originator, fee);
return output.transferredNumberOfShares;
}
- sint64 getTestExAsShareManagementRightsByInvokingTestExB(const Asset& asset, const id& currentOwnerAndPossesor, sint64 numberOfShares, sint64 fee = 0)
+ sint64 getTestExAsShareManagementRightsByInvokingTestExB(const Asset& asset, const id& currentOwnerAndPossessor, sint64 numberOfShares, sint64 fee = 0)
{
TESTEXB::GetTestExampleAShareManagementRights_input input;
TESTEXB::GetTestExampleAShareManagementRights_output output;
@@ -260,12 +281,12 @@ class ContractTestingTestEx : protected ContractTesting
input.asset = asset;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(TESTEXB::__contract_index, 7, input, output, currentOwnerAndPossesor, fee);
+ invokeUserProcedure(TESTEXB::__contract_index, 7, input, output, currentOwnerAndPossessor, fee);
return output.transferredNumberOfShares;
}
- sint64 getTestExAsShareManagementRightsByInvokingTestExC(const Asset& asset, const id& currentOwnerAndPossesor, sint64 numberOfShares, sint64 fee = 0)
+ sint64 getTestExAsShareManagementRightsByInvokingTestExC(const Asset& asset, const id& currentOwnerAndPossessor, sint64 numberOfShares, sint64 fee = 0)
{
TESTEXC::GetTestExampleAShareManagementRights_input input;
TESTEXC::GetTestExampleAShareManagementRights_output output;
@@ -273,7 +294,7 @@ class ContractTestingTestEx : protected ContractTesting
input.asset = asset;
input.numberOfShares = numberOfShares;
- invokeUserProcedure(TESTEXC::__contract_index, 7, input, output, currentOwnerAndPossesor, fee);
+ invokeUserProcedure(TESTEXC::__contract_index, 7, input, output, currentOwnerAndPossessor, fee);
return output.transferredNumberOfShares;
}
@@ -341,8 +362,209 @@ class ContractTestingTestEx : protected ContractTesting
else
return -2;
}
+
+ template
+ uint16 setShareholderProposal(const id& originator, const typename StateStruct::SetShareholderProposal_input& input)
+ {
+ typename StateStruct::SetShareholderProposal_output output;
+ EXPECT_TRUE(invokeUserProcedure(StateStruct::__contract_index, 65534, input, output, originator, 0));
+ return output;
+ }
+
+ template
+ bool setShareholderVotes(const id& originator, uint16 proposalIndex, const typename StateStruct::ProposalDataT& proposalData, sint64 voteValue)
+ {
+ // Contract procedure expects ProposalMultiVoteDataV1, but ProposalSingleVoteDataV1 is compatible
+ ProposalSingleVoteDataV1 input{ proposalIndex, proposalData.type, proposalData.tick, voteValue };
+ typename StateStruct::SetShareholderVotes_output output;
+ invokeUserProcedure(StateStruct::__contract_index, 65535, input, output, originator, 0, false);
+ return output;
+ }
+
+ template
+ bool setShareholderVotes(const id& originator, uint16 proposalIndex, const typename StateStruct::ProposalDataT& proposalData,
+ const std::vector>& voteValueCountPairs)
+ {
+ ASSERT(voteValueCountPairs.size() <= 8);
+ ProposalMultiVoteDataV1 input{ proposalIndex, proposalData.type, proposalData.tick };
+ input.voteValues.set(0, NO_VOTE_VALUE); // default with no voteValueCountPairs (vote count 0): set all to no votes
+ for (size_t i = 0; i < voteValueCountPairs.size(); ++i)
+ {
+ input.voteValues.set(i, voteValueCountPairs[i].first);
+ input.voteCounts.set(i, voteValueCountPairs[i].second);
+ }
+ typename StateStruct::SetShareholderVotes_output output;
+ invokeUserProcedure(StateStruct::__contract_index, 65535, input, output, originator, 0);
+ return output;
+ }
+
+ template
+ std::vector getShareholderProposalIndices(bit activeProposals)
+ {
+ typename StateStruct::GetShareholderProposalIndices_input input{ activeProposals, -1 };
+ typename StateStruct::GetShareholderProposalIndices_output output;
+ std::vector indices;
+ do
+ {
+ callFunction(StateStruct::__contract_index, 65532, input, output);
+ for (uint16 i = 0; i < output.numOfIndices; ++i)
+ indices.push_back(output.indices.get(i));
+ } while (output.numOfIndices == output.indices.capacity());
+ return indices;
+ }
+
+ template
+ StateStruct::GetShareholderProposal_output getShareholderProposal(uint16 proposalIndex)
+ {
+ typename StateStruct::GetShareholderProposal_input input{ proposalIndex };
+ typename StateStruct::GetShareholderProposal_output output;
+ callFunction(StateStruct::__contract_index, 65533, input, output);
+ return output;
+ }
+
+ template
+ ProposalMultiVoteDataV1 getShareholderVotes(uint16 proposalIndex, const id& voter)
+ {
+ typename StateStruct::GetShareholderVotes_input input{ voter, proposalIndex };
+ typename StateStruct::GetShareholderVotes_output output;
+ callFunction(StateStruct::__contract_index, 65534, input, output);
+ return output;
+ }
+
+ template
+ ProposalSummarizedVotingDataV1 getShareholderVotingResults(uint16 proposalIndex)
+ {
+ typename StateStruct::GetShareholderVotingResults_input input{ proposalIndex };
+ typename StateStruct::GetShareholderVotingResults_output output;
+ callFunction(StateStruct::__contract_index, 65535, input, output);
+ return output;
+ }
+
+ uint16 setupShareholderProposalTestExA(
+ const id& proposer, uint16 type,
+ bool setVar1 = false, uint64 valueVar1 = 0,
+ bool setVar2 = false, uint32 valueVar2 = 0,
+ bool setVar3 = false, sint8 valueVar3 = 0,
+ bool expectSuccess = true)
+ {
+ TESTEXA::SetShareholderProposal_input input;
+ setMemory(input, 0);
+ input.proposalData.epoch = system.epoch;
+ input.proposalData.type = type;
+ switch (ProposalTypes::cls(type))
+ {
+ case ProposalTypes::Class::Variable:
+ {
+ if (setVar1)
+ {
+ EXPECT_FALSE(setVar2);
+ EXPECT_FALSE(setVar3);
+ input.proposalData.variableOptions.variable = 0;
+ input.proposalData.variableOptions.value = valueVar1;
+ }
+ else if (setVar2)
+ {
+ EXPECT_FALSE(setVar1);
+ EXPECT_FALSE(setVar3);
+ input.proposalData.variableOptions.variable = 1;
+ input.proposalData.variableOptions.value = valueVar2;
+ }
+ else if (setVar3)
+ {
+ EXPECT_FALSE(setVar1);
+ EXPECT_FALSE(setVar2);
+ input.proposalData.variableOptions.variable = 2;
+ input.proposalData.variableOptions.value = valueVar3;
+ }
+ break;
+ }
+ case ProposalTypes::Class::MultiVariables:
+ input.multiVarData.hasValueDummyStateVariable1 = setVar1;
+ input.multiVarData.hasValueDummyStateVariable2 = setVar2;
+ input.multiVarData.hasValueDummyStateVariable3 = setVar3;
+ input.multiVarData.optionYesValues.dummyStateVariable1 = valueVar1;
+ input.multiVarData.optionYesValues.dummyStateVariable2 = valueVar2;
+ input.multiVarData.optionYesValues.dummyStateVariable3 = valueVar3;
+ break;
+ }
+ uint16 proposalIdx = this->setShareholderProposal(proposer, input);
+ if (expectSuccess)
+ EXPECT_NE((int)proposalIdx, (int)INVALID_PROPOSAL_INDEX);
+ else
+ EXPECT_EQ((int)proposalIdx, (int)INVALID_PROPOSAL_INDEX);
+ return proposalIdx;
+ }
+
+ template
+ uint16 setProposalInOtherContractAsShareholder(const id& originator, uint16 otherContractIndex, const FullProposalDataT& fullProposalData)
+ {
+ typename StateStruct::SetProposalInOtherContractAsShareholder_input input;
+ copyToBuffer(input, fullProposalData);
+ input.otherContractIndex = otherContractIndex;
+ typename StateStruct::SetProposalInOtherContractAsShareholder_output output;
+ invokeUserProcedure(StateStruct::__contract_index, 40, input, output, originator, 0);
+ return output.proposalIndex;
+ }
+
+ template
+ bool setVotesInOtherContractAsShareholder(const id& originator, uint16 otherContractIndex, uint16 proposalIndex, const ProposalDataT& proposalData,
+ const std::vector>& voteValueCountPairs)
+ {
+ ASSERT(voteValueCountPairs.size() <= 8);
+ typename StateStruct::SetVotesInOtherContractAsShareholder_input input{ {proposalIndex, proposalData.type, proposalData.tick} };
+ input.otherContractIndex = otherContractIndex;
+ input.voteData.voteValues.set(0, NO_VOTE_VALUE); // default with no voteValueCountPairs (vote count 0): set all to no votes
+ for (size_t i = 0; i < voteValueCountPairs.size(); ++i)
+ {
+ input.voteData.voteValues.set(i, voteValueCountPairs[i].first);
+ input.voteData.voteCounts.set(i, voteValueCountPairs[i].second);
+ }
+ typename StateStruct::SetVotesInOtherContractAsShareholder_output output;
+ invokeUserProcedure(StateStruct::__contract_index, 41, input, output, originator, 0);
+ return output.success;
+ }
+
+ void endEpoch(bool expectSuccess = true)
+ {
+ callSystemProcedure(TESTEXD_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ callSystemProcedure(TESTEXC_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ callSystemProcedure(TESTEXB_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ callSystemProcedure(TESTEXA_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ callSystemProcedure(QX_CONTRACT_INDEX, END_EPOCH, expectSuccess);
+ }
};
+void checkVoteCounts(const ProposalMultiVoteDataV1& votes, const std::vector>& expectedVoteValueCountPairs)
+{
+ std::vector> expectedPairsNotFound = expectedVoteValueCountPairs;
+ for (int i = 0; i < votes.voteCounts.capacity(); ++i)
+ {
+ sint64 value = votes.voteValues.get(i);
+ uint32 count = votes.voteCounts.get(i);
+ std::pair pair(value, count);
+ auto it = std::find(expectedPairsNotFound.begin(), expectedPairsNotFound.end(), pair);
+ if (it != expectedPairsNotFound.end())
+ {
+ // value-count pair found
+ expectedPairsNotFound.erase(it);
+ }
+ else if (count)
+ {
+ FAIL() << "Error: unexpected vote value/count pair " << value << "/" << count;
+ }
+ }
+ for (const auto& it : expectedPairsNotFound)
+ {
+ FAIL() << "Error: missing vote value/count pair " << it.first << "/" << it.second;
+ }
+}
+
+bool operator==(const TESTEXA::MultiVariablesProposalExtraData& p1, const TESTEXA::MultiVariablesProposalExtraData& p2)
+{
+ return memcmp(&p1, &p2, sizeof(p1)) == 0;
+}
+
+
TEST(ContractTestEx, QpiReleaseShares)
{
ContractTestingTestEx test;
@@ -351,7 +573,7 @@ TEST(ContractTestEx, QpiReleaseShares)
const sint64 totalShareCount = 1000000000;
const sint64 transferShareCount = totalShareCount/4;
- // make sure the enities have enough qu
+ // make sure the entities have enough qu
increaseEnergy(USER1, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER2, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER3, test.qxFees.assetIssuanceFee * 10);
@@ -504,7 +726,7 @@ TEST(ContractTestEx, QpiAcquireShares)
const sint64 totalShareCount = 100000000;
const sint64 transferShareCount = totalShareCount / 4;
- // make sure the enities have enough qu
+ // make sure the entities have enough qu
increaseEnergy(USER1, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER2, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER3, test.qxFees.assetIssuanceFee * 10);
@@ -684,7 +906,7 @@ TEST(ContractTestEx, GetManagementRightsByInvokingOtherContractsRelease)
const sint64 totalShareCount = 1000000;
const sint64 transferShareCount = totalShareCount / 5;
- // make sure the enities have enough qu
+ // make sure the entities have enough qu
increaseEnergy(USER1, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER2, test.qxFees.assetIssuanceFee * 10);
increaseEnergy(USER3, test.qxFees.assetIssuanceFee * 10);
@@ -1326,3 +1548,466 @@ TEST(ContractTestEx, BurnAssets)
EXPECT_EQ(1000000 - 100, numberOfShares(asset, { USER1, QX_CONTRACT_INDEX }, { USER1, QX_CONTRACT_INDEX }));
}
}
+
+TEST(ContractTestEx, ShareholderProposals)
+{
+ ContractTestingTestEx test;
+ uint16 proposalIdx = 0;
+
+ system.epoch = 200;
+
+ increaseEnergy(USER1, 12345678);
+ increaseEnergy(USER2, 31427);
+ increaseEnergy(USER3, 218000);
+ increaseEnergy(USER4, 218000);
+ increaseEnergy(TESTEXA_CONTRACT_ID, 987654321);
+ increaseEnergy(TESTEXB_CONTRACT_ID, 19283764);
+
+ // issue contract shares
+ std::vector> sharesTestExA{
+ {USER1, 356},
+ {USER2, 200},
+ {TESTEXB_CONTRACT_ID, 100},
+ {USER3, 20}
+ };
+ issueContractShares(TESTEXA_CONTRACT_INDEX, sharesTestExA);
+
+ // enable that TESTEXA accepts transfer for 0 fee
+ test.setPreAcquireSharesOutput(true, 0);
+
+ // transfer management rights of some shares to other contract to cover case of multiple asset records of single possessor
+ const Asset TESTEXA_ASSET{ NULL_ID, assetNameFromString("TESTEXA") };
+ EXPECT_EQ(test.transferShareManagementRightsQx(TESTEXA_ASSET, USER2, 50, TESTEXA_CONTRACT_INDEX), 50);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { USER1, QX_CONTRACT_INDEX }, { USER1, QX_CONTRACT_INDEX }), 356);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { USER2, QX_CONTRACT_INDEX }, { USER2, QX_CONTRACT_INDEX }), 150);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { USER2, TESTEXA_CONTRACT_INDEX }, { USER2, TESTEXA_CONTRACT_INDEX }), 50);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { TESTEXB_CONTRACT_ID, QX_CONTRACT_INDEX }, { TESTEXB_CONTRACT_ID, QX_CONTRACT_INDEX }), 100);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { USER3, QX_CONTRACT_INDEX }, { USER3, QX_CONTRACT_INDEX }), 20);
+ EXPECT_EQ(numberOfShares(TESTEXA_ASSET, { USER4, QX_CONTRACT_INDEX }, { USER4, QX_CONTRACT_INDEX }), 0);
+
+ // fail: 4 options not supported with Yes/No proposals
+ test.setupShareholderProposalTestExA(USER2, ProposalTypes::FourOptions, false, 0, false, 0, false, 0, false);
+
+ // fail: no right, because no shareholder
+ test.setupShareholderProposalTestExA(USER4, ProposalTypes::ThreeOptions, false, 0, false, 0, false, 0, false);
+
+ // fail: transfer not allowed
+ test.setupShareholderProposalTestExA(USER2, ProposalTypes::TransferYesNo, false, 0, false, 0, false, 0, false);
+
+ // fail: invalid value of variable
+ test.setupShareholderProposalTestExA(USER2, ProposalTypes::VariableYesNo, false, 0, false, 0, true, 120, false);
+
+ // check that no active/inactive proposals
+ EXPECT_EQ(test.getShareholderProposalIndices(true).size(), 0);
+ EXPECT_EQ(test.getShareholderProposalIndices(false).size(), 0);
+
+ // success: set var3 with single-var proposal
+ proposalIdx = test.setupShareholderProposalTestExA(USER2, ProposalTypes::VariableYesNo, false, 0, false, 0, true, 100, true);
+
+ // check that no active/inactive proposals
+ auto proposalIndices = test.getShareholderProposalIndices(true);
+ EXPECT_TRUE(proposalIndices.size() == 1 && proposalIndices[0] == proposalIdx);
+ EXPECT_EQ(test.getShareholderProposalIndices(false).size(), 0);
+
+ // fail: try to get non-existing proposal
+ auto fullProposalData = test.getShareholderProposal(proposalIdx + 1);
+ EXPECT_EQ(fullProposalData.proposerPubicKey, NULL_ID);
+ EXPECT_EQ((int)fullProposalData.proposal.type, 0);
+
+ // success: get existing proposal
+ fullProposalData = test.getShareholderProposal(proposalIdx);
+ EXPECT_EQ(fullProposalData.proposerPubicKey, USER2);
+ EXPECT_EQ((int)fullProposalData.proposal.type, (int)ProposalTypes::VariableYesNo);
+ auto proposal = fullProposalData.proposal;
+
+ // fail: try to get shareholder votes of user who is no shareholder
+ auto votes = test.getShareholderVotes(proposalIdx, USER4);
+ EXPECT_EQ((int)votes.proposalType, 0);
+
+ // fail: try to get shareholder votes of non-existing proposal
+ votes = test.getShareholderVotes(proposalIdx + 1, USER1);
+ EXPECT_EQ((int)votes.proposalType, 0);
+
+ // success: get shareholder votes of user who is no shareholder
+ votes = test.getShareholderVotes(proposalIdx, USER1);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ EXPECT_EQ((int)votes.proposalIndex, (int)proposalIdx);
+ EXPECT_EQ(votes.proposalTick, proposal.tick);
+ checkVoteCounts(votes, {});
+
+ // set all votes of USER1 to option 0 with single-vote struct
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdx, proposal, 0));
+
+ // get shareholder votes of user who is no shareholder and check that they are correct
+ votes = test.getShareholderVotes(proposalIdx, USER1);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ checkVoteCounts(votes, { {0, 356} });
+
+ // set 50 votes of USER2 to option 0 and 150 to option 1
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdx, proposal, { {0, 50}, {1, 150} }));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ checkVoteCounts(votes, { {0, 50}, {1, 150} });
+
+ // fail: set 51 votes of USER2 to option 1 and 150 to option 0 (more votes than shares)
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, { {1, 51}, {0, 150} }));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ checkVoteCounts(votes, { {0, 50}, {1, 150} });
+
+ // set 20 votes of USER2 to option 0 and 30 to option 1 (some votes unused)
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdx, proposal, { {0, 20}, {1, 30} }));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ checkVoteCounts(votes, { {0, 20}, {1, 30} });
+
+ // fail: try to get voting results of invalid proposal
+ auto results = test.getShareholderVotingResults(proposalIdx + 1);
+ EXPECT_EQ(results.totalVotesAuthorized, 0);
+
+ // check voting results
+ results = test.getShareholderVotingResults(proposalIdx);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ((int)results.optionCount, 2);
+ EXPECT_EQ(results.optionVoteCount.get(0), 20 + 356);
+ EXPECT_EQ(results.optionVoteCount.get(1), 30);
+ EXPECT_EQ(results.totalVotesCasted, 20 + 356 + 30);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.getMostVotedOption(), 0);
+
+ // set 1 vote of USER3 to option 0 and 19 to option 1
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdx, proposal, { {0, 1}, {1, 19} }));
+
+ // change votes of USER1
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdx, proposal, { {0, 300}, {1, 50} }));
+
+ votes = test.getShareholderVotes(proposalIdx, USER3);
+ EXPECT_EQ((int)votes.proposalType, (int)proposal.type);
+ checkVoteCounts(votes, { {0, 1}, {1, 19} });
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ checkVoteCounts(votes, { {0, 20}, {1, 30} });
+ votes = test.getShareholderVotes(proposalIdx, USER1);
+ checkVoteCounts(votes, { {0, 300}, {1, 50} });
+
+ results = test.getShareholderVotingResults(proposalIdx);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ((int)results.optionCount, 2);
+ EXPECT_EQ(results.optionVoteCount.get(0), 1 + 20 + 300);
+ EXPECT_EQ(results.optionVoteCount.get(1), 19 + 30 + 50);
+ EXPECT_EQ(results.totalVotesCasted, 1 + 20 + 300 + 19 + 30 + 50);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.getMostVotedOption(), 0);
+
+ // withdraw votes of USER1 and USER3
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdx, proposal, std::vector>()));
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdx, proposal, NO_VOTE_VALUE));
+
+ votes = test.getShareholderVotes(proposalIdx, USER3);
+ checkVoteCounts(votes, {});
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ checkVoteCounts(votes, { {0, 20}, {1, 30} });
+ votes = test.getShareholderVotes(proposalIdx, USER1);
+ checkVoteCounts(votes, {});
+
+ results = test.getShareholderVotingResults(proposalIdx);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 20);
+ EXPECT_EQ(results.optionVoteCount.get(1), 30);
+ EXPECT_EQ(results.totalVotesCasted, 20 + 30);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.getMostVotedOption(), 1);
+
+ // fail: try to set all votes of USER2 to invalid value with single-vote struct
+ // (uses Multi-Vote internally for testing compatibility, so votes of the user are reset)
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, 4));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ checkVoteCounts(votes, {});
+
+ // fail: try to set votes of invalid proposal index
+ EXPECT_FALSE(test.setShareholderVotes(USER2, 0xffff, proposal, { { 0, 111 } }));
+
+ // fail: try to set votes of inactive proposal
+ ++system.epoch;
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, { { 0, 111 } }));
+ --system.epoch;
+
+ // fail: try to set votes of with wrong proposal type
+ proposal.type = ProposalTypes::VariableThreeValues;
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, { { 0, 111 } }));
+ proposal.type = ProposalTypes::VariableYesNo;
+
+ // fail: try to set votes of with wrong proposal tick
+ ++proposal.tick;
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, { { 0, 111 } }));
+ --proposal.tick;
+
+ // fail: try to set votes for USER4 who is no shareholder
+ EXPECT_FALSE(test.setShareholderVotes(USER4, proposalIdx, proposal, { { 0, 111 } }));
+
+ // success: set votes with duplicate values in array
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdx, proposal, { { 0, 111 }, {1, 10}, {0, 22}, {1, 3} }));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ checkVoteCounts(votes, { {0, 133}, {1, 13} });
+
+ // fail: try to set votes of USER2 to invalid value with multi-vote struct
+ // (votes of the user are reset)
+ EXPECT_FALSE(test.setShareholderVotes(USER2, proposalIdx, proposal, { {0, 12}, {1, 23}, {2, 34} }));
+ votes = test.getShareholderVotes(proposalIdx, USER2);
+ checkVoteCounts(votes, {});
+
+ // voting of TESTEXB as shareholder of TESTEXA (originator not checked by procedure)
+ // user procedure TESTEXB::setVotesInOtherContractAsShareholder
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, proposalIdx, proposal, { {0, 10}, {1, 20}, {0, 70} }));
+ votes = test.getShareholderVotes(proposalIdx, TESTEXB_CONTRACT_ID);
+ checkVoteCounts(votes, { {0, 80}, {1, 20} });
+
+ results = test.getShareholderVotingResults(proposalIdx);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 80);
+ EXPECT_EQ(results.optionVoteCount.get(1), 20);
+ EXPECT_EQ(results.totalVotesCasted, 100);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.getMostVotedOption(), 0);
+
+ //////////////////////////////////////////////////////
+ // create new shareholder proposal in TESTEXA as shareholder TESTEXB
+ TESTEXA::SetShareholderProposal_input setShareholderProposalInput2;
+ setShareholderProposalInput2.proposalData.type = ProposalTypes::MultiVariablesYesNo;
+ setShareholderProposalInput2.proposalData.epoch = system.epoch;
+ setMemory(setShareholderProposalInput2.multiVarData, 0);
+
+ // fails to create proposal, because multiVarData is invalid (originator not checked by procedure)
+ uint16 proposalIdx2 = test.setProposalInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, setShareholderProposalInput2);
+ EXPECT_EQ((int)proposalIdx2, (int)INVALID_PROPOSAL_INDEX);
+
+ // create proposal (originator not checked by procedure)
+ setShareholderProposalInput2.multiVarData.hasValueDummyStateVariable1 = true;
+ setShareholderProposalInput2.multiVarData.hasValueDummyStateVariable2 = true;
+ setShareholderProposalInput2.multiVarData.hasValueDummyStateVariable3 = true;
+ setShareholderProposalInput2.multiVarData.optionYesValues.dummyStateVariable1 = 1;
+ setShareholderProposalInput2.multiVarData.optionYesValues.dummyStateVariable2 = 2;
+ setShareholderProposalInput2.multiVarData.optionYesValues.dummyStateVariable3 = 3;
+ proposalIdx2 = test.setProposalInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, setShareholderProposalInput2);
+
+ // get and check new proposal
+ auto fullProposalData2 = test.getShareholderProposal(proposalIdx2);
+ EXPECT_EQ(fullProposalData2.proposerPubicKey, TESTEXB_CONTRACT_ID);
+ EXPECT_EQ((int)fullProposalData2.proposal.type, (int)ProposalTypes::MultiVariablesYesNo);
+ auto proposal2 = fullProposalData2.proposal;
+ EXPECT_EQ(fullProposalData2.multiVarData, setShareholderProposalInput2.multiVarData);
+
+ // cast votes
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, proposalIdx2, proposal2, { {1, 90} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdx2, proposal2, { {0, 50}, {1, 260} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdx2, proposal2, { {0, 10}, {1, 160} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdx2, proposal2, { {0, 1}, {1, 15} }));
+ results = test.getShareholderVotingResults(proposalIdx2);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 61);
+ EXPECT_EQ(results.optionVoteCount.get(1), 525);
+ EXPECT_EQ(results.getAcceptedOption(), 1);
+ EXPECT_EQ(results.totalVotesCasted, 61 + 525);
+
+ // test proposal listing function (2 active, 0 inactive)
+ proposalIndices = test.getShareholderProposalIndices(true);
+ EXPECT_TRUE(proposalIndices.size() == 2 && proposalIndices[0] == proposalIdx && proposalIndices[1] == proposalIdx2);
+ EXPECT_EQ(test.getShareholderProposalIndices(false).size(), 0);
+
+ // test that variables are set correctly after epoch switch
+ test.getStateTestExampleA()->checkVariablesSetByProposal(0, 0, 0);
+ test.endEpoch();
+ ++system.epoch;
+ test.getStateTestExampleA()->checkVariablesSetByProposal(1, 2, 3);
+
+ // test proposal listing function (2 inactive by USER2/TESTEXB, 0 active)
+ proposalIndices = test.getShareholderProposalIndices(false);
+ EXPECT_TRUE(proposalIndices.size() == 2 && proposalIndices[0] == proposalIdx && proposalIndices[1] == proposalIdx2);
+ EXPECT_EQ(test.getShareholderProposalIndices(true).size(), 0);
+
+ // Setup proposal to change variable 1
+ uint16 proposalIdxA1 = test.setupShareholderProposalTestExA(USER1, ProposalTypes::VariableYesNo, true, 13);
+ EXPECT_NE((int)proposalIdxA1, (int)INVALID_PROPOSAL_INDEX);
+ auto proposalDataA1 = test.getShareholderProposal(proposalIdxA1);
+ auto proposalA1 = proposalDataA1.proposal;
+ EXPECT_EQ((int)proposalA1.type, (int)ProposalTypes::VariableYesNo);
+
+ // Setup proposal to change variable 2 and 3
+ uint16 proposalIdxA2 = test.setupShareholderProposalTestExA(USER2, ProposalTypes::MultiVariablesYesNo, false, 0, true, 4, true, 5);
+ EXPECT_NE((int)proposalIdxA2, (int)INVALID_PROPOSAL_INDEX);
+ auto proposalDataA2 = test.getShareholderProposal(proposalIdxA2);
+ auto proposalA2 = proposalDataA2.proposal;
+ EXPECT_EQ((int)proposalA2.type, (int)ProposalTypes::MultiVariablesYesNo);
+ EXPECT_EQ(proposalDataA2.proposerPubicKey, USER2);
+ EXPECT_EQ(proposalDataA2.multiVarData.optionYesValues.dummyStateVariable2, 4);
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdxA2, proposalA2, { {0, 3} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxA2, USER2), { {0, 3} });
+
+ // Overwrite proposal to change variable 2 and 3
+ proposalIdxA2 = test.setupShareholderProposalTestExA(USER2, ProposalTypes::MultiVariablesYesNo, false, 0, true, 1337, true, 42);
+ EXPECT_NE((int)proposalIdxA2, (int)INVALID_PROPOSAL_INDEX);
+ checkVoteCounts(test.getShareholderVotes(proposalIdxA2, USER2), {});
+
+ ///////////////////////////////////////////////////////////////
+ // Proposals in TestExB
+
+ // issue contract shares
+ std::vector> sharesTestExB{
+ {TESTEXA_CONTRACT_ID, 256},
+ {USER2, 200},
+ {USER3, 100},
+ {USER4, 120}
+ };
+ issueContractShares(TESTEXB_CONTRACT_INDEX, sharesTestExB);
+ const Asset TESTEXB_ASSET{ NULL_ID, assetNameFromString("TESTEXB") };
+ EXPECT_EQ(numberOfShares(TESTEXB_ASSET, { TESTEXA_CONTRACT_ID, QX_CONTRACT_INDEX }, { TESTEXA_CONTRACT_ID, QX_CONTRACT_INDEX }), 256);
+ EXPECT_EQ(numberOfShares(TESTEXB_ASSET, { USER2, QX_CONTRACT_INDEX }, { USER2, QX_CONTRACT_INDEX }), 200);
+ EXPECT_EQ(numberOfShares(TESTEXB_ASSET, { USER3, QX_CONTRACT_INDEX }, { USER3, QX_CONTRACT_INDEX }), 100);
+ EXPECT_EQ(numberOfShares(TESTEXB_ASSET, { USER4, QX_CONTRACT_INDEX }, { USER4, QX_CONTRACT_INDEX }), 120);
+ EXPECT_EQ(numberOfShares(TESTEXB_ASSET, { USER1, QX_CONTRACT_INDEX }, { USER1, QX_CONTRACT_INDEX }), 0);
+
+ // Create scalar variable proposal
+ TESTEXB::ProposalDataT proposalB1;
+ proposalB1.epoch = system.epoch;
+ proposalB1.type = ProposalTypes::VariableScalarMean;
+ proposalB1.variableScalar.variable = 0;
+ proposalB1.variableScalar.minValue = 0;
+ proposalB1.variableScalar.maxValue = MAX_AMOUNT;
+ proposalB1.variableScalar.proposedValue = 1000;
+ uint16 proposalIdxB1 = test.setShareholderProposal(USER2, { proposalB1 });
+ EXPECT_NE((int)proposalIdxB1, (int)INVALID_PROPOSAL_INDEX);
+ auto proposalDataB1 = test.getShareholderProposal(proposalIdxB1);
+ proposalB1 = proposalDataB1.proposal; // needed to set tick
+ EXPECT_EQ((int)proposalDataB1.proposal.type, (int)ProposalTypes::VariableScalarMean);
+ EXPECT_EQ(proposalDataB1.proposerPubicKey, USER2);
+ EXPECT_EQ(proposalDataB1.proposal.variableScalar.maxValue, MAX_AMOUNT);
+ EXPECT_EQ(proposalDataB1.proposal.variableScalar.proposedValue, 1000);
+
+ // Create multi-option variable proposal as shareholder TESTEXA
+ TESTEXB::ProposalDataT proposalB2;
+ proposalB2.epoch = system.epoch;
+ proposalB2.type = ProposalTypes::VariableFourValues;
+ proposalB2.variableOptions.variable = 1;
+ proposalB2.variableOptions.values.set(0, 100);
+ proposalB2.variableOptions.values.set(1, 1000);
+ proposalB2.variableOptions.values.set(2, 10000);
+ proposalB2.variableOptions.values.set(3, 100000);
+ uint16 proposalIdxB2 = test.setProposalInOtherContractAsShareholder(USER1, TESTEXB_CONTRACT_INDEX, TESTEXB::SetShareholderProposal_input{ proposalB2 });
+ EXPECT_NE((int)proposalIdxB2, (int)INVALID_PROPOSAL_INDEX);
+ auto proposalDataB2 = test.getShareholderProposal(proposalIdxB2);
+ proposalB2 = proposalDataB2.proposal; // needed to set tick
+ EXPECT_EQ((int)proposalDataB2.proposal.type, (int)ProposalTypes::VariableFourValues);
+ EXPECT_EQ(proposalDataB2.proposerPubicKey, TESTEXA_CONTRACT_ID);
+ EXPECT_EQ(proposalDataB2.proposal.variableOptions.variable, 1);
+ EXPECT_EQ(proposalDataB2.proposal.variableOptions.values.get(0), 100);
+ EXPECT_EQ(proposalDataB2.proposal.variableOptions.values.get(1), 1000);
+ EXPECT_EQ(proposalDataB2.proposal.variableOptions.values.get(2), 10000);
+ EXPECT_EQ(proposalDataB2.proposal.variableOptions.values.get(3), 100000);
+
+ // cast votes in A1
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdxA1, proposalA1, { {0, 60}, {1, 270} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdxA1, proposalA1, { {0, 15}, {1, 180} }));
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, proposalIdxA1, proposalA1, { {1, 80}, {0, 15} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdxA1, proposalA1, { {0, 9}, {1, 11} }));
+ results = test.getShareholderVotingResults(proposalIdxA1);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 99);
+ EXPECT_EQ(results.optionVoteCount.get(1), 541);
+ EXPECT_EQ(results.getAcceptedOption(), 1);
+ EXPECT_EQ(results.totalVotesCasted, 99 + 541);
+
+ // cast votes in A2
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdxA2, proposalA2, { {0, 150}, {1, 150} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdxA2, proposalA2, { {0, 100}, {1, 100} }));
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER4, TESTEXA_CONTRACT_INDEX, proposalIdxA2, proposalA2, { {1, 50}, {0, 50} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdxA2, proposalA2, { {0, 10}, {1, 10} }));
+ results = test.getShareholderVotingResults(proposalIdxA2);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 310);
+ EXPECT_EQ(results.optionVoteCount.get(1), 310);
+ EXPECT_EQ(results.getAcceptedOption(), 0);
+ EXPECT_EQ(results.totalVotesCasted, 620);
+ EXPECT_TRUE(test.setShareholderVotes(USER1, proposalIdxA2, proposalA2, { {0, 0}, {1, 350} }));
+ results = test.getShareholderVotingResults(proposalIdxA2);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 160);
+ EXPECT_EQ(results.optionVoteCount.get(1), 510);
+ EXPECT_EQ(results.getAcceptedOption(), 1);
+ EXPECT_EQ(results.totalVotesCasted, 670);
+
+ // cast votes in B1
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER1, TESTEXB_CONTRACT_INDEX, proposalIdxB1, proposalB1, { {0, 10}, {100, 20}, {1000, 200}, {10000, 10}, {100000, 5}, {1000000, 5}, {10000000, 2}, {100000000, 2} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxB1, TESTEXA_CONTRACT_ID), { {0, 10}, {100, 20}, {1000, 200}, {10000, 10}, {100000, 5}, {1000000, 5}, {10000000, 2}, {100000000, 2} });
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdxB1, proposalB1, { {100, 200} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxB1, USER2), { {100, 200} });
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdxB1, proposalB1, { {150, 90}, {200, 10} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxB1, USER3), { {150, 90}, {200, 10} });
+ EXPECT_TRUE(test.setShareholderVotes(USER4, proposalIdxB1, proposalB1, { {300, 99}, {11974, 1} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxB1, USER4), { {300, 99}, {11974, 1} });
+ results = test.getShareholderVotingResults(proposalIdxB1);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ((int)results.optionCount, 0);
+ EXPECT_EQ(results.scalarVotingResult, 345381);
+ EXPECT_EQ(results.totalVotesCasted, 654);
+
+ // cast votes in B2
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER1, TESTEXB_CONTRACT_INDEX, proposalIdxB2, proposalB2, { {0, 10}, {1, 20}, {2, 30}, {3, 40} }));
+ checkVoteCounts(test.getShareholderVotes(proposalIdxB2, TESTEXA_CONTRACT_ID), { {0, 10}, {1, 20}, {2, 30}, {3, 40} });
+ EXPECT_TRUE(test.setShareholderVotes(USER2, proposalIdxB2, proposalB2, { {0, 20}, {1, 30}, {2, 40}, {3, 50}, {4, 3} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER3, proposalIdxB2, proposalB2, { {0, 5}, {1, 10}, {2, 15}, {3, 20}, {4, 2} }));
+ EXPECT_TRUE(test.setShareholderVotes(USER4, proposalIdxB2, proposalB2, { {0, 25}, {1, 20}, {2, 15}, {3, 10} }));
+ results = test.getShareholderVotingResults(proposalIdxB2);
+ EXPECT_EQ(results.totalVotesAuthorized, 676);
+ EXPECT_EQ(results.optionVoteCount.get(0), 60);
+ EXPECT_EQ(results.optionVoteCount.get(1), 80);
+ EXPECT_EQ(results.optionVoteCount.get(2), 100);
+ EXPECT_EQ(results.optionVoteCount.get(3), 120);
+ EXPECT_EQ(results.optionVoteCount.get(4), 5);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.totalVotesCasted, 365);
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER1, TESTEXB_CONTRACT_INDEX, proposalIdxB2, proposalB2, { {0, 45}, {1, 50}, {2, 55}, {3, 50}, {4, 5} }));
+ results = test.getShareholderVotingResults(proposalIdxB2);
+ EXPECT_EQ(results.optionVoteCount.get(0), 95);
+ EXPECT_EQ(results.optionVoteCount.get(1), 110);
+ EXPECT_EQ(results.optionVoteCount.get(2), 125);
+ EXPECT_EQ(results.optionVoteCount.get(3), 130);
+ EXPECT_EQ(results.optionVoteCount.get(4), 10);
+ EXPECT_EQ(results.getAcceptedOption(), -1);
+ EXPECT_EQ(results.totalVotesCasted, 470);
+ EXPECT_TRUE(test.setVotesInOtherContractAsShareholder(USER1, TESTEXB_CONTRACT_INDEX, proposalIdxB2, proposalB2, { {0, 5}, {1, 5}, {2, 5}, {3, 240} }));
+ results = test.getShareholderVotingResults(proposalIdxB2);
+ EXPECT_EQ(results.optionVoteCount.get(0), 55);
+ EXPECT_EQ(results.optionVoteCount.get(1), 65);
+ EXPECT_EQ(results.optionVoteCount.get(2), 75);
+ EXPECT_EQ(results.optionVoteCount.get(3), 320);
+ EXPECT_EQ(results.optionVoteCount.get(4), 5);
+ EXPECT_EQ(results.getAcceptedOption(), 3);
+ EXPECT_EQ(results.totalVotesCasted, 520);
+
+ // test proposal listing function in TESTEXA: 1 inactive by TESTEXB, 2 active by USER2/USER1
+ proposalIndices = test.getShareholderProposalIndices(false);
+ EXPECT_TRUE(proposalIndices.size() == 1 && proposalIndices[0] == proposalIdx2);
+ proposalIndices = test.getShareholderProposalIndices(true);
+ EXPECT_TRUE(proposalIndices.size() == 2 && proposalIndices[0] == proposalIdxA2 && proposalIndices[1] == proposalIdxA1);
+
+ // test proposal listing function in TESTEXB: 0 inactive, 2 active by USER1/TESTEXA
+ proposalIndices = test.getShareholderProposalIndices(false);
+ EXPECT_TRUE(proposalIndices.size() == 0);
+ proposalIndices = test.getShareholderProposalIndices(true);
+ EXPECT_TRUE(proposalIndices.size() == 2 && proposalIndices[0] == proposalIdxB1 && proposalIndices[1] == proposalIdxB2);
+
+ // test that variables are set correctly after epoch switch
+ test.getStateTestExampleA()->checkVariablesSetByProposal(1, 2, 3);
+ test.getStateTestExampleB()->checkVariablesSetByProposal(0, 0, 0);
+ test.endEpoch();
+ ++system.epoch;
+ test.getStateTestExampleA()->checkVariablesSetByProposal(13, 1337, 42);
+ test.getStateTestExampleB()->checkVariablesSetByProposal(345381, 10000, 0);
+
+ // test proposal listing function in TESTEXA: 3 inactive by TESTEXB/USER2/USER1, 0 active
+ EXPECT_TRUE(test.getShareholderProposalIndices