@bosonprotocol/agentic-commerce 1.0.0-alpha.52 → 1.0.0-alpha.54

package/dist/boson/mcp-server/index.js

@@ -37,13 +37,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BosonMCPServer = void 0;
 const node_crypto_1 = require("node:crypto");
 const core_sdk_1 = require("@bosonprotocol/core-sdk");
+const ethers_sdk_1 = require("@bosonprotocol/ethers-sdk");
+const ipfs_storage_1 = require("@bosonprotocol/ipfs-storage");
 const core_sdk_2 = require("@fermionprotocol/core-sdk");
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
+const ethers_1 = require("ethers");
+const index_js_1 = require("../../common/index.js");
 const configLoader_js_1 = require("../../common/mcp-server/configLoader.js");
+const configValidation_js_1 = require("../../common/mcp-server/configValidation.js");
 const errorHandling_js_1 = require("../../common/mcp-server/errorHandling.js");
+const ipfs_js_1 = require("../../common/mcp-server/ipfs.js");
+const jsonUtils_js_1 = require("../../common/mcp-server/jsonUtils.js");
 const transactionSigning_js_1 = require("../../common/mcp-server/transactionSigning.js");
 const disputeResolversFilter_js_1 = require("./filters/disputeResolversFilter.js");
 const disputesFilter_js_1 = require("./filters/disputesFilter.js");
@@ -59,17 +66,100 @@ const exchanges_js_1 = require("./handlers/exchanges.js");
 const funds_js_1 = require("./handlers/funds.js");
 const metaTx_js_1 = require("./handlers/metaTx.js");
 const offers_js_1 = require("./handlers/offers.js");
-const sdk_js_1 = require("./handlers/sdk.js");
 const transactions_js_1 = require("./handlers/transactions.js");
-const resourceParameterTypes_js_1 = require("./resourceParameterTypes.js");
 const validation_js_1 = require("./validation.js");
-const log = console.error;
 class BosonMCPServer {
-    coreSDK = null;
-    config = null;
     constructor() {
         // Error handling will be set up per server instance
     }
+    createSDKFromContext(configId, signerAddress) {
+        const config = (0, core_sdk_1.getConfigFromConfigId)(configId);
+        let jsonRpcUrl = config.jsonRpcUrl;
+        if (process.env.LOCALHOST_SUBSTITUTE) {
+            jsonRpcUrl = jsonRpcUrl
+                .replace(/localhost/i, process.env.LOCALHOST_SUBSTITUTE)
+                .replace("127.0.0.1", process.env.LOCALHOST_SUBSTITUTE);
+        }
+        const provider = new ethers_1.providers.StaticJsonRpcProvider(jsonRpcUrl);
+        const metadataStorageUrl = process.env.IPFS_METADATA_URL || config.ipfsMetadataUrl;
+        const theGraphStorageUrl = process.env.THE_GRAPH_IPFS_URL ||
+            config.theGraphIpfsUrl ||
+            metadataStorageUrl;
+        const infuraIpfsProjectId = process.env.INFURA_IPFS_PROJECT_ID;
+        if (!infuraIpfsProjectId) {
+            throw new Error("infuraIpfsProjectId is required. Set INFURA_IPFS_PROJECT_ID environment variable.");
+        }
+        const infuraIpfsProjectSecret = process.env.INFURA_IPFS_PROJECT_SECRET;
+        if (!infuraIpfsProjectSecret) {
+            throw new Error("infuraIpfsProjectSecret is required. Set INFURA_IPFS_PROJECT_SECRET environment variable.");
+        }
+        const ipfsMetadataStorageHeaders = (0, ipfs_js_1.getIpfsMetadataStorageHeaders)(infuraIpfsProjectId, infuraIpfsProjectSecret);
+        const coreSDK = core_sdk_1.CoreSDK.fromDefaultConfig({
+            envName: config.envName,
+            configId: config.configId,
+            web3Lib: new ethers_sdk_1.AgentAdapter(provider, {
+                signerAddress: signerAddress,
+            }),
+            theGraphStorage: new ipfs_storage_1.IpfsMetadataStorage(core_sdk_1.validateMetadata, {
+                url: theGraphStorageUrl,
+                headers: theGraphStorageUrl === metadataStorageUrl
+                    ? ipfsMetadataStorageHeaders
+                    : undefined,
+            }),
+            metadataStorage: new ipfs_storage_1.IpfsMetadataStorage(core_sdk_1.validateMetadata, {
+                url: metadataStorageUrl,
+                headers: ipfsMetadataStorageHeaders,
+            }),
+        });
+        return { coreSDK, config };
+    }
+    createHandler(handlerFactory, needsConfig = false, requiresSignerAddress = true) {
+        return async (args) => {
+            if (requiresSignerAddress) {
+                if (!args.configId || !args.signerAddress) {
+                    throw new Error("configId and signerAddress are required");
+                }
+            }
+            else {
+                if (!args.configId) {
+                    throw new Error("configId is required");
+                }
+            }
+            const { coreSDK, config } = this.createSDKFromContext(args.configId, args.signerAddress);
+            const handler = needsConfig
+                ? handlerFactory(() => coreSDK, () => config)
+                : handlerFactory(() => coreSDK);
+            return await handler(args);
+        };
+    }
+    createToolHandler(handlerFactory, needsConfig = false) {
+        return async (args) => {
+            const result = await this.createHandler(handlerFactory, needsConfig)(args);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: result,
+                    },
+                ],
+            };
+        };
+    }
+    createResourceHandler(handlerFactory, needsConfig = false) {
+        return async (url) => {
+            const params = Object.fromEntries(url.searchParams);
+            const result = await this.createHandler(handlerFactory, needsConfig, false)({ ...params, signerAddress: ethers_1.ethers.constants.AddressZero }); // Default signerAddress to zero address for resource handlers as no resources need a signer address
+            return {
+                contents: [
+                    {
+                        uri: url.toString(),
+                        mimeType: "application/json",
+                        text: result,
+                    },
+                ],
+            };
+        };
+    }
     createServerInstance() {
         const server = new mcp_js_1.McpServer({
             name: "boson-protocol-server",
@@ -98,138 +188,35 @@ class BosonMCPServer {
         });
     }
     setupToolHandlers(server) {
-        const initializeSDKHandler = (0, sdk_js_1.createInitializeSDKHandler)((sdk) => {
-            this.coreSDK = sdk;
-        }, (config) => {
-            this.config = config;
-        });
-        const offerHandler = (0, offers_js_1.createOfferHandler)(() => this.coreSDK, () => this.config);
-        const offerWithConditionHandler = (0, offers_js_1.createOfferWithConditionHandler)(() => this.coreSDK, () => this.config);
-        const voidOfferHandler = (0, offers_js_1.createVoidOfferHandler)(() => this.coreSDK);
-        const sellerHandler = (0, accounts_js_1.createSellerHandler)(() => this.coreSDK);
-        const transactionHandler = (0, transactions_js_1.createTransactionHandler)(() => this.coreSDK);
         const signTransactionHandler = (0, transactions_js_1.createSignTransactionHandler)();
         const signTypedDataHandler = (0, transactions_js_1.createSignTypedDataHandler)();
-        const sendMetaTransactionHandler = (0, metaTx_js_1.createSendMetaTransactionHandler)(() => this.coreSDK);
-        const sendNativeMetaTransactionHandler = (0, metaTx_js_1.createSendNativeMetaTransactionHandler)(() => this.coreSDK);
-        const sendForwardedMetaTransactionHandler = (0, metaTx_js_1.createSendForwardedMetaTransactionHandler)(() => this.coreSDK);
-        const withdrawFundsHandler = (0, funds_js_1.createWithdrawFundsHandler)(() => this.coreSDK);
-        const depositFundsHandler = (0, funds_js_1.createDepositFundsHandler)(() => this.coreSDK);
-        const getFundsHandler = (0, funds_js_1.createGetFundsHandler)(() => this.coreSDK);
-        const extendDisputeTimeoutHandler = (0, disputes_js_1.createExtendDisputeTimeoutHandler)(() => this.coreSDK);
-        const expireDisputeHandler = (0, disputes_js_1.createExpireDisputeHandler)(() => this.coreSDK);
-        const expireDisputeBatchHandler = (0, disputes_js_1.createExpireDisputeBatchHandler)(() => this.coreSDK);
-        const resolveDisputeHandler = (0, disputes_js_1.createResolveDisputeHandler)(() => this.coreSDK);
-        const disputeResolutionProposalHandler = (0, disputes_js_1.createDisputeResolutionProposalHandler)(() => this.coreSDK);
-        const getDisputesHandler = (0, disputes_js_1.createGetDisputesHandler)(() => this.coreSDK);
-        const revokeVoucherHandler = (0, exchanges_js_1.createRevokeVoucherHandler)(() => this.coreSDK);
-        const commitToOfferHandler = (0, offers_js_1.createCommitToOfferHandler)(() => this.coreSDK);
-        const cancelVoucherHandler = (0, exchanges_js_1.createCancelVoucherHandler)(() => this.coreSDK);
-        const redeemVoucherHandler = (0, exchanges_js_1.createRedeemVoucherHandler)(() => this.coreSDK);
-        const getExchangesHandler = (0, exchanges_js_1.createGetExchangesHandler)(() => this.coreSDK);
-        const getOffersHandler = (0, offers_js_1.createGetOffersHandler)(() => this.coreSDK);
-        const getSellersHandler = (0, accounts_js_1.createGetSellersHandler)(() => this.coreSDK);
-        const getSellersByAddressHandler = (0, accounts_js_1.createGetSellersByAddressHandler)(() => this.coreSDK);
-        const getAllProductsWithNotVoidedVariantsHandler = (0, offers_js_1.createGetAllProductsWithNotVoidedVariantsHandler)(() => this.coreSDK);
-        const getDisputeResolversHandler = (0, accounts_js_1.createGetDisputeResolversHandler)(() => this.coreSDK);
-        const storeProductV1MetadataHandler = (0, offers_js_1.createStoreProductV1MetadataHandler)(() => this.coreSDK);
-        const storeBundleMetadataHandler = (0, offers_js_1.createStoreBundleMetadataHandler)(() => this.coreSDK);
-        const storeCustomMetadataHandler = (0, offers_js_1.createStoreCustomMetadataHandler)(() => this.coreSDK);
-        const renderContractualAgreementHandler = (0, offers_js_1.createRenderContractualAgreementHandler)(() => this.coreSDK);
-        const storeBundleItemProductV1MetadataHandler = (0, offers_js_1.createStoreBundleItemProductV1MetadataHandler)(() => this.coreSDK);
-        const storeBundleItemNftMetadataHandler = (0, offers_js_1.createStoreBundleItemNftMetadataHandler)(() => this.coreSDK);
         // Add tools for resource queries
-        server.tool("get_funds", "Get funds entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getFundsValidation.shape, async (args) => {
-            const validatedArgs = validation_js_1.getFundsValidation.parse(args);
-            const result = await getFundsHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
-        });
-        server.tool("get_disputes", "Get dispute entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getDisputesValidation.shape, async (args) => {
-            const validatedArgs = validation_js_1.getDisputesValidation.parse(args);
-            const result = await getDisputesHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
-        });
-        server.tool("get_exchanges", "Get exchange entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getExchangesValidation.shape, async (args) => {
-            const validatedArgs = validation_js_1.getExchangesValidation.parse(args);
-            const result = await getExchangesHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
-        });
-        server.tool("get_offers", "Get offer entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getOffersValidation.shape, async (args) => {
+        server.tool("get_funds", "Get funds entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getFundsValidation.shape, this.createToolHandler(funds_js_1.createGetFundsHandler));
+        server.tool("get_disputes", "Get dispute entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getDisputesValidation.shape, this.createToolHandler(disputes_js_1.createGetDisputesHandler));
+        server.tool("get_exchanges", "Get exchange entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getExchangesValidation.shape, this.createToolHandler(exchanges_js_1.createGetExchangesHandler));
+        server.tool("get_offers", "Get offer entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getOffersValidation.shape, (args) => {
             const validatedArgs = validation_js_1.getOffersValidation.parse(args);
-            const result = await getOffersHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createToolHandler(offers_js_1.createGetOffersHandler)(validatedArgs);
         });
-        server.tool("get_sellers", "Get seller entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getSellersValidation.shape, async (args) => {
+        server.tool("get_sellers", "Get seller entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getSellersValidation.shape, (args) => {
             const validatedArgs = validation_js_1.getSellersValidation.parse(args);
-            const result = await getSellersHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createToolHandler(accounts_js_1.createGetSellersHandler)(validatedArgs);
         });
-        server.tool("get_dispute_resolvers", "Get dispute resolver entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getDisputeResolversValidation.shape, async (args) => {
+        server.tool("get_dispute_resolvers", "Get dispute resolver entities with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getDisputeResolversValidation.shape, (args) => {
             const validatedArgs = validation_js_1.getDisputeResolversValidation.parse(args);
-            const result = await getDisputeResolversHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
-        });
-        server.tool("initialize_sdk", "Initialize the Boson Protocol SDK with custom configuration. Set defaultDisputeResolverId to configure fallback dispute resolver selection.", sdk_js_1.initializeSDKSchema, (args) => {
-            // Validate required fields - signerAddress can come from params or env
-            const signerAddress = args.signerAddress || process.env.SIGNER_ADDRESS;
-            if (!signerAddress) {
-                throw new Error("signerAddress is required. Provide it as parameter or set SIGNER_ADDRESS environment variable.");
-            }
-            return initializeSDKHandler(args);
+            return this.createToolHandler(accounts_js_1.createGetDisputeResolversHandler)(validatedArgs);
         });
         server.tool("create_offer", "Create a new offer on Boson Protocol. Tip: Consider storing metadata first using store_product_v1_metadata, store_bundle_metadata, or store_custom_metadata tools to get URIs for the metadata fields.", validation_js_1.createOfferValidation.shape, (args) => {
             try {
                 const validatedArgs = validation_js_1.createOfferValidation.parse(args);
-                return offerHandler(validatedArgs);
+                return this.createToolHandler(offers_js_1.createOfferHandler, true)(validatedArgs);
             }
             catch (error) {
                 return {
                     content: [
                         {
                             type: "text",
-                            text: JSON.stringify({
+                            text: (0, jsonUtils_js_1.stringifyWithBigInt)({
                                 success: false,
                                 error: `Failed to create offer: ${(0, errorHandling_js_1.formatErrorMessage)(error)}`,
                                 errorDetails: error,
@@ -243,14 +230,14 @@ class BosonMCPServer {
         server.tool("create_offer_with_condition", "Create a new offer with a specific condition on Boson Protocol. Tip: Consider storing metadata first using store_product_v1_metadata, store_bundle_metadata, or store_custom_metadata tools to get URIs for the metadata fields.", validation_js_1.createOfferWithConditionValidation.shape, (args) => {
             try {
                 const validatedArgs = validation_js_1.createOfferWithConditionValidation.parse(args);
-                return offerWithConditionHandler(validatedArgs);
+                return this.createToolHandler(offers_js_1.createOfferWithConditionHandler, true)(validatedArgs);
             }
             catch (error) {
                 return {
                     content: [
                         {
                             type: "text",
-                            text: JSON.stringify({
+                            text: (0, jsonUtils_js_1.stringifyWithBigInt)({
                                 success: false,
                                 error: `Failed to create offer with condition: ${(0, errorHandling_js_1.formatErrorMessage)(error)}`,
                                 errorDetails: error,
@@ -261,125 +248,62 @@ class BosonMCPServer {
                 };
             }
         });
-        server.tool("void_offer", "Void an existing offer by calling the OfferHandlerFacet contract", validation_js_1.voidOfferValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.voidOfferValidation.parse(args);
-            return voidOfferHandler(validatedArgs);
-        });
-        server.tool("create_seller", "Create a new seller on Boson Protocol", validation_js_1.createSellerValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.createSellerValidation.parse(args);
-            return sellerHandler(validatedArgs);
-        });
-        server.tool("send_signed_transaction", "Send a signed transaction to the Ethereum network", validation_js_1.signedTransactionValidation, transactionHandler);
+        server.tool("void_offer", "Void an existing offer by calling the OfferHandlerFacet contract", validation_js_1.voidOfferValidation.shape, this.createToolHandler(offers_js_1.createVoidOfferHandler));
+        server.tool("create_seller", "Create a new seller on Boson Protocol", validation_js_1.createSellerValidation.shape, this.createToolHandler(accounts_js_1.createSellerHandler));
+        server.tool("send_signed_transaction", "Send a signed transaction to the Ethereum network", validation_js_1.signedTransactionValidation, this.createToolHandler(transactions_js_1.createTransactionHandler));
         server.tool("sign_transaction", "Sign a transaction with a private key", validation_js_1.signTransactionValidation, signTransactionHandler);
         server.tool("sign_typed_data", "Sign typed data using EIP-712 standard (optionally create transaction for contract submission)", transactionSigning_js_1.signTypedDataValidation, signTypedDataHandler);
-        server.tool("send_meta_transaction", "Send a meta transaction using Boson Protocol SDK", metaTx_js_1.sendMetaTransactionValidation.shape, (args) => {
-            const validatedArgs = metaTx_js_1.sendMetaTransactionValidation.parse(args);
-            return sendMetaTransactionHandler(validatedArgs);
-        });
-        server.tool("send_native_meta_transaction", "Send a native meta transaction using Boson Protocol SDK", metaTx_js_1.sendNativeMetaTransactionValidation.shape, (args) => {
-            const validatedArgs = metaTx_js_1.sendNativeMetaTransactionValidation.parse(args);
-            return sendNativeMetaTransactionHandler(validatedArgs);
-        });
-        server.tool("send_forwarded_meta_transaction", "Send a forwarded meta transaction using Boson Protocol SDK", metaTx_js_1.sendForwardedMetaTransactionValidation.shape, (args) => {
-            const validatedArgs = metaTx_js_1.sendForwardedMetaTransactionValidation.parse(args);
-            return sendForwardedMetaTransactionHandler(validatedArgs);
-        });
-        server.tool("withdraw_funds", "Withdraw funds from an entity treasury", validation_js_1.withdrawFundsValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.withdrawFundsValidation.parse(args);
-            return withdrawFundsHandler(validatedArgs);
-        });
-        server.tool("deposit_funds", "Deposit funds to an entity treasury", validation_js_1.depositFundsValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.depositFundsValidation.parse(args);
-            return depositFundsHandler(validatedArgs);
-        });
-        server.tool("extend_dispute_timeout", "Extend the timeout for a dispute", validation_js_1.extendDisputeTimeoutValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.extendDisputeTimeoutValidation.parse(args);
-            return extendDisputeTimeoutHandler(validatedArgs);
-        });
-        server.tool("expire_dispute", "Expire a dispute", validation_js_1.expireDisputeValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.expireDisputeValidation.parse(args);
-            return expireDisputeHandler(validatedArgs);
-        });
-        server.tool("expire_dispute_batch", "Expire multiple disputes in a batch", validation_js_1.expireDisputeBatchValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.expireDisputeBatchValidation.parse(args);
-            return expireDisputeBatchHandler(validatedArgs);
-        });
-        server.tool("resolve_dispute", "Resolve a dispute with mutual agreement", validation_js_1.resolveDisputeValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.resolveDisputeValidation.parse(args);
-            return resolveDisputeHandler(validatedArgs);
-        });
-        server.tool("create_dispute_resolution_proposal", "Create a dispute resolution proposal signature", validation_js_1.createDisputeResolutionProposalValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.createDisputeResolutionProposalValidation.parse(args);
-            return disputeResolutionProposalHandler(validatedArgs);
-        });
-        server.tool("revoke_voucher", "Revoke an existing voucher by seller assistant", validation_js_1.revokeVoucherValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.revokeVoucherValidation.parse(args);
-            return revokeVoucherHandler(validatedArgs);
-        });
-        server.tool("commit_to_offer", "Commit to an offer to create an exchange", validation_js_1.commitToOfferValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.commitToOfferValidation.parse(args);
-            return commitToOfferHandler(validatedArgs);
-        });
-        server.tool("cancel_voucher", "Cancel an existing voucher by buyer", validation_js_1.cancelVoucherValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.cancelVoucherValidation.parse(args);
-            return cancelVoucherHandler(validatedArgs);
-        });
-        server.tool("redeem_voucher", "Redeem an existing voucher by buyer", validation_js_1.redeemVoucherValidation.shape, (args) => {
-            const validatedArgs = validation_js_1.redeemVoucherValidation.parse(args);
-            return redeemVoucherHandler(validatedArgs);
-        });
-        server.tool("get_sellers_by_address", "Get seller entities by address with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getSellersByAddressValidation.shape, async (args) => {
+        server.tool("send_meta_transaction", "Send a meta transaction using Boson Protocol SDK", metaTx_js_1.sendMetaTransactionValidation.shape, this.createToolHandler(metaTx_js_1.createSendMetaTransactionHandler));
+        server.tool("send_native_meta_transaction", "Send a native meta transaction using Boson Protocol SDK", metaTx_js_1.sendNativeMetaTransactionValidation.shape, this.createToolHandler(metaTx_js_1.createSendNativeMetaTransactionHandler));
+        server.tool("send_forwarded_meta_transaction", "Send a forwarded meta transaction using Boson Protocol SDK", metaTx_js_1.sendForwardedMetaTransactionValidation.shape, this.createToolHandler(metaTx_js_1.createSendForwardedMetaTransactionHandler));
+        server.tool("withdraw_funds", "Withdraw funds from an entity treasury", validation_js_1.withdrawFundsValidation.shape, this.createToolHandler(funds_js_1.createWithdrawFundsHandler));
+        server.tool("deposit_funds", "Deposit funds to an entity treasury", validation_js_1.depositFundsValidation.shape, this.createToolHandler(funds_js_1.createDepositFundsHandler));
+        server.tool("extend_dispute_timeout", "Extend the timeout for a dispute", validation_js_1.extendDisputeTimeoutValidation.shape, this.createToolHandler(disputes_js_1.createExtendDisputeTimeoutHandler));
+        server.tool("expire_dispute", "Expire a dispute", validation_js_1.expireDisputeValidation.shape, this.createToolHandler(disputes_js_1.createExpireDisputeHandler));
+        server.tool("expire_dispute_batch", "Expire multiple disputes in a batch", validation_js_1.expireDisputeBatchValidation.shape, this.createToolHandler(disputes_js_1.createExpireDisputeBatchHandler));
+        server.tool("resolve_dispute", "Resolve a dispute with mutual agreement", validation_js_1.resolveDisputeValidation.shape, this.createToolHandler(disputes_js_1.createResolveDisputeHandler));
+        server.tool("create_dispute_resolution_proposal", "Create a dispute resolution proposal signature", validation_js_1.createDisputeResolutionProposalValidation.shape, this.createToolHandler(disputes_js_1.createDisputeResolutionProposalHandler));
+        server.tool("revoke_voucher", "Revoke an existing voucher by seller assistant", validation_js_1.revokeVoucherValidation.shape, this.createToolHandler(exchanges_js_1.createRevokeVoucherHandler));
+        server.tool("commit_to_offer", "Commit to an offer to create an exchange", validation_js_1.commitToOfferValidation.shape, this.createToolHandler(offers_js_1.createCommitToOfferHandler));
+        server.tool("cancel_voucher", "Cancel an existing voucher by buyer", validation_js_1.cancelVoucherValidation.shape, this.createToolHandler(exchanges_js_1.createCancelVoucherHandler));
+        server.tool("redeem_voucher", "Redeem an existing voucher by buyer", validation_js_1.redeemVoucherValidation.shape, this.createToolHandler(exchanges_js_1.createRedeemVoucherHandler));
+        server.tool("get_sellers_by_address", "Get seller entities by address with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getSellersByAddressValidation.shape, (args) => {
             const validatedArgs = validation_js_1.getSellersByAddressValidation.parse(args);
-            const result = await getSellersByAddressHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createToolHandler(accounts_js_1.createGetSellersByAddressHandler)(validatedArgs);
         });
-        server.tool("get_all_products_with_not_voided_variants", "Get all products with not voided variants with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getAllProductsWithNotVoidedVariantsValidation.shape, async (args) => {
+        server.tool("get_all_products_with_not_voided_variants", "Get all products with not voided variants with flexible query parameters including pagination, ordering, and filtering", validation_js_1.getAllProductsWithNotVoidedVariantsValidation.shape, (args) => {
             const validatedArgs = validation_js_1.getAllProductsWithNotVoidedVariantsValidation.parse(args);
-            const result = await getAllProductsWithNotVoidedVariantsHandler(validatedArgs);
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createToolHandler(offers_js_1.createGetAllProductsWithNotVoidedVariantsHandler)(validatedArgs);
         });
         server.tool("store_product_v1_metadata", "Store ProductV1 metadata to IPFS and return metadata URI and hash", validation_js_1.storeProductV1MetadataValidation.shape, (args) => {
             const validatedArgs = validation_js_1.storeProductV1MetadataValidation.parse(args);
-            return storeProductV1MetadataHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createStoreProductV1MetadataHandler)(validatedArgs);
         });
         server.tool("store_bundle_metadata", "Store Bundle metadata to IPFS. You should call the store_bundle_item_* tools before calling this", validation_js_1.storeBundleMetadataValidation.shape, (args) => {
             const validatedArgs = validation_js_1.storeBundleMetadataValidation.parse(args);
-            return storeBundleMetadataHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createStoreBundleMetadataHandler)(validatedArgs);
         });
         server.tool("store_custom_metadata", "Store custom metadata to IPFS and return metadata URI and hash", validation_js_1.storeCustomMetadataValidation.shape, (args) => {
             const validatedArgs = validation_js_1.storeCustomMetadataValidation.parse(args);
-            return storeCustomMetadataHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createStoreCustomMetadataHandler)(validatedArgs);
         });
         server.tool("render_contractual_agreement", "Render a contractual agreement using renderContractualAgreement from Boson Protocol SDK", validation_js_1.renderContractualAgreementValidation.shape, (args) => {
             const validatedArgs = validation_js_1.renderContractualAgreementValidation.parse(args);
-            return renderContractualAgreementHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createRenderContractualAgreementHandler, true)(validatedArgs);
         });
         server.tool("store_bundle_item_product_v1_metadata", "Store Bundle Item ProductV1 metadata to IPFS, useful for store_bundle_metadata tool", validation_js_1.storeBundleItemProductV1MetadataValidation.shape, (args) => {
             const validatedArgs = validation_js_1.storeBundleItemProductV1MetadataValidation.parse(args);
-            return storeBundleItemProductV1MetadataHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createStoreBundleItemProductV1MetadataHandler)(validatedArgs);
         });
         server.tool("store_bundle_item_nft_metadata", "Store Bundle Item NFT metadata to IPFS, useful for store_bundle_metadata tool", validation_js_1.storeBundleItemNftMetadataValidation.shape, (args) => {
             const validatedArgs = validation_js_1.storeBundleItemNftMetadataValidation.parse(args);
-            return storeBundleItemNftMetadataHandler(validatedArgs);
+            return this.createToolHandler(offers_js_1.createStoreBundleItemNftMetadataHandler)(validatedArgs);
         });
         // Add the funds resource with flexible query parameters
         server.resource("funds", new mcp_js_1.ResourceTemplate(fundsFilter_js_1.fundsUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 fundsSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -395,60 +319,41 @@ class BosonMCPServer {
             },
         }), {
             name: "Funds Entities",
-            description: "Get funds entities with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get funds entities with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
-            const queryParams = {};
+            const params = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
-            if (urlParams.get("fundsSkip")) {
-                queryParams.fundsSkip = parseInt(urlParams.get("fundsSkip"));
+            if (urlParams.has("fundsSkip")) {
+                params.fundsSkip = parseInt(urlParams.get("fundsSkip"));
             }
-            if (urlParams.get("fundsFirst")) {
-                queryParams.fundsFirst = parseInt(urlParams.get("fundsFirst"));
+            if (urlParams.has("fundsFirst")) {
+                params.fundsFirst = parseInt(urlParams.get("fundsFirst"));
             }
-            if (urlParams.get("fundsOrderBy")) {
-                queryParams.fundsOrderBy = urlParams.get("fundsOrderBy");
+            if (urlParams.has("fundsOrderBy")) {
+                params.fundsOrderBy = urlParams.get("fundsOrderBy");
             }
-            if (urlParams.get("fundsOrderDirection")) {
-                queryParams.fundsOrderDirection = urlParams.get("fundsOrderDirection");
+            if (urlParams.has("fundsOrderDirection")) {
+                params.fundsOrderDirection = urlParams.get("fundsOrderDirection");
             }
             // Process filter parameters
             const filterParams = (0, fundsFilter_js_1.fundsProcessFilterParams)(urlParams);
             if (Object.keys(filterParams).length > 0) {
-                queryParams.fundsFilter = filterParams;
+                params.fundsFilter = filterParams;
             }
-            const validatedArgs = validation_js_1.getFundsValidation.parse(queryParams);
-            const result = await getFundsHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
-        });
-        // Add the signer-address resource with no parameters
-        server.resource("signer-address", resourceParameterTypes_js_1.SIGNER_ADDRESS_URI, async (url) => {
-            if (!this.coreSDK?.web3Lib?.getSignerAddress) {
-                throw new Error("SDK not initialized. Call initialize_sdk first.");
-            }
-            return {
-                contents: [
-                    {
-                        uri: url.toString(),
-                        mimeType: "text/plain",
-                        text: await this.coreSDK.web3Lib.getSignerAddress(),
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getFundsResourceValidation.parse(params);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, funds_js_1.createGetFundsHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the disputes resource with flexible query parameters
         server.resource("disputes", new mcp_js_1.ResourceTemplate(disputesFilter_js_1.disputesUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 disputesSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -464,22 +369,22 @@ class BosonMCPServer {
             },
         }), {
             name: "Dispute Entities",
-            description: "Get dispute entities with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get dispute entities with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const queryParams = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
-            if (urlParams.get("disputesSkip")) {
+            if (urlParams.has("disputesSkip")) {
                 queryParams.disputesSkip = parseInt(urlParams.get("disputesSkip"));
             }
-            if (urlParams.get("disputesFirst")) {
+            if (urlParams.has("disputesFirst")) {
                 queryParams.disputesFirst = parseInt(urlParams.get("disputesFirst"));
             }
-            if (urlParams.get("disputesOrderBy")) {
+            if (urlParams.has("disputesOrderBy")) {
                 queryParams.disputesOrderBy = urlParams.get("disputesOrderBy");
             }
-            if (urlParams.get("disputesOrderDirection")) {
+            if (urlParams.has("disputesOrderDirection")) {
                 queryParams.disputesOrderDirection = urlParams.get("disputesOrderDirection");
             }
             // Process filter parameters
@@ -487,22 +392,18 @@ class BosonMCPServer {
             if (Object.keys(filterParams).length > 0) {
                 queryParams.disputesFilter = filterParams;
             }
-            const validatedArgs = validation_js_1.getDisputesValidation.parse(queryParams);
-            const result = await getDisputesHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getDisputesResourceValidation.parse(queryParams);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, disputes_js_1.createGetDisputesHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the exchanges resource with flexible query parameters
         server.resource("exchanges", new mcp_js_1.ResourceTemplate(exchangesFilter_js_1.exchangesUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 exchangesSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -518,22 +419,22 @@ class BosonMCPServer {
             },
         }), {
             name: "Exchange Entities",
-            description: "Get exchange entities with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get exchange entities with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const queryParams = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
-            if (urlParams.get("exchangesSkip")) {
+            if (urlParams.has("exchangesSkip")) {
                 queryParams.exchangesSkip = parseInt(urlParams.get("exchangesSkip"));
             }
-            if (urlParams.get("exchangesFirst")) {
+            if (urlParams.has("exchangesFirst")) {
                 queryParams.exchangesFirst = parseInt(urlParams.get("exchangesFirst"));
             }
-            if (urlParams.get("exchangesOrderBy")) {
+            if (urlParams.has("exchangesOrderBy")) {
                 queryParams.exchangesOrderBy = urlParams.get("exchangesOrderBy");
             }
-            if (urlParams.get("exchangesOrderDirection")) {
+            if (urlParams.has("exchangesOrderDirection")) {
                 queryParams.exchangesOrderDirection = urlParams.get("exchangesOrderDirection");
             }
             // Process filter parameters
@@ -541,22 +442,18 @@ class BosonMCPServer {
             if (Object.keys(filterParams).length > 0) {
                 queryParams.exchangesFilter = filterParams;
             }
-            const validatedArgs = validation_js_1.getExchangesValidation.parse(queryParams);
-            const result = await getExchangesHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getExchangesResourceValidation.parse(queryParams);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, exchanges_js_1.createGetExchangesHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the offers resource with flexible query parameters
         server.resource("offers", new mcp_js_1.ResourceTemplate(offersFilter_js_1.offersUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 offersSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -587,39 +484,39 @@ class BosonMCPServer {
             },
         }), {
             name: "Offer Entities",
-            description: "Get offer entities with flexible query parameters including pagination, ordering, and filtering. Supports exchanges filtering for exchangeId",
+            description: "Get offer entities with flexible query parameters including pagination, ordering, and filtering. Supports exchanges filtering for exchangeId. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const queryParams = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
             // Offers parameters
-            if (urlParams.get("offersSkip")) {
+            if (urlParams.has("offersSkip")) {
                 queryParams.offersSkip = parseInt(urlParams.get("offersSkip"));
             }
-            if (urlParams.get("offersFirst")) {
+            if (urlParams.has("offersFirst")) {
                 queryParams.offersFirst = parseInt(urlParams.get("offersFirst"));
             }
-            if (urlParams.get("offersOrderBy")) {
+            if (urlParams.has("offersOrderBy")) {
                 queryParams.offersOrderBy = urlParams.get("offersOrderBy");
             }
-            if (urlParams.get("offersOrderDirection")) {
+            if (urlParams.has("offersOrderDirection")) {
                 queryParams.offersOrderDirection = urlParams.get("offersOrderDirection");
             }
             // Exchanges parameters
-            if (urlParams.get("exchangesSkip")) {
+            if (urlParams.has("exchangesSkip")) {
                 queryParams.exchangesSkip = parseInt(urlParams.get("exchangesSkip"));
             }
-            if (urlParams.get("exchangesFirst")) {
+            if (urlParams.has("exchangesFirst")) {
                 queryParams.exchangesFirst = parseInt(urlParams.get("exchangesFirst"));
             }
-            if (urlParams.get("exchangesOrderBy")) {
+            if (urlParams.has("exchangesOrderBy")) {
                 queryParams.exchangesOrderBy = urlParams.get("exchangesOrderBy");
             }
-            if (urlParams.get("exchangesOrderDirection")) {
+            if (urlParams.has("exchangesOrderDirection")) {
                 queryParams.exchangesOrderDirection = urlParams.get("exchangesOrderDirection");
             }
-            if (urlParams.get("includeExchanges")) {
+            if (urlParams.has("includeExchanges")) {
                 queryParams.includeExchanges =
                     urlParams.get("includeExchanges") === "true";
             }
@@ -633,21 +530,18 @@ class BosonMCPServer {
             if (Object.keys(filterParams).length > 0) {
                 queryParams.offersFilter = filterParams;
             }
-            const result = await getOffersHandler(queryParams);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getOffersResourceValidation.parse(queryParams);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, offers_js_1.createGetOffersHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the sellers resource with flexible query parameters
         server.resource("sellers", new mcp_js_1.ResourceTemplate(sellersFilter_js_1.sellersUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 sellersSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -675,35 +569,35 @@ class BosonMCPServer {
             },
         }), {
             name: "Seller Entities",
-            description: "Get seller entities with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get seller entities with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const queryParams = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
-            if (urlParams.get("sellersSkip")) {
+            if (urlParams.has("sellersSkip")) {
                 queryParams.sellersSkip = parseInt(urlParams.get("sellersSkip"));
             }
-            if (urlParams.get("sellersFirst")) {
+            if (urlParams.has("sellersFirst")) {
                 queryParams.sellersFirst = parseInt(urlParams.get("sellersFirst"));
             }
-            if (urlParams.get("sellersOrderBy")) {
+            if (urlParams.has("sellersOrderBy")) {
                 queryParams.sellersOrderBy = urlParams.get("sellersOrderBy");
             }
-            if (urlParams.get("sellersOrderDirection")) {
+            if (urlParams.has("sellersOrderDirection")) {
                 queryParams.sellersOrderDirection = urlParams.get("sellersOrderDirection");
             }
-            if (urlParams.get("includeExchanges")) {
+            if (urlParams.has("includeExchanges")) {
                 queryParams.includeExchanges =
                     urlParams.get("includeExchanges") === "true";
             }
-            if (urlParams.get("includeOffers")) {
+            if (urlParams.has("includeOffers")) {
                 queryParams.includeOffers = urlParams.get("includeOffers") === "true";
             }
-            if (urlParams.get("includeFunds")) {
+            if (urlParams.has("includeFunds")) {
                 queryParams.includeFunds = urlParams.get("includeFunds") === "true";
             }
-            if (urlParams.get("includeLogs")) {
+            if (urlParams.has("includeLogs")) {
                 queryParams.includeLogs = urlParams.get("includeLogs") === "true";
             }
             // Process filter parameters
@@ -711,22 +605,18 @@ class BosonMCPServer {
             if (Object.keys(filterParams).length > 0) {
                 queryParams.sellersFilter = filterParams;
             }
-            const validatedArgs = validation_js_1.getSellersValidation.parse(queryParams);
-            const result = await getSellersHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getSellersResourceValidation.parse(queryParams);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, accounts_js_1.createGetSellersHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the dispute_resolvers resource with flexible query parameters
         server.resource("dispute_resolvers", new mcp_js_1.ResourceTemplate(disputeResolversFilter_js_1.disputeResolversUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 disputeResolversSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -748,16 +638,16 @@ class BosonMCPServer {
             const queryParams = {};
             // Extract query parameters from URL
             const urlParams = new URLSearchParams(uri.search);
-            if (urlParams.get("disputeResolversSkip")) {
+            if (urlParams.has("disputeResolversSkip")) {
                 queryParams.disputeResolversSkip = parseInt(urlParams.get("disputeResolversSkip"));
             }
-            if (urlParams.get("disputeResolversFirst")) {
+            if (urlParams.has("disputeResolversFirst")) {
                 queryParams.disputeResolversFirst = parseInt(urlParams.get("disputeResolversFirst"));
             }
-            if (urlParams.get("disputeResolversOrderBy")) {
+            if (urlParams.has("disputeResolversOrderBy")) {
                 queryParams.disputeResolversOrderBy = urlParams.get("disputeResolversOrderBy");
             }
-            if (urlParams.get("disputeResolversOrderDirection")) {
+            if (urlParams.has("disputeResolversOrderDirection")) {
                 queryParams.disputeResolversOrderDirection = urlParams.get("disputeResolversOrderDirection");
             }
             // Process filter parameters
@@ -765,22 +655,18 @@ class BosonMCPServer {
             if (Object.keys(filterParams).length > 0) {
                 queryParams.disputeResolversFilter = filterParams;
             }
-            const validatedArgs = validation_js_1.getDisputeResolversValidation.parse(queryParams);
-            const result = await getDisputeResolversHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            const validatedArgs = validation_js_1.getDisputeResolversResourceValidation.parse(queryParams);
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, accounts_js_1.createGetDisputeResolversHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
         // Add the sellers-by-address resource with flexible query parameters
         server.resource("sellers-by-address", new mcp_js_1.ResourceTemplate(sellersByAddressFilter_js_1.sellersByAddressUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 sellersSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -808,51 +694,43 @@ class BosonMCPServer {
             },
         }), {
             name: "Sellers By Address",
-            description: "Get seller entities by address with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get seller entities by address with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const urlParams = new URLSearchParams(uri.search);
             const queryParams = {};
             // Extract address parameter (required)
-            const address = urlParams.get("address");
-            if (!address) {
+            if (!urlParams.has("address")) {
                 throw new Error("address parameter is required");
             }
-            queryParams.address = address;
+            const address = urlParams.get("address");
             // Extract pagination parameters
-            const sellersSkip = urlParams.get("sellersSkip");
-            if (sellersSkip !== null) {
-                queryParams.sellersSkip = parseInt(sellersSkip, 10);
+            if (urlParams.has("sellersSkip")) {
+                queryParams.sellersSkip = parseInt(urlParams.get("sellersSkip"), 10);
             }
-            const sellersFirst = urlParams.get("sellersFirst");
-            if (sellersFirst !== null) {
-                queryParams.sellersFirst = parseInt(sellersFirst, 10);
+            if (urlParams.has("sellersFirst")) {
+                queryParams.sellersFirst = parseInt(urlParams.get("sellersFirst"), 10);
             }
             // Extract ordering parameters
-            const sellersOrderBy = urlParams.get("sellersOrderBy");
-            if (sellersOrderBy !== null) {
-                queryParams.sellersOrderBy = sellersOrderBy;
+            if (urlParams.has("sellersOrderBy")) {
+                queryParams.sellersOrderBy = urlParams.get("sellersOrderBy");
             }
-            const sellersOrderDirection = urlParams.get("sellersOrderDirection");
-            if (sellersOrderDirection !== null) {
-                queryParams.sellersOrderDirection = sellersOrderDirection;
+            if (urlParams.has("sellersOrderDirection")) {
+                queryParams.sellersOrderDirection = urlParams.get("sellersOrderDirection");
             }
             // Extract include flags
-            const includeExchanges = urlParams.get("includeExchanges");
-            if (includeExchanges !== null) {
-                queryParams.includeExchanges = includeExchanges === "true";
+            if (urlParams.has("includeExchanges")) {
+                queryParams.includeExchanges =
+                    urlParams.get("includeExchanges") === "true";
             }
-            const includeOffers = urlParams.get("includeOffers");
-            if (includeOffers !== null) {
-                queryParams.includeOffers = includeOffers === "true";
+            if (urlParams.has("includeOffers")) {
+                queryParams.includeOffers = urlParams.get("includeOffers") === "true";
             }
-            const includeFunds = urlParams.get("includeFunds");
-            if (includeFunds !== null) {
-                queryParams.includeFunds = includeFunds === "true";
+            if (urlParams.has("includeFunds")) {
+                queryParams.includeFunds = urlParams.get("includeFunds") === "true";
             }
-            const includeLogs = urlParams.get("includeLogs");
-            if (includeLogs !== null) {
-                queryParams.includeLogs = includeLogs === "true";
+            if (urlParams.has("includeLogs")) {
+                queryParams.includeLogs = urlParams.get("includeLogs") === "true";
             }
             // Process filter parameters
             const sellersFilter = (0, sellersByAddressFilter_js_1.sellersByAddressProcessFilterParams)(urlParams);
@@ -860,23 +738,22 @@ class BosonMCPServer {
                 queryParams.sellersFilter = sellersFilter;
             }
             // Validate arguments
-            const validatedArgs = validation_js_1.getSellersByAddressValidation.parse(queryParams);
+            const validatedArgs = validation_js_1.getSellersByAddressResourceValidation.parse(queryParams);
             // Call the handler
-            const result = await getSellersByAddressHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, accounts_js_1.createGetSellersByAddressHandler)(getSDK)({
+                        ...validatedArgs,
+                        address,
+                    });
+                };
+            })(uri);
         });
         // Add the products resource with flexible query parameters
         server.resource("products", new mcp_js_1.ResourceTemplate(productsFilter_js_1.productsUriTemplate, {
             list: undefined,
             complete: {
+                configId: () => configValidation_js_1.supportedConfigIds,
                 productsSkip: () => {
                     return ["0", "10", "20", "50", "100"];
                 },
@@ -892,28 +769,24 @@ class BosonMCPServer {
             },
         }), {
             name: "Products",
-            description: "Get all products with not voided variants with flexible query parameters including pagination, ordering, and filtering",
+            description: "Get all products with not voided variants with flexible query parameters including pagination, ordering, and filtering. Requires configId parameter.",
             mimeType: "application/json",
         }, async (uri) => {
             const urlParams = new URLSearchParams(uri.search);
             const queryParams = {};
             // Extract pagination parameters
-            const productsSkip = urlParams.get("productsSkip");
-            if (productsSkip !== null) {
-                queryParams.productsSkip = parseInt(productsSkip, 10);
+            if (urlParams.has("productsSkip")) {
+                queryParams.productsSkip = parseInt(urlParams.get("productsSkip"), 10);
             }
-            const productsFirst = urlParams.get("productsFirst");
-            if (productsFirst !== null) {
-                queryParams.productsFirst = parseInt(productsFirst, 10);
+            if (urlParams.has("productsFirst")) {
+                queryParams.productsFirst = parseInt(urlParams.get("productsFirst"), 10);
             }
             // Extract ordering parameters
-            const productsOrderBy = urlParams.get("productsOrderBy");
-            if (productsOrderBy !== null) {
-                queryParams.productsOrderBy = productsOrderBy;
+            if (urlParams.has("productsOrderBy")) {
+                queryParams.productsOrderBy = urlParams.get("productsOrderBy");
             }
-            const productsOrderDirection = urlParams.get("productsOrderDirection");
-            if (productsOrderDirection !== null) {
-                queryParams.productsOrderDirection = productsOrderDirection;
+            if (urlParams.has("productsOrderDirection")) {
+                queryParams.productsOrderDirection = urlParams.get("productsOrderDirection");
             }
             // Process filter parameters
             const productsFilter = (0, productsFilter_js_1.productsProcessFilterParams)(urlParams);
@@ -921,29 +794,24 @@ class BosonMCPServer {
                 queryParams.productsFilter = productsFilter;
             }
             // Validate arguments
-            const validatedArgs = validation_js_1.getAllProductsWithNotVoidedVariantsValidation.parse(queryParams);
+            const validatedArgs = validation_js_1.getAllProductsWithNotVoidedVariantsResourceValidation.parse(queryParams);
             // Call the handler
-            const result = await getAllProductsWithNotVoidedVariantsHandler(validatedArgs);
-            return {
-                contents: [
-                    {
-                        uri: uri.toString(),
-                        mimeType: "application/json",
-                        text: result,
-                    },
-                ],
-            };
+            return this.createResourceHandler((getSDK) => {
+                return async () => {
+                    return await (0, offers_js_1.createGetAllProductsWithNotVoidedVariantsHandler)(getSDK)(validatedArgs);
+                };
+            })(uri);
         });
     }
     async startStdio() {
         const server = this.createServerInstance();
         const transport = new stdio_js_1.StdioServerTransport();
         await server.connect(transport);
-        log("Boson Protocol MCP server running on stdio");
+        (0, index_js_1.log)("Boson Protocol MCP server running on stdio");
     }
     async startHttp(port = 3000) {
-        const express = await Promise.resolve().then(() => __importStar(require("express")));
-        const app = express.default();
+        const { default: express } = await Promise.resolve().then(() => __importStar(require("express")));
+        const app = express();
         app.use(express.json());
         // Get allowed hosts from environment variable
         const allowedHosts = process.env.ALLOWED_HOSTS?.split(",").map((h) => h.trim()) || ["127.0.0.1", "localhost"];
@@ -1026,7 +894,7 @@ class BosonMCPServer {
                 });
                 // Clean up transport when closed
                 transport.onclose = () => {
-                    log("transport has been closed");
+                    (0, index_js_1.log)("transport has been closed");
                     if (transport.sessionId) {
                         delete transports[transport.sessionId];
                     }
@@ -1084,10 +952,10 @@ class BosonMCPServer {
         // Get bind address from environment variable
         const bindAddress = process.env.BIND_ADDRESS || "127.0.0.1";
         app.listen(port, bindAddress, () => {
-            log(`Boson MCP Server running on http://${bindAddress}:${port}`);
-            log(`Web interface: http://${bindAddress}:${port}`);
-            log(`MCP endpoint: http://${bindAddress}:${port}/mcp`);
-            log(`Health check: http://${bindAddress}:${port}/health`);
+            (0, index_js_1.log)(`Boson MCP Server running on http://${bindAddress}:${port}`);
+            (0, index_js_1.log)(`Web interface: http://${bindAddress}:${port}`);
+            (0, index_js_1.log)(`MCP endpoint: http://${bindAddress}:${port}/mcp`);
+            (0, index_js_1.log)(`Health check: http://${bindAddress}:${port}/health`);
         });
     }
     async run() {
@@ -1107,6 +975,6 @@ exports.BosonMCPServer = BosonMCPServer;
 // Only run server if not in test environment
 if (process.env.NODE_ENV !== "test" && process.env.VITEST !== "true") {
     const server = new BosonMCPServer();
-    server.run().catch(log);
+    server.run().catch(index_js_1.log);
 }
 //# sourceMappingURL=index.js.map