From 33b70ec85b8ffb0fc240c9bd6589c9240fdb6ac1 Mon Sep 17 00:00:00 2001 From: alnoki <43892045+alnoki@users.noreply.github.com> Date: Wed, 22 Jan 2025 18:44:30 -0800 Subject: [PATCH 1/2] Resurrect stacks --- .../deploy-indexer-fallback.yaml | 30 +++++++++---------- src/cloud-formation/deploy-indexer-main.yaml | 30 +++++++++---------- .../deploy-indexer-production.yaml | 30 +++++++++---------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/cloud-formation/deploy-indexer-fallback.yaml b/src/cloud-formation/deploy-indexer-fallback.yaml index 79a438f43..e3390c59d 100644 --- a/src/cloud-formation/deploy-indexer-fallback.yaml +++ b/src/cloud-formation/deploy-indexer-fallback.yaml @@ -1,29 +1,29 @@ --- parameters: BrokerCpu: 1024 - BrokerImageVersion: '2.0.1' + BrokerImageVersion: '2.1.1' BrokerMemory: 2048 DbMaxCapacity: 8 - DeployAlb: 'false' - DeployAlbDnsRecord: 'false' - DeployBastionHost: 'false' - DeployBroker: 'false' - DeployContainers: 'false' - DeployDb: 'false' - DeployNlb: 'false' - DeployNlbVpcLink: 'false' - DeployPostgrest: 'false' - DeployProcessor: 'false' - DeployRestApi: 'false' - DeployRestApiDnsRecord: 'false' - DeployStack: 'false' + DeployAlb: 'true' + DeployAlbDnsRecord: 'true' + DeployBastionHost: 'true' + DeployBroker: 'true' + DeployContainers: 'true' + DeployDb: 'true' + DeployNlb: 'true' + DeployNlbVpcLink: 'true' + DeployPostgrest: 'true' + DeployProcessor: 'true' + DeployRestApi: 'true' + DeployRestApiDnsRecord: 'true' + DeployStack: 'true' DeployWaf: 'false' EnableWafRulesGeneral: 'false' EnableWafRulesRestApi: 'false' EnableWafRulesWebSocket: 'false' Environment: 'fallback' Network: 'mainnet' - ProcessorImageVersion: '2.0.1' + ProcessorImageVersion: '2.1.1' VpcStackName: 'emoji-vpc' tags: null template-file-path: 'src/cloud-formation/indexer.cfn.yaml' diff --git a/src/cloud-formation/deploy-indexer-main.yaml b/src/cloud-formation/deploy-indexer-main.yaml index 73913a7d1..909589024 100644 --- a/src/cloud-formation/deploy-indexer-main.yaml +++ b/src/cloud-formation/deploy-indexer-main.yaml @@ -1,26 +1,26 @@ --- parameters: - BrokerImageVersion: '2.0.1' - DeployAlb: 'false' - DeployAlbDnsRecord: 'false' - DeployBastionHost: 'false' - DeployBroker: 'false' - DeployContainers: 'false' - DeployDb: 'false' - DeployNlb: 'false' - DeployNlbVpcLink: 'false' - DeployPostgrest: 'false' - DeployProcessor: 'false' - DeployRestApi: 'false' - DeployRestApiDnsRecord: 'false' - DeployStack: 'false' + BrokerImageVersion: '2.1.1' + DeployAlb: 'true' + DeployAlbDnsRecord: 'true' + DeployBastionHost: 'true' + DeployBroker: 'true' + DeployContainers: 'true' + DeployDb: 'true' + DeployNlb: 'true' + DeployNlbVpcLink: 'true' + DeployPostgrest: 'true' + DeployProcessor: 'true' + DeployRestApi: 'true' + DeployRestApiDnsRecord: 'true' + DeployStack: 'true' DeployWaf: 'false' EnableWafRulesGeneral: 'false' EnableWafRulesRestApi: 'false' EnableWafRulesWebSocket: 'false' Environment: 'main' Network: 'testnet' - ProcessorImageVersion: '2.0.1' + ProcessorImageVersion: '2.1.1' VpcStackName: 'emoji-vpc' tags: null template-file-path: 'src/cloud-formation/indexer.cfn.yaml' diff --git a/src/cloud-formation/deploy-indexer-production.yaml b/src/cloud-formation/deploy-indexer-production.yaml index 9ad8871ee..38d687cbb 100644 --- a/src/cloud-formation/deploy-indexer-production.yaml +++ b/src/cloud-formation/deploy-indexer-production.yaml @@ -1,29 +1,29 @@ --- parameters: BrokerCpu: 1024 - BrokerImageVersion: '2.0.1' + BrokerImageVersion: '2.1.1' BrokerMemory: 2048 DbMaxCapacity: 8 - DeployAlb: 'false' - DeployAlbDnsRecord: 'false' - DeployBastionHost: 'false' - DeployBroker: 'false' - DeployContainers: 'false' - DeployDb: 'false' - DeployNlb: 'false' - DeployNlbVpcLink: 'false' - DeployPostgrest: 'false' - DeployProcessor: 'false' - DeployRestApi: 'false' - DeployRestApiDnsRecord: 'false' - DeployStack: 'false' + DeployAlb: 'true' + DeployAlbDnsRecord: 'true' + DeployBastionHost: 'true' + DeployBroker: 'true' + DeployContainers: 'true' + DeployDb: 'true' + DeployNlb: 'true' + DeployNlbVpcLink: 'true' + DeployPostgrest: 'true' + DeployProcessor: 'true' + DeployRestApi: 'true' + DeployRestApiDnsRecord: 'true' + DeployStack: 'true' DeployWaf: 'false' EnableWafRulesGeneral: 'false' EnableWafRulesRestApi: 'false' EnableWafRulesWebSocket: 'false' Environment: 'production' Network: 'mainnet' - ProcessorImageVersion: '2.0.1' + ProcessorImageVersion: '2.1.1' VpcStackName: 'emoji-vpc' tags: null template-file-path: 'src/cloud-formation/indexer.cfn.yaml' From 96af65e7fe5f9d32458348903e5eff461e6c6288 Mon Sep 17 00:00:00 2001 From: alnoki <43892045+alnoki@users.noreply.github.com> Date: Wed, 22 Jan 2025 18:55:40 -0800 Subject: [PATCH 2/2] Include emojicoin arena in indexer stack --- src/cloud-formation/README.md | 16 ++++++++++++++-- src/cloud-formation/indexer.cfn.yaml | 3 +++ src/move/emojicoin_arena/README.md | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/cloud-formation/README.md b/src/cloud-formation/README.md index aea6e7d49..560c25c28 100644 --- a/src/cloud-formation/README.md +++ b/src/cloud-formation/README.md @@ -136,8 +136,18 @@ indexer deployments. `/emojicoin/package-address/` - The address of the Move package you want to index. - + + The address of the [`emojicoin dot fun`] Move package you want to index. + + + + `/emojicoin/arena-package-address/` + + + + The address of the [`emojicoin arena`] Move package you want to index. + + @@ -563,4 +573,6 @@ REST and WebSocket endpoints. [web acl traffic overview dashboards]: https://docs.aws.amazon.com/waf/latest/developerguide/web-acl-dashboards.html [web application firewall]: https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html [`ecr::getauthorizationtoken`]: https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_GetAuthorizationToken.html +[`emojicoin arena`]: ../move/emojicoin_arena +[`emojicoin dot fun`]: ../move/emojicoin_dot_fun [`rain`]: https://github.com/aws-cloudformation/rain diff --git a/src/cloud-formation/indexer.cfn.yaml b/src/cloud-formation/indexer.cfn.yaml index 181d7fe4e..61add4d24 100644 --- a/src/cloud-formation/indexer.cfn.yaml +++ b/src/cloud-formation/indexer.cfn.yaml @@ -1420,6 +1420,9 @@ Resources: - Name: 'EMOJICOIN_MODULE_ADDRESS' Value: !Sub '{{resolve:ssm:/emojicoin/package-address/${Network}}}' + - Name: 'EMOJICOIN_ARENA_MODULE_ADDRESS' + Value: !Sub + '{{resolve:ssm:/emojicoin/arena-package-address/${Network}}}' - Name: 'WS_PORT' Value: !FindInMap - 'Constants' diff --git a/src/move/emojicoin_arena/README.md b/src/move/emojicoin_arena/README.md index 5dcb27f8d..5eea65453 100644 --- a/src/move/emojicoin_arena/README.md +++ b/src/move/emojicoin_arena/README.md @@ -1,6 +1,6 @@ -# Emojicoin arena +# emojicoin arena ## Overview