fix evm examples

Author: mgild

evm/.gitignore

@@ -1,3 +1,2 @@
-broadcast/
-cache/
-out/
+out/
+.env

evm/README.md

@@ -58,8 +58,8 @@ That's it! You're now fetching and verifying real-time oracle prices on EVM. 
 | Network | Chain ID | Switchboard Contract |
 |---------|----------|---------------------|
 | **Monad Mainnet** | 143 | `0xB7F03eee7B9F56347e32cC71DaD65B303D5a0E67` |
-| **Monad Testnet** | 10143 | `0xD3860E2C66cBd5c969Fa7343e6912Eff0416bA33` |
-| **Hyperliquid Mainnet** | 999 | `0xcDb299Cb902D1E39F83F54c7725f54eDDa7F3347` |
+| **Monad Testnet** | 10143 | `0x33A5066f65f66161bEb3f827A3e40fce7d7A2e6C` |
+| **HyperEVM Mainnet** | 999 | `0x316fbe540c719970e6427ccd8590d7e0a2814c5d` |
 | **Hyperliquid Testnet** | 998 | TBD |
 
 > **Note**: For other EVM chains (Arbitrum, Core, etc.), see the [legacy examples](./legacy/) which use the previous Switchboard implementation.
@@ -73,7 +73,7 @@ Monad is a high-performance EVM-compatible blockchain optimized for speed and ef
 | Network | Chain ID | RPC URL | Switchboard Contract |
 |---------|----------|---------|---------------------|
 | **Monad Mainnet** | 143 | `https://rpc-mainnet.monadinfra.com/rpc/YOUR_API_KEY` | `0xB7F03eee7B9F56347e32cC71DaD65B303D5a0E67` |
-| **Monad Testnet** | 10143 | `https://testnet-rpc.monad.xyz` | `0xD3860E2C66cBd5c969Fa7343e6912Eff0416bA33` |
+| **Monad Testnet** | 10143 | `https://testnet-rpc.monad.xyz` | `0x33A5066f65f66161bEb3f827A3e40fce7d7A2e6C` |
 
 ### Quick Start on Monad
 
@@ -183,7 +183,7 @@ Hyperliquid is a high-performance Layer 1 blockchain with native perpetual futur
 
 | Network | Chain ID | RPC URL | Switchboard Contract |
 |---------|----------|---------|---------------------|
-| **Hyperliquid Mainnet** | 999 | `https://rpc.hyperliquid.xyz/evm` | `0xcDb299Cb902D1E39F83F54c7725f54eDDa7F3347` |
+| **HyperEVM Mainnet** | 999 | `https://rpc.hyperliquid.xyz/evm` | `0x316fbe540c719970e6427ccd8590d7e0a2814c5d` |
 | **Hyperliquid Testnet** | 998 | `https://rpc.hyperliquid-testnet.xyz/evm` | TBD |
 
 ### Quick Start on Hyperliquid
@@ -248,8 +248,8 @@ import { CrossbarClient } from '@switchboard-xyz/common';
 const provider = new ethers.JsonRpcProvider('https://rpc.hyperliquid.xyz/evm');
 const signer = new ethers.Wallet(process.env.PRIVATE_KEY!, provider);
 
-// Switchboard contract on Hyperliquid Mainnet
-const switchboardAddress = '0xcDb299Cb902D1E39F83F54c7725f54eDDa7F3347';
+// Switchboard contract on HyperEVM Mainnet
+const switchboardAddress = '0x316fbe540c719970e6427ccd8590d7e0a2814c5d';
 const switchboard = new ethers.Contract(switchboardAddress, SWITCHBOARD_ABI, signer);
 
 // Your deployed price consumer contract

evm/bun.lock

@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+
+# Load .env if it exists
+if [ -f .env ]; then
+  source .env
+fi
+
+# Check required vars
+if [ -z "$PRIVATE_KEY" ] || [ -z "$RPC_URL" ]; then
+  echo "Error: PRIVATE_KEY and RPC_URL must be set in .env"
+  exit 1
+fi
+
+echo "Deploying SwitchboardPriceConsumer..."
+
+# Deploy and capture output
+OUTPUT=$(forge script script/DeploySwitchboardPriceConsumer.s.sol:DeploySwitchboardPriceConsumer \
+  --rpc-url "$RPC_URL" \
+  --private-key "$PRIVATE_KEY" \
+  --broadcast \
+  2>&1)
+
+echo "$OUTPUT"
+
+# Extract contract address from output
+CONTRACT_ADDRESS=$(echo "$OUTPUT" | grep -oE "SwitchboardPriceConsumer deployed at: 0x[a-fA-F0-9]{40}" | grep -oE "0x[a-fA-F0-9]{40}")
+
+if [ -z "$CONTRACT_ADDRESS" ]; then
+  echo "Error: Could not extract contract address from deployment output"
+  exit 1
+fi
+
+echo ""
+echo "Updating .env with CONTRACT_ADDRESS=$CONTRACT_ADDRESS"
+
+# Update or add CONTRACT_ADDRESS in .env
+if grep -q "^CONTRACT_ADDRESS=" .env 2>/dev/null; then
+  # Replace existing
+  sed -i.bak "s/^CONTRACT_ADDRESS=.*/CONTRACT_ADDRESS=$CONTRACT_ADDRESS/" .env && rm -f .env.bak
+else
+  # Add new
+  echo "CONTRACT_ADDRESS=$CONTRACT_ADDRESS" >> .env
+fi
+
+echo ""
+echo "Done! Now run: bun scripts/run.ts"

evm/deploy.sh

@@ -1,10 +1,13 @@
 [profile.default]
 src = "src"
-out = "out"
+out = "out/artifacts"
+cache_path = "out/cache"
+broadcast = "out/broadcast"
 libs = ["node_modules", "lib"]
 
 remappings = [
     "forge-std/=node_modules/forge-std/src/",
+    "@switchboard-xyz/on-demand-solidity/=node_modules/@switchboard-xyz/on-demand-solidity/",
 ]
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

evm/foundry.toml

@@ -34,8 +34,9 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@switchboard-xyz/common": "^5",
-    "@switchboard-xyz/on-demand-solidity": "^0.0.4",
+    "@switchboard-xyz/common": "^5.5.0",
+    "@switchboard-xyz/on-demand": "^3.7.3",
+    "@switchboard-xyz/on-demand-solidity": "^1.0.0",
     "@types/yargs": "^17.0.33",
     "ethers": "^6.13.1",
     "forge-std": "github:foundry-rs/forge-std#v1.9.4",

evm/package.json

@@ -30,8 +30,8 @@ import "../src/SwitchboardPriceConsumer.sol";
  *     -vvvv
  */
 contract DeploySwitchboardPriceConsumer is Script {
-    // Monad Switchboard addresses
-    address constant MONAD_TESTNET_SWITCHBOARD = 0xD3860E2C66cBd5c969Fa7343e6912Eff0416bA33;
+    // Monad Switchboard addresses (from docs.switchboard.xyz)
+    address constant MONAD_TESTNET_SWITCHBOARD = 0x33A5066f65f66161bEb3f827A3e40fce7d7A2e6C;
     address constant MONAD_MAINNET_SWITCHBOARD = 0xB7F03eee7B9F56347e32cC71DaD65B303D5a0E67;
 
     function run() external {