From 4f41a3798aed67fe4a608609818b99ea62093f00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 15:34:27 +0200 Subject: [PATCH 01/33] Bump faker from 25.1.0 to 25.2.0 (#1131) Bumps [faker](https://github.com/joke2k/faker) from 25.1.0 to 25.2.0. - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v25.1.0...v25.2.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b5dc5091..f08665fc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black==24.4.2 coverage==7.5.1 factory-boy==3.3.0 -Faker==25.1.0 +Faker==25.2.0 flake8==7.0.0 isort==5.13.2 pre-commit==3.7.1 From c0bf9f36885f7f09888f218cc785f76486906429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 15:35:13 +0200 Subject: [PATCH 02/33] Bump boto3 from 1.34.103 to 1.34.113 (#1134) Bumps [boto3](https://github.com/boto/boto3) from 1.34.103 to 1.34.113. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.103...1.34.113) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3f0cb30e..c13bb9ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto3==1.34.103 +boto3==1.34.113 Django==5.0.6 django-cors-headers==4.3.1 djangorestframework==3.15.1 From 463daf714803f4931a7eaa712ff47d17a3162ed8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 15:36:05 +0200 Subject: [PATCH 03/33] Bump django-stubs-ext from 5.0.0 to 5.0.2 (#1135) Bumps [django-stubs-ext](https://github.com/typeddjango/django-stubs) from 5.0.0 to 5.0.2. - [Release notes](https://github.com/typeddjango/django-stubs/releases) - [Commits](https://github.com/typeddjango/django-stubs/compare/5.0.0...5.0.2) --- updated-dependencies: - dependency-name: django-stubs-ext dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c13bb9ae..9997b3da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ django-cors-headers==4.3.1 djangorestframework==3.15.1 djangorestframework-camel-case==1.4.2 django-storages==1.14.3 -django-stubs-ext==5.0.0 +django-stubs-ext==5.0.2 drf-yasg[validation]==1.21.7 safe-eth-py[django]==5.8.0 gunicorn==22.0.0 From a97e02d6c6d1ea8d4a2c391c80f2b1126f986d1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 15:37:00 +0200 Subject: [PATCH 04/33] Bump types-requests from 2.31.0.20240406 to 2.32.0.20240523 (#1136) Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.20240406 to 2.32.0.20240523. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f08665fc..0ec0ebbf 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,4 +13,4 @@ responses==0.25.0 mypy==1.10.0 django-stubs==5.0.0 djangorestframework-stubs==3.15.0 -types-requests==2.31.0.20240406 +types-requests==2.32.0.20240523 From ca948c9b1b2ffc53f329015a4529bfad4708e88c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 15:37:21 +0200 Subject: [PATCH 05/33] Bump requests from 2.31.0 to 2.32.2 (#1137) Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9997b3da..bb1fe3b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,4 @@ safe-eth-py[django]==5.8.0 gunicorn==22.0.0 Pillow==10.3.0 psycopg2-binary==2.9.9 -requests==2.31.0 +requests==2.32.2 From 344431e62a254a2e2e80f7c20c2b23dfb994b90b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:51:08 +0200 Subject: [PATCH 06/33] Bump docker/login-action from 3.1.0 to 3.2.0 (#1140) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 029dc8c4..8e87b441 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -159,7 +159,7 @@ jobs: restore-keys: | ${{ runner.os }}-buildx- - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -207,7 +207,7 @@ jobs: restore-keys: | ${{ runner.os }}-buildx- - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} From 689add40ae5ed32cc49e85eb2e7a9034d947cfd3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:51:31 +0200 Subject: [PATCH 07/33] Bump requests from 2.32.2 to 2.32.3 (#1141) Bumps [requests](https://github.com/psf/requests) from 2.32.2 to 2.32.3. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.32.2...v2.32.3) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bb1fe3b5..f7c716c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,4 @@ safe-eth-py[django]==5.8.0 gunicorn==22.0.0 Pillow==10.3.0 psycopg2-binary==2.9.9 -requests==2.32.2 +requests==2.32.3 From d2f0bd354c7ba6c207671c2db2f01a423ff06afa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:51:47 +0200 Subject: [PATCH 08/33] Bump django-stubs from 5.0.0 to 5.0.2 (#1142) Bumps [django-stubs](https://github.com/typeddjango/django-stubs) from 5.0.0 to 5.0.2. - [Release notes](https://github.com/typeddjango/django-stubs/releases) - [Commits](https://github.com/typeddjango/django-stubs/compare/5.0.0...5.0.2) --- updated-dependencies: - dependency-name: django-stubs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0ec0ebbf..375a718a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,6 +11,6 @@ responses==0.25.0 # mypy and PEP 561 stubs mypy==1.10.0 -django-stubs==5.0.0 +django-stubs==5.0.2 djangorestframework-stubs==3.15.0 types-requests==2.32.0.20240523 From 2c043069a4f8342ce799a078035481a859cb0206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:52:03 +0200 Subject: [PATCH 09/33] Bump boto3 from 1.34.113 to 1.34.117 (#1143) Bumps [boto3](https://github.com/boto/boto3) from 1.34.113 to 1.34.117. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.113...1.34.117) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f7c716c7..6a1549b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto3==1.34.113 +boto3==1.34.117 Django==5.0.6 django-cors-headers==4.3.1 djangorestframework==3.15.1 From e8fc4c771dde80b21b87ceee6b996bfd37e25db8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:52:20 +0200 Subject: [PATCH 10/33] Bump faker from 25.2.0 to 25.3.0 (#1144) Bumps [faker](https://github.com/joke2k/faker) from 25.2.0 to 25.3.0. - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v25.2.0...v25.3.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 375a718a..a1a18331 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black==24.4.2 coverage==7.5.1 factory-boy==3.3.0 -Faker==25.2.0 +Faker==25.3.0 flake8==7.0.0 isort==5.13.2 pre-commit==3.7.1 From dc107a5c80d028a778c4529493655a965a492ddf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 23:52:36 +0200 Subject: [PATCH 11/33] Bump types-requests from 2.32.0.20240523 to 2.32.0.20240602 (#1145) Bumps [types-requests](https://github.com/python/typeshed) from 2.32.0.20240523 to 2.32.0.20240602. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1a18331..906fdb04 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,4 +13,4 @@ responses==0.25.0 mypy==1.10.0 django-stubs==5.0.2 djangorestframework-stubs==3.15.0 -types-requests==2.32.0.20240523 +types-requests==2.32.0.20240602 From 7357ad4652710fad7a4ed209d93b165dbc1e5229 Mon Sep 17 00:00:00 2001 From: Aaron Cook Date: Wed, 5 Jun 2024 09:44:44 +0200 Subject: [PATCH 12/33] Make `iconUrl` of Safe Apps required (#1139) Explicity prevents nullish `icon_url` for Safe Apps, setting a default image and adding a default URL to any entries that may be missing them: - Prevent Django from storing `null` icons - Do not allow the field to be `blank` - Add default image - Add migration for assigning default value and changing the value to non-nullable (as they can't be performed in the same operation) --- .gitignore | 1 + src/media/safe_apps/icon_url.jpg | Bin 0 -> 3217 bytes .../0013_assign_safeapp_icon_url.py | 32 +++++++++++ .../migrations/0014_alter_safeapp_icon_url.py | 25 +++++++++ src/safe_apps/migrations/tests/__init__.py | 0 .../migrations/tests/test_migration_0013.py | 50 ++++++++++++++++++ src/safe_apps/models.py | 3 +- 7 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 src/media/safe_apps/icon_url.jpg create mode 100644 src/safe_apps/migrations/0013_assign_safeapp_icon_url.py create mode 100644 src/safe_apps/migrations/0014_alter_safeapp_icon_url.py create mode 100644 src/safe_apps/migrations/tests/__init__.py create mode 100644 src/safe_apps/migrations/tests/test_migration_0013.py diff --git a/.gitignore b/.gitignore index bb11a042..8e2f8a84 100644 --- a/.gitignore +++ b/.gitignore @@ -135,3 +135,4 @@ data/ docker-compose.override.yml .vscode/ src/media/ +!src/media/safe_apps/icon_url.jpg diff --git a/src/media/safe_apps/icon_url.jpg b/src/media/safe_apps/icon_url.jpg new file mode 100644 index 0000000000000000000000000000000000000000..db57f69323c81796ef6479d7f426e0768868e778 GIT binary patch literal 3217 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 literal 0 HcmV?d00001 diff --git a/src/safe_apps/migrations/0013_assign_safeapp_icon_url.py b/src/safe_apps/migrations/0013_assign_safeapp_icon_url.py new file mode 100644 index 00000000..82d56360 --- /dev/null +++ b/src/safe_apps/migrations/0013_assign_safeapp_icon_url.py @@ -0,0 +1,32 @@ +# Associated with migration #0014, ensuring that all SafeApps have an icon_url +# before making it non-nullable. Assigning a value and changing the field to +# non-nullable in the same migration otherwise causes an error. + +from django.db import migrations +from django.db.backends.base.schema import BaseDatabaseSchemaEditor +from django.db.migrations.state import StateApps +from django.db.models import Q + + +def assign_missing_default_icon_url( + apps: StateApps, schema_editor: BaseDatabaseSchemaEditor +) -> None: + SafeApp = apps.get_model("safe_apps", "SafeApp") + default_icon_url = "safe_apps/icon_url.jpg" + + SafeApp.objects.filter(Q(icon_url__isnull=True) | Q(icon_url="")).update( + icon_url=default_icon_url + ) + + +class Migration(migrations.Migration): + + dependencies = [ + ("safe_apps", "0012_rename_visible_safeapp_listed"), + ] + + operations = [ + migrations.RunPython( + assign_missing_default_icon_url, reverse_code=migrations.RunPython.noop + ), + ] diff --git a/src/safe_apps/migrations/0014_alter_safeapp_icon_url.py b/src/safe_apps/migrations/0014_alter_safeapp_icon_url.py new file mode 100644 index 00000000..7f53fd59 --- /dev/null +++ b/src/safe_apps/migrations/0014_alter_safeapp_icon_url.py @@ -0,0 +1,25 @@ +# Generated by Django 5.0.6 on 2024-05-31 14:46 + +from django.db import migrations, models + +import safe_apps.models + + +class Migration(migrations.Migration): + + dependencies = [ + ("safe_apps", "0013_assign_safeapp_icon_url"), + ] + + operations = [ + migrations.AlterField( + model_name="safeapp", + name="icon_url", + field=models.ImageField( + default="safe_apps/icon_url.jpg", + max_length=255, + upload_to=safe_apps.models.safe_app_icon_path, + validators=[safe_apps.models.validate_safe_app_icon_size], + ), + ), + ] diff --git a/src/safe_apps/migrations/tests/__init__.py b/src/safe_apps/migrations/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/safe_apps/migrations/tests/test_migration_0013.py b/src/safe_apps/migrations/tests/test_migration_0013.py new file mode 100644 index 00000000..7e230e84 --- /dev/null +++ b/src/safe_apps/migrations/tests/test_migration_0013.py @@ -0,0 +1,50 @@ +from django.db.migrations.state import StateApps + +from chains.migrations.tests.utils import TestMigrations + + +class Migration0013TestCase(TestMigrations): + migrate_from = "0012_rename_visible_safeapp_listed" + migrate_to = "0013_assign_safeapp_icon_url" + + def setUpBeforeMigration(self, apps: StateApps) -> None: + SafeApp = apps.get_model("safe_apps", "SafeApp") + SafeApp.objects.create( + app_id=1, + chain_ids=[1], + description="No icon_url", + ) + + SafeApp.objects.create( + app_id=2, + chain_ids=[1], + icon_url=None, + description="Null icon_url", + ) + + SafeApp.objects.create( + app_id=3, + chain_ids=[1], + icon_url="", + description="Empty icon_url", + ) + + SafeApp.objects.create( + app_id=4, + chain_ids=[1], + icon_url="existing/icon_url.jpg", + description="Existing icon_url", + ) + + def test_icon_url_is_set(self) -> None: + SafeApp = self.apps_registry.get_model("safe_apps", "SafeApp") + + app_1 = SafeApp.objects.get(app_id=1) + app_2 = SafeApp.objects.get(app_id=2) + app_3 = SafeApp.objects.get(app_id=3) + app_4 = SafeApp.objects.get(app_id=4) + + self.assertEqual(app_1.icon_url.url, "/media/safe_apps/icon_url.jpg") + self.assertEqual(app_2.icon_url.url, "/media/safe_apps/icon_url.jpg") + self.assertEqual(app_3.icon_url.url, "/media/safe_apps/icon_url.jpg") + self.assertEqual(app_4.icon_url.url, "/media/existing/icon_url.jpg") diff --git a/src/safe_apps/models.py b/src/safe_apps/models.py index b3e780d3..dfdcbdee 100644 --- a/src/safe_apps/models.py +++ b/src/safe_apps/models.py @@ -67,8 +67,7 @@ class AccessControlPolicy(str, Enum): validators=[validate_safe_app_icon_size], upload_to=safe_app_icon_path, max_length=255, - null=True, - blank=True, + default="safe_apps/icon_url.jpg", ) description = models.CharField(max_length=200) chain_ids = ArrayField(models.PositiveBigIntegerField()) From 17e4372fb80051186a87833d20f798bd796c0a01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:16:23 +0200 Subject: [PATCH 13/33] Bump responses from 0.25.0 to 0.25.2 (#1146) Bumps [responses](https://github.com/getsentry/responses) from 0.25.0 to 0.25.2. - [Release notes](https://github.com/getsentry/responses/releases) - [Changelog](https://github.com/getsentry/responses/blob/master/CHANGES) - [Commits](https://github.com/getsentry/responses/compare/0.25.0...0.25.2) --- updated-dependencies: - dependency-name: responses dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 906fdb04..a1029b82 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,7 +7,7 @@ flake8==7.0.0 isort==5.13.2 pre-commit==3.7.1 pytest-django==4.8.0 -responses==0.25.0 +responses==0.25.2 # mypy and PEP 561 stubs mypy==1.10.0 From 707c06b9ab711112e79f58e05ffa3f602a0262ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:16:37 +0200 Subject: [PATCH 14/33] Bump boto3 from 1.34.117 to 1.34.122 (#1147) Bumps [boto3](https://github.com/boto/boto3) from 1.34.117 to 1.34.122. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.117...1.34.122) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6a1549b4..eb1181bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto3==1.34.117 +boto3==1.34.122 Django==5.0.6 django-cors-headers==4.3.1 djangorestframework==3.15.1 From cb1ae577a1a7801d268413551db84a2d02244225 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:16:59 +0200 Subject: [PATCH 15/33] Bump coverage from 7.5.1 to 7.5.3 (#1148) Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.5.1 to 7.5.3. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.5.1...7.5.3) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a1029b82..52c5631f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ -r requirements.txt black==24.4.2 -coverage==7.5.1 +coverage==7.5.3 factory-boy==3.3.0 Faker==25.3.0 flake8==7.0.0 From 6a41cd92596229aed60751e280f7fe4475e9582c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:21:57 +0200 Subject: [PATCH 16/33] Bump faker from 25.3.0 to 25.8.0 (#1149) Bumps [faker](https://github.com/joke2k/faker) from 25.3.0 to 25.8.0. - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v25.3.0...v25.8.0) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 52c5631f..02beacca 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black==24.4.2 coverage==7.5.3 factory-boy==3.3.0 -Faker==25.3.0 +Faker==25.8.0 flake8==7.0.0 isort==5.13.2 pre-commit==3.7.1 From f92af167a954cf4d530c1bffac6e5fcc870494ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:22:13 +0200 Subject: [PATCH 17/33] Bump python from 3.12.3-slim to 3.12.4-slim (#1150) Bumps python from 3.12.3-slim to 3.12.4-slim. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b848fdfd..17001e25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.3-slim +FROM python:3.12.4-slim # python ENV PYTHONUNBUFFERED=1 From 46e916d6b4ce7a2a986ac86fb35cf09f6fcb43d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:22:30 +0200 Subject: [PATCH 18/33] Bump docker/build-push-action from 5.3.0 to 5.4.0 (#1151) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8e87b441..565476d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -165,7 +165,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: . platforms: linux/amd64,linux/arm64 @@ -213,7 +213,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: . platforms: linux/amd64,linux/arm64 From 43ed50424c3d743607a4443dabd6760336b1568d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20G=C3=B3mez?= Date: Thu, 13 Jun 2024 13:21:47 +0200 Subject: [PATCH 19/33] Add Zerion configuration to Chain (#1153) Add Chain['balances_provider'] field, holding chainName and enabled properties --- ...n_balances_provider_chain_name_and_more.py | 26 +++++++++++ .../migrations/tests/test_migration_0042.py | 45 +++++++++++++++++++ src/chains/models.py | 7 +++ src/chains/serializers.py | 11 +++++ src/chains/tests/factories.py | 2 + src/chains/tests/test_views.py | 8 ++++ 6 files changed, 99 insertions(+) create mode 100644 src/chains/migrations/0042_chain_balances_provider_chain_name_and_more.py create mode 100644 src/chains/migrations/tests/test_migration_0042.py diff --git a/src/chains/migrations/0042_chain_balances_provider_chain_name_and_more.py b/src/chains/migrations/0042_chain_balances_provider_chain_name_and_more.py new file mode 100644 index 00000000..49fb6f93 --- /dev/null +++ b/src/chains/migrations/0042_chain_balances_provider_chain_name_and_more.py @@ -0,0 +1,26 @@ +# Generated by Django 4.2.2 on 2024-06-13 11:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("chains", "0041_chain_prices_provider_chain_name_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="chain", + name="balances_provider_chain_name", + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name="chain", + name="balances_provider_enabled", + field=models.BooleanField( + default=False, + help_text="This flag informs API clients whether the balances provider is enabled for the chain", + ), + ), + ] diff --git a/src/chains/migrations/tests/test_migration_0042.py b/src/chains/migrations/tests/test_migration_0042.py new file mode 100644 index 00000000..9b7fc12f --- /dev/null +++ b/src/chains/migrations/tests/test_migration_0042.py @@ -0,0 +1,45 @@ +from django.db.migrations.state import StateApps + +from chains.migrations.tests.utils import TestMigrations + + +class Migration0042TestCase(TestMigrations): + migrate_from = "0041_chain_prices_provider_chain_name_and_more" + migrate_to = "0042_chain_balances_provider_chain_name_and_more" + + def setUpBeforeMigration(self, apps: StateApps) -> None: + Chain = apps.get_model("chains", "Chain") + Chain.objects.create( + id=1, + name="Mainnet", + short_name="eth", + description="", + l2=False, + rpc_authentication="API_KEY_PATH", + rpc_uri="https://mainnet.infura.io/v3/", + safe_apps_rpc_authentication="API_KEY_PATH", + safe_apps_rpc_uri="https://mainnet.infura.io/v3/", + block_explorer_uri_address_template="https://etherscan.io/address/{{address}}", + block_explorer_uri_tx_hash_template="https://etherscan.io/tx/{{txHash}}", + currency_name="Ether", + currency_symbol="ETH", + currency_decimals=18, + currency_logo_uri="https://gnosis-safe-token-logos.s3.amazonaws.com/ethereum-eth-logo.png", + transaction_service_uri="http://mainnet-safe-transaction-web.safe.svc.cluster.local", + vpc_transaction_service_uri="", + theme_text_color="#001428", + theme_background_color="#E8E7E6", + ens_registry_address="0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e", + recommended_master_copy_version="1.3.0", + prices_provider_native_coin="ethereum", + prices_provider_chain_name="ethereum", + hidden=False, + ) + + def test_new_fields(self) -> None: + Chain = self.apps_registry.get_model("chains", "Chain") + + chain = Chain.objects.get(id=1) + + self.assertEqual(chain.balances_provider_chain_name, None) + self.assertEqual(chain.balances_provider_enabled, False) diff --git a/src/chains/models.py b/src/chains/models.py index f29189fe..42601a04 100644 --- a/src/chains/models.py +++ b/src/chains/models.py @@ -140,6 +140,13 @@ class RpcAuthentication(models.TextChoices): max_length=255, null=True, blank=True ) prices_provider_chain_name = models.CharField(max_length=255, null=True, blank=True) + balances_provider_chain_name = models.CharField( + max_length=255, null=True, blank=True + ) + balances_provider_enabled = models.BooleanField( + default=False, + help_text="This flag informs API clients whether the balances provider is enabled for the chain", + ) hidden = models.BooleanField(default=False) def get_disabled_wallets(self) -> QuerySet["Wallet"]: diff --git a/src/chains/serializers.py b/src/chains/serializers.py index 23d300fe..d7f28e35 100644 --- a/src/chains/serializers.py +++ b/src/chains/serializers.py @@ -86,6 +86,11 @@ class PricesProviderSerializer(serializers.Serializer[Chain]): chain_name = serializers.CharField(source="prices_provider_chain_name") +class BalancesProviderSerializer(serializers.Serializer[Chain]): + chain_name = serializers.CharField(source="balances_provider_chain_name") + enabled = serializers.BooleanField(source="balances_provider_enabled") + + class BaseRpcUriSerializer(serializers.Serializer[Chain]): authentication = serializers.SerializerMethodField() value = serializers.SerializerMethodField(method_name="get_rpc_value") @@ -162,6 +167,7 @@ class ChainSerializer(serializers.ModelSerializer[Chain]): block_explorer_uri_template = serializers.SerializerMethodField() native_currency = serializers.SerializerMethodField() prices_provider = serializers.SerializerMethodField() + balances_provider = serializers.SerializerMethodField() transaction_service = serializers.URLField( source="transaction_service_uri", default=None ) @@ -188,6 +194,7 @@ class Meta: "block_explorer_uri_template", "native_currency", "prices_provider", + "balances_provider", "transaction_service", "vpc_transaction_service", "theme", @@ -247,3 +254,7 @@ def get_features(self, instance: Chain) -> ReturnDict[Any, Any]: @swagger_serializer_method(serializer_or_field=PricesProviderSerializer) # type: ignore[misc] def get_prices_provider(self, instance: Chain) -> ReturnDict[Any, Any]: return PricesProviderSerializer(instance).data + + @swagger_serializer_method(serializer_or_field=BalancesProviderSerializer) # type: ignore[misc] + def get_balances_provider(self, instance: Chain) -> ReturnDict[Any, Any]: + return BalancesProviderSerializer(instance).data diff --git a/src/chains/tests/factories.py b/src/chains/tests/factories.py index 5f6cbe0f..60153838 100644 --- a/src/chains/tests/factories.py +++ b/src/chains/tests/factories.py @@ -48,6 +48,8 @@ class Meta: recommended_master_copy_version = "1.3.0" prices_provider_native_coin = factory.Faker("cryptocurrency_code") prices_provider_chain_name = factory.Faker("company") + balances_provider_chain_name = factory.Faker("company") + balances_provider_enabled = factory.Faker("pybool") hidden = False diff --git a/src/chains/tests/test_views.py b/src/chains/tests/test_views.py index eb7ed778..9072f5be 100644 --- a/src/chains/tests/test_views.py +++ b/src/chains/tests/test_views.py @@ -70,6 +70,10 @@ def test_json_payload_format(self) -> None: "nativeCoin": chain.prices_provider_native_coin, "chainName": chain.prices_provider_chain_name, }, + "balancesProvider": { + "chainName": chain.balances_provider_chain_name, + "enabled": chain.balances_provider_enabled, + }, "transactionService": chain.transaction_service_uri, "vpcTransactionService": chain.vpc_transaction_service_uri, "theme": { @@ -193,6 +197,10 @@ def test_json_payload_format(self) -> None: "nativeCoin": chain.prices_provider_native_coin, "chainName": chain.prices_provider_chain_name, }, + "balancesProvider": { + "chainName": chain.balances_provider_chain_name, + "enabled": chain.balances_provider_enabled, + }, "transactionService": chain.transaction_service_uri, "vpcTransactionService": chain.vpc_transaction_service_uri, "theme": { From 3443a3bcc03fa953c6aa98fd17a22b03851df7fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:25:17 +0200 Subject: [PATCH 20/33] Bump docker/build-push-action from 5.4.0 to 6.0.0 (#1157) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.4.0 to 6.0.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.4.0...v6.0.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 565476d6..de8b0911 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -165,7 +165,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.0 with: context: . platforms: linux/amd64,linux/arm64 @@ -213,7 +213,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.0 with: context: . platforms: linux/amd64,linux/arm64 From 6c99e447f0b03031425c7c2358e21b0cef077594 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:25:37 +0200 Subject: [PATCH 21/33] Bump responses from 0.25.2 to 0.25.3 (#1156) Bumps [responses](https://github.com/getsentry/responses) from 0.25.2 to 0.25.3. - [Release notes](https://github.com/getsentry/responses/releases) - [Changelog](https://github.com/getsentry/responses/blob/master/CHANGES) - [Commits](https://github.com/getsentry/responses/compare/0.25.2...0.25.3) --- updated-dependencies: - dependency-name: responses dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 02beacca..0140d312 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,7 +7,7 @@ flake8==7.0.0 isort==5.13.2 pre-commit==3.7.1 pytest-django==4.8.0 -responses==0.25.2 +responses==0.25.3 # mypy and PEP 561 stubs mypy==1.10.0 From 6ea437b252d323b112a928054928f063302137fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:25:55 +0200 Subject: [PATCH 22/33] Bump boto3 from 1.34.122 to 1.34.127 (#1155) Bumps [boto3](https://github.com/boto/boto3) from 1.34.122 to 1.34.127. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.122...1.34.127) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index eb1181bf..d14537ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto3==1.34.122 +boto3==1.34.127 Django==5.0.6 django-cors-headers==4.3.1 djangorestframework==3.15.1 From 12895046f0df3f9ab3d9ce217ff8c40a5816ce0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 15:26:13 +0200 Subject: [PATCH 23/33] Bump flake8 from 7.0.0 to 7.1.0 (#1154) Bumps [flake8](https://github.com/pycqa/flake8) from 7.0.0 to 7.1.0. - [Commits](https://github.com/pycqa/flake8/compare/7.0.0...7.1.0) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0140d312..483f5d25 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ black==24.4.2 coverage==7.5.3 factory-boy==3.3.0 Faker==25.8.0 -flake8==7.0.0 +flake8==7.1.0 isort==5.13.2 pre-commit==3.7.1 pytest-django==4.8.0 From e31c6785e620430a7de118000bc5f2a94bd574cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:30:48 +0200 Subject: [PATCH 24/33] Bump faker from 25.8.0 to 25.9.1 (#1159) Bumps [faker](https://github.com/joke2k/faker) from 25.8.0 to 25.9.1. - [Release notes](https://github.com/joke2k/faker/releases) - [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/joke2k/faker/compare/v25.8.0...v25.9.1) --- updated-dependencies: - dependency-name: faker dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 483f5d25..01223535 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black==24.4.2 coverage==7.5.3 factory-boy==3.3.0 -Faker==25.8.0 +Faker==25.9.1 flake8==7.1.0 isort==5.13.2 pre-commit==3.7.1 From d354149bc57e660203b4604ff4aa9f0d541d2023 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:31:33 +0200 Subject: [PATCH 25/33] Bump boto3 from 1.34.127 to 1.34.131 (#1160) Bumps [boto3](https://github.com/boto/boto3) from 1.34.127 to 1.34.131. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.127...1.34.131) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d14537ea..12d47de0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -boto3==1.34.127 +boto3==1.34.131 Django==5.0.6 django-cors-headers==4.3.1 djangorestframework==3.15.1 From 2925296627ff13f6f273badb2de800a9270b01c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:32:36 +0200 Subject: [PATCH 26/33] Bump docker/build-push-action from 6.0.0 to 6.1.0 (#1164) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.0.0...v6.1.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de8b0911..2aee5eec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -165,7 +165,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v6.0.0 + uses: docker/build-push-action@v6.1.0 with: context: . platforms: linux/amd64,linux/arm64 @@ -213,7 +213,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build - uses: docker/build-push-action@v6.0.0 + uses: docker/build-push-action@v6.1.0 with: context: . platforms: linux/amd64,linux/arm64 From b1835c9f8be1e162d230212961ba8ceb89fc069f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:34:55 +0200 Subject: [PATCH 27/33] Bump coverage from 7.5.3 to 7.5.4 (#1161) Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.5.3 to 7.5.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.5.3...7.5.4) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 01223535..74d0834d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ -r requirements.txt black==24.4.2 -coverage==7.5.3 +coverage==7.5.4 factory-boy==3.3.0 Faker==25.9.1 flake8==7.1.0 From a06bbf98d797d44ec19db1c3b618b360558d029b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:35:14 +0200 Subject: [PATCH 28/33] Bump djangorestframework from 3.15.1 to 3.15.2 (#1162) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.15.1 to 3.15.2. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](https://github.com/encode/django-rest-framework/compare/3.15.1...3.15.2) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12d47de0..bf5d5750 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ boto3==1.34.131 Django==5.0.6 django-cors-headers==4.3.1 -djangorestframework==3.15.1 +djangorestframework==3.15.2 djangorestframework-camel-case==1.4.2 django-storages==1.14.3 django-stubs-ext==5.0.2 From 49a1ef8bddc34468325eedc7d7813330e3a69f88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:42:38 +0200 Subject: [PATCH 29/33] Bump django-cors-headers from 4.3.1 to 4.4.0 (#1163) Bumps [django-cors-headers](https://github.com/adamchainz/django-cors-headers) from 4.3.1 to 4.4.0. - [Changelog](https://github.com/adamchainz/django-cors-headers/blob/main/CHANGELOG.rst) - [Commits](https://github.com/adamchainz/django-cors-headers/compare/4.3.1...4.4.0) --- updated-dependencies: - dependency-name: django-cors-headers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bf5d5750..d5d8189c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ boto3==1.34.131 Django==5.0.6 -django-cors-headers==4.3.1 +django-cors-headers==4.4.0 djangorestframework==3.15.2 djangorestframework-camel-case==1.4.2 django-storages==1.14.3 From 1f42a5891d959154712f95915cbd6201fea42c6b Mon Sep 17 00:00:00 2001 From: dzianis smalonski Date: Wed, 14 Aug 2024 16:38:26 +0300 Subject: [PATCH 30/33] fix: update version --- .env.custom | 1 + src/version.py | 1 + 2 files changed, 2 insertions(+) create mode 100644 .env.custom diff --git a/.env.custom b/.env.custom new file mode 100644 index 00000000..7b34e583 --- /dev/null +++ b/.env.custom @@ -0,0 +1 @@ +APPLICATION_VERSION=2.83.0 \ No newline at end of file diff --git a/src/version.py b/src/version.py index 9ad57f2c..94fbef87 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1,2 @@ __name__ = "Safe Config Service" +__version__ = "2.83.0" \ No newline at end of file From 6a64f39e3576b033008d723fc83a661cab595f8d Mon Sep 17 00:00:00 2001 From: Nikita Zasimuk Date: Thu, 29 Aug 2024 00:30:37 +0300 Subject: [PATCH 31/33] fix: add a specific version of web3 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d5d8189c..715ced19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ gunicorn==22.0.0 Pillow==10.3.0 psycopg2-binary==2.9.9 requests==2.32.3 +web3==6.11.4 \ No newline at end of file From e61b54dc781567611e3b20624ac0411b7728a00a Mon Sep 17 00:00:00 2001 From: Denis Smolonski Date: Mon, 20 May 2024 16:21:32 +0200 Subject: [PATCH 32/33] Bump version to 2.80.0 --- .env.protofire | 1 + 1 file changed, 1 insertion(+) create mode 100644 .env.protofire diff --git a/.env.protofire b/.env.protofire new file mode 100644 index 00000000..fcfeaeaa --- /dev/null +++ b/.env.protofire @@ -0,0 +1 @@ +APPLICATION_VERSION=2.80.0 \ No newline at end of file From 03259285981020c782d4fbe58935adbef4d1cfcb Mon Sep 17 00:00:00 2001 From: Denis Smolonski Date: Mon, 3 Jun 2024 17:57:00 +0200 Subject: [PATCH 33/33] feature: update env --- .env.protofire | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .env.protofire diff --git a/.env.protofire b/.env.protofire deleted file mode 100644 index fcfeaeaa..00000000 --- a/.env.protofire +++ /dev/null @@ -1 +0,0 @@ -APPLICATION_VERSION=2.80.0 \ No newline at end of file