@net-protocol/cli 0.1.32 → 0.1.34

package/dist/cli/index.mjs

@@ -7,9 +7,9 @@ import chalk4 from 'chalk';
 import * as fs6 from 'fs';
 import { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
 import { OPTIMAL_CHUNK_SIZE, StorageClient, detectFileTypeFromBase64, base64ToDataUri, shouldSuggestXmlStorage, getStorageKeyBytes, encodeStorageKeyForUrl, chunkDataForStorage, CHUNKED_STORAGE_CONTRACT, STORAGE_CONTRACT as STORAGE_CONTRACT$1 } from '@net-protocol/storage';
-import { stringToHex, createWalletClient, http, hexToString, parseEther, encodeFunctionData, publicActions, defineChain, createPublicClient } from 'viem';
+import { stringToHex, createWalletClient, http, hexToString, parseEther, encodeFunctionData, publicActions, concat, defineChain, createPublicClient } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { getNetContract, getChainName, getPublicClient, getChainRpcUrls, NetClient, getBaseDataSuffix, toBytes32, NULL_ADDRESS } from '@net-protocol/core';
+import { getNetContract, getChainName, getPublicClient, getChainRpcUrls, getBaseDataSuffix, NetClient, toBytes32, NULL_ADDRESS } from '@net-protocol/core';
 import { createRelayX402Client, createRelaySession, checkBackendWalletBalance, fundBackendWallet, batchTransactions, submitTransactionsViaRelay, waitForConfirmations, retryFailedTransactions as retryFailedTransactions$1 } from '@net-protocol/relay';
 import { FeedRegistryClient, FeedClient, AgentRegistryClient } from '@net-protocol/feeds';
 import { isNetrSupportedChain, NetrClient } from '@net-protocol/netr';
@@ -746,8 +746,9 @@ async function uploadFileWithRelay(options) {
   const userWalletClient = createWalletClient({
     account: userAccount,
     chain: publicClient.chain,
-    transport: http(rpcUrls[0])
+    transport: http(rpcUrls[0]),
     // Use first RPC URL
+    dataSuffix: getBaseDataSuffix(options.chainId)
   });
   const { fetchWithPayment, httpClient } = createRelayX402Client(
     userAccount,
@@ -1235,9 +1236,11 @@ function encodeTransaction(config, chainId) {
     functionName: config.functionName,
     args: config.args
   });
+  const suffix = getBaseDataSuffix(chainId);
+  const data = suffix ? concat([calldata, suffix]) : calldata;
   return {
     to: config.to,
-    data: calldata,
+    data,
     chainId,
     value: config.value?.toString() ?? "0"
   };
@@ -1689,7 +1692,8 @@ async function executeSend(options) {
   });
   const walletClient = createWalletClient({
     account,
-    transport: http(rpcUrls[0])
+    transport: http(rpcUrls[0]),
+    dataSuffix: getBaseDataSuffix(commonOptions.chainId)
   });
   console.log(chalk4.blue("Sending message..."));
   try {
@@ -2060,20 +2064,20 @@ async function executeEncodeOnly2(options) {
     },
     saltResult.salt
   );
-  const calldata = encodeFunctionData({
-    abi: txConfig.abi,
-    functionName: txConfig.functionName,
-    args: txConfig.args
-  });
+  const encoded = encodeTransaction(
+    {
+      to: txConfig.address,
+      abi: txConfig.abi,
+      functionName: txConfig.functionName,
+      args: txConfig.args,
+      value: txConfig.value
+    },
+    readOnlyOptions.chainId
+  );
   const result = {
     predictedAddress: saltResult.predictedAddress,
     salt: saltResult.salt,
-    transaction: {
-      to: txConfig.address,
-      data: calldata,
-      chainId: readOnlyOptions.chainId,
-      value: txConfig.value?.toString() ?? "0"
-    },
+    transaction: encoded,
     config: {
       name: options.name,
       symbol: options.symbol,
@@ -2504,7 +2508,8 @@ async function executeProfileSetPicture(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`\u{1F4F7} Setting profile picture...`));
     console.log(chalk4.gray(`   URL: ${options.url}`));
@@ -2618,7 +2623,8 @@ async function executeProfileSetUsername(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting X username...`));
     console.log(chalk4.gray(`   Username: ${displayUsername}`));
@@ -2719,7 +2725,8 @@ async function executeProfileSetBio(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting profile bio...`));
     console.log(chalk4.gray(`   Bio: ${options.bio}`));
@@ -2820,7 +2827,8 @@ async function executeProfileSetDisplayName(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting display name...`));
     console.log(chalk4.gray(`   Name: ${options.name}`));
@@ -2922,7 +2930,8 @@ async function executeProfileSetTokenAddress(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting profile token address...`));
     console.log(chalk4.gray(`   Token Address: ${normalizedAddress}`));
@@ -3075,7 +3084,8 @@ async function executeProfileSetCanvas(options) {
       account,
       chain: base,
       // TODO: Support other chains
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting profile canvas...`));
     console.log(
@@ -3299,7 +3309,8 @@ ${available}`
     const client = createWalletClient({
       account,
       chain: base,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     }).extend(publicActions);
     console.log(chalk4.blue(`Setting profile CSS...`));
     console.log(
@@ -3844,7 +3855,8 @@ async function executeCreateListing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -3982,7 +3994,8 @@ async function executeCreateOffer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -4127,7 +4140,8 @@ async function executeSubmitListing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     console.log(chalk4.blue("Submitting listing..."));
     const calldata = encodeFunctionData({
@@ -4208,7 +4222,8 @@ async function executeSubmitOffer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     console.log(chalk4.blue("Submitting offer..."));
     const calldata = encodeFunctionData({
@@ -4287,7 +4302,8 @@ async function executeBuyListing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -4420,7 +4436,8 @@ async function executeAcceptOffer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -4701,7 +4718,8 @@ async function executeCreateErc20Listing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -4842,7 +4860,8 @@ async function executeCreateErc20Offer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -4990,7 +5009,8 @@ async function executeSubmitErc20Listing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     console.log(chalk4.blue("Submitting ERC-20 listing..."));
     const calldata = encodeFunctionData({
@@ -5071,7 +5091,8 @@ async function executeSubmitErc20Offer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     console.log(chalk4.blue("Submitting ERC-20 offer..."));
     const calldata = encodeFunctionData({
@@ -5150,7 +5171,8 @@ async function executeBuyErc20Listing(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));
@@ -5283,7 +5305,8 @@ async function executeAcceptErc20Offer(options) {
     });
     const walletClient = createWalletClient({
       account,
-      transport: http(rpcUrls[0])
+      transport: http(rpcUrls[0]),
+      dataSuffix: getBaseDataSuffix(commonOptions.chainId)
     });
     for (const approval of prepared.approvals) {
       console.log(chalk4.blue("Sending approval transaction..."));