Merge branch 'master' into feature/oct-1548-wallet-select

.github/pull_request_template.md

@@ -2,17 +2,18 @@
 
 ## Definition of Done
 
-1. [ ] Acceptance criteria are met.
-2. [ ] PR is manually tested before the merge by developer(s).
+1. [ ] If required, the desciption of your change is added to the [QA changelog](https://www.notion.so/octantapp/Changelog-for-the-QA-d96fa3b411cf488bb1d8d9a598d88281) 
+2. [ ] Acceptance criteria are met.
+3. [ ] PR is manually tested before the merge by developer(s).
     - [ ] Happy path is manually checked.
-3. [ ] PR is manually tested by QA when their assistance is required (1).
+4. [ ] PR is manually tested by QA when their assistance is required (1).
     - [ ] Octant Areas & Test Cases are checked for impact and updated if required (2).
-4. [ ] Unit tests are added unless there is a reason to omit them.
-5. [ ] Automated tests are added when required.
-6. [ ] The code is merged.
-7. [ ] Tech documentation is added / updated, reviewed and approved (including mandatory approval by a code owner, should such exist for changed files).
+5. [ ] Unit tests are added unless there is a reason to omit them.
+6. [ ] Automated tests are added when required.
+7. [ ] The code is merged.
+8. [ ] Tech documentation is added / updated, reviewed and approved (including mandatory approval by a code owner, should such exist for changed files).
     - [ ] BE: Swagger documentation is updated.
-8. [ ] When required by QA:
+9. [ ] When required by QA:
     - [ ] Deployed to the relevant environment.
     - [ ] Passed system tests.
 

.github/workflows/deploy-pr.yml

@@ -41,6 +41,7 @@ jobs:
       anvil-block-time: 5
       decision-window: 1800
       epoch-duration: 3600
+      ipfs-gateways: 'https://ipfs.octant.wildland.dev/ipfs/'
     secrets: inherit
 
   run:

.github/workflows/e2e-run.yml

@@ -72,6 +72,7 @@ jobs:
       glm-claim-enabled: true
       vault-confirm-withdrawals-enabled: true
       anvil-block-time: 5
+      ipfs-gateways: 'https://ipfs.octant.wildland.dev/ipfs/'
     secrets: inherit
 
   run-e2e-tests:

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

@@ -118,6 +118,10 @@ on:
         required: false
         default: true
         type: boolean
+      ipfs-gateways:
+        required: false
+        default: 'https://turquoise-accused-gayal-88.mypinata.cloud/ipfs/,https://octant.infura-ipfs.io/ipfs/'
+        type: string
 
 env:
   ENV_TYPE: ${{ inputs.env-type }}
@@ -140,7 +144,7 @@ env:
   BACKEND_SERVER_REPLICAS: ${{ inputs.backend-server-replicas }}
   OCTANT_ENV: ${{ inputs.octant-env }}
   GLM_SENDER_NONCE: ${{ vars.GLM_SENDER_NONCE }}
-  MAINNET_PROPOSAL_CIDS: "QmSQEFD35gKxdPEmngNt1CWe3kSwiiGqBn1Z3FZvWb8mvK,Qmds9N5y2vkMuPTD6M4EBxNXnf3bjTDmzWBGnCkQGsMMGe,QmSXcT18anMXKACTueom8GXw8zrxTBbHGB71atitf6gZ9V"
+  MAINNET_PROPOSAL_CIDS: "QmSQEFD35gKxdPEmngNt1CWe3kSwiiGqBn1Z3FZvWb8mvK,Qmds9N5y2vkMuPTD6M4EBxNXnf3bjTDmzWBGnCkQGsMMGe,QmSXcT18anMXKACTueom8GXw8zrxTBbHGB71atitf6gZ9V,QmXomSdCCwt4FtBp3pidqSz3PtaiV2EyQikU6zRGWeCAsf"
   # ----------------------------------------------------------------------------
   # CONTRACTS / ANVIL / SUBGRAPH / SYNPRESS
   NETWORK: ${{ inputs.chain-name }}
@@ -152,14 +156,15 @@ 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: 0x0B7246eF74Ca7b37Fdc3D15be4f0b49876622F95,0x0c9dc7622aE5f56491aB4cCe060d6002450B79D2,0x0cbF31Ef6545EE30f47651D1A991Bf0aeB03DF29,0x1c01595f9534E33d411035AE99a4317faeC4f6Fe,0x02Cb3C150BEdca124d0aE8CcCb72fefbe705c953,0x2DCDF80f439843D7E0aD1fEF9E7a439B7917eAc9,0x4C6fd545fc18C6538eC304Ae549717CA58f0D6eb,0x7Dd488f03E0A043b550E82D3C2685aA83B96407C,0x9cce47E9cF12C6147c9844adBB81fE85880c4df4,0x15c941a44a343B8c46a28F2BB9aFc7a54E255A4f,0x87fEEd6162CB7dFe6B62F64366742349bF4D1B05,0x242ba6d68FfEb4a098B591B32d370F973FF882B7,0x576edCed7475D8F64a5e2D5227c93Ca57d7f5d20,0x809C9f8dd8CA93A41c3adca4972Fa234C28F7714,0x3250c2CEE20FA34D1c4F68eAA87E53512e95A62a,0x5597cD8d55D2Db56b10FF4F8fe69C8922BF6C537,0x7380A42137D16a0E7684578d8b3d32e1fbD021B5,0x9438b8B447179740cD97869997a2FCc9b4AA63a2,0x9531C059098e3d194fF87FebB587aB07B30B1306,0x00080706a7D99CBC163D52dcF435205B1aD940D1,0x6612213880f80b298aB66375789E8Ef15e98604E,0x53390590476dC98860316e4B46Bb9842AF55efc4,0xB476Ee7D610DAe7B23B671EBC7Bd6112E9772969,0xBCA48834b3653ec795411EB0FCBE4038F8527d62,0xc6FD734790E83820e311211B6d9A682BCa4ac97b,0xd1B8dB70Ded72dB850713b2ce7e1A4FfAfAD95d1,0xe126b3E5d052f1F575828f61fEBA4f4f2603652a,0xF01CEe26213d1A6eaF16422241AE81f7C17B9f98,0xF41a98D4F2E52aa1ccB48F0b6539e955707b8F7a,0xf7253A0E87E39d2cD6365919D4a3D56D431D0041
-  PROPOSALS_CID: QmXomSdCCwt4FtBp3pidqSz3PtaiV2EyQikU6zRGWeCAsf
+  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
   MULTISIG_ADDRESS: "${{ vars.MULTISIG_ADDRESS }}"
   TESTNET_DEPLOYER_PRIVATE_KEY: "${{ secrets.TESTNET_DEPLOYER_PRIVATE_KEY }}"
   TESTNET_MULTISIG_PRIVATE_KEY: "${{ secrets.TESTNET_MULTISIG_PRIVATE_KEY }}"
   TESTNET_RPC_URL: "${{ secrets.TESTNET_RPC_URL }}"
   ETHERSCAN_API_KEY: "${{ secrets.ETHERSCAN_API_KEY }}"
   VITE_ALCHEMY_ID: "${{ secrets.VITE_ALCHEMY_ID }}"
+  IPFS_GATEWAYS: "${{ inputs.ipfs-gateways }}"
   MULTIDEPLOYER_ENABLED: ${{ inputs.multideployer-enabled }}
   SUBGRAPH_DEPLOY: ${{ inputs.subgraph-deploy }}
   GRAPH_HEALTCHECKER_ENABLED: ${{ inputs.graph-healtchecker-enabled }}

backend/README.md

@@ -64,7 +64,7 @@ yarn apitest:run # in a second console
 When backend code is changed, just re-run `yarn apitest:run`.
 To run just one test, use standard pytest naming:
 ```
-yarn apitest:run tests/legacy/test_api_snapshot.py::test_pending_snapshot
+yarn apitest:run tests/api-e2e/test_api_snapshot.py::test_pending_snapshot
 ```
 
 To stop the env, run `yarn apitest:down`

backend/app/__init__.py

@@ -7,7 +7,6 @@
     db,
     migrate,
     cors,
-    socketio,
     cache,
     init_web3,
     api,
@@ -47,7 +46,8 @@ def register_extensions(app):
     cors.init_app(app)
     db.init_app(app)
     migrate.init_app(app, db)
-    socketio.init_app(app)
+    # This is meant to be disabled because we migrate to FastAPI
+    # socketio.init_app(app)
     cache.init_app(app)
     init_scheduler(app)
     init_logger(app)