chore(protocol-contracts): do not enforce executor gas option for governance sender (#1307)

Author: jatZama

protocol-contracts/governance/layerzero.config.testnet.ts

@@ -1,7 +1,5 @@
 import { EndpointId } from '@layerzerolabs/lz-definitions'
-import { ExecutorOptionType } from '@layerzerolabs/lz-v2-utilities'
 import { TwoWayConfig, generateConnectionsConfig } from '@layerzerolabs/metadata-tools'
-import { OAppEnforcedOption } from '@layerzerolabs/toolbox-hardhat'
 
 import type { OmniPointHardhat } from '@layerzerolabs/toolbox-hardhat'
 
@@ -15,20 +13,11 @@ const zamaTestnetContract: OmniPointHardhat = {
     contractName: 'GovernanceOAppReceiver',
 }
 
-// To connect all the above chains to each other, we need the following pathways:
-// ZamaGatewayTestnet <-> Sepolia
+// To connect the above chains to each other, we need the following pathway:
+// Sepolia -> ZamaGatewayTestnet
 
-// For this example's simplicity, we will use the same enforced options values for sending to all chains
-// For production, you should ensure `gas` is set to the correct value through profiling the gas usage of calling GovernanceOAppReceiver._lzReceive(...) on the destination chain
+// We don't use enforce executor gas options here, so we should ensure `options` is set to the correct value through profiling the gas usage of calling GovernanceOAppReceiver._lzReceive(...) on the destination chain.
 // To learn more, read https://docs.layerzero.network/v2/concepts/applications/oapp-standard#execution-options-and-enforced-settings
-const EVM_ENFORCED_OPTIONS: OAppEnforcedOption[] = [
-    {
-        msgType: 1,
-        optionType: ExecutorOptionType.LZ_RECEIVE,
-        gas: 80000,
-        value: 0,
-    },
-]
 
 // With the config generator, pathways declared are automatically bidirectional
 // i.e. if you declare A,B there's no need to declare B,A
@@ -38,16 +27,25 @@ const pathways: TwoWayConfig[] = [
         zamaTestnetContract, // Chain B contract
         // TODO: Add custom ZAMA DVN in next line?
         [['LayerZero Labs'], []], // [ requiredDVN[], [ optionalDVN[], threshold ] ]
-        [15, undefined], // [A to B confirmations, B to A confirmations] // NOTE: undefined is used here because we want an uniderectional pathway
-        [EVM_ENFORCED_OPTIONS, undefined], // Chain B enforcedOptions, Chain A enforcedOptions  // NOTE: undefined is used here because we want an uniderectional pathway
+        [15, undefined], // [A to B confirmations, B to A confirmations] // NOTE: `undefined` is used here because we want an uniderectional pathway
+        [undefined, undefined], // NOTE: first `undefined` is because we do not enforce gas, since proposals are arbitrary calls. Instead, we will use a gas profiler to calculate the gas needed for proposal execution and adds a relative buffer on top. Second `undefined` is used here because we want an uniderectional pathway.
     ],
 ]
 
 export default async function () {
     // Generate the connections config based on the pathways
     const connections = await generateConnectionsConfig(pathways)
     return {
-        contracts: [{ contract: zamaTestnetContract, config: { owner: process.env.SAFE_PROXY_ADDRESS, delegate: process.env.SAFE_PROXY_ADDRESS } }, { contract: sepoliaContract, config: { owner: process.env.DAO_ADDRESS, delegate : process.env.DAO_ADDRESS }  }],
+        contracts: [
+            {
+                contract: zamaTestnetContract,
+                config: { owner: process.env.SAFE_PROXY_ADDRESS, delegate: process.env.SAFE_PROXY_ADDRESS },
+            },
+            {
+                contract: sepoliaContract,
+                config: { owner: process.env.DAO_ADDRESS, delegate: process.env.DAO_ADDRESS },
+            },
+        ],
         connections,
     }
 }