From 9fae376500c3b7bde4ac0d0f03f15d47a4d6f12c Mon Sep 17 00:00:00 2001
From: Michael Sutton <msutton@cs.huji.ac.il>
Date: Fri, 20 Sep 2024 13:31:55 +0300
Subject: [PATCH] Deploy linux binary without musl in its name + various minor
 miscellaneous things towards v0.15.2  (#564)

* remove musl from linux binary name

* remove simpa from win and osx builds in order to be consistent with linux build

* safe eqv optimization: use inplace truncate (tested)
---
 .github/workflows/deploy.yaml | 8 ++------
 rpc/service/src/service.rs    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 8f46cb1fe..537eeef89 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -65,8 +65,8 @@ jobs:
           cp target/x86_64-unknown-linux-musl/release/kaspad bin/
           cp target/x86_64-unknown-linux-musl/release/rothschild bin/
           cp target/x86_64-unknown-linux-musl/release/kaspa-wallet bin/
-          archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-linux-musl-amd64.zip"
-          asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-linux-musl-amd64.zip"
+          archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
+          asset_name="rusty-kaspa-${{ github.event.release.tag_name }}-linux-amd64.zip"
           zip -r "${archive}" ./bin/*
           echo "archive=${archive}" >> $GITHUB_ENV
           echo "asset_name=${asset_name}" >> $GITHUB_ENV
@@ -76,12 +76,10 @@ jobs:
         shell: bash
         run: |
           cargo build --bin kaspad --release
-          cargo build --bin simpa --release
           cargo build --bin rothschild --release
           cargo build --bin kaspa-wallet --release
           mkdir bin || true
           cp target/release/kaspad.exe bin/
-          cp target/release/simpa.exe bin/
           cp target/release/rothschild.exe bin/
           cp target/release/kaspa-wallet.exe bin/
           archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-win64.zip"
@@ -94,12 +92,10 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           cargo build --bin kaspad --release
-          cargo build --bin simpa --release
           cargo build --bin rothschild --release
           cargo build --bin kaspa-wallet --release
           mkdir bin || true
           cp target/release/kaspad bin/
-          cp target/release/simpa bin/
           cp target/release/rothschild bin/
           cp target/release/kaspa-wallet bin/
           archive="bin/rusty-kaspa-${{ github.event.release.tag_name }}-osx.zip"
diff --git a/rpc/service/src/service.rs b/rpc/service/src/service.rs
index bdc2a9541..d75ff770b 100644
--- a/rpc/service/src/service.rs
+++ b/rpc/service/src/service.rs
@@ -623,7 +623,7 @@ NOTE: This error usually indicates an RPC conversion error between the node and
                 .get_virtual_chain_accepted_transaction_ids(&session, &virtual_chain_batch, Some(batch_size))
                 .await?;
             // bound added to the length of the accepted transaction ids, which is bounded by merged blocks
-            virtual_chain_batch.added = virtual_chain_batch.added[..accepted_transaction_ids.len()].to_vec();
+            virtual_chain_batch.added.truncate(accepted_transaction_ids.len());
             accepted_transaction_ids
         } else {
             vec![]