Merge branch 'qubic:main' into feature/qutil

Author: double-k-3033

.github/workflows/contract-verify.yml

@@ -32,13 +32,15 @@ jobs:
       # Checkout repo to use files of the repo as input for container action
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: 'true'
       - name: Find all contract files to verify
         id: filepaths
         run: |
-          files=$(find src/contracts/ -maxdepth 1 -type f -name "*.h" ! -name "*QUtil*" ! -name "*TestExample*" ! -name "*math_lib*" ! -name "*qpi*" -printf "%p\n" | paste -sd, -)
+          files=$(find src/contracts/ -maxdepth 1 -type f -name "*.h" ! -name "*TestExample*" ! -name "*math_lib*" ! -name "*qpi*" -printf "%p\n" | paste -sd, -)
           echo "contract-filepaths=$files" >> "$GITHUB_OUTPUT"
       - name: Contract verify action step
         id: verify
-        uses: Franziska-Mueller/qubic-contract-verify@v1.0.5
+        uses: Franziska-Mueller/qubic-contract-verify@main
         with:
           filepaths: '${{ steps.filepaths.outputs.contract-filepaths }}'

doc/contracts.md

@@ -498,6 +498,9 @@ The following container types are available in the QPI:
   Lookup by key, insert, and remove run in approximately constant time if population is less than 80% of `L`.
 - `HashSet<KeyT, L>`: Hash set of keys of type `KeyT` and total capacity `L`.
   Lookup by key, insert, and remove run in approximately constant time if population is less than 80% of `L`.
+- `LinkedList<T, L>`: Doubly-linked list of elements of type `T` with fixed capacity `L` (`L` must be 2^N).
+  Provides O(1) insertion at head/tail, O(1) insertion before/after a given index, O(1) removal by index, and bidirectional traversal.
+  Removed nodes are immediately recycled via a free list (no deferred cleanup needed).
 
 Please note that removing items from `Collection`, `HashMap`, and `HashSet` does not immediately free the hash map slots used for the removed items.
 This may negatively impact the lookup speed, which depends on the maximum population seen since the last cleanup.
@@ -613,7 +616,7 @@ Global constants, structs and classes must begin with the name of the contract s
 There is a limit for recursion and depth of nested contract function / procedure calls (the limit is 10 at the moment).
 
 The input and output structs of contract user procedures and functions may only use integer and boolean types (such as `uint64`, `sint8`, `bit`) as well as `id`, `Array`, and `BitArray`, and struct types containing only allowed types.
-Complex types that may have an inconsistent internal state, such as `Collection`, are forbidden in the public interface of a contract.
+Complex types that may have an inconsistent internal state, such as `Collection` and `LinkedList`, are forbidden in the public interface of a contract.
 
 
 ## General Change Management

doc/protocol.md

@@ -26,9 +26,10 @@ The following transaction types (`tx->inputType`) are defined:
 - `FileTrailerTransaction`, type 5, defined in `src/files/files.h`.
 - `OracleReplyCommitTransactionPrefix`, type 6, defined in `src/oracle_core/oracle_transactions.h`.
 - `OracleReplyRevealTransactionPrefix`, type 7, defined in `src/oracle_core/oracle_transactions.h`.
-- `CustomMiningSolutionTransaction`, type 8, defined in `src/mining/mining.h`.
+- `CustomMiningSolutionTransaction`, type 8, defined in `src/mining/mining.h`. (will be reclaimed if XMR is removed)
 - `ExecutionFeeReportTransactionPrefix`, type 9, defined in `src/network_messages/execution_fees.h`.
 - `OracleUserQueryTransactionPrefix`, type 10, defined in `src/oracle_core/oracle_transactions.h`.
+- `DogeMiningShareTransaction`, type 11, defined in `src/mining/mining.h`.
 
 
 ## Peer Sharing

src/Qubic.vcxproj

@@ -46,9 +46,11 @@
     <ClInclude Include="contracts\QRaffle.h" />
     <ClInclude Include="contracts\QBond.h" />
     <ClInclude Include="contracts\QIP.h" />
+    <ClInclude Include="contracts\Qusino.h" />
     <ClInclude Include="contracts\QReservePool.h" />
     <ClInclude Include="contracts\QThirtyFour.h" />
     <ClInclude Include="contracts\Pulse.h" />
+    <ClInclude Include="contracts\Escrow.h" />
     <ClInclude Include="contracts\TestExampleA.h" />
     <ClInclude Include="contracts\TestExampleB.h" />
     <ClInclude Include="contracts\TestExampleC.h" />
@@ -67,13 +69,15 @@
     <ClInclude Include="contract_core\qpi_spectrum_impl.h" />
     <ClInclude Include="contract_core\qpi_system_impl.h" />
     <ClInclude Include="contract_core\qpi_hash_map_impl.h" />
+    <ClInclude Include="contract_core\qpi_linked_list_impl.h" />
     <ClInclude Include="contract_core\qpi_ticking_impl.h" />
     <ClInclude Include="contract_core\qpi_trivial_impl.h" />
     <ClInclude Include="contract_core\stack_buffer.h" />
     <ClInclude Include="contract_core\qpi_proposal_voting.h" />
     <ClInclude Include="files\files.h" />
     <ClInclude Include="logging\logging.h" />
     <ClInclude Include="logging\net_msg_impl.h" />
+    <ClInclude Include="mining\custom_qubic_mining_storage.h" />
     <ClInclude Include="mining\mining.h" />
     <ClInclude Include="mining\score_addition.h" />
     <ClInclude Include="mining\score_common.h" />
@@ -106,6 +110,7 @@
     <ClInclude Include="oracle_core\oracle_interfaces_def.h" />
     <ClInclude Include="oracle_core\oracle_transactions.h" />
     <ClInclude Include="oracle_core\snapshot_files.h" />
+    <ClInclude Include="oracle_interfaces\DogeShareValidation.h" />
     <ClInclude Include="oracle_interfaces\Mock.h" />
     <ClInclude Include="oracle_interfaces\Price.h" />
     <ClInclude Include="platform\assert.h" />

src/Qubic.vcxproj.filters

@@ -132,6 +132,12 @@
     <ClInclude Include="contracts\QIP.h">
       <Filter>contracts</Filter>
     </ClInclude>
+    <ClInclude Include="contracts\Qusino.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
+    <ClInclude Include="contracts\Escrow.h">
+      <Filter>contracts</Filter>
+    </ClInclude>
     <ClInclude Include="contract_core\contract_def.h">
       <Filter>contract_core</Filter>
     </ClInclude>
@@ -206,6 +212,9 @@
     <ClInclude Include="contract_core\qpi_hash_map_impl.h">
       <Filter>contract_core</Filter>
     </ClInclude>
+    <ClInclude Include="contract_core\qpi_linked_list_impl.h">
+      <Filter>contract_core</Filter>
+    </ClInclude>
     <ClInclude Include="contract_core\qpi_asset_impl.h">
       <Filter>contract_core</Filter>
     </ClInclude>
@@ -365,6 +374,12 @@
     <ClInclude Include="oracle_core\snapshot_files.h">
       <Filter>oracle_core</Filter>
     </ClInclude>
+    <ClInclude Include="oracle_interfaces\DogeShareValidation.h">
+      <Filter>oracle_interfaces</Filter>
+    </ClInclude>
+    <ClInclude Include="mining\custom_qubic_mining_storage.h">
+      <Filter>mining</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="platform">
@@ -415,4 +430,4 @@
       <Filter>platform</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>

src/common_buffers.h

@@ -43,7 +43,7 @@ class CommonBuffers
         // memory layout of buffer: sub buffer pointers | sub buffer locks | sub buffer 1 | sub buffer 2 | ...
         unsigned char* buffer = nullptr;
         const unsigned long long ptrSize = count * sizeof(unsigned char*);
-        const unsigned long long lockSize = (count + 7) / 8;
+        const unsigned long long lockSize = count * sizeof(subBufferLock[0]);
         const unsigned long long bufSize = count * size;
 
         if (!allocPoolWithErrorLog(L"commonBuffers", ptrSize + lockSize + bufSize, (void**)&buffer, __LINE__))

src/contract_core/contract_def.h

@@ -254,8 +254,6 @@
 #define CONTRACT_STATE2_TYPE PULSE2
 #include "contracts/Pulse.h"
 
-#ifndef NO_VOTTUN
-
 #undef CONTRACT_INDEX
 #undef CONTRACT_STATE_TYPE
 #undef CONTRACT_STATE2_TYPE
@@ -266,6 +264,27 @@
 #define CONTRACT_STATE2_TYPE VOTTUNBRIDGE2
 #include "contracts/VottunBridge.h"
 
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define QUSINO_CONTRACT_INDEX 26
+#define CONTRACT_INDEX QUSINO_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE QUSINO
+#define CONTRACT_STATE2_TYPE QUSINO2
+#include "contracts/Qusino.h"
+
+#ifndef NO_ESCROW
+#undef CONTRACT_INDEX
+#undef CONTRACT_STATE_TYPE
+#undef CONTRACT_STATE2_TYPE
+
+#define ESCROW_CONTRACT_INDEX 27
+#define CONTRACT_INDEX ESCROW_CONTRACT_INDEX
+#define CONTRACT_STATE_TYPE ESCROW
+#define CONTRACT_STATE2_TYPE ESCROW2
+#include "contracts/Escrow.h"
+
 #endif
 
 // new contracts should be added above this line
@@ -327,6 +346,7 @@ constexpr unsigned short TESTEXD_CONTRACT_INDEX = (CONTRACT_INDEX + 1);
 #include "qpi_collection_impl.h"
 #include "qpi_trivial_impl.h"
 #include "qpi_hash_map_impl.h"
+#include "qpi_linked_list_impl.h"
 
 #include "platform/global_var.h"
 
@@ -356,7 +376,7 @@ constexpr struct ContractDescription
     {"", 0, 0, sizeof(Contract0State)},
     {"QX", 66, 10000, sizeof(QX::StateData)},
     {"QTRY", 72, 10000, sizeof(QUOTTERY::StateData)},
-    {"RANDOM", 88, 10000, sizeof(IPO)},
+    {"RANDOM", 88, 10000, sizeof(RANDOM::StateData)},
     {"QUTIL", 99, 10000, sizeof(QUTIL::StateData)},
     {"MLM", 112, 10000, sizeof(IPO)},
     {"GQMPROP", 123, 10000, sizeof(GQMPROP::StateData)},
@@ -378,8 +398,10 @@ constexpr struct ContractDescription
 	{"QTF", 199, 10000, sizeof(QTF::StateData)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
     {"QDUEL", 199, 10000, sizeof(QDUEL::StateData)}, // proposal in epoch 197, IPO in 198, construction and first use in 199
 	{"PULSE", 204, 10000, sizeof(PULSE::StateData)}, // proposal in epoch 202, IPO in 203, construction and first use in 204
-#ifndef NO_VOTTUN
     {"VOTTUN", 206, 10000, sizeof(VOTTUNBRIDGE::StateData)}, // proposal in epoch 204, IPO in 205, construction and first use in 206
+    {"QUSINO", 208, 10000, sizeof(QUSINO::StateData)}, // proposal in epoch 206, IPO in 207, construction and first use in 208
+#ifndef NO_ESCROW
+    {"ESCROW", 210, 10000, sizeof(ESCROW::StateData)}, // proposal in epoch 208, IPO in 209, construction and first use in 210
 #endif
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -501,8 +523,10 @@ static void initializeContracts()
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QTF);
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QDUEL);
 	REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(PULSE);
-#ifndef NO_VOTTUN
     REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(VOTTUNBRIDGE);
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(QUSINO);
+#ifndef NO_ESCROW
+    REGISTER_CONTRACT_FUNCTIONS_AND_PROCEDURES(ESCROW);
 #endif
     // new contracts should be added above this line
 #ifdef INCLUDE_CONTRACT_TEST_EXAMPLES
@@ -513,6 +537,15 @@ static void initializeContracts()
 #endif
 }
 
+// Automatic Contract Padding
+// Contracts whose state struct grew this epoch. Update this list each epoch as needed.
+// When enabling, replace both lines below, e.g.:
+//   constexpr unsigned int paddableContracts[] = { RANDOM_CONTRACT_INDEX };
+//   constexpr unsigned int paddableCount = sizeof(paddableContracts) / sizeof(paddableContracts[0]);
+constexpr const unsigned int* paddableContracts = nullptr;
+constexpr unsigned int paddableCount = 0;
+
+
 // Class for registering and looking up user procedures independently of input type, for example for notifications
 class UserProcedureRegistry
 {

src/contract_core/qpi_collection_impl.h

@@ -621,8 +621,10 @@ namespace QPI
 			return;
 		}
 
-		// Init buffers
-		__ScopedScratchpad scratchpad(sizeof(_povs) + sizeof(_povOccupationFlags), /*initZero=*/true);
+		// Init buffers. Besides the rebuilt pov tables we also need traversal stack
+		// space for walking a pov's BST while updating element.povIndex.
+		const uint64 stackBytes = _population * sizeof(sint64);
+		__ScopedScratchpad scratchpad(sizeof(_povs) + sizeof(_povOccupationFlags) + stackBytes, /*initZero=*/true);
 		ASSERT(scratchpad.ptr);
 		auto* _povsBuffer = reinterpret_cast<PoV*>(scratchpad.ptr);
 		auto* _povOccupationFlagsBuffer = reinterpret_cast<uint64*>(_povsBuffer + L);

src/contract_core/qpi_hash_map_impl.h

@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "pre_qpi_def.h"
+#include "../common_buffers.h"
 #include "../contracts/qpi.h"
 #include "../platform/memory.h"
 #include "../kangaroo_twelve.h"