Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production #1

Merged
merged 80 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
216d0ef
Bump pillow from 10.3.0 to 10.4.0 (#1165)
dependabot[bot] Jul 1, 2024
f9e5af8
Bump faker from 25.9.1 to 26.0.0 (#1166)
dependabot[bot] Jul 1, 2024
5aeb8a3
Bump boto3 from 1.34.131 to 1.34.136 (#1167)
dependabot[bot] Jul 1, 2024
17c1a3b
Bump mypy from 1.10.0 to 1.10.1 (#1168)
dependabot[bot] Jul 1, 2024
f4debcc
Bump types-requests from 2.32.0.20240602 to 2.32.0.20240622 (#1169)
dependabot[bot] Jul 1, 2024
ff74e49
Bump docker/build-push-action from 6.1.0 to 6.2.0 (#1170)
dependabot[bot] Jul 1, 2024
335a921
Bump docker/setup-qemu-action from 3.0.0 to 3.1.0 (#1171)
dependabot[bot] Jul 10, 2024
617be0c
Bump docker/setup-buildx-action from 3.3.0 to 3.4.0 (#1172)
dependabot[bot] Jul 10, 2024
d976afa
Bump docker/build-push-action from 6.2.0 to 6.3.0 (#1173)
dependabot[bot] Jul 10, 2024
f50a269
Bump boto3 from 1.34.136 to 1.34.140 (#1174)
dependabot[bot] Jul 10, 2024
83075fc
Bump django from 5.0.6 to 5.0.7 (#1176)
dependabot[bot] Jul 11, 2024
fcd40f1
Add contract address configuration (#1175)
iamacook Jul 15, 2024
2a6507f
Bump django-storages from 1.14.3 to 1.14.4 (#1178)
dependabot[bot] Jul 15, 2024
d351248
Bump types-requests from 2.32.0.20240622 to 2.32.0.20240712 (#1179)
dependabot[bot] Jul 15, 2024
bb8d675
Bump boto3 from 1.34.140 to 1.34.144 (#1180)
dependabot[bot] Jul 15, 2024
5798075
Bump coverage from 7.5.4 to 7.6.0 (#1181)
dependabot[bot] Jul 15, 2024
6092835
Bump docker/build-push-action from 6.3.0 to 6.4.0 (#1182)
dependabot[bot] Jul 15, 2024
5341f94
Allow URL paths on CGW_URL (#1183)
hectorgomezv Jul 22, 2024
d816ab4
Bump docker/setup-qemu-action from 3.1.0 to 3.2.0 (#1186)
dependabot[bot] Jul 23, 2024
24afe7a
Bump docker/build-push-action from 6.4.0 to 6.5.0 (#1188)
dependabot[bot] Jul 23, 2024
ed6508c
Bump docker/setup-buildx-action from 3.4.0 to 3.5.0 (#1189)
dependabot[bot] Jul 23, 2024
700e0a2
Bump docker/login-action from 3.2.0 to 3.3.0 (#1187)
dependabot[bot] Jul 23, 2024
c81c60e
Bump boto3 from 1.34.144 to 1.34.145 (#1185)
dependabot[bot] Jul 23, 2024
9e2796f
Bump mypy from 1.10.1 to 1.11.0 (#1184)
dependabot[bot] Jul 23, 2024
09e7efd
Bump pre-commit from 3.7.1 to 3.8.0 (#1190)
dependabot[bot] Jul 29, 2024
2132e91
Bump boto3 from 1.34.145 to 1.34.149 (#1191)
dependabot[bot] Jul 29, 2024
f376a40
Bump django-stubs-ext from 5.0.2 to 5.0.4 (#1192)
dependabot[bot] Jul 29, 2024
ed8952b
Bump docker/setup-buildx-action from 3.5.0 to 3.6.0 (#1194)
dependabot[bot] Jul 29, 2024
be7baec
Bump docker/setup-buildx-action from 3.6.0 to 3.6.1 (#1195)
dependabot[bot] Aug 5, 2024
0180652
Bump faker from 26.0.0 to 26.1.0 (#1199)
dependabot[bot] Aug 5, 2024
97a7e84
Bump django-stubs from 5.0.2 to 5.0.4 (#1193)
dependabot[bot] Aug 5, 2024
34f3338
Bump boto3 from 1.34.149 to 1.34.153 (#1198)
dependabot[bot] Aug 5, 2024
c20c413
Bump black from 24.4.2 to 24.8.0 (#1196)
dependabot[bot] Aug 5, 2024
198f778
Bump mypy from 1.11.0 to 1.11.1 (#1197)
dependabot[bot] Aug 5, 2024
733d268
Bump django from 5.0.7 to 5.0.8 (#1201)
dependabot[bot] Aug 12, 2024
2018bd9
Bump coverage from 7.6.0 to 7.6.1 (#1204)
dependabot[bot] Aug 14, 2024
bbff443
Bump docker/build-push-action from 6.5.0 to 6.6.1 (#1202)
dependabot[bot] Aug 14, 2024
4eef795
Bump boto3 from 1.34.153 to 1.34.158 (#1206)
dependabot[bot] Aug 14, 2024
26678e2
Bump faker from 26.1.0 to 27.0.0 (#1209)
dependabot[bot] Aug 14, 2024
a398121
Bump gunicorn from 22.0.0 to 23.0.0 (#1205)
dependabot[bot] Aug 14, 2024
36b8e13
Bump python from 3.12.4-slim to 3.12.5-slim (#1208)
dependabot[bot] Aug 15, 2024
69f0627
Bump factory-boy from 3.3.0 to 3.3.1 (#1214)
dependabot[bot] Aug 19, 2024
d8a3c17
Bump flake8 from 7.1.0 to 7.1.1 (#1213)
dependabot[bot] Aug 19, 2024
a92c559
Bump boto3 from 1.34.158 to 1.35.0 (#1212)
dependabot[bot] Aug 19, 2024
2259ee6
Bump cla-assistant/github-action from 2.4.0 to 2.5.1 (#1211)
dependabot[bot] Aug 19, 2024
afba877
Bump docker/build-push-action from 6.6.1 to 6.7.0 (#1210)
dependabot[bot] Aug 19, 2024
67002cc
Bump django from 5.0.8 to 5.1 (#1203)
dependabot[bot] Aug 19, 2024
8b9d1b4
Revert boto3 upgrade to 1.34.158 (#1215)
hectorgomezv Aug 21, 2024
b135454
Revert django upgrade back to 5.0.8 (#1216)
hectorgomezv Aug 21, 2024
e6a985f
Pin web3 to 6.20.2 (#1231)
iamacook Sep 17, 2024
3b0c1ac
Bump faker from 27.0.0 to 28.4.1 (#1226)
dependabot[bot] Sep 18, 2024
f656751
Bump mypy from 1.11.1 to 1.11.2 (#1220)
dependabot[bot] Sep 18, 2024
b1ea3e8
Bump python from 3.12.5-slim to 3.12.6-slim (#1228)
dependabot[bot] Sep 18, 2024
f0af89e
Bump pytest-django from 4.8.0 to 4.9.0 (#1227)
dependabot[bot] Sep 18, 2024
9209f3a
Bump boto3 from 1.34.158 to 1.35.20 (#1232)
dependabot[bot] Sep 18, 2024
04dbd17
Feat(Safe Apps): admin chains with names (#1234)
katspaugh Sep 20, 2024
4045b87
Bump types-requests from 2.32.0.20240712 to 2.32.0.20240914 (#1236)
dependabot[bot] Oct 1, 2024
2a96ab4
Bump faker from 28.4.1 to 30.0.0 (#1242)
dependabot[bot] Oct 1, 2024
af635c5
Bump djangorestframework-stubs from 3.15.0 to 3.15.1 (#1237)
dependabot[bot] Oct 1, 2024
8e9e3bc
Bump cla-assistant/github-action from 2.5.1 to 2.6.1 (#1244)
dependabot[bot] Oct 1, 2024
d70363f
Bump docker/build-push-action from 6.7.0 to 6.9.0 (#1245)
dependabot[bot] Oct 1, 2024
790fdc9
Add `beaconChainExplorerUriTemplate` property (#1241)
iamacook Oct 2, 2024
a130b3e
feat: import default config beta
nick8319 Oct 3, 2024
6e88464
fix: add dotenv dependency
nick8319 Oct 3, 2024
e7f6d46
fix: remove dotenv
nick8319 Oct 3, 2024
6b5e2d5
fix: safeApps icons download
nick8319 Oct 3, 2024
8270fe2
chore: disable import
nick8319 Oct 3, 2024
b0af227
chore: disable all import
nick8319 Oct 3, 2024
445ceca
Bump docker/setup-buildx-action from 3.6.1 to 3.7.1 (#1248)
dependabot[bot] Oct 7, 2024
98b30fa
Bump python from 3.12.6-slim to 3.12.7-slim (#1247)
dependabot[bot] Oct 7, 2024
c5f342e
Bump django-stubs-ext from 5.0.4 to 5.1.0 (#1249)
dependabot[bot] Oct 7, 2024
5cd2000
Bump faker from 30.0.0 to 30.1.0 (#1251)
dependabot[bot] Oct 7, 2024
99ceacc
Bump boto3 from 1.35.20 to 1.35.34 (#1252)
dependabot[bot] Oct 7, 2024
a5e7aa7
Add install command to README (#1246)
iamacook Oct 7, 2024
74b5079
Bump django-stubs from 5.0.4 to 5.1.0 (#1250)
dependabot[bot] Oct 7, 2024
0c9b958
Bump django from 5.0.8 to 5.1.1 (#1225)
dependabot[bot] Oct 8, 2024
a2c2c31
Double pagination of `Chains` (#1253)
iamacook Oct 8, 2024
073934a
Merge tag 'v2.87.0' into staging
DenSmolonski Oct 16, 2024
f8a356f
feat: update env
DenSmolonski Oct 16, 2024
b858084
Merge branch 'staging' into production
DenSmolonski Nov 19, 2024
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 .env.custom
Original file line number Diff line number Diff line change
@@ -1 +1 @@
APPLICATION_VERSION=2.83.0
APPLICATION_VERSION=2.87.0
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
# Beta Release
uses: cla-assistant/github-action@v2.4.0
uses: cla-assistant/github-action@v2.6.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.2.0
with:
platforms: arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.7.1
- name: Cache Docker layers
uses: actions/cache@v4
with:
Expand All @@ -159,13 +159,13 @@ jobs:
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v3.2.0
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.9.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down Expand Up @@ -194,11 +194,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.2.0
with:
platforms: arm64
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.7.1
- name: Cache Docker layers
uses: actions/cache@v4
with:
Expand All @@ -207,13 +207,13 @@ jobs:
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v3.2.0
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.9.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.4-slim
FROM python:3.12.7-slim

# python
ENV PYTHONUNBUFFERED=1
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ In order to start the server application:
python -m venv venv # creates a virtual environment venv in the local directory
source venv/bin/activate
pip install -r requirements-dev.txt
pip install setuptools
```

#### 2. Launch the Postgres database image
Expand Down
2 changes: 2 additions & 0 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ cp -r staticfiles/ ${DOCKER_NGINX_VOLUME_ROOT}/

echo "==> $(date +%H:%M:%S) ==> Migrating Django models..."
python src/manage.py migrate --noinput
#echo "==> $(date +%H:%M:%S) ==> Importing default config..."
#python src/manage.py import_default_config

echo "==> $(date +%H:%M:%S) ==> Running Gunicorn..."
exec gunicorn -c /app/src/config/gunicorn.py config.wsgi -b ${GUNICORN_BIND_SOCKET} -b 0.0.0.0:${GUNICORN_BIND_PORT} --chdir /app/src/
22 changes: 11 additions & 11 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
-r requirements.txt
black==24.4.2
coverage==7.5.4
factory-boy==3.3.0
Faker==25.9.1
flake8==7.1.0
black==24.8.0
coverage==7.6.1
factory-boy==3.3.1
Faker==30.1.0
flake8==7.1.1
isort==5.13.2
pre-commit==3.7.1
pytest-django==4.8.0
pre-commit==3.8.0
pytest-django==4.9.0
responses==0.25.3

# mypy and PEP 561 stubs
mypy==1.10.0
django-stubs==5.0.2
djangorestframework-stubs==3.15.0
types-requests==2.32.0.20240602
mypy==1.11.2
django-stubs==5.1.0
djangorestframework-stubs==3.15.1
types-requests==2.32.0.20240914
19 changes: 12 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
boto3==1.34.131
Django==5.0.6
boto3==1.35.34
Django==5.1.1
django-cors-headers==4.4.0
djangorestframework==3.15.2
djangorestframework-camel-case==1.4.2
django-storages==1.14.3
django-stubs-ext==5.0.2
django-storages==1.14.4
django-stubs-ext==5.1.0
drf-yasg[validation]==1.21.7
safe-eth-py[django]==5.8.0
gunicorn==22.0.0
Pillow==10.3.0
gunicorn==23.0.0
Pillow==10.4.0
psycopg2-binary==2.9.9
requests==2.32.3
web3==6.11.4

# Without pin, safe-eth-py 5.8.0 installs >= 7 which breaks django-check job
# > ImportError: cannot import name 'geth_poa_middleware' from 'web3.middleware'
# TODO: Remove when safe-eth-py updates web3 to >= 7
# https://github.com/safe-global/safe-eth-py/pull/1315
web3==6.20.2
3 changes: 2 additions & 1 deletion src/chains/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

def _validate_storage_setup() -> None:
if (
settings.DEFAULT_FILE_STORAGE == "storages.backends.s3boto3.S3Boto3Storage"
settings.STORAGES["default"]["BACKEND"]
== "storages.backends.s3boto3.S3Boto3Storage"
and settings.AWS_ACCESS_KEY_ID is None
and settings.AWS_SECRET_ACCESS_KEY is None
and settings.AWS_STORAGE_BUCKET_NAME is None
Expand Down
Loading