fix: address PR review comments

- Add hexAddress to deployment files (mainnet.json and nile.json)
- Move tron/nile chain definitions from declarative to tron folder
- Update DeclarativeChainName type to remove tron/nile
- Use erc20FeeProxyArtifact.getDeploymentInformation() instead of hardcoded values
- Rename tron-fee-proxy.ts to trc20-fee-proxy.ts for clarity
- Make fee limit configurable in utils-tron.ts with defaults

Author: rodrigopavezi

packages/currency/src/chains/declarative/index.ts

@@ -1,7 +1,5 @@
 import { CurrencyTypes } from '@requestnetwork/types';
 
-import * as TronDefinition from './data/tron';
-import * as NileDefinition from './data/nile';
 import * as SolanaDefinition from './data/solana';
 import * as StarknetDefinition from './data/starknet';
 import * as TonDefinition from './data/ton';
@@ -11,8 +9,6 @@ import * as SuiDefinition from './data/sui';
 export type DeclarativeChain = CurrencyTypes.Chain;
 
 export const chains: Record<CurrencyTypes.DeclarativeChainName, DeclarativeChain> = {
-  tron: TronDefinition,
-  nile: NileDefinition,
   solana: SolanaDefinition,
   starknet: StarknetDefinition,
   ton: TonDefinition,

…ency/src/chains/declarative/data/nile.ts …es/currency/src/chains/tron/data/nile.tspackages/currency/src/chains/declarative/data/nile.ts renamed to packages/currency/src/chains/tron/data/nile.ts packages/currency/src/chains/declarative/data/nile.ts renamed to packages/currency/src/chains/tron/data/nile.ts

@@ -1,7 +1,7 @@
 import { CurrencyTypes } from '@requestnetwork/types';
 
-import * as TronDefinition from '../declarative/data/tron';
-import * as NileDefinition from '../declarative/data/nile';
+import * as TronDefinition from './data/tron';
+import * as NileDefinition from './data/nile';
 
 export type TronChain = CurrencyTypes.Chain;
 

…ency/src/chains/declarative/data/tron.ts …es/currency/src/chains/tron/data/tron.tspackages/currency/src/chains/declarative/data/tron.ts renamed to packages/currency/src/chains/tron/data/tron.ts packages/currency/src/chains/declarative/data/tron.ts renamed to packages/currency/src/chains/tron/data/tron.ts

@@ -50,14 +50,8 @@ export class TronERC20FeeProxyPaymentDetector extends ERC20FeeProxyPaymentDetect
     _paymentNetworkVersion?: string,
   ): { address: string; creationBlockNumber: number } {
     void _paymentNetworkVersion; // Parameter kept for API compatibility
-    // For TRON, we use the 'tron' version of the artifact
-    const address = erc20FeeProxyArtifact.getAddress(network, 'tron');
-    const creationBlockNumber =
-      network === 'tron'
-        ? 79216121 // TRON mainnet
-        : 63208782; // Nile testnet
-
-    return { address, creationBlockNumber };
+    // For TRON, we use the 'tron' version of the artifact which contains Tron-specific deployments
+    return erc20FeeProxyArtifact.getDeploymentInformation(network, 'tron');
   }
 
   /**

packages/currency/src/chains/tron/index.ts

@@ -29,7 +29,7 @@ export * as Escrow from './payment/erc20-escrow-payment';
 export * from './payment/prepared-transaction';
 export * from './payment/utils-near';
 export * from './payment/utils-tron';
-export * from './payment/tron-fee-proxy';
+export * from './payment/trc20-fee-proxy';
 export * from './payment/single-request-forwarder';
 export * from './payment/erc20-recurring-payment-proxy';
 export * from './payment/erc20-commerce-escrow-wrapper';

packages/payment-detection/src/tron/tron-fee-proxy-detector.ts

@@ -137,22 +137,30 @@ export const getTronAllowance = async (
   }
 };
 
+/** Default fee limit for TRC20 approval (100 TRX in SUN) */
+export const DEFAULT_APPROVAL_FEE_LIMIT = 100_000_000;
+
+/** Default fee limit for TRC20 fee proxy payment (150 TRX in SUN) */
+export const DEFAULT_PAYMENT_FEE_LIMIT = 150_000_000;
+
 /**
  * Approves the ERC20FeeProxy contract to spend TRC20 tokens
+ * @param feeLimit - Optional fee limit in SUN (1 TRX = 1,000,000 SUN). Defaults to 100 TRX.
  */
 export const approveTrc20 = async (
   tronWeb: TronWeb,
   tokenAddress: string,
   network: CurrencyTypes.TronChainName,
   amount: BigNumberish,
   callback?: ITronTransactionCallback,
+  feeLimit: number = DEFAULT_APPROVAL_FEE_LIMIT,
 ): Promise<string> => {
   const proxyAddress = getERC20FeeProxyAddress(network);
   const contract = await tronWeb.contract(TRC20_ABI, tokenAddress);
 
   try {
     const result = await contract.approve(proxyAddress, amount.toString()).send({
-      feeLimit: 100000000, // 100 TRX fee limit
+      feeLimit,
       shouldPollResponse: true,
     });
 
@@ -168,6 +176,7 @@ export const approveTrc20 = async (
 
 /**
  * Processes a TRC20 fee proxy payment on Tron
+ * @param feeLimit - Optional fee limit in SUN (1 TRX = 1,000,000 SUN). Defaults to 150 TRX.
  */
 export const processTronFeeProxyPayment = async (
   tronWeb: TronWeb,
@@ -179,6 +188,7 @@ export const processTronFeeProxyPayment = async (
   feeAmount: BigNumberish,
   feeAddress: string,
   callback?: ITronTransactionCallback,
+  feeLimit: number = DEFAULT_PAYMENT_FEE_LIMIT,
 ): Promise<string> => {
   // Validate addresses
   if (!isValidTronAddress(to)) {
@@ -213,7 +223,7 @@ export const processTronFeeProxyPayment = async (
         feeAddress,
       )
       .send({
-        feeLimit: 150000000, // 150 TRX fee limit for proxy call
+        feeLimit,
         shouldPollResponse: true,
       });
 

packages/payment-processor/src/index.ts

@@ -7,6 +7,7 @@
   "contracts": {
     "ERC20FeeProxy": {
       "address": "TCUDPYnS9dH3WvFEaE7wN7vnDa51J4R4fd",
+      "hexAddress": "411b6ca35d39842cf8fbe49000653a1505412da659",
       "creationBlockNumber": 79216121
     }
   }