tilt: e2e with mm and executor

Author: evan-gray

Tiltfile

@@ -14,20 +14,20 @@ docker_build(
     ignore=["./sdk/__tests__", "./sdk/Dockerfile", "./sdk/ci.yaml", "./sdk/**/dist", "./sdk/node_modules", "./sdk/**/node_modules"],
     dockerfile = "./solana/Dockerfile",
 )
-docker_build(
-    ref = "solana-test-validator",
-    context = "solana",
-    dockerfile = "solana/Dockerfile.test-validator"
-)
-k8s_yaml_with_ns("./solana/solana-devnet.yaml")
-k8s_resource(
-    "solana-devnet",
-    labels = ["anchor-ntt"],
-    port_forwards = [
-        port_forward(8899, name = "Solana RPC [:8899]"),
-        port_forward(8900, name = "Solana WS [:8900]"),
-    ],
-)
+# docker_build(
+#     ref = "solana-test-validator",
+#     context = "solana",
+#     dockerfile = "solana/Dockerfile.test-validator"
+# )
+# k8s_yaml_with_ns("./solana/solana-devnet.yaml")
+# k8s_resource(
+#     "solana-devnet",
+#     labels = ["anchor-ntt"],
+#     port_forwards = [
+#         port_forward(8899, name = "Solana RPC [:8899]"),
+#         port_forward(8900, name = "Solana WS [:8900]"),
+#     ],
+# )
 
 # EVM build
 docker_build(
@@ -36,6 +36,35 @@ docker_build(
     dockerfile = "./evm/Dockerfile",
 )
 
+# MM and Executor Contract Deploy / Setup
+docker_build(
+    ref = "executor-deploy",
+    context = "tilt",
+    dockerfile = "tilt/Dockerfile.deploy",
+    only = ["deploy.sh"]
+)
+docker_build(
+    ref = "executor",
+    context = "tilt",
+    dockerfile = "tilt/Dockerfile.executor",
+    only = [],
+)
+k8s_yaml_with_ns("tilt/executor-deploy.yaml") 
+k8s_resource(
+    "executor-deploy",
+    labels = ["executor"],
+    resource_deps = ["eth-devnet", "eth-devnet2"],
+)
+k8s_yaml_with_ns("tilt/executor.yaml") 
+k8s_resource(
+    "executor",
+    labels = ["executor"],
+    resource_deps = ["eth-devnet", "eth-devnet2", "guardian", "executor-deploy"],
+    port_forwards = [
+        port_forward(3000, name = "Executor [:3000]"),
+    ],
+)
+
 # CI tests
 docker_build(
     ref = "ntt-ci",
@@ -47,5 +76,5 @@ k8s_yaml_with_ns("./sdk/ci.yaml")
 k8s_resource(
     "ntt-ci-tests",
     labels = ["ntt"],
-    resource_deps = ["eth-devnet", "eth-devnet2", "solana-devnet", "guardian", "relayer-engine", "wormchain"],
+    resource_deps = ["eth-devnet", "eth-devnet2", "solana-devnet", "guardian", "relayer-engine", "wormchain", "executor"],
 )

evm/lib/example-messaging-executor

@@ -42,7 +42,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
     using TrimmedAmountLib for uint256;
     using TrimmedAmountLib for TrimmedAmount;
 
-    string public constant NTT_MANAGER_VERSION = "1.1.0";
+    string public constant NTT_MANAGER_VERSION = "2.0.0";
 
     // =============== Setup =================================================================
 
@@ -597,7 +597,8 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         checkFork(evmChainId);
 
         // Compute the quote price and refund user excess value from msg.value
-        uint256 epTotalPriceQuote = quoteAndRefund(recipientChain, transceiverInstructions);
+        (uint256 epTotalPriceQuote, uint256 excessValue) =
+            quoteEndpoint(recipientChain, transceiverInstructions);
 
         return _transfer(
             _TransferArgs({
@@ -610,7 +611,8 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
                 executorQuote: executorQuote,
                 relayInstructions: relayInstructions,
                 transceiverInstructions: transceiverInstructions,
-                epTotalPriceQuote: epTotalPriceQuote
+                epTotalPriceQuote: epTotalPriceQuote,
+                excessValue: excessValue
             })
         );
     }
@@ -627,6 +629,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         bytes relayInstructions;
         bytes transceiverInstructions;
         uint256 epTotalPriceQuote;
+        uint256 excessValue;
     }
 
     function _transfer(
@@ -667,7 +670,7 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
             relayInstructions = abi.encodePacked(relayInstructions, args.relayInstructions);
         }
 
-        executor.requestExecution(
+        executor.requestExecution{value: args.excessValue}(
             args.recipientChain,
             peerData.peerAddress,
             UniversalAddressLibrary.fromBytes32(args.refundAddress).toAddress(),
@@ -682,15 +685,12 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
         return args.sequence;
     }
 
-    function quoteAndRefund(
+    function quoteEndpoint(
         uint16 recipientChain,
         bytes memory transceiverInstructions
-    ) internal returns (uint256 epTotalPriceQuote) {
+    ) internal returns (uint256 epTotalPriceQuote, uint256 excessValue) {
         epTotalPriceQuote = quoteDeliveryPrice(recipientChain, transceiverInstructions);
-        uint256 excessValue = msg.value - epTotalPriceQuote;
-        if (excessValue > 0) {
-            _refundToSender(excessValue);
-        }
+        excessValue = msg.value - epTotalPriceQuote;
     }
 
     function buildEncodedPayload(

evm/src/NttManager/NttManager.sol

@@ -37,7 +37,7 @@
     "build": "npm run build:esm && npm run build:cjs",
     "rebuild": "npm run clean && npm run build",
     "clean": "rm -rf ./dist",
-    "generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../out/**/*.json'",
+    "generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../out/?(WormholeTransceiver.sol|NttManager.sol)/*.json'",
     "generate:slim": "ABI_VERSION=`tsx scripts/readVersion.ts` && typechain --node16-modules --target ethers-v6 --out-dir src/ethers-contracts/$ABI_VERSION '../out/?(WormholeTransceiver.sol|NttManager.sol)/*.json'",
     "generate": "npm run generate:slim",
     "build:contracts": "cd ../.. && make build-evm-prod",

evm/ts/package.json

@@ -1,16 +1,12 @@
 import { Provider } from "ethers";
 
-import { _0_1_0, _1_0_0, _1_1_0 } from "./ethers-contracts/index.js";
+import { _0_1_0, _1_0_0, _1_1_0, _2_0_0 } from "./ethers-contracts/index.js";
 import { Ntt } from "@wormhole-foundation/sdk-definitions-ntt";
 
 // This is a descending list of all ABI versions the SDK is aware of.
 // We check for the first match in descending order, allowing for higher minor and patch versions
 // being used by the live contract (these are supposed to still be compatible with older ABIs).
-export const abiVersions = [
-  ["1.1.0", _1_1_0],
-  ["1.0.0", _1_0_0],
-  ["0.1.0", _0_1_0],
-] as const;
+export const abiVersions = [["2.0.0", _2_0_0]] as const;
 export type AbiVersion = (typeof abiVersions)[number][0];
 
 export interface NttBindings {
@@ -32,7 +28,7 @@ export interface NttTransceiverBindings {
 }
 
 export namespace NttManagerBindings {
-  export type NttManager = ReturnType<typeof _0_1_0.NttManager.connect>;
+  export type NttManager = ReturnType<typeof _2_0_0.NttManager.connect>;
 }
 
 export interface NttManagerBindings {