IPO QThirtyFour #684
IPO QThirtyFour #684
Conversation
# Conflicts: # src/Qubic.vcxproj # src/contract_core/contract_def.h
…reserve and don’t consume reseed budget with tier top-ups on k4 rounds - test/contract_qtf.cpp: expose private/protected internals for unit tests, add exact-match k2/k3 ticket generators (unique), fund jackpot balance in k4 test, and force FR off in baseline k2/k3 revenue-split test
# Conflicts: # src/contract_core/contract_def.h # src/contracts/RandomLottery.h # test/test.vcxproj # test/test.vcxproj.filters
…eserve top-ups; correct schedule bitmask in specx
src/contracts/QReservePool.h
Outdated
|
|
||
| // Number of available smart contracts in the QRP contract. | ||
| static constexpr uint16 QRP_AVAILABLE_SC_NUM = 128; | ||
| static constexpr uint64 QRP_QTF_INDEX = 21; |
There was a problem hiding this comment.
Just a reminder that this index needs to be adapted when merging. There are some more SCs in the pipeline so indices are currently unclear. It becomes especially tricky when we have multiple proposals in one epoch because indices then depend on proposal outcomes.
Maybe it would be best to define this as QRP_CONTRACT_INDEX + 1. This should always be correct assuming QRP and QTF can only be accepted together (=single proposal)?
There was a problem hiding this comment.
Thank you. I'll do that
src/contracts/QReservePool.h
Outdated
| return; | ||
| } | ||
|
|
||
| state.availableSmartContracts.remove(id(input.scIndex, 0, 0, 0)); |
There was a problem hiding this comment.
this HashMap needs a call to cleanup or cleanupIfNeeded because it's calling remove (see https://github.com/qubic/core/blob/main/doc/contracts.md#container-types)
src/contracts/QReservePool.h
Outdated
| { | ||
| // Procedures | ||
| REGISTER_USER_PROCEDURE(GetReserve, 1); | ||
| REGISTER_USER_PROCEDURE(AddAvailableSC, 2); |
There was a problem hiding this comment.
Up to you but I suggest to rename *AvailableSC to *AllowedSC. Available reserve makes sense to me but the SCs are either allowed or not.
src/contracts/QThirtyFour.h
Outdated
| } | ||
| } | ||
|
|
||
| public: |
There was a problem hiding this comment.
this is already public (or are you repeating it for easier readability?)
Auto-update QTF index in QRP Adds cleanup for allowedSmartContracts in QRP
Franziska-Mueller
left a comment
Franziska-Mueller
left a comment
There was a problem hiding this comment.
Please merge develop and fix the contract indices in contract_def.h.
You can decide in which epoch the proposals for QDuel and QThirtyFour/QReservePool should happen and adapt the indices accordingly.
src/contracts/QReservePool.h
Outdated
| static constexpr uint8 toReturnCode(const EReturnCode& code) { return static_cast<uint8>(code); }; | ||
|
|
||
| public: | ||
| // Get Reserve |
There was a problem hiding this comment.
nit: the comment still says "Get Reserve"
# Conflicts: # src/contract_core/contract_def.h
# Conflicts: # src/contract_core/contract_def.h
2 participants
Proposal:
QTF
QRP