diff --git a/.github/actions/develop/deploy-indexer/action.yaml b/.github/actions/develop/deploy-indexer/action.yaml index fc9396f1..4159b25a 100644 --- a/.github/actions/develop/deploy-indexer/action.yaml +++ b/.github/actions/develop/deploy-indexer/action.yaml @@ -2,7 +2,7 @@ name: 'deploy-indexer' runs: using: 'composite' steps: - - name: -> V2 -- Deploy INDEXER cli in staging [namespace -> ${{ env.STG_COMMON_NAMESPACE_V2 }}] + - name: -> V2 -- Deploy INDEXER cli in staging2 uses: tensor-hq/eksctl-helm-action@main env: RELEASE_NAME: ${{ env.INDEXER_RELEASE_NAME_V2 }} # notice diff --git a/.github/actions/develop/deploy-operator/action.yaml b/.github/actions/develop/deploy-operator/action.yaml index c8d562b3..8f4f970d 100644 --- a/.github/actions/develop/deploy-operator/action.yaml +++ b/.github/actions/develop/deploy-operator/action.yaml @@ -2,7 +2,7 @@ name: 'deploy-operator' runs: using: 'composite' steps: - - name: -> V2 -- Deploy OPERATOR cli in staging [namespace -> ${{ env.STG_COMMON_NAMESPACE_V2 }}] + - name: -> V2 -- Deploy OPERATOR cli in staging2 uses: tensor-hq/eksctl-helm-action@main env: RELEASE_NAME: ${{ env.OPERATOR_RELEASE_NAME_V2 }} # notice diff --git a/.github/actions/testnet/deploy-indexer/action.yaml b/.github/actions/testnet/deploy-indexer/action.yaml index 4c378614..04417c44 100644 --- a/.github/actions/testnet/deploy-indexer/action.yaml +++ b/.github/actions/testnet/deploy-indexer/action.yaml @@ -2,7 +2,7 @@ name: 'deploy-indexer' runs: using: 'composite' steps: - - name: -> V2 -- Deploy INDEXER cli in TESTNET [namespace -> ${{ env.TESTNET_COMMON_NAMESPACE_V2 }}] + - name: -> V2 -- Deploy INDEXER cli in TESTNET uses: tensor-hq/eksctl-helm-action@main env: RELEASE_NAME: ${{ env.INDEXER_RELEASE_NAME_V2 }} # notice diff --git a/.github/actions/testnet/deploy-operator/action.yaml b/.github/actions/testnet/deploy-operator/action.yaml index e9136c58..fa135073 100644 --- a/.github/actions/testnet/deploy-operator/action.yaml +++ b/.github/actions/testnet/deploy-operator/action.yaml @@ -2,7 +2,7 @@ name: 'deploy-operator' runs: using: 'composite' steps: - - name: -> V2 -- Deploy OPERATOR cli in TESTNET [namespace -> ${{ env.TESTNET_COMMON_NAMESPACE_V2 }}] + - name: -> V2 -- Deploy OPERATOR cli in TESTNET uses: tensor-hq/eksctl-helm-action@main env: RELEASE_NAME: ${{ env.OPERATOR_RELEASE_NAME_V2 }} # notice diff --git a/.github/actions/testnet/initial-setup/action.yaml b/.github/actions/testnet/initial-setup/action.yaml index 3e5a1498..cd795a58 100644 --- a/.github/actions/testnet/initial-setup/action.yaml +++ b/.github/actions/testnet/initial-setup/action.yaml @@ -80,10 +80,8 @@ runs: - name: Pull the holograph-indexer helm chart version x.x.x from ECR shell: bash env: - # CHART_REPO: holo-indexer CHART_VERSION: ${{ env.TESTNET_HOLO_INDEXER_HELM_CHART_VERSION }} - # ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} run: | helm pull oci://$ECR_REGISTRY/$CHART_REPO --version $CHART_VERSION @@ -93,10 +91,8 @@ runs: - name: Pull the holograph-operator helm chart version x.x.x from ECR shell: bash env: - # CHART_REPO: holo-operator CHART_VERSION: ${{ env.TESTNET_HOLO_OPERATOR_HELM_CHART_VERSION }} - # ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} run: | helm pull oci://$ECR_REGISTRY/$CHART_REPO --version $CHART_VERSION diff --git a/.github/workflows/cicd_clis_develop.yaml b/.github/workflows/cicd_clis_develop.yaml index bb6909c0..f0b45725 100644 --- a/.github/workflows/cicd_clis_develop.yaml +++ b/.github/workflows/cicd_clis_develop.yaml @@ -1,4 +1,4 @@ -name: Deploy V2 holoclis to staging[develop-v2] +name: Deploy V2 clis to staging2[develop-v2] permissions: id-token: write @@ -11,7 +11,7 @@ env: # IMAGE_TAG: dev-${{ github.sha }} # - CLUSTER_NAME: staging + CLUSTER_NAME: 'staging2' # AWS_KEY_ID: ${{ secrets.NEWSTAGE_USER_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY: ${{ secrets.NEWSTAGE_USER_AWS_SECRET_ACCESS_KEY }} @@ -26,16 +26,14 @@ env: HOLOGRAPH_ENVIRONMENT: develop BLOCK_PROCESSING_VERSION: 'V2' # - STG_DOMAIN: 'holograph.xyz' # needed only for the health checks - # # SQS User [indexer_processor_sqs_user] # STG_COMMON_NAMESPACE_V2: 'develop-v2' ####################################### - STG_HOLOGRAPH_INDEXER_HELM_CHART_VERSION: 0.1.88 + STG_HOLOGRAPH_INDEXER_HELM_CHART_VERSION: 0.1.89 INDEXER_RELEASE_NAME_V2: 'indexer-dev-v2' # format -> [release_name]-indexer-[env] # - STG_HOLOGRAPH_OPERATOR_HELM_CHART_VERSION: 0.1.20 + STG_HOLOGRAPH_OPERATOR_HELM_CHART_VERSION: 0.1.21 OPERATOR_RELEASE_NAME_V2: 'operator-dev-v2' # format -> [release_name]-indexer-[env] ####################################### diff --git a/.github/workflows/cicd_clis_testnet.yaml b/.github/workflows/cicd_clis_testnet.yaml index c9fca30c..f424c9c3 100644 --- a/.github/workflows/cicd_clis_testnet.yaml +++ b/.github/workflows/cicd_clis_testnet.yaml @@ -1,4 +1,4 @@ -name: Deploy V2 holoclis to prod[testnet-v2] +name: Deploy V2 holoclis to prod2[testnet-v2] permissions: id-token: write @@ -7,11 +7,11 @@ permissions: env: AWS_REGION: us-west-2 IAM_ROLE: arn:aws:iam::177635894328:role/Github_role_to_access_ECR - ECR_REPOSITORY: holo-cli # notice: the same for all cli apps + ECR_REPOSITORY: holo-cli # IMAGE_TAG: testnet-${{ github.sha }} # - CLUSTER_NAME: prod0 + CLUSTER_NAME: 'prod2' # AWS_KEY_ID: ${{ secrets.PROD0_CICD_USER_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY: ${{ secrets.PROD0_CICD_USER_AWS_SECRET_ACCESS_KEY }} @@ -30,10 +30,10 @@ env: # TESTNET_COMMON_NAMESPACE_V2: 'testnet-v2' ####################################### - TESTNET_HOLO_INDEXER_HELM_CHART_VERSION: 0.1.88 + TESTNET_HOLO_INDEXER_HELM_CHART_VERSION: 0.1.89 INDEXER_RELEASE_NAME_V2: 'blondie-indexer-testnet-v2' # format -> [release_name]-indexer-[env] # - TESTNET_HOLO_OPERATOR_HELM_CHART_VERSION: 0.1.20 + TESTNET_HOLO_OPERATOR_HELM_CHART_VERSION: 0.1.21 OPERATOR_RELEASE_NAME_V2: 'blondie-operator-testnet-v2' # format -> [release_name]-indexer-[env] ####################################### @@ -41,7 +41,7 @@ env: #on: # push: # branches: -# - 'something' +# - 'deactivated' # # Excluded branches # - '!develop' # - '!main' @@ -51,7 +51,6 @@ on: pull_request: branches: - 'testnet' - # - 'deactivated' types: [closed] jobs: diff --git a/src/utils/protocol-events-map.ts b/src/utils/protocol-events-map.ts index 45480bcb..6a41ad0f 100644 --- a/src/utils/protocol-events-map.ts +++ b/src/utils/protocol-events-map.ts @@ -70,10 +70,10 @@ export const protocolEventsMap: {readonly [key in ProtocolEvent]: ProtocolEventI events: [ eventMap[EventType.SecondarySaleFees], eventMap[EventType.BridgeableContractDeployed], - eventMap[EventType.AssignJob], - eventMap[EventType.RelayerParams], + // eventMap[EventType.AssignJob], // NOTE: LZ V1 events differ from LZ V2 events, so they will be ignored. + // eventMap[EventType.RelayerParams], // NOTE: LZ V1 events differ from LZ V2 events, so they will be ignored. // UNKNOWN EVENT: 0x4e41ee13e03cd5e0446487b524fdc48af6acf26c074dacdbdfb6b574b42c8146 - eventMap[EventType.PacketLZ], + // eventMap[EventType.PacketLZ], // NOTE: LZ V1 events differ from LZ V2 events, so they will be ignored. eventMap[EventType.CrossChainMessageSent], ], sqsEventNames: [SqsEventName.ContractDeployed, SqsEventName.BridgePreProcess], @@ -111,10 +111,10 @@ export const protocolEventsMap: {readonly [key in ProtocolEvent]: ProtocolEventI events: [ // eventMap[EventType.TransferERC721], // NOTE: transfer checks are skipped for efficiency. Filtering transfer logs is costly, and all relevant data is already available in the HolographableContractEvent. eventMap[EventType.HolographableContractEvent], - eventMap[EventType.AssignJob], - eventMap[EventType.RelayerParams], + // eventMap[EventType.AssignJob], // NOTE: LZ V1 events differ from LZ V2 events, so they will be ignored. + // eventMap[EventType.RelayerParams], // UNKNOWN EVENT: 0x4e41ee13e03cd5e0446487b524fdc48af6acf26c074dacdbdfb6b574b42c8146 - eventMap[EventType.PacketLZ], + // eventMap[EventType.PacketLZ], eventMap[EventType.CrossChainMessageSent], ], sqsEventNames: [SqsEventName.BridgePreProcess], @@ -124,7 +124,10 @@ export const protocolEventsMap: {readonly [key in ProtocolEvent]: ProtocolEventI [ProtocolEvent.AvailableOperatorJob]: { name: ProtocolEvent.AvailableOperatorJob, contractMethodName: ContractMethodId.validateTransactionProofV1, - events: [eventMap[EventType.AvailableOperatorJob], eventMap[EventType.PacketReceived]], + events: [ + eventMap[EventType.AvailableOperatorJob], + // eventMap[EventType.PacketReceived] // NOTE: LZ V1 events differ from LZ V2 events, so they will be ignored. + ], sqsEventNames: [SqsEventName.AvailableOperatorJob], validateAndGetSqsEvents: (interestingTransaction: InterestingTransaction) => getSqsEventsFromTx(ProtocolEvent.AvailableOperatorJob, interestingTransaction),