feat: off-chain quoting (#1)

* feat: off-chain quoting

* rm: wsteth

Author: evan-gray

src/axelar/AxelarTransceiver.sol

@@ -2,6 +2,7 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import "wormhole-solidity-sdk/Utils.sol";
+import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
 
 import {TransceiverStructs} from
     "@wormhole-foundation/native_token_transfer/libraries/TransceiverStructs.sol";
@@ -21,9 +22,11 @@ import {ITransceiver} from "@wormhole-foundation/native_token_transfer/interface
 import {IAxelarTransceiver} from "./interfaces/IAxelarTransceiver.sol";
 
 contract AxelarTransceiver is IAxelarTransceiver, AxelarGMPExecutable, Transceiver {
+    using BytesParsing for bytes;
+
     IAxelarGasService public immutable gasService;
 
-    string public constant AXELAR_TRANSCEIVER_VERSION = "1.1.0";
+    string public constant AXELAR_TRANSCEIVER_VERSION = "2.0.0";
 
     // These mappings are used to convert chainId and chainName between Wormhole and Axelar formats.
     struct AxelarTransceiverStorage {
@@ -37,9 +40,6 @@ contract AxelarTransceiver is IAxelarTransceiver, AxelarGMPExecutable, Transceiv
     bytes32 internal constant AXELAR_TRANSCEIVER_STORAGE_SLOT =
         0x6d72a7741b755e11bdb1cef6ed3f290bbe196e69da228a3ae322e5bc37ea7600;
 
-    // TODO: update this based on tests
-    uint256 internal constant DESTINATION_EXECUTION_GAS_LIMIT = 200000;
-
     constructor(
         address _gateway,
         address _gasService,
@@ -97,25 +97,35 @@ contract AxelarTransceiver is IAxelarTransceiver, AxelarGMPExecutable, Transceiv
         emit AxelarChainIdSet(chainId, chainName, transceiverAddress);
     }
 
+    /// @inheritdoc IAxelarTransceiver
+    function parseAxelarTransceiverInstruction(
+        bytes memory encoded
+    ) public pure returns (AxelarTransceiverInstruction memory instruction) {
+        uint256 offset = 0;
+        (instruction.estimatedMsgValue, offset) = encoded.asUint256Unchecked(offset);
+        encoded.checkLength(offset);
+    }
+
+    /// @inheritdoc IAxelarTransceiver
+    function encodeAxelarTransceiverInstruction(
+        AxelarTransceiverInstruction memory instruction
+    ) public pure returns (bytes memory) {
+        return abi.encodePacked(instruction.estimatedMsgValue);
+    }
+
     /// @notice Fetch the delivery price for a given recipient chain transfer.
-    /// @param recipientChainId The Wormhole chain ID of the target chain.
-    /// param instruction An additional Instruction provided by the Transceiver to be
+    /// param recipientChainId The Wormhole chain ID of the target chain.
+    /// @param instruction An additional Instruction provided by the Transceiver to be
     ///        executed on the recipient chain.
     /// @return deliveryPrice The cost of delivering a message to the recipient chain,
     ///         in this chain's native token.
     function _quoteDeliveryPrice(
-        uint16 recipientChainId,
-        TransceiverStructs.TransceiverInstruction memory /*instruction*/
+        uint16, /*recipientChainId*/
+        TransceiverStructs.TransceiverInstruction memory instruction
     ) internal view virtual override returns (uint256) {
-        // Use the gas estimation from gas service
-        AxelarTransceiverStorage storage slot = _storage();
-        return gasService.estimateGasFee(
-            slot.idToAxelarChainId[recipientChainId],
-            slot.idToTransceiverAddress[recipientChainId],
-            bytes(""),
-            DESTINATION_EXECUTION_GAS_LIMIT,
-            bytes("")
-        );
+        AxelarTransceiverInstruction memory axIns =
+            parseAxelarTransceiverInstruction(instruction.payload);
+        return axIns.estimatedMsgValue;
     }
 
     /// @dev Send a message to another chain.

src/axelar/interfaces/IAxelarTransceiver.sol

@@ -4,6 +4,12 @@ pragma solidity >=0.8.0 <0.9.0;
 import {ITransceiver} from "@wormhole-foundation/native_token_transfer/interfaces/ITransceiver.sol";
 
 interface IAxelarTransceiver is ITransceiver {
+    /// @notice The instruction for the WormholeTransceiver contract
+    ///         to skip delivery via the relayer.
+    struct AxelarTransceiverInstruction {
+        uint256 estimatedMsgValue;
+    }
+
     /// @notice Chain is not supported.
     /// @param chainId The wormhole chainId.
     /// @param sourceChain The source chain axelar name.
@@ -54,4 +60,19 @@ interface IAxelarTransceiver is ITransceiver {
         string calldata chainName,
         string calldata transceiverAddress
     ) external;
+
+    /// @notice Parses the encoded instruction and returns the instruction struct.
+    ///         This instruction is specific to the AxelarTransceiver contract.
+    /// @param encoded The encoded instruction.
+    /// @return instruction The parsed `AxelarTransceiverInstruction`.
+    function parseAxelarTransceiverInstruction(
+        bytes memory encoded
+    ) external pure returns (AxelarTransceiverInstruction memory instruction);
+
+    /// @notice Encodes the `AxelarTransceiverInstruction` into a byte array.
+    /// @param instruction The `AxelarTransceiverInstruction` to encode.
+    /// @return encoded The encoded instruction.
+    function encodeAxelarTransceiverInstruction(
+        AxelarTransceiverInstruction memory instruction
+    ) external pure returns (bytes memory);
 }

src/token/WstEthL2Token.sol

@@ -9,9 +9,9 @@ import {TransceiverStructs} from
 import {NttManager} from "@wormhole-foundation/native_token_transfer/NttManager/NttManager.sol";
 import {INttManager} from "@wormhole-foundation/native_token_transfer/interfaces/INttManager.sol";
 import {IManagerBase} from "@wormhole-foundation/native_token_transfer/interfaces/IManagerBase.sol";
+import {DummyTokenMintAndBurn} from
+    "@wormhole-foundation/native_token_transfer/mocks/DummyToken.sol";
 import {ERC1967Proxy} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {WstEthL2Token} from "src/token/WstEthL2Token.sol";
-import {WstEthL2TokenHarness} from "test/token/WstEthL2TokenHarness.sol";
 import {Upgrades} from "script/lib/Upgrades.sol";
 
 import "forge-std/console.sol";
@@ -41,21 +41,14 @@ contract AxelarTransceiverTest is Test {
     IAxelarGateway gateway;
     IAxelarGasService gasService;
     NttManager manager;
-    WstEthL2TokenHarness token;
+    DummyTokenMintAndBurn token;
 
     function setUp() public {
         gateway = IAxelarGateway(new MockAxelarGateway());
         gasService = IAxelarGasService(address(new MockAxelarGasService()));
 
         // Deploy the token
-        address proxy = Upgrades.deployUUPSProxy(
-            "out/ERC1967Proxy.sol/ERC1967Proxy.json",
-            "WstEthL2TokenHarness.sol",
-            abi.encodeCall(WstEthL2Token.initialize, ("Wrapped Staked Eth", "wstEth", OWNER))
-        );
-        vm.label(proxy, "Proxy");
-
-        token = WstEthL2TokenHarness(proxy);
+        token = new DummyTokenMintAndBurn();
 
         address managerImplementation = address(
             new NttManager(
@@ -232,8 +225,6 @@ contract AxelarTransceiverTest is Test {
         vm.prank(OWNER);
         transceiver.setAxelarChainId(chainId, chainName, axelarAddress);
         vm.prank(OWNER);
-        token.setMinter(OWNER);
-        vm.prank(OWNER);
         token.mint(address(manager), amount);
         gateway.approveContractCall(messageId, chainName, axelarAddress, keccak256(payload));
 

test/axelar/AxelarTransceiver.t.sol

@@ -9,8 +9,10 @@ import {TransceiverStructs} from
 import {NttManager} from "@wormhole-foundation/native_token_transfer/NttManager/NttManager.sol";
 import {INttManager} from "@wormhole-foundation/native_token_transfer/interfaces/INttManager.sol";
 import {IManagerBase} from "@wormhole-foundation/native_token_transfer/interfaces/IManagerBase.sol";
+
+import {DummyTokenMintAndBurn} from
+    "@wormhole-foundation/native_token_transfer/mocks/DummyToken.sol";
 import {ERC1967Proxy} from "openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {WstEthL2Token} from "src/token/WstEthL2Token.sol";
 
 import "forge-std/console.sol";
 import "forge-std/Test.sol";
@@ -28,32 +30,20 @@ contract AxelarTransceiverEndToEnd is Test {
     IAxelarGateway gateway;
     IAxelarGasService gasService;
     NttManager sourceNttmanager;
-    WstEthL2Token sourceToken;
+    DummyTokenMintAndBurn sourceToken;
     uint16 sourceChainId;
 
     AxelarTransceiver recipientTransceiver;
     NttManager recipientNttManager;
-    WstEthL2Token recipientToken;
+    DummyTokenMintAndBurn recipientToken;
     uint16 recipientChainId;
 
     function setUp() public {
         gateway = IAxelarGateway(new MockAxelarGateway());
         gasService = IAxelarGasService(address(new MockAxelarGasService()));
         // Setup Source Infrastructure
         sourceChainId = 1;
-        address tokenImplementaion = address(new WstEthL2Token());
-        sourceToken = WstEthL2Token(
-            address(
-                new ERC1967Proxy(
-                    tokenImplementaion,
-                    abi.encodeWithSelector(
-                        WstEthL2Token.initialize.selector, "Source Token", "ST", OWNER
-                    )
-                )
-            )
-        );
-        vm.prank(OWNER);
-        sourceToken.setMinter(OWNER);
+        sourceToken = new DummyTokenMintAndBurn();
         address sourceManagerImplementation = address(
             new NttManager(
                 address(sourceToken),
@@ -77,18 +67,7 @@ contract AxelarTransceiverEndToEnd is Test {
 
         // Setup Recipient Infrastructure
         recipientChainId = 2;
-        recipientToken = WstEthL2Token(
-            address(
-                new ERC1967Proxy(
-                    tokenImplementaion,
-                    abi.encodeWithSelector(
-                        WstEthL2Token.initialize.selector, "Source Token", "ST", OWNER
-                    )
-                )
-            )
-        );
-        vm.prank(OWNER);
-        recipientToken.setMinter(OWNER);
+        recipientToken = new DummyTokenMintAndBurn();
         address recipientManagerImplementation = address(
             new NttManager(
                 address(recipientToken),