Skip to content
Draft
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
142 changes: 137 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ members = [
"plugins/wss-proxy-plugin",
"plugins/bip353-plugin",
"plugins/currencyrate-plugin",
"plugins/reckless-plugin",
]

[workspace.dependencies]
Expand Down
10 changes: 2 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,7 @@ ALL_NONGEN_SRCFILES := $(ALL_NONGEN_HEADERS) $(ALL_NONGEN_SOURCES)
BIN_PROGRAMS = \
cli/lightning-cli \
lightningd/lightningd \
tools/lightning-hsmtool\
tools/reckless
tools/lightning-hsmtool
PKGLIBEXEC_PROGRAMS = \
lightningd/lightning_channeld \
lightningd/lightning_closingd \
Expand Down Expand Up @@ -872,7 +871,7 @@ clean: obsclean

# See doc/contribute-to-core-lightning/contributor-workflow.md
PYLNS=client proto testing
update-versions: update-pyln-versions update-reckless-version update-dot-version # FIXME: update-doc-examples
update-versions: update-pyln-versions update-dot-version # FIXME: update-doc-examples
@uv lock

update-pyln-versions: $(PYLNS:%=update-pyln-version-%)
Expand Down Expand Up @@ -910,11 +909,6 @@ pyln-build-all: pyln-build pyln-build-bolts pyln-build-grpc-proto pyln-build-wss
update-lock:
uv sync --all-extras --all-groups

update-reckless-version:
@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
@echo "Updating tools/reckless to $(NEW_VERSION)"
@$(SED) -i.bak "s/__VERSION__ = '.*'/__VERSION__ = '$(NEW_VERSION)'/" tools/reckless && rm tools/reckless.bak

update-dot-version:
@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
echo $(NEW_VERSION) > .version
Expand Down
6 changes: 3 additions & 3 deletions cln-rpc/src/primitives.rs
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ impl Serialize for Amount {
where
S: Serializer,
{
serializer.serialize_str(&format!("{}msat", self.msat))
serializer.serialize_u64(self.msat)
}
}

Expand All @@ -637,7 +637,7 @@ impl Serialize for AmountOrAll {
S: Serializer,
{
match self {
AmountOrAll::Amount(a) => serializer.serialize_str(&format!("{}msat", a.msat)),
AmountOrAll::Amount(a) => serializer.serialize_u64(a.msat),
AmountOrAll::All => serializer.serialize_str("all"),
}
}
Expand All @@ -649,7 +649,7 @@ impl Serialize for AmountOrAny {
S: Serializer,
{
match self {
AmountOrAny::Amount(a) => serializer.serialize_str(&format!("{}msat", a.msat)),
AmountOrAny::Amount(a) => serializer.serialize_u64(a.msat),
AmountOrAny::Any => serializer.serialize_str("any"),
}
}
Expand Down
Loading
Loading