Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ services:
network_mode: service:bitcoind

coordinator-CLN:
image: elementsproject/lightningd:${CLN_VERSION:-v24.05}
image: elementsproject/lightningd:${CLN_VERSION:-v24.08}
restart: always
container_name: test-coordinator-CLN
environment:
Expand Down
4 changes: 2 additions & 2 deletions docker/cln/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:bullseye-slim as builder
ARG DEBIAN_FRONTEND=noninteractive

ARG LIGHTNINGD_VERSION=v24.05
ARG LIGHTNINGD_VERSION=v24.08
RUN apt-get update -qq && \
apt-get install -qq -y --no-install-recommends \
autoconf \
Expand All @@ -22,7 +22,7 @@ RUN git clone https://github.com/daywalker90/holdinvoice.git /tmp/holdinvoice
RUN cd /tmp/holdinvoice \
&& cargo build --release

FROM elementsproject/lightningd:v24.05 as final
FROM elementsproject/lightningd:v24.08 as final

COPY --from=builder /tmp/holdinvoice/target/release/holdinvoice /tmp/holdinvoice
COPY config /tmp/config
Expand Down
27 changes: 1 addition & 26 deletions docs/assets/schemas/api-latest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: 3.0.3
info:
title: RoboSats REST API
version: 0.6.3
version: 0.7.4
x-logo:
url: https://raw.githubusercontent.com/Reckless-Satoshi/robosats/main/frontend/static/assets/images/robosats-0.1.1-banner.png
backgroundColor: '#FFFFFF'
Expand Down Expand Up @@ -1125,7 +1125,6 @@ components:
status:
allOf:
- $ref: '#/components/schemas/StatusEnum'
default: 0
minimum: 0
maximum: 32767
created_at:
Expand All @@ -1149,7 +1148,6 @@ components:
nullable: true
has_range:
type: boolean
default: false
min_amount:
type: string
format: decimal
Expand All @@ -1162,17 +1160,14 @@ components:
nullable: true
payment_method:
type: string
default: not specified
maxLength: 70
is_explicit:
type: boolean
default: false
premium:
type: string
format: decimal
pattern: ^-?\d{0,3}(?:\.\d{0,2})?$
nullable: true
default: '0.00'
satoshis:
type: integer
maximum: 5000000
Expand All @@ -1188,12 +1183,10 @@ components:
type: integer
maximum: 28800
minimum: 1800
default: 10799
bond_size:
type: string
format: decimal
pattern: ^-?\d{0,2}(?:\.\d{0,2})?$
default: '3.00'
latitude:
type: string
format: decimal
Expand Down Expand Up @@ -1260,7 +1253,6 @@ components:
format: decimal
pattern: ^-?\d{0,3}(?:\.\d{0,2})?$
nullable: true
default: '0.00'
satoshis:
type: integer
maximum: 5000000
Expand All @@ -1270,17 +1262,14 @@ components:
type: integer
maximum: 86400
minimum: 597.6
default: 86399
escrow_duration:
type: integer
maximum: 28800
minimum: 1800
default: 10799
bond_size:
type: string
format: decimal
pattern: ^-?\d{0,2}(?:\.\d{0,2})?$
default: '3.00'
latitude:
type: string
format: decimal
Expand Down Expand Up @@ -1320,7 +1309,6 @@ components:
status:
allOf:
- $ref: '#/components/schemas/StatusEnum'
default: 0
minimum: 0
maximum: 32767
created_at:
Expand All @@ -1344,7 +1332,6 @@ components:
nullable: true
has_range:
type: boolean
default: false
min_amount:
type: string
format: decimal
Expand All @@ -1357,11 +1344,9 @@ components:
nullable: true
payment_method:
type: string
default: not specified
maxLength: 70
is_explicit:
type: boolean
default: false
premium:
type: string
description: Premium over the CEX price set by the maker
Expand All @@ -1387,7 +1372,6 @@ components:
type: integer
maximum: 28800
minimum: 1800
default: 10799
total_secs_exp:
type: integer
description: Duration of time (in seconds) to expire, according to the current
Expand Down Expand Up @@ -1559,12 +1543,10 @@ components:
type: integer
maximum: 86400
minimum: 597.6
default: 86399
bond_size:
type: string
format: decimal
pattern: ^-?\d{0,2}(?:\.\d{0,2})?$
default: '3.00'
trade_fee_percent:
type: integer
description: The fee for the trade (fees differ for maker and taker)
Expand Down Expand Up @@ -1646,7 +1628,6 @@ components:
nullable: true
has_range:
type: boolean
default: false
min_amount:
type: string
format: decimal
Expand All @@ -1659,17 +1640,14 @@ components:
nullable: true
payment_method:
type: string
default: not specified
maxLength: 70
is_explicit:
type: boolean
default: false
premium:
type: string
format: decimal
pattern: ^-?\d{0,3}(?:\.\d{0,2})?$
nullable: true
default: '0.00'
satoshis:
type: integer
maximum: 5000000
Expand All @@ -1693,7 +1671,6 @@ components:
type: integer
maximum: 28800
minimum: 1800
default: 10799
satoshis_now:
type: integer
description: The amount of sats to be traded at the present moment (not
Expand All @@ -1702,7 +1679,6 @@ components:
type: string
format: decimal
pattern: ^-?\d{0,2}(?:\.\d{0,2})?$
default: '3.00'
latitude:
type: string
format: decimal
Expand Down Expand Up @@ -1939,7 +1915,6 @@ components:
fee:
type: string
format: decimal
default: '0.0000'
TypeEnum:
enum:
- 0
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate_grpc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ curl --parallel -o lightning.proto https://raw.githubusercontent.com/lightningne
-o signer.proto https://raw.githubusercontent.com/lightningnetwork/lnd/master/lnrpc/signrpc/signer.proto \
-o verrpc.proto https://raw.githubusercontent.com/lightningnetwork/lnd/master/lnrpc/verrpc/verrpc.proto \
-o hold.proto https://raw.githubusercontent.com/daywalker90/holdinvoice/master/proto/hold.proto \
-o primitives.proto https://raw.githubusercontent.com/ElementsProject/lightning/v24.05/cln-grpc/proto/primitives.proto \
-o node.proto https://raw.githubusercontent.com/ElementsProject/lightning/v24.05/cln-grpc/proto/node.proto
-o primitives.proto https://raw.githubusercontent.com/ElementsProject/lightning/v24.08/cln-grpc/proto/primitives.proto \
-o node.proto https://raw.githubusercontent.com/ElementsProject/lightning/v24.08/cln-grpc/proto/node.proto

echo -n "Done\nBuilding api from GRPC specs..."
python3 -m grpc_tools.protoc --proto_path=googleapis:. --python_out=. --grpc_python_out=. lightning.proto invoices.proto router.proto signer.proto verrpc.proto
Expand Down
2 changes: 1 addition & 1 deletion tests/compose.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ ROBOSATS_ENVS_FILE=".env-sample"

BITCOIND_VERSION='24.0.1'
LND_VERSION='v0.17.0-beta'
CLN_VERSION='v24.05'
CLN_VERSION='v24.08'
REDIS_VERSION='7.2.1'
POSTGRES_VERSION='14.2'