Skip to content

Commit

Permalink
Merge pull request #687 from holographxyz/develop
Browse files Browse the repository at this point in the history
Release/012-Blondie-v11-testnet
  • Loading branch information
sogoiii authored Jun 25, 2024
2 parents c95c011 + b414499 commit bdeabb9
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/actions/develop/deploy-indexer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/develop/deploy-operator/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/testnet/deploy-indexer/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/testnet/deploy-operator/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .github/actions/testnet/initial-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/cicd_clis_develop.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy V2 holoclis to staging[develop-v2]
name: Deploy V2 clis to staging2[develop-v2]

permissions:
id-token: write
Expand All @@ -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 }}
Expand All @@ -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]
#######################################

Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/cicd_clis_testnet.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy V2 holoclis to prod[testnet-v2]
name: Deploy V2 holoclis to prod2[testnet-v2]

permissions:
id-token: write
Expand All @@ -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 }}
Expand All @@ -30,18 +30,18 @@ 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]
#######################################

# notice: the trigger
#on:
# push:
# branches:
# - 'something'
# - 'deactivated'
# # Excluded branches
# - '!develop'
# - '!main'
Expand All @@ -51,7 +51,6 @@ on:
pull_request:
branches:
- 'testnet'
# - 'deactivated'
types: [closed]

jobs:
Expand Down
17 changes: 10 additions & 7 deletions src/utils/protocol-events-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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],
Expand All @@ -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),
Expand Down

0 comments on commit bdeabb9

Please sign in to comment.