From 91b5c85a7c0124afa91b3cac976390e837de8262 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Mon, 17 Nov 2025 02:16:39 +0800 Subject: [PATCH 1/2] Update litecoin address regex --- fdroidserver/metadata.py | 2 +- tests/test_metadata.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index a0403fe4..30d60d75 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -429,7 +429,7 @@ valuetypes = { ["Bitcoin"]), FieldValidator("Litecoin address", - r'^([LM3][a-km-zA-HJ-NP-Z1-9]{26,33}|ltc1[a-z0-9]{39})$', + r'^([LM3][a-km-zA-HJ-NP-Z1-9]{26,33}|ltc1[ac-hj-np-z0-9]{39,59})$', ["Litecoin"]), FieldValidator("Repo Type", diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 90793c16..0543e86d 100755 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -138,6 +138,23 @@ class MetadataTest(unittest.TestCase): 'ltc1q7euacwhn6ef99vcfa57mute92q572aqsc4c2j5', 'fake.app.id' ) ) + self.assertIsNone( + validator.check('LYnHPyAsMZ77DiHTbP4gJATc2xugbkRpzq', 'fake.app.id') + ) + self.assertIsNone( + validator.check('MEp2J2AGxN6PaN44GdDH4Hh1H7SEVKqygt', 'fake.app.id') + ) + self.assertIsNone( + validator.check( + 'ltc1q8ls9ygtr2pkms8fav88ly4zz0rq9g6ck8g3z8c', 'fake.app.id' + ) + ) + self.assertIsNone( + validator.check( + 'ltc1pgdn5w8ctc0r4c738vzh7730rhxepw2ggx0ud9alsfjkz0v6zpkss9w4qaq', + 'fake.app.id', + ) + ) # some invalid addresses (various special use/testnet addresses, invalid chars) self.assertRaises( From 62459ba320a47718acf30d6665ede84aa3c13095 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Mon, 17 Nov 2025 02:17:08 +0800 Subject: [PATCH 2/2] Bump RELEASE_COMMIT_ID --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91598c8a..dacdfee2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ metadata_v0: image: registry.gitlab.com/fdroid/fdroidserver:buildserver variables: GIT_DEPTH: 1000 - RELEASE_COMMIT_ID: 50aa35772b058e76b950c01e16019c072c191b73 # after switching to `git rev-parse` + RELEASE_COMMIT_ID: 91b5c85a7c0124afa91b3cac976390e837de8262 # after switching to `git rev-parse` script: - git fetch https://gitlab.com/fdroid/fdroidserver.git $RELEASE_COMMIT_ID - cd tests