update bitcoind to 30.0. pin loopd protofiles to released version.

Author: rsafier

Docker/bitcoin/30.0/Dockerfile

@@ -1,15 +1,15 @@
 FROM debian:stable-slim
 
 ARG BITCOIN_VERSION="30.0"
-ENV PATH=/opt/bitcoin-30.0rc2/bin:$PATH
+ENV PATH=/opt/bitcoin-30.0/bin:$PATH
 
 RUN apt-get update -y \
   && apt-get install -y curl gosu \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN SYS_ARCH="$(uname -m)" \
-  && curl -SLO https://bitcoincore.org/bin/bitcoin-core-30.0/test.rc2/bitcoin-30.0rc2-${SYS_ARCH}-linux-gnu.tar.gz \
+  && curl -SLO https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-${SYS_ARCH}-linux-gnu.tar.gz \
   && tar -xzf *.tar.gz -C /opt \
   && rm *.tar.gz
 

LNUnit.LND/Grpc/looprpc/client.proto

@@ -775,10 +775,7 @@ message OutTermsResponse {
 
 message QuoteRequest {
     /*
-    The amount to swap in satoshis. In the loop-in case this can either be taken
-    from the connected lnd wallet or coin-selected from static address deposits.
-    This is controlled by the select_deposits flag. If deposit_outpoints are
-    specified, the coins are taken out of that.
+    The amount to swap in satoshis.
     */
     int64 amt = 1;
 
@@ -826,9 +823,8 @@ message QuoteRequest {
 
     /*
     Static address deposit outpoints that will be quoted for. This option only
-    pertains to loop in swaps. If the amt field is set as well the respective
-    partial amount will be swapped. Cannot be used in conjunction with
-    auto_select_deposits.
+    pertains to loop in swaps. Either this or the amt parameter can be set at
+    the same time.
     */
     repeated string deposit_outpoints = 8;
 
@@ -837,14 +833,6 @@ message QuoteRequest {
     be returned in the specified asset.
     */
     AssetLoopOutRequest asset_info = 9;
-
-    /*
-    In the legacy loop-in case this field must be set to false.
-    If set to true, the swap amount will be automatically selected from the
-    static address deposits. If set to true, deposit_outpoints must be empty.
-    This option only pertains to loop in swaps.
-    */
-    bool auto_select_deposits = 10;
 }
 
 message InQuoteResponse {
@@ -1922,12 +1910,6 @@ message Deposit {
     loop-in swap anymore.
     */
     int64 blocks_until_expiry = 6;
-
-    /*
-    The swap hash of the swap that this deposit is part of. This field is only
-    set if the deposit is part of a loop-in swap.
-    */
-    bytes swap_hash = 7;
 }
 
 message StaticAddressWithdrawal {
@@ -1989,11 +1971,6 @@ message StaticAddressLoopInSwap {
     fees.
     */
     int64 payment_request_amount_satoshis = 5;
-
-    /*
-    The deposits that were used for this swap.
-    */
-    repeated Deposit deposits = 6;
 }
 
 enum StaticAddressLoopInSwapState {
@@ -2101,21 +2078,6 @@ message StaticAddressLoopInRequest {
     side and the client can retry the swap with different parameters.
     */
     uint32 payment_timeout_seconds = 8;
-
-    /*
-    The optional swap amount the client is attempting to swap. It can be
-    provided in combination with the outpoints or separately. If provided with
-    outpoints the client takes out this amount from the sum of provided
-    outpoints and sends the change back to the static address. If the amount is
-    provided without outpoints, the client will select deposits automatically.
-    The coin selection strategy is simplified by sorting all available deposits
-    in descending order by amount, and equal amounts in ascending order of
-    blocks until expiry, and then selecting the largest deposits first until the
-    amount is reached. The change will be sent back to the static address. If a
-    subset of outpoints suffice to cover the specified amount the swap will be
-    canceled to allow the user to safe on transaction fees.
-    */
-    int64 amount = 9;
 }
 
 message StaticAddressLoopInResponse {

LNUnit.LND/update-protofiles.sh

@@ -16,7 +16,7 @@ mkdir -p ./Grpc/looprpc
 mkdir -p ./Grpc/swapserverrpc
 
 LND_TAG=${1:-v0.20.0-beta.rc1}
-LOOP_TAG=${2:-master}
+LOOP_TAG=${2:-v0.31.2-beta}
 
 
 wget -O ./Grpc/lightning.proto https://raw.githubusercontent.com/lightningnetwork/lnd/$LND_TAG/lnrpc/lightning.proto

LNUnit.Tests/LNUnit.Tests.csproj

@@ -41,8 +41,7 @@
         <!--        <PackageReference Include="Serilog.Sinks.AwsCloudWatch" Version="4.0.182"/>-->
         <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
-        <PackageReference Include="System.Text.Json" Version="9.0.9" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" /> 
     </ItemGroup>
 
     <ItemGroup>