Merge branch 'main' into indexer_refactoring_constants

kkrt-labs · Oct 29, 2024 · 08edcae · 08edcae
2 parents c526889 + 1ae465c
commit 08edcae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -55,7 +55,7 @@ lint:
 actions:
   disabled:
     - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
   enabled:
     - trunk-upgrade-available
-    - trunk-fmt-pre-commit
-    - trunk-check-pre-push
diff --git a/lib/kakarot b/lib/kakarot
+1 −1		.github/workflows/cairo-zero-release.yml
+1 −1		.github/workflows/ssj-ci.yml
+5 −5		.trunk/trunk.yaml
+8 −0		Makefile
+4 −4		deployments/starknet-mainnet/declarations.json
+32 −0		deployments/starknet-sepolia-staging/kakarot_deployments.json
+5 −0		deployments/starknet-sepolia-staging/l1_addresses.json
+4 −4		deployments/starknet-sepolia/declarations.json
+1 −1		deployments/starknet-sepolia/deployments.json
+13 −1		deployments/starknet-sepolia/kakarot_deployments.json
+6 −1		docker/deployer/Dockerfile
+1 −1		docs/general/kakarot_components.md
+1 −0		kakarot_scripts/constants.py
+3 −1		kakarot_scripts/deployment/main.py
+17 −7		kakarot_scripts/deployment/starknet_deployments.py
+3 −1		kakarot_scripts/setup/setup.py
+2 −0		pyproject.toml
+1 −0		tests/fixtures/EVM.cairo