From 219f7f18edd8f6d6d5196e2a04b3dfbce02d3c1f Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 9 Oct 2024 14:38:33 +0200 Subject: [PATCH 1/8] pin otel version --- terraform/ecs/cluster.tf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/terraform/ecs/cluster.tf b/terraform/ecs/cluster.tf index 195c0f94..87c925e0 100644 --- a/terraform/ecs/cluster.tf +++ b/terraform/ecs/cluster.tf @@ -6,9 +6,10 @@ locals { task_cpu = module.this.stage == "prod" ? var.task_cpu : 256 task_memory = module.this.stage == "prod" ? var.task_memory : 512 - otel_port = var.port + 1 - otel_cpu = 128 - otel_memory = 128 + otel_image_tag = "v0.35.1" + otel_port = var.port + 1 + otel_cpu = 128 + otel_memory = 128 file_descriptor_soft_limit = pow(2, 18) file_descriptor_hard_limit = local.file_descriptor_soft_limit * 2 @@ -139,7 +140,7 @@ resource "aws_ecs_task_definition" "app_task" { # Forward telemetry data to AWS CloudWatch { name = "aws-otel-collector", - image = "public.ecr.aws/aws-observability/aws-otel-collector:latest", + image = "public.ecr.aws/aws-observability/aws-otel-collector:${local.otel_image_tag}", cpu = local.otel_cpu, memory = local.otel_memory, essential = true, From 9d96660430d6062565c94f97740775f2b64f567b Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 9 Oct 2024 09:04:32 -0400 Subject: [PATCH 2/8] chore: fix some build/lint errors --- Cargo.lock | 16 ++++++++++++---- src/config/local.rs | 1 + src/model/helpers.rs | 3 +-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32960135..37e7022e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3180,6 +3180,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -5214,12 +5220,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5234,10 +5241,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/src/config/local.rs b/src/config/local.rs index 2dce58de..f64f713c 100644 --- a/src/config/local.rs +++ b/src/config/local.rs @@ -26,6 +26,7 @@ pub struct LocalConfiguration { #[serde(default = "default_postgres_max_connections")] pub postgres_max_connections: u32, #[serde(default = "default_redis_url")] + #[allow(unused)] // TODO remove pub redis_url: String, #[serde(default = "default_keypair_seed")] pub keypair_seed: String, diff --git a/src/model/helpers.rs b/src/model/helpers.rs index f2d5d2a0..a7eba613 100644 --- a/src/model/helpers.rs +++ b/src/model/helpers.rs @@ -644,11 +644,10 @@ impl From for SubscriberWithProject { unread_notification_count: val .unread_notification_count .try_into() - .map_err(|e| { + .inspect_err(|e| { // This error shouldn't happen so not bothering with returning Result here // But if it does, this is a bug and apply use defensive programming error!("Error converting unread_notification_count from i64 to u64: {e}"); - e }) .unwrap_or(0), } From 7de3ee409506e74be9e3101373f175745f05cabb Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Wed, 9 Oct 2024 09:22:35 -0400 Subject: [PATCH 3/8] chore: fix lint --- src/registry/storage/redis/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registry/storage/redis/mod.rs b/src/registry/storage/redis/mod.rs index 475a0f15..0e21516f 100644 --- a/src/registry/storage/redis/mod.rs +++ b/src/registry/storage/redis/mod.rs @@ -99,6 +99,7 @@ impl Redis { self.read_pool.clone() } + #[allow(dependency_on_unit_never_type_fallback)] // can't figure out how to fix this right now async fn set_internal( &self, key: &str, From 21d66fd1beea36839f8e4c766d6a0a4840a9c819 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 10 Oct 2024 15:22:01 +0200 Subject: [PATCH 4/8] unpin relay version --- .gitmodules | 1 - rs-relay | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a578df21..af714fa3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,3 @@ [submodule "rs-relay"] path = rs-relay url = git@github.com:WalletConnect/rs-relay.git - branch = chore/test-irn-cluster diff --git a/rs-relay b/rs-relay index 3a377aa8..291c6948 160000 --- a/rs-relay +++ b/rs-relay @@ -1 +1 @@ -Subproject commit 3a377aa866dc066824db8e5a354c7720f7f9913c +Subproject commit 291c69481077b97023aac692c10655a6b4ec492a From ce54b44596269e41fec6e4a4112bf880e1dc6763 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 11 Oct 2024 11:19:55 +0200 Subject: [PATCH 5/8] update relay ref --- rs-relay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rs-relay b/rs-relay index 291c6948..ac69a234 160000 --- a/rs-relay +++ b/rs-relay @@ -1 +1 @@ -Subproject commit 291c69481077b97023aac692c10655a6b4ec492a +Subproject commit ac69a234568e6e50bdef60808b0ff52650df1d31 From 03c2542a123cbc74940bc9992ed65cafe628842f Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 11 Oct 2024 12:04:53 +0200 Subject: [PATCH 6/8] bump workflow version --- .github/workflows/dispatch_deploy.yml | 2 +- .github/workflows/dispatch_publish.yml | 2 +- .github/workflows/event_release.yml | 2 +- .github/workflows/sub-cd.yml | 4 ++-- .github/workflows/sub-ci.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dispatch_deploy.yml b/.github/workflows/dispatch_deploy.yml index 5fa49dab..619b11b8 100644 --- a/.github/workflows/dispatch_deploy.yml +++ b/.github/workflows/dispatch_deploy.yml @@ -49,7 +49,7 @@ jobs: name: Lookup Version if: ${{ inputs.version-type == 'current' }} secrets: inherit - uses: WalletConnect/ci_workflows/.github/workflows/release-get_deployed_version.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/release-get_deployed_version.yml@0.2.15 with: task-name: ${{ vars.IMAGE_NAME }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/dispatch_publish.yml b/.github/workflows/dispatch_publish.yml index 5ae2e35b..15717ed3 100644 --- a/.github/workflows/dispatch_publish.yml +++ b/.github/workflows/dispatch_publish.yml @@ -35,7 +35,7 @@ jobs: release: name: Release - uses: WalletConnect/ci_workflows/.github/workflows/release.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/release.yml@0.2.15 secrets: inherit with: infra-changed: false diff --git a/.github/workflows/event_release.yml b/.github/workflows/event_release.yml index 87dedfed..73235e41 100644 --- a/.github/workflows/event_release.yml +++ b/.github/workflows/event_release.yml @@ -46,7 +46,7 @@ jobs: release: name: Release needs: [ paths_filter ] - uses: WalletConnect/ci_workflows/.github/workflows/release.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/release.yml@0.2.15 secrets: inherit with: infra-changed: ${{ needs.paths_filter.outputs.infra == 'true' }} diff --git a/.github/workflows/sub-cd.yml b/.github/workflows/sub-cd.yml index 5b2a5f35..20e6c1f8 100644 --- a/.github/workflows/sub-cd.yml +++ b/.github/workflows/sub-cd.yml @@ -31,7 +31,7 @@ jobs: cd-staging: name: Staging secrets: inherit - uses: WalletConnect/ci_workflows/.github/workflows/cd.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/cd.yml@0.2.15 with: deploy-infra: ${{ inputs.deploy-infra }} deploy-app: ${{ inputs.deploy-app }} @@ -74,7 +74,7 @@ jobs: needs: [ validate-staging-health, validate-staging-rust ] if: ${{ inputs.deploy-prod }} secrets: inherit - uses: WalletConnect/ci_workflows/.github/workflows/cd.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/cd.yml@0.2.15 with: deploy-infra: ${{ inputs.deploy-infra }} deploy-app: ${{ inputs.deploy-app }} diff --git a/.github/workflows/sub-ci.yml b/.github/workflows/sub-ci.yml index 295a5077..9d999b04 100644 --- a/.github/workflows/sub-ci.yml +++ b/.github/workflows/sub-ci.yml @@ -28,7 +28,7 @@ jobs: ci: name: / secrets: inherit - uses: WalletConnect/ci_workflows/.github/workflows/ci.yml@0.2.9 + uses: WalletConnect/ci_workflows/.github/workflows/ci.yml@0.2.15 with: check-infra: ${{ inputs.check-infra }} check-app: ${{ inputs.check-app }} From a3578902af677b4b57215286cb7328a4c92e8fac Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 11 Oct 2024 12:21:46 +0200 Subject: [PATCH 7/8] change token used --- .github/workflows/sub-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sub-ci.yml b/.github/workflows/sub-ci.yml index 9d999b04..b690ad5b 100644 --- a/.github/workflows/sub-ci.yml +++ b/.github/workflows/sub-ci.yml @@ -71,7 +71,7 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - token: ${{ secrets.RELEASE_PAT }} + token: ${{ secrets.PRIVATE_SUBMODULE_ACCESS_TOKEN }} - name: Install Rust ${{ vars.RUST_VERSION }} uses: WalletConnect/actions-rs/toolchain@2.0.0 From 7d191d99add076aab987f5078fab4a812f9777ba Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 11 Oct 2024 14:59:53 +0200 Subject: [PATCH 8/8] update deps --- terraform/.terraform.lock.hcl | 137 ++++++++++++---------------------- 1 file changed, 49 insertions(+), 88 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 62b20561..cb291400 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,108 +2,69 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/alxrem/jsonnet" { - version = "2.3.1" + version = "2.3.2" constraints = "~> 2.3.0" hashes = [ - "h1:2DaB3C1wktEE/rTisfOWjqVV35Z+0fT8pPoBjrQWrzc=", - "h1:3bG0wbnCVIZCKhNAcnHhPJH1mP+CtdgRCJ42D+6rcLU=", - "h1:OBP4Hi5O56DUwUBY781FieK+pw8WhRBQpFd/Mm+0zzo=", - "h1:XoirPubFMa+inUKW/py8bzNqVkuyn/t3dguWh3Q2CpY=", - "h1:aBQlM1+TYzW1iH7JE13zLvK+Sf1WGseBE+8COmUQSQw=", - "h1:dopUl+wIhQzvxCy1GGhKnIMl/wKxof835j0ODE+O46M=", - "h1:h3o4pc6l9zw5QClss/+rq5W2dsxAlsjf1gUoFGmDlc4=", - "h1:hhgft+XkSDE5ayFLJEGeyQtH8SDnVIh96XcLISmSP9U=", - "h1:j+bfro+Q0BCiGJ8NZC1pN2ow11mJK2BDabr2Qc1AhgY=", - "h1:jVTrl9RWsMiCcSQl1b0+XEMLZZP2YQIKWC0H7j39Bdo=", - "h1:joUwl+nBs8vrZGLJSAeWrjFbmI3ZAZhuR2oZQbhqAgw=", - "h1:nJWe8MlT7oGpKf3j0GL4RJsk02b+8XIjCGtLO58L2Sk=", - "h1:nQ1/kWqHLsRwcsC98VbGBcK1wsvFbed498YUR+C0eB4=", - "h1:ye2grGO3e408CbL/Ku6q+gvkYylmFpPYm/NQo6PzKzA=", - "zh:07479550eb7604605d943cc31fa96b002624be63a1c0c04d3bed350af9ef3543", - "zh:0b8eba2be9a162f0cc78a5911f760dfefdd78b50ecc785710a98e86f933b53a4", - "zh:0e320d005a8730a0c1ed65a3bf3bb4bb8c35d4a19005f43e0442cfa3b62622e5", - "zh:10861809d729f74acb773d71d251160449b1acc728a3710d43ddc2b31b3f09f7", - "zh:24fad4bd096d8386b1dc27e6d4296086fb275c0dc6f25814077eb6cdc8146389", - "zh:2a9bca30f084fa992ef614ebf0ceaf83145890fdef005220541d4c889e935cc0", - "zh:3602b01d339a322d8366f23ff1836ca9438091c6bc3de12a0f7679b9650ceaa6", - "zh:402adf2f5bb2d6724405b22f2a81a6cff3059598fb8dbc93aa1d2a4cf09aa888", - "zh:70768655d9f24aba48ccacdbd1ea4318c0dc1f0077f8f7c4e7edb6f2edb90b6d", - "zh:73d84e10ce8211c18342aebd89eab8f3085ddcb48ec846d7368c80d94b8ebe4e", - "zh:775540195cb6e94b23459dd51e6b9d33c2992040be86d4db227a295ca0b5023a", - "zh:bc350b6529bf07e72479ef3098382e89464a68d956af397414a8ef6c66482048", - "zh:e82ffb1c7aff7bc9cf8f4ff7452207c690a19294844653900b6a3b7e73bf68ea", - "zh:ff9c40d558b7782370bf4147a78600e7a430fbf44a4bdde89c33475336bc9a53", + "h1:382Ls1U6Td9ygPFrjGnsj0J6YKv2V3t3TOgNmeiYSSQ=", + "zh:11d3c329581ac045c59f96cbeec67413c8496e2b65f39133d74c3d5294e01c48", + "zh:2332a9d3910a951917c8783856c010ebfa058973775d8d97811279d50b9c67c0", + "zh:3cf37cf75644b8f30f5400fe9e0ffade1971ae28c4f90398b4efb381763fe45b", + "zh:41df1b211210e5c1f083eeb393b1236a32b29e9a2ef0a52791d25d80d60e9f05", + "zh:5a5256af803b7f6efac1b76494c7fbd9ae6100452e3e537f53fd474b6b14df76", + "zh:5af451895b4e1762825127570f9a361ee76827bb8aef7184ca6c62df566f1c72", + "zh:5d8777bdbfed29a6d6141520036202d08cd29cddabfff8317cb1c61d57b7f80e", + "zh:5f8ce0e10ec885b581f2e63d195aed23ca7729554cfdcd0c4acb77b193e0844d", + "zh:8c2254887190a7ef3119d3592789f2344beeda60f25ebc93fe7a1cc81a576284", + "zh:99af2ed1ae1acfe30ede44730f29e37a309a65050e77cf327a03a647c3fe25d4", + "zh:af7121b7aa529e49c3922007e761eeb3a9edb4cd7d399c5098a6645299f4c24e", + "zh:be338f56766ce7bb2d8830259266a91b105428c3e0aa5b7a1c17143a13e1c74a", + "zh:d17d3da7e8b36c124762478e7444a86a7240d30c14e7ec40d6fa5e0d4f1256b4", + "zh:eb1878738514aaad15894b6833bb66fa64def7471071dc2ade7e1c8c5d6bf59f", ] } provider "registry.terraform.io/grafana/grafana" { - version = "2.19.0" + version = "2.19.4" constraints = "~> 2.0, >= 2.1.0" hashes = [ - "h1:3RlPMmH6+/z/zHunrHuSyVhAjqHf/U1PA25J0pzKzX8=", - "h1:AZ1NffecT+y7dZdeFLKoKEQMvYn/i9o8RkQe6xtembM=", - "h1:BHucSDlemGVvrpPjpZn1wHlFOZgykyK4Tcha0TlitpY=", - "h1:EYSdBVAC4fyFTxqd9pCy2uTiIEYW8jSmQU43Lvddqac=", - "h1:FNNCu7xprJjKIQVBRa8hcegZ1JJzu45Y8DVbdtEBFJE=", - "h1:IAd5WY0wxTEi5Xtt3feJweOPfIe6hO84cgvF5bMXbj4=", - "h1:L9A5My0gdANUlMsjuN15MGtoiHmDgxwbtWMolRYkNQE=", - "h1:Psih0ChIaluHxdP2ccW1oIdCPSKfzL/7inlDKEt0iqY=", - "h1:R0eiu4ef9Rnr5hC1yU0Ibv+/PuHQpTbU5YDlQvEbBwI=", - "h1:Rqn7cIJs9cU+V7Dus2cQwl5HaFhnUAZoZrly3oz9UlM=", - "h1:YRiNgt8nS9cSfIDARp/6MYpQcL1NyIIj3aC9u5H1NxY=", - "h1:rgXooJIdkoQqpeoR6KHAMHzkEjQCnmlfEH0QAvaWe20=", - "h1:tBs3VQeCiW2r1UiDC+MPwo7hkC0X0vfpH4u7K4/7ob4=", - "h1:u/MFaBh3uTW1hE5eBL0kf9JdC4CZNljhMm7EQTewi2I=", - "zh:0f85e0602ccf119a203f47ee18524a8172457e82b8cbffca7b6b4d7f474639ad", - "zh:1a626e0d04dedd48cb5b0bdf8a68f428fdf0f7080128928dfaa293a4db78b9b3", - "zh:2a4de32569e070de38faa3d3224ab7fe0a837809d70d75dedc8f1f1f8d9dc227", - "zh:3c3b77436da2fc8ff428ee7dae44d0bc820ebf835c951de4ed1052b68431081f", - "zh:404de4f0e0bb7fe9b6f95187a69e4d9a9e6ba452bba7a62c62c15f154136c2b2", - "zh:6a247dea12ade810c5f74528bac5ffeb7a4c9d54089e1a42134e34b193fddc32", - "zh:90d795e190f1374bde468e90014dcd818e65f66b21cd518487f84cec7bc842c9", - "zh:9e2e846bb354fe8b041913e55211f95bb9d8246ec426e7c589c87f1b4e0573c5", - "zh:a43e2f0cc5fb76dbf508b3f66061d67b469bd248a557f05d3c7f43b7a45041c0", - "zh:b90e3120face56f753933ecabd5b80131679c444b72ab53d0e40263be684eab6", - "zh:bdb35128710a6f45c8e473b9c0171f6cb7ae5cf572ca72561d0543a4dca3e609", - "zh:c786b6e95597c677f6d6e5e994376889b17635df512fe2798902b0ee3fd63367", - "zh:cb3d7f28a1eb696607b3d799a6b6b2ac5914240e61b578c7b45e42eb76979481", - "zh:f106de3485bcd1af0dbf45ffd475ec60c452cb39df51e2e550eb4ab4cf1e0f73", + "h1:8uJyS87ss5J2pF0cxSqfRrSLnLP3f41PCOemk01Tmb8=", + "zh:10e1db6012433e84592cee299e7014deda1d9772f86f0f6f635e9d46543ebf25", + "zh:2ef424112ff8b6fbd6ea918b3d1498af6bcbd5407b8adc862ad892b1ff3f7047", + "zh:34697e3abbef0b01b883792983bcf0f9e55c131ce3afa167f76b8712384fbc50", + "zh:4961c3de106e3b78cfb5cfc01946d17e062de274cacd60365f020a92c86a98f9", + "zh:4eca84134b1ce5deb018246a87635677afce64689a72fef9a10b37b4d09cf47f", + "zh:84568baf9deaa220c02e4b1b6797f1cb09547340baa07a0c1dbc53725275fd6e", + "zh:956baf9dc58d4e6bdcc1148fc30b1a7ce0cf251e01d8c4e1c0249226be550d94", + "zh:ad185a8c63c99f0408f4e6f3174c2854817143c59fd15f91771048e4ad91f6e5", + "zh:c5a92a4089f21278cc214051895ad51b62e8420df1c310ade752f79c1379167d", + "zh:da8b458d27434d775f482751a11a167a39fe9ba6c293e085116201def3d68437", + "zh:de2d4f5c12799ee65f478ca7a8f90d48e0944b19b7918da841e167f175627278", + "zh:e1cb92c84cbe42a8f2a54c2af70da4d85a131c7e5d82ac389451d2619f492a58", + "zh:e836db1d0d1fa1c9618c3c0fec254c954d36cd0d9d11d39e74b3cdfdfaed053c", + "zh:f0c7ae3fbcd2651348f1d8ec455f61eae59fd8a06cf97778b53c7b91bd0b981b", ] } provider "registry.terraform.io/hashicorp/aws" { - version = "5.48.0" - constraints = ">= 4.9.0, >= 4.50.0, >= 4.67.0, >= 5.0.0, >= 5.7.0, ~> 5.7, >= 5.30.0" + version = "5.71.0" + constraints = ">= 4.50.0, >= 5.7.0, ~> 5.7, >= 5.30.0, >= 5.42.0, >= 5.46.0, >= 5.70.0" hashes = [ - "h1:+JXJA9o1r4i9XKQW9T+VldstdAHOngaFxpH5gOSwig0=", - "h1:/iVSXwQQ1wwzCv0YWToDtBovXX69JYYU5ihcNgQqmmc=", - "h1:5ARkW1jRFkiUs5uluggvF8vm9t3VVVU6tbS1NrNLv5o=", - "h1:8K42AueeXUezJjaMUjY752g48wudNXh6H09Eu6XBuRE=", - "h1:EZR1Shsb6kr4hrAXjvr5br8neWNuJFNvN0XFxAxTmKI=", - "h1:IiJ4muAyJ0GEiCYlW5dJDjG0VFlOvQ8eunjj7o9BqIU=", - "h1:PPyDA1s1IY1nCnJBy81mQZtWKSVv74wIq3lkNDMfvIc=", - "h1:SaoGoyfivuc25ajqFLlRTMFnJss7i4WoRlI21wHGeS0=", - "h1:WjAI+1dpL+pBgfVNJckY4yJvsHPquPb5v67bwCmQsEU=", - "h1:ZCus5udkkFdYzAqqPpFp1oHkzsnlDUNXRiyt/2HEcBY=", - "h1:oYwnrdqLKAPL6R3QFuPpI/6HsI29x1fBvs6zjewtTOU=", - "h1:rMyeKizkPgNuYQ1UQpWGDvGdJQs5vDPDlYtS4jVxxcI=", - "h1:sdlIu2yp0/x9nyEgJcKOYDE95hMd6SFvcO8aWzJFAqE=", - "h1:t4xjxXM4DJtUQDCipFyBcjNgFjDZrHIdduXYGl4qU4E=", - "zh:0876d94be46be905d1f6c149461979cd6e9bec80d5ffad43fd6267fe7c3a924d", - "zh:3a853f887e6f61c2ba383c46e71bcec97ecd31d25a78dab08958f43bbbaecb86", - "zh:43235595e26dd131f00704b5b64a65c4e7c4984a559b30d4272170e1b78e99b7", - "zh:6866f7535ec2ef8fe6ed16eecee2e31418a2bd86cec73e1d18e47bd3bb87f68e", - "zh:756a4ed97f30ea6e8871c16446b24ce55601143a715e067b7f9ebdae8349da34", - "zh:793e8414962934be9805186874f207ca1dc8d162b6665e4938893ad827a545c6", - "zh:79b2f886507f21ff1b752ff140ed95ed551f389abf0c8177c7b5f5bbbd95da8e", - "zh:8653b1bc6f7e62404e02f940d962d0c2ba0c4dd4c28bd595945454cf348c2697", + "h1:BcCr9NRT+2XajrgkTB9n0/K5Bw8hS69lQWO1B+iUkec=", + "zh:2c8cb5884d378e282ba48b7472f2fb29465db77a5b72115f178ec39e10ac938e", + "zh:3a30d58c72b0697c47e8311ffffa1bb90f21881f0624098518f57f3f5149e079", + "zh:5640741d22ed75b06f14fe98d834e781691adf45426444261ba401d8c184193f", + "zh:60303f97d576d3b566c5fdf76a8c43d05a34f55202fde48fc41d870dba933e25", + "zh:7e6359a3a2d38290fd411a287c4df5c61bcc700449710d2105d70acaa8785006", + "zh:821d73747c4be7e4a0ae95c580bf3340fce9d1391a119dfe338799f3fc949978", + "zh:8dada4f8b1dfd8672b22c5b19374dc43ecdf25daf587c05da17aaf8d046443ab", + "zh:90eb7dec23f3fc8438e2233ced70b849c3ee12c89b06fe4bbd24093aa35d0228", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9bd612f013c075685c129e5d0ec9243572cd51359599b7218459babe0e9b6ac7", - "zh:aabafe758ee8392f56d2c894017203de4dae38c1e3e0d274c54e194b9b8fccff", - "zh:aded7d6034115ca512b79ca17da65ebb8906e3b8def78dcbc0640142b0c05ca0", - "zh:ce383ee19b37666aba60db6b01cbe7a1fcbb40c6dd54d0cb36b2ba114ee5ae62", - "zh:ceaf1b998b9ced4b63f35da386358e4c7ad6def582438987c91bceffefb9e258", - "zh:d79225a9ae6a7391c33aa2d794bf9b167db66398c4f054f94d557615b051a40d", + "zh:9fddd257191bd2a14b9ef569539c437e6a8a2bf6e09b0fbe561d10106335e69f", + "zh:c164d3ed13eb4c28ac243221591fc4ac3cfe621f8cd20af533dedd98a6387363", + "zh:cb74525c31b64e6bc17a3caa3a3fe3650e06bed988354b9fc11aa9ed4f7b486b", + "zh:e7a1a622c815043dededcc743bdcbb296704a47f1fccf7f33cd99e9e54983d4d", + "zh:ec3a755c3d9b23543cc892d88c49062e762207013b78405bb16c21b7a002a1dd", + "zh:f176dd57bd097a85164974bc7f9816a2ba7cd323a2c30a44855a5db10bfe6b0b", ] }