Update release tooling for Peya binaries

Dockerfile

@@ -41,26 +41,25 @@ RUN set -ex && \
     rm -rf /var/lib/apt
 COPY --from=builder /src/build/x86_64-linux-gnu/release/bin /usr/local/bin/
 
-# Create salvium user
-RUN adduser --system --group --disabled-password salvium && \
-	mkdir -p /wallet /home/salvium/.salvium && \
-	chown -R salvium:salvium /home/salvium/.salvium && \
-	chown -R salvium:salvium /wallet
+# Create peya user
+RUN adduser --system --group --disabled-password peya && \
+	mkdir -p /wallet /home/peya/.peya && \
+	chown -R peya:peya /home/peya/.peya && \
+	chown -R peya:peya /wallet
 
 # Contains the blockchain
-VOLUME /home/salvium/.salvium
+VOLUME /home/peya/.peya
 
 # Generate your wallet via accessing the container and run:
 # cd /wallet
-# salvium-wallet-cli
+# peya-wallet-cli
 VOLUME /wallet
 
-EXPOSE 19080
-EXPOSE 19081
+EXPOSE 17749
+EXPOSE 17750
 
-# switch to user salvium
-USER salvium
-
-ENTRYPOINT ["salviumd"]
-CMD ["--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=19080", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=19081", "--non-interactive", "--confirm-external-bind"]
+# switch to user peya
+USER peya
 
+ENTRYPOINT ["peyad"]
+CMD ["--p2p-bind-ip=0.0.0.0", "--p2p-bind-port=17749", "--rpc-bind-ip=0.0.0.0", "--rpc-bind-port=17750", "--non-interactive", "--confirm-external-bind"]

Dockerfile.salvium

@@ -15,10 +15,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates curl zip libtool gperf automake autoconf \
  && rm -rf /var/lib/apt/lists/*
 
-# Clone the develop branch
-WORKDIR /opt
-RUN git clone --recursive -b develop https://github.com/salvium/salvium.git
-WORKDIR /opt/salvium
+# Build the checked-out Peya tree
+WORKDIR /opt/peya
+COPY . .
 
 # make the script runnable
 RUN chmod +x make_releases.sh
@@ -29,9 +28,9 @@ RUN mkdir ~/releases
 # Expose the releases directory for copying zip files to the host
 VOLUME ["~/releases"]
 
-ENTRYPOINT ["/opt/salvium/make_releases.sh"]
+ENTRYPOINT ["/opt/peya/make_releases.sh"]
 
 
 # To access the generated zip files on your host, run the container with:
 #   docker run -v ~/releases:/root/releases <image>
-# This will copy the zip files to your host's ~/salvium-releases directory.
+# This will copy the zip files to your host's ~/releases directory.

make_releases.sh

@@ -7,25 +7,25 @@ COMMIT=`git rev-parse --short=9 HEAD`
 # Build the 64-bit Windows release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-w64-mingw32 -j12
 pushd ./build/x86_64-w64-mingw32/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-win64.zip salviumd.exe salvium-wallet-cli.exe salvium-wallet-rpc.exe
+zip -ur ~/releases/peya-${TAG}-win64.zip peyad.exe peya-wallet-cli.exe peya-wallet-rpc.exe
 popd > /dev/null
 
 # Build the 64-bit Apple Silicon release
 USE_DEVICE_TREZOR=OFF make depends target=aarch64-apple-darwin -j12
 pushd ./build/aarch64-apple-darwin/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-macos-arm64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-macos-arm64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Build the 64-bit MacOS Intel Silicon release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-apple-darwin -j12
 pushd ./build/x86_64-apple-darwin/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-macos-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-macos-x86_64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Build the 64-bit Linux release
 USE_DEVICE_TREZOR=OFF make depends target=x86_64-linux-gnu -j12
 pushd ./build/x86_64-linux-gnu/release/bin > /dev/null
-zip -ur ~/releases/salvium-${TAG}-linux-x86_64.zip salviumd salvium-wallet-cli salvium-wallet-rpc
+zip -ur ~/releases/peya-${TAG}-linux-x86_64.zip peyad peya-wallet-cli peya-wallet-rpc
 popd > /dev/null
 
 # Finish

salvium-v1.0.7-hashes.txt

@@ -1,5 +0,0 @@
-48417220800f174a3613881a56131d25c49d344228fca124c8331e0b58a8ff06 salvium-v1.0.7-ubuntu22.04-linux-x86_64.zip
-52226551a9e1842df46cf068292cfa3c1e05328e0695cf6723365d4401af19a6 salvium-v1.0.7-ubuntu22.04-linux-aarch64.zip
-b40c3765479c9d5712e766ddd01314b63e5080472b7639d34388e6b74b36142e salvium-v1.0.7-macos-x86_64.zip
-60b05548f69040fe901e336e8fc4189a1028a8d7ded09bad555b3c854a0e8d6e salvium-v1.0.7-macos-aarch64.zip
-b2c3e0bb8254ad1f62a78d6670c6e5adba1e42bb823919faad1cbf5796d53910 salvium-v1.0.7-win64.zip

salvium-v1.1.0-rc4-hashes.txt

@@ -1,5 +0,0 @@
-d0a8b0515ae2ee79849cbc17b0639bb7859e30efcd50e5b058540874cd0919ce salvium-v1.1.0-rc4-ubuntu22.04-linux-x86_64.zip
-6528b8b23f09c574fc9383b48b88e87f99609ff5ce1b727872b5554505a69d77 salvium-v1.1.0-rc4-ubuntu22.04-linux-aarch64.zip
-00ca183c47f852b8b30e4b87ce3b3536a0e97866e6027bf25d389b4a1bc9c471 salvium-v1.1.0-rc4-macos-x86_64.zip
-50480b1043e9b5901576ab45f926b0b51a5d21237c6da549603ad1f13819e6ed salvium-v1.1.0-rc4-macos-aarch64.zip
-adf96eee17e16f318fc047721acb5bfa8ae7ed1c0ff8d022da8ab5df64d8ce3f salvium-v1.1.0-rc4-win64.zip

salvium-v1.1.0-rc5-hashes.txt

@@ -1,5 +0,0 @@
-23a03277e922c3f41ba6ddb0efc7581c3287d9f3faa2ddd19cc2d018a6797701 salvium-v1.1.0-rc5-ubuntu22.04-linux-x86_64.zip
-94409b190eae890792b2d04cfffe148828dc23d658cd54a8d7802b12a9f274a4 salvium-v1.1.0-rc5-ubuntu22.04-linux-aarch64.zip
-76cc02603cb21cd0729f0e5c9a39bb32310428b15580458ec8d74dcba39c9319 salvium-v1.1.0-rc5-macos-x86_64.zip
-dc477718bfb370ecbafebf3e1736df5978200302f13542374f1b1fd43e07ab45 salvium-v1.1.0-rc5-macos-aarch64.zip
-0e9b81eeaa32a4709a1cbd4c198721455a3c8cc86c1f1915cfc74af7885f8fee salvium-v1.1.0-rc5-win64.zip

src/cryptonote_core/blockchain.cpp

@@ -1552,7 +1552,6 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl
   case HF_VERSION_AUDIT2_PAUSE:
   case HF_VERSION_CARROT:
   case HF_VERSION_ENABLE_TOKENS:
-    MERROR("validate_miner_transaction: height=" << height << ", hf=" << static_cast<unsigned>(version) << ", already_generated_coins=" << already_generated_coins << ", has_active_stakes=" << has_active_stakes << ", miner_amount_burnt=" << b.miner_tx.amount_burnt << ", money_in_use_before_burn=" << money_in_use);
     if (b.miner_tx.amount_burnt > 0) {
       CHECK_AND_ASSERT_MES(money_in_use + b.miner_tx.amount_burnt > money_in_use, false, "miner transaction is overflowed by amount_burnt");
       money_in_use += b.miner_tx.amount_burnt;

src/cryptonote_core/cryptonote_tx_utils.cpp

@@ -543,7 +543,6 @@ namespace cryptonote
         tx = carrot::store_carrot_to_coinbase_transaction_v1(enotes, extra_nonce, cryptonote::transaction_type::MINER, height);
         tx.version = (hard_fork_version >= HF_VERSION_ENABLE_TOKENS) ? TRANSACTION_VERSION_ENABLE_TOKENS : TRANSACTION_VERSION_CARROT;
         tx.amount_burnt = stake_reward;
-        MERROR("construct_miner_tx: carrot branch final height=" << height << ", has_active_stakes=" << has_active_stakes << ", block_reward=" << block_reward << ", amount_burnt=" << tx.amount_burnt << ", miner_amount=" << payment_proposal.amount);
         tx.invalidate_hashes();
       }
       catch (const std::exception &e)
@@ -587,8 +586,6 @@ namespace cryptonote
 
     // Should we award some of the block reward to the stakers?
     if (height != 0) {
-      MERROR("construct_miner_tx: height=" << height << ", hf=" << static_cast<unsigned>(hard_fork_version) << ", has_active_stakes=" << has_active_stakes << ", block_reward=" << block_reward << ", initial_amount=" << amount);
-
       if (has_active_stakes) {
         // Different forks take a different proportion of the block_reward for stakers
         switch (hard_fork_version) {
@@ -607,7 +604,6 @@ namespace cryptonote
           CHECK_AND_ASSERT_MES(tx.amount_burnt == 0, false, "while creating outs: amount_burnt is nonzero");
           tx.amount_burnt = amount / 5;
           amount -= tx.amount_burnt;
-          MERROR("construct_miner_tx: staking burn applied, amount_burnt=" << tx.amount_burnt << ", miner_amount=" << amount);
           break;
         default:
           assert(false);
@@ -620,8 +616,6 @@ namespace cryptonote
         asset_type = "PEY";
       cryptonote::set_tx_out(amount, asset_type, CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW, out_eph_public_key, use_view_tags, view_tag, out);    
       tx.vout.push_back(out);
-      MERROR("construct_miner_tx: final amount_burnt=" << tx.amount_burnt << ", vout_amount=" << amount);
-
     } else {
 
       // Genesis TX - create the necessary distribution for Salvium seed funds