From 06d522dd92d4d54aecbb7dce96cf840aacd2aa86 Mon Sep 17 00:00:00 2001
From: Trevor Porter <trkporter@ucdavis.edu>
Date: Wed, 15 Mar 2023 18:52:47 +0000
Subject: [PATCH] Testnet3 gas amount enforcement (#1941)

### Description

Deploys testnet3 to fully enforce gas amounts

Note this doesn't enforce for arbitrumgoerli yet -- when testing things
it seemed there was some flakiness in gas amount enforcement for
arbitrum that I allude to in
https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/1940. Working
on a more robust fix here

### Drive-by changes

none

### Related issues

related #1610 - mainnet & arbitrum chains will come soon

### Backward compatibility

_Are these changes backward compatible?_

Yes

_Are there any infrastructure implications, e.g. changes that would
prohibit deploying older commits using this infra tooling?_

None


### Testing

_What kind of testing have these changes undergone?_

Deployed!
---
 .../config/environments/testnet3/agent.ts     | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/typescript/infra/config/environments/testnet3/agent.ts b/typescript/infra/config/environments/testnet3/agent.ts
index 72565fb54..088357c5b 100644
--- a/typescript/infra/config/environments/testnet3/agent.ts
+++ b/typescript/infra/config/environments/testnet3/agent.ts
@@ -29,7 +29,7 @@ export const hyperlane: AgentConfig = {
   context: Contexts.Hyperlane,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',
-    tag: '0b10247-20230313-205739',
+    tag: '19d9450-20230315-153147',
   },
   aws: {
     region: 'us-east-1',
@@ -53,9 +53,22 @@ export const hyperlane: AgentConfig = {
           // https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/1605
           matchingList: interchainQueriesMatchingList,
         },
+        // Don't enforce amounts for messages to arbitrumgoerli yet
         {
           type: GasPaymentEnforcementPolicyType.Minimum,
           payment: '1',
+          matchingList: [
+            {
+              originDomain: '*',
+              destinationDomain: chainMetadata.arbitrumgoerli.domainId,
+              senderAddress: '*',
+              recipientAddress: '*',
+            },
+          ],
+        },
+        // Default policy is OnChainFeeQuoting
+        {
+          type: GasPaymentEnforcementPolicyType.OnChainFeeQuoting,
         },
       ],
     },
@@ -69,7 +82,7 @@ export const releaseCandidate: AgentConfig = {
   context: Contexts.ReleaseCandidate,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',
-    tag: '1cbe5fd-20230309-202035',
+    tag: '19d9450-20230315-153147',
   },
   aws: {
     region: 'us-east-1',
@@ -88,6 +101,20 @@ export const releaseCandidate: AgentConfig = {
           type: GasPaymentEnforcementPolicyType.None,
           matchingList: interchainQueriesMatchingList,
         },
+        // Don't enforce amounts for messages to arbitrumgoerli yet
+        {
+          type: GasPaymentEnforcementPolicyType.Minimum,
+          payment: '1',
+          matchingList: [
+            {
+              originDomain: '*',
+              destinationDomain: chainMetadata.arbitrumgoerli.domainId,
+              senderAddress: '*',
+              recipientAddress: '*',
+            },
+          ],
+        },
+        // Default policy is OnChainFeeQuoting
         {
           type: GasPaymentEnforcementPolicyType.OnChainFeeQuoting,
         },