solana: add matching engine and token router

.github/workflows/solana-integration.yml

@@ -0,0 +1,43 @@
+name: Solana Integration Checks
+on:
+    push:
+        branches:
+            - solana/integration
+    pull_request: null
+
+env:
+    RUSTC_VERSION: 1.76.0
+jobs:
+    cancel-previous-runs:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Cancel Previous Runs
+              uses: styfle/cancel-workflow-action@0.9.1
+              with:
+                access_token: ${{ github.token }}
+    make-lint:
+        name: make lint
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Install toolchain
+              uses: dtolnay/rust-toolchain@master
+              with:
+                toolchain: ${{ env.RUSTC_VERSION }}
+                components: clippy, rustfmt
+            - name: make lint
+              run: make lint
+              working-directory: ./solana
+    make-test:
+        name: make test
+        runs-on: ubuntu-latest
+        # Anchor Docker image: https://www.anchor-lang.com/docs/verifiable-builds#images
+        container: backpackapp/build:v0.29.0
+        steps:
+            - uses: actions/checkout@v4
+            - name: Set default Rust toolchain
+              run: rustup default stable
+              working-directory: ./solana
+            - name: make test
+              run: make test
+              working-directory: ./solana

evm/env/localnet/arbitrum.env

@@ -42,7 +42,8 @@ export RELEASE_TOKEN_ROUTER_ADDRESS=0xB9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
 ###############################  Matching Engine ###############################
 
 
-### Matching Engine Proxy (evm address)
+### Matching Engine Proxy (universal evm address)
 export RELEASE_MATCHING_ENGINE_CHAIN=6
-export RELEASE_MATCHING_ENGINE_ADDRESS=0xB9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_ADDRESS=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_MINT_RECIPIENT=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
 export RELEASE_MATCHING_ENGINE_DOMAIN=1

evm/env/localnet/avalanche.env

@@ -49,9 +49,10 @@ export RELEASE_TOKEN_ROUTER_ADDRESS=0x438fDf069b811b871280AECd130D58ab6EC5c0Bc
 ###############################  Matching Engine ###############################
 
 
-### Matching Engine Proxy (evm address)
+### Matching Engine Proxy (universal evm address)
 export RELEASE_MATCHING_ENGINE_CHAIN=6
-export RELEASE_MATCHING_ENGINE_ADDRESS=0xB9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_ADDRESS=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_MINT_RECIPIENT=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
 export RELEASE_MATCHING_ENGINE_DOMAIN=1
 
 

evm/env/localnet/ethereum.env

@@ -42,7 +42,8 @@ export RELEASE_TOKEN_ROUTER_ADDRESS=0xd98bfe6915cE92D4915149941246d36504125501
 ###############################  Matching Engine ###############################
 
 
-### Matching Engine Proxy (evm address)
+### Matching Engine Proxy (universal evm address)
 export RELEASE_MATCHING_ENGINE_CHAIN=6
-export RELEASE_MATCHING_ENGINE_ADDRESS=0xB9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_ADDRESS=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
+export RELEASE_MATCHING_ENGINE_MINT_RECIPIENT=0x000000000000000000000000B9c90045934D8AdBc665BC5D77c5F8C112F2a2ca
 export RELEASE_MATCHING_ENGINE_DOMAIN=1

evm/forge/scripts/DeployTokenRouterContracts.s.sol

@@ -25,7 +25,9 @@ contract DeployTokenRouterContracts is CheckWormholeContracts, Script {
     address immutable _wormhole = vm.envAddress("RELEASE_WORMHOLE_ADDRESS");
     address immutable _cctpTokenMessenger = vm.envAddress("RELEASE_TOKEN_MESSENGER_ADDRESS");
     address immutable _ownerAssistantAddress = vm.envAddress("RELEASE_OWNER_ASSISTANT_ADDRESS");
-    address immutable _matchingEngineAddress = vm.envAddress("RELEASE_MATCHING_ENGINE_ADDRESS");
+    bytes32 immutable _matchingEngineAddress = vm.envBytes32("RELEASE_MATCHING_ENGINE_ADDRESS");
+    bytes32 immutable _matchingEngineMintRecipient =
+        vm.envBytes32("RELEASE_MATCHING_ENGINE_MINT_RECIPIENT");
     uint16 immutable _matchingEngineChain = uint16(vm.envUint("RELEASE_MATCHING_ENGINE_CHAIN"));
     uint32 immutable _matchingEngineDomain = uint32(vm.envUint("RELEASE_MATCHING_ENGINE_DOMAIN"));
 
@@ -37,7 +39,8 @@ contract DeployTokenRouterContracts is CheckWormholeContracts, Script {
             _wormhole,
             _cctpTokenMessenger,
             _matchingEngineChain,
-            _matchingEngineAddress.toUniversalAddress(),
+            _matchingEngineAddress,
+            _matchingEngineMintRecipient,
             _matchingEngineDomain
         );
 

evm/forge/scripts/UpgradeMatchingEngine.s.sol

@@ -16,12 +16,17 @@ import {MatchingEngineImplementation} from
 
 import {CheckWormholeContracts} from "./helpers/CheckWormholeContracts.sol";
 
+import {Utils} from "../../src/shared/Utils.sol";
+
 contract UpgradeMatchingEngine is CheckWormholeContracts, Script {
+    using Utils for bytes32;
+
     uint16 immutable _chainId = uint16(vm.envUint("RELEASE_CHAIN_ID"));
     address immutable _token = vm.envAddress("RELEASE_TOKEN_ADDRESS");
     address immutable _wormhole = vm.envAddress("RELEASE_WORMHOLE_ADDRESS");
     address immutable _cctpTokenMessenger = vm.envAddress("RELEASE_TOKEN_MESSENGER_ADDRESS");
-    address immutable _matchingEngineAddress = vm.envAddress("RELEASE_MATCHING_ENGINE_ADDRESS");
+    bytes32 immutable _matchingEngineAddress =
+        vm.envBytes32("RELEASE_MATCHING_ENGINE_MINT_RECIPIENT");
 
     // Auction parameters.
     uint24 immutable _userPenaltyRewardBps = uint24(vm.envUint("RELEASE_USER_REWARD_BPS"));
@@ -43,7 +48,9 @@ contract UpgradeMatchingEngine is CheckWormholeContracts, Script {
             _auctionGracePeriod,
             _auctionPenaltyBlocks
         );
-        IMatchingEngine(_matchingEngineAddress).upgradeContract(address(implementation));
+        IMatchingEngine(_matchingEngineAddress.fromUniversalAddress()).upgradeContract(
+            address(implementation)
+        );
     }
 
     function run() public {

evm/forge/scripts/UpgradeTokenRouter.s.sol

@@ -25,7 +25,9 @@ contract UpgradeTokenRouter is CheckWormholeContracts, Script {
     address immutable _wormhole = vm.envAddress("RELEASE_WORMHOLE_ADDRESS");
     address immutable _cctpTokenMessenger = vm.envAddress("RELEASE_TOKEN_MESSENGER_ADDRESS");
     address immutable _ownerAssistantAddress = vm.envAddress("RELEASE_OWNER_ASSISTANT_ADDRESS");
-    address immutable _matchingEngineAddress = vm.envAddress("RELEASE_MATCHING_ENGINE_ADDRESS");
+    bytes32 immutable _matchingEngineAddress = vm.envBytes32("RELEASE_MATCHING_ENGINE_ADDRESS");
+    bytes32 immutable _matchingEngineMintRecipient =
+        vm.envBytes32("RELEASE_MATCHING_ENGINE_MINT_RECIPIENT");
     uint16 immutable _matchingEngineChain = uint16(vm.envUint("RELEASE_MATCHING_ENGINE_CHAIN"));
     uint32 immutable _matchingEngineDomain = uint32(vm.envUint("RELEASE_MATCHING_ENGINE_DOMAIN"));
 
@@ -37,7 +39,8 @@ contract UpgradeTokenRouter is CheckWormholeContracts, Script {
             _wormhole,
             _cctpTokenMessenger,
             _matchingEngineChain,
-            _matchingEngineAddress.toUniversalAddress(),
+            _matchingEngineAddress,
+            _matchingEngineMintRecipient,
             _matchingEngineDomain
         );