Merge branch 'develop'

.github/workflows/tpl-deploy-app.yml

@@ -156,8 +156,8 @@ env:
   SKIP_LOCAL_SUBGRAPH_UPDATE: ${{ inputs.skip-local-subgraph-update }}
   ANVIL_BLOCK_TIME: ${{ inputs.anvil-block-time }}
   SECRET_WORDS: test test test test test test test test test test test junk
-  PROPOSALS_ADDRESSES: 0x09A38B6187a2c44B6ba71c277c50764B5878b824,0x5597cD8d55D2Db56b10FF4F8fe69C8922BF6C537,0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a,0x0B7246eF74Ca7b37Fdc3D15be4f0b49876622F95,0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f,0xe7d4Ac3c77cF3683E0d15C15eaba7CDB8c092D98,0xa83a92297B3d80A70cC396bf74424971A9890704,0x7380A42137D16a0E7684578d8b3d32e1fbD021B5,0x53390590476dC98860316e4B46Bb9842AF55efc4,0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20,0x809C9f8dd8CA93A41c3adca4972Fa234C28F7714,0x4C6fd545fc18C6538eC304Ae549717CA58f0D6eb,0xfFbD35255008F86322051F2313D4b343540e0e00,0x9be7267002CAD0b8501f7322d50612CB13788Bcf,0x7Dd488f03E0A043b550E82D3C2685aA83B96407C,0x2DCDF80f439843D7E0aD1fEF9E7a439B7917eAc9,0xd1B8dB70Ded72dB850713b2ce7e1A4FfAfAD95d1,0x08e40e1C0681D072a54Fc5868752c02bb3996FFA,0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29,0x02Cb3C150BEdca124d0aE8CcCb72fefbe705c953,0x9531C059098e3d194fF87FebB587aB07B30B1306,0xBCA48834b3653ec795411EB0FCBE4038F8527d62,0xa095Ee27B11FCAac8e1be84891ab62C74F08C854,0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a,0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05,0x1337E2624ffEC537087c6774e9A18031CFEAf0a9,0x00080706a7D99CBC163D52dcF435205B1aD940D1,0x992A3a242D6471d24783b4C2C6AF3EC7df871761,0xFC1436689F68079Fc17A931666b7947789229ed8,0xfcBf17200C64E860F6639aa12B525015d115F863
-  PROPOSALS_CID: QmdtFLK3sB7EwQTNaqtmBnZqnN2pYZcu6GmUSTrpvb9wcq
+  PROPOSALS_ADDRESSES: 0x898b2500C4Fed262D7cc564dD892A34B33DA0a41,0x09A38B6187a2c44B6ba71c277c50764B5878b824,0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a,0x8D3AcA27963D5BAD978d3e953D3F3680cEa3FAeC,0xa39E7b901570120f6F963bccE8F5Ea4D883Cb2EE,0xe1887fF140BfA9D3b45D0B2077b7471124acD242,0x2B76AbD0889620597d6A52fccc4865d04004eAa7,0x242ba6d68FfEb4a098B591B32d370F973FF882B7,0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f,0xa83a92297B3d80A70cC396bf74424971A9890704,0x53390590476dC98860316e4B46Bb9842AF55efc4,0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20,0x9438b8B447179740cD97869997a2FCc9b4AA63a2,0x004C1193262542ffF59e64fF29404DEAeb3F3dEC,0xB3f2b4a0b5F2f99e6B6bfc71D5E18a59B92D5606,0x08e40e1C0681D072a54Fc5868752c02bb3996FFA,0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29,0xaaBC0D621F375Ec70fB0e83CdC6FE60281697854,0x9531C059098e3d194fF87FebB587aB07B30B1306,0xBCA48834b3653ec795411EB0FCBE4038F8527d62,0xa095Ee27B11FCAac8e1be84891ab62C74F08C854,0x7DAC9Fc15C1Db4379D75A6E3f330aE849dFfcE18,0x74D8967e812de34702eCD3D453a44bf37440b10b,0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a,0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05,0x1337E2624ffEC537087c6774e9A18031CFEAf0a9,0x00080706a7D99CBC163D52dcF435205B1aD940D1,0xFC1436689F68079Fc17A931666b7947789229ed8,0x7340F1a1e4e38F43d2FCC85cdb2b764de36B40c0,0xfcBf17200C64E860F6639aa12B525015d115F863
+  PROPOSALS_CID: bafybeifs53yk5oycvy5lu5r42oefk3vh7qkvfdkklkvaw2ocubmycgvche
   MULTISIG_ADDRESS: "${{ vars.MULTISIG_ADDRESS }}"
   TESTNET_DEPLOYER_PRIVATE_KEY: "${{ secrets.TESTNET_DEPLOYER_PRIVATE_KEY }}"
   TESTNET_MULTISIG_PRIVATE_KEY: "${{ secrets.TESTNET_MULTISIG_PRIVATE_KEY }}"

backend/migrations/ipfs_integration/config.py

@@ -5,10 +5,10 @@
 
 class Config:
     FILENAME_PREFIX = "ipfs_projects_details"
-    EPOCH = 5  # change corresponding to the epoch
+    EPOCH = 6  # change corresponding to the epoch
     JSON_FILEPATH = f"files/{build_filename(FILENAME_PREFIX, EPOCH)}"
     CID = [
-        "QmdtFLK3sB7EwQTNaqtmBnZqnN2pYZcu6GmUSTrpvb9wcq"
+        "bafybeifs53yk5oycvy5lu5r42oefk3vh7qkvfdkklkvaw2ocubmycgvche"
     ]  # change corresponding to the epoch
     GATEWAY_URL = "https://octant.infura-ipfs.io/ipfs/"
 

backend/migrations/ipfs_integration/files/cids.md

@@ -4,3 +4,4 @@
 - Epoch3: QmSXcT18anMXKACTueom8GXw8zrxTBbHGB71atitf6gZ9V
 - Epoch4: QmXomSdCCwt4FtBp3pidqSz3PtaiV2EyQikU6zRGWeCAsf
 - Epoch5: QmdtFLK3sB7EwQTNaqtmBnZqnN2pYZcu6GmUSTrpvb9wcq
+- Epoch6: bafybeifs53yk5oycvy5lu5r42oefk3vh7qkvfdkklkvaw2ocubmycgvche

backend/migrations/ipfs_integration/files/ipfs_projects_details_epoch_6.json

@@ -0,0 +1,124 @@
+[
+    [
+        {
+            "name": "BuidlGuidl",
+            "address": "0x00080706a7D99CBC163D52dcF435205B1aD940D1"
+        },
+        {
+            "name": "ZuCity Japan",
+            "address": "0x004C1193262542ffF59e64fF29404DEAeb3F3dEC"
+        },
+        {
+            "name": "Regens Unite",
+            "address": "0x08e40e1C0681D072a54Fc5868752c02bb3996FFA"
+        },
+        {
+            "name": "EVMavericks Doots Podcast",
+            "address": "0x09A38B6187a2c44B6ba71c277c50764B5878b824"
+        },
+        {
+            "name": "L2BEAT",
+            "address": "0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29"
+        },
+        {
+            "name": "Kiwi News",
+            "address": "0x1337E2624ffEC537087c6774e9A18031CFEAf0a9"
+        },
+        {
+            "name": "Tor Project",
+            "address": "0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f"
+        },
+        {
+            "name": "Blockscout",
+            "address": "0x242ba6d68FfEb4a098B591B32d370F973FF882B7"
+        },
+        {
+            "name": "Alfred By Atlantis",
+            "address": "0x2B76AbD0889620597d6A52fccc4865d04004eAa7"
+        },
+        {
+            "name": "Protocol Guild",
+            "address": "0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a"
+        },
+        {
+            "name": "Dappnode",
+            "address": "0x53390590476dC98860316e4B46Bb9842AF55efc4"
+        },
+        {
+            "name": "Funding the Commons",
+            "address": "0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20"
+        },
+        {
+            "name": "ReFiDAO",
+            "address": "0x7340F1a1e4e38F43d2FCC85cdb2b764de36B40c0"
+        },
+        {
+            "name": "Vocdoni",
+            "address": "0x74D8967e812de34702eCD3D453a44bf37440b10b"
+        },
+        {
+            "name": "Kernel",
+            "address": "0x7DAC9Fc15C1Db4379D75A6E3f330aE849dFfcE18"
+        },
+        {
+            "name": "Open Source Observer",
+            "address": "0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05"
+        },
+        {
+            "name": "WebHash",
+            "address": "0x898b2500C4Fed262D7cc564dD892A34B33DA0a41"
+        },
+        {
+            "name": "Ethereum Cat Herders",
+            "address": "0x8D3AcA27963D5BAD978d3e953D3F3680cEa3FAeC"
+        },
+        {
+            "name": "GrowThePie",
+            "address": "0x9438b8B447179740cD97869997a2FCc9b4AA63a2"
+        },
+        {
+            "name": "Rotki",
+            "address": "0x9531C059098e3d194fF87FebB587aB07B30B1306"
+        },
+        {
+            "name": "FlowState",
+            "address": "0xB3f2b4a0b5F2f99e6B6bfc71D5E18a59B92D5606"
+        },
+        {
+            "name": "Ethereum Attestation Service",
+            "address": "0xBCA48834b3653ec795411EB0FCBE4038F8527d62"
+        },
+        {
+            "name": "PizzaDAO",
+            "address": "0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a"
+        },
+        {
+            "name": "B<>rder/ess Developers",
+            "address": "0xFC1436689F68079Fc17A931666b7947789229ed8"
+        },
+        {
+            "name": "Aestus MEV Relay",
+            "address": "0xa095Ee27B11FCAac8e1be84891ab62C74F08C854"
+        },
+        {
+            "name": "Citizen Wallet",
+            "address": "0xa39E7b901570120f6F963bccE8F5Ea4D883Cb2EE"
+        },
+        {
+            "name": "EthStaker",
+            "address": "0xa83a92297B3d80A70cC396bf74424971A9890704"
+        },
+        {
+            "name": "TogetherCrew",
+            "address": "0xaaBC0D621F375Ec70fB0e83CdC6FE60281697854"
+        },
+        {
+            "name": "Bankless Academy",
+            "address": "0xe1887fF140BfA9D3b45D0B2077b7471124acD242"
+        },
+        {
+            "name": "Revoke.cash",
+            "address": "0xfcBf17200C64E860F6639aa12B525015d115F863"
+        }
+    ]
+]

backend/migrations/versions/2e1e54ed62d3_add_project_details_from_ipfs_for_epoch_.py

@@ -0,0 +1,28 @@
+"""Add project details from IPFS for Epoch 6
+
+Revision ID: 2e1e54ed62d3
+Revises: 5398b1538a31
+Create Date: 2025-01-09 10:11:38.296552
+
+"""
+from migrations.ipfs_integration import migration_helpers as ipfs_migration
+
+revision = "2e1e54ed62d3"
+down_revision = "5398b1538a31"
+branch_labels = None
+depends_on = None
+
+FILENAME = "ipfs_projects_details_epoch_{}.json"
+EPOCHS = (6,)
+
+
+def upgrade():
+    for epoch in EPOCHS:
+        filename = FILENAME.format(epoch)
+        ipfs_migration.upgrade(filename, epoch)
+
+
+def downgrade():
+    for epoch in EPOCHS:
+        filename = FILENAME.format(epoch)
+        ipfs_migration.downgrade(filename, epoch)

backend/migrations/versions/6ab87f7762d8_remove_existing_delegations_and_gp_.py

@@ -0,0 +1,25 @@
+"""Remove existing delegations and gp stamps before AW6
+
+Revision ID: 6ab87f7762d8
+Revises: 2e1e54ed62d3
+Create Date: 2025-01-09 10:53:09.674239
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "6ab87f7762d8"
+down_revision = "2e1e54ed62d3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("TRUNCATE TABLE score_delegation")
+    op.execute("TRUNCATE TABLE gitcoin_passport_stamps")
+
+
+def downgrade():
+    pass

backend/tests/modules/projects/metadata/test_projects_retrieval.py

@@ -84,6 +84,21 @@ def test_get_projects_metadata_epoch_5():
         context, is_mainnet=True
     )
 
+    assert (
+        projects_metadata.projects_cid
+        == "QmdtFLK3sB7EwQTNaqtmBnZqnN2pYZcu6GmUSTrpvb9wcq"
+    )
+    assert projects_metadata.projects_addresses == ["0x0", "0x1"]
+
+
+def test_get_projects_metadata_epoch_6():
+    context = get_context(6)
+
+    service = StaticProjectsMetadataService()
+    projects_metadata: ProjectsMetadata = service.get_projects_metadata(
+        context, is_mainnet=True
+    )
+
     assert (
         projects_metadata.projects_cid
         == "QmXbFKrMGJUbXupmTQsQhoy9zkzXDBHZkPAzKC4yiaLt5n"

ci/argocd/contracts/master.env

@@ -1,8 +1,8 @@
-BLOCK_NUMBER=7317908
+BLOCK_NUMBER=7447731
 GLM_CONTRACT_ADDRESS=0x71432DD1ae7DB41706ee6a22148446087BdD0906
-AUTH_CONTRACT_ADDRESS=0xB1Eca5900e468cE874C291C8c64b87857f207Ee5
-DEPOSITS_CONTRACT_ADDRESS=0x6f30d6f0C23Fe7876cdB7cf07bCceB3824CA6D9a
-EPOCHS_CONTRACT_ADDRESS=0x99f85bE661974e7D830A996AD2ce026e2f526A1F
-PROPOSALS_CONTRACT_ADDRESS=0xeF7263756a6B04AF1bdf01598049DAD4bE846273
-WITHDRAWALS_TARGET_CONTRACT_ADDRESS=0x6F03ca7B9Fc64Fb3E59D818e42444445bE587D0b
-VAULT_CONTRACT_ADDRESS=0x04Ac197A4C9612Bfc356290cF6E617ABd63BFc7C
+AUTH_CONTRACT_ADDRESS=0x5c7Aa9Ea5244D392812794DEEd048C2D245F1A89
+DEPOSITS_CONTRACT_ADDRESS=0x9EB0260d78C8e9E22B88E76e18cCEffb7FDF58e0
+EPOCHS_CONTRACT_ADDRESS=0x211D0a1d39ab60979CF057594636CCe45c905F2C
+PROPOSALS_CONTRACT_ADDRESS=0x8597d78293bCE387D402852872a46a5ED7c35D29
+WITHDRAWALS_TARGET_CONTRACT_ADDRESS=0x7E3e912256b3E049a0e5730D8E560E4115553320
+VAULT_CONTRACT_ADDRESS=0xbC12768CCeB4682270D00F33Af8Ed06c2122E079

contracts-v1/.env.template

@@ -7,5 +7,5 @@ TESTNET_DEPLOYER_PRIVATE_KEY=
 MULTISIG_ADDRESS=
 TESTNET_MULTISIG_PRIVATE_KEY=
 
-PROPOSALS_CID=QmdtFLK3sB7EwQTNaqtmBnZqnN2pYZcu6GmUSTrpvb9wcq
-PROPOSALS_ADDRESSES=0x09A38B6187a2c44B6ba71c277c50764B5878b824,0x5597cD8d55D2Db56b10FF4F8fe69C8922BF6C537,0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a,0x0B7246eF74Ca7b37Fdc3D15be4f0b49876622F95,0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f,0xe7d4Ac3c77cF3683E0d15C15eaba7CDB8c092D98,0xa83a92297B3d80A70cC396bf74424971A9890704,0x7380A42137D16a0E7684578d8b3d32e1fbD021B5,0x53390590476dC98860316e4B46Bb9842AF55efc4,0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20,0x809C9f8dd8CA93A41c3adca4972Fa234C28F7714,0x4C6fd545fc18C6538eC304Ae549717CA58f0D6eb,0xfFbD35255008F86322051F2313D4b343540e0e00,0x9be7267002CAD0b8501f7322d50612CB13788Bcf,0x7Dd488f03E0A043b550E82D3C2685aA83B96407C,0x2DCDF80f439843D7E0aD1fEF9E7a439B7917eAc9,0xd1B8dB70Ded72dB850713b2ce7e1A4FfAfAD95d1,0x08e40e1C0681D072a54Fc5868752c02bb3996FFA,0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29,0x02Cb3C150BEdca124d0aE8CcCb72fefbe705c953,0x9531C059098e3d194fF87FebB587aB07B30B1306,0xBCA48834b3653ec795411EB0FCBE4038F8527d62,0xa095Ee27B11FCAac8e1be84891ab62C74F08C854,0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a,0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05,0x1337E2624ffEC537087c6774e9A18031CFEAf0a9,0x00080706a7D99CBC163D52dcF435205B1aD940D1,0x992A3a242D6471d24783b4C2C6AF3EC7df871761,0xFC1436689F68079Fc17A931666b7947789229ed8,0xfcBf17200C64E860F6639aa12B525015d115F863
+PROPOSALS_CID=bafybeifs53yk5oycvy5lu5r42oefk3vh7qkvfdkklkvaw2ocubmycgvche
+PROPOSALS_ADDRESSES=0x898b2500C4Fed262D7cc564dD892A34B33DA0a41,0x09A38B6187a2c44B6ba71c277c50764B5878b824,0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a,0x8D3AcA27963D5BAD978d3e953D3F3680cEa3FAeC,0xa39E7b901570120f6F963bccE8F5Ea4D883Cb2EE,0xe1887fF140BfA9D3b45D0B2077b7471124acD242,0x2B76AbD0889620597d6A52fccc4865d04004eAa7,0x242ba6d68FfEb4a098B591B32d370F973FF882B7,0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f,0xa83a92297B3d80A70cC396bf74424971A9890704,0x53390590476dC98860316e4B46Bb9842AF55efc4,0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20,0x9438b8B447179740cD97869997a2FCc9b4AA63a2,0x004C1193262542ffF59e64fF29404DEAeb3F3dEC,0xB3f2b4a0b5F2f99e6B6bfc71D5E18a59B92D5606,0x08e40e1C0681D072a54Fc5868752c02bb3996FFA,0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29,0xaaBC0D621F375Ec70fB0e83CdC6FE60281697854,0x9531C059098e3d194fF87FebB587aB07B30B1306,0xBCA48834b3653ec795411EB0FCBE4038F8527d62,0xa095Ee27B11FCAac8e1be84891ab62C74F08C854,0x7DAC9Fc15C1Db4379D75A6E3f330aE849dFfcE18,0x74D8967e812de34702eCD3D453a44bf37440b10b,0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a,0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05,0x1337E2624ffEC537087c6774e9A18031CFEAf0a9,0x00080706a7D99CBC163D52dcF435205B1aD940D1,0xFC1436689F68079Fc17A931666b7947789229ed8,0x7340F1a1e4e38F43d2FCC85cdb2b764de36B40c0,0xfcBf17200C64E860F6639aa12B525015d115F863