Address comments

express_relay/sdk/js/src/evm.ts

@@ -196,7 +196,7 @@ export async function getSignature(
 }
 
 export async function signOpportunityBid(
- opportunity: Opportunity & OpportunityEvm,
+ opportunity: OpportunityEvm,
  bidParams: BidParams,
  privateKey: Hex
 ): Promise<OpportunityBid> {

express_relay/sdk/js/src/examples/simpleSearcherLimo.ts

@@ -136,9 +136,7 @@ class SimpleSearcherLimo {
  }
 
  async opportunityHandler(opportunity: Opportunity) {
- if (!("order" in opportunity))
- throw new Error("Not a valid SVM opportunity");
- const bid = await this.generateBid(opportunity);
+ const bid = await this.generateBid(opportunity as OpportunitySvm);
  try {
  const bidId = await this.client.submitBid(bid);
  console.log(

express_relay/sdk/js/src/examples/simpleSearcherSvm.ts

@@ -9,7 +9,7 @@ import { Program, AnchorProvider } from "@coral-xyz/anchor";
 import { Keypair, PublicKey, Connection } from "@solana/web3.js";
 import dummyIdl from "./idl/idlDummy.json";
 import { Dummy } from "./dummyTypes";
-import { getConfigRouterPda, getExpressRelayMetadataPda } from "../svmPda";
+import { getConfigRouterPda, getExpressRelayMetadataPda } from "../svm";
 
 const DAY_IN_SECONDS = 60 * 60 * 24;
 const DUMMY_PIDS: Record<string, PublicKey> = {

express_relay/sdk/js/src/index.ts

@@ -15,7 +15,7 @@ import {
  Opportunity,
  OpportunityBid,
  OpportunityEvm,
- OpportunityParams,
+ OpportunityCreate,
  TokenAmount,
 } from "./types";
 import {
@@ -256,7 +256,7 @@ export class Client {
  * Submits an opportunity to be exposed to searchers
  * @param opportunity Opportunity to submit
  */
- async submitOpportunity(opportunity: OpportunityParams) {
+ async submitOpportunity(opportunity: OpportunityCreate) {
  const client = createClient<paths>(this.clientOptions);
  let body;
  if ("order" in opportunity) {
@@ -439,22 +439,22 @@ export class Client {
 
  /**
  * Creates a signed opportunity bid for an opportunity
- * @param opportunity Opportunity to bid on
+ * @param opportunity EVM Opportunity to bid on
  * @param bidParams Bid amount and valid until timestamp
  * @param privateKey Private key to sign the bid with
  * @returns Signed opportunity bid
  */
  async signOpportunityBid(
- opportunity: Opportunity & OpportunityEvm,
+ opportunity: OpportunityEvm,
  bidParams: BidParams,
  privateKey: Hex
  ): Promise<OpportunityBid> {
  return evm.signOpportunityBid(opportunity, bidParams, privateKey);
  }
 
  /**
- * Creates a signed bid for an opportunity
- * @param opportunity Opportunity to bid on
+ * Creates a signed bid for an EVM opportunity
+ * @param opportunity EVM Opportunity to bid on
  * @param bidParams Bid amount, nonce, and deadline timestamp
  * @param privateKey Private key to sign the bid with
  * @returns Signed bid
@@ -469,7 +469,7 @@ export class Client {
 
  /**
  * Creates a signature for the bid and opportunity
- * @param opportunity Opportunity to bid on
+ * @param opportunity EVM Opportunity to bid on
  * @param bidParams Bid amount, nonce, and deadline timestamp
  * @param privateKey Private key to sign the bid with
  * @returns Signature for the bid and opportunity

express_relay/sdk/js/src/types.ts

@@ -93,6 +93,10 @@ export type OpportunityEvm = {
  * Tokens to receive after the opportunity is executed
  */
  buyTokens: TokenAmount[];
+ /**
+ * Unique identifier for the opportunity
+ */
+ opportunityId: string;
 };
 
 export type OpportunitySvm = {
@@ -102,18 +106,25 @@ export type OpportunitySvm = {
  * The chain id where the opportunity will be executed.
  */
  chainId: ChainId;
+ /**
+ * Slot where the opportunity was found
+ */
  slot: number;
+ /**
+ * Blockhash that can be used to sign transactions for this opportunity
+ */
  blockHash: Blockhash;
-};
-
-export type OpportunityParams = OpportunityEvm | OpportunitySvm;
-
-export type Opportunity = OpportunityParams & {
  /**
  * Unique identifier for the opportunity
  */
  opportunityId: string;
 };
+
+export type OpportunityCreate =
+ | Omit<OpportunityEvm, "opportunity_id">
+ | Omit<OpportunitySvm, "opportunity_id">;
+
+export type Opportunity = OpportunityEvm | OpportunitySvm;
 /**
  * Represents a bid for an opportunity
  */

express_relay/sdk/python/express_relay/searcher/examples/simple_searcher_svm.py

@@ -1,6 +1,7 @@
 import argparse
 import asyncio
 import logging
+import typing
 from decimal import Decimal
 
 from solana.rpc.async_api import AsyncClient
@@ -18,7 +19,6 @@
  BidStatusUpdate,
  BidSvm,
  Opportunity,
- OpportunityEvm,
 )
 from express_relay.express_relay_svm_types import OpportunitySvm
 from express_relay.svm.generated.express_relay.accounts import ExpressRelayMetadata
@@ -71,11 +71,7 @@ async def opportunity_callback(self, opp: Opportunity):
  Args:
  opp: An object representing a single opportunity.
  """
-
- if isinstance(opp, OpportunityEvm):
- raise ValueError("Opportunity is not an SVM opportunity")
-
- bid = await self.assess_opportunity(opp)
+ bid = await self.assess_opportunity(typing.cast(OpportunitySvm, opp))
 
  if bid:
  try: