@yodlpay/payment-decoder 1.1.0 → 1.2.1

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { PublicClient, Address, Hex, Log } from 'viem';
+import { TokenInfo } from '@yodlpay/tokenlists';
 
 type ChainClients = Record<number, PublicClient>;
 declare function createClients(): ChainClients;
@@ -26,8 +27,8 @@ interface SwapInfo {
     service: ServiceProvider;
 }
 interface BridgeInfo extends SwapInfo {
-    originChainId: number;
-    originTxHash: Hex;
+    sourceChainId: number;
+    sourceTxHash: Hex;
     destinationChainId: number;
     destinationTxHash: Hex;
     tokenOutAmountGross: bigint;
@@ -39,6 +40,16 @@ type PaymentInfo = (PaymentEvent & {
 }) | (PaymentEvent & BridgeInfo & {
     type: "bridge";
 });
+interface TokenInInfo extends TokenInfo {
+    amount: bigint;
+    amountFormatted: string;
+}
+interface TokenOutInfo extends TokenInfo {
+    amountGross: bigint;
+    amountGrossFormatted: string;
+    amountNet: bigint;
+    amountNetFormatted: string;
+}
 interface YodlPayment {
     senderAddress: Address;
     receiverAddress: Address;
@@ -46,16 +57,13 @@ interface YodlPayment {
     processorMemo: string;
     processorAddress: Address;
     data: Record<string, unknown>;
-    tokenInAddress: Address;
-    tokenInAmount: string;
-    tokenOutAddress: Address;
-    originChainId: number;
-    originTxHash: Hex;
+    tokenIn: TokenInInfo;
+    tokenOut: TokenOutInfo;
+    sourceChainId: number;
+    sourceTxHash: Hex;
     destinationChainId: number;
     destinationTxHash: Hex;
     solver: string | null;
-    tokenOutAmountGross: string;
-    tokenOutAmountNet: string;
     blockTimestamp: Date;
 }
 
@@ -99,4 +107,4 @@ declare function decodeBridgePayment(hash: Hex, clients: ChainClients): Promise<
 
 declare function decodeYodlPayment(txHash: Hex, chainId: number, clients: ChainClients): Promise<YodlPayment>;
 
-export { type BridgeInfo, type ChainClients, type DecodedYodlEvent, NoBridgeFoundError, NoYodlEventError, type PaymentEvent, type PaymentInfo, type ServiceProvider, type SwapInfo, type Webhook, type YodlPayment, createClients, decodeBridgePayment, decodePayment, decodeYodlFromLogs, decodeYodlPayment };
+export { type BridgeInfo, type ChainClients, type DecodedYodlEvent, NoBridgeFoundError, NoYodlEventError, type PaymentEvent, type PaymentInfo, type ServiceProvider, type SwapInfo, type TokenInInfo, type TokenOutInfo, type Webhook, type YodlPayment, createClients, decodeBridgePayment, decodePayment, decodeYodlFromLogs, decodeYodlPayment };

package/dist/index.js

@@ -374,8 +374,8 @@ function parseRelayResponse(request) {
     throw new NoBridgeFoundError();
   }
   return {
-    originChainId: inTx.chainId,
-    originTxHash: inTx.hash,
+    sourceChainId: inTx.chainId,
+    sourceTxHash: inTx.hash,
     destinationChainId: outTx.chainId,
     destinationTxHash: outTx.hash,
     inputAmountGross: BigInt(data?.metadata?.currencyIn?.amount ?? 0)
@@ -384,18 +384,18 @@ function parseRelayResponse(request) {
 async function decodeBridgePayment(hash, clients) {
   const request = await fetchRelayRequest(hash);
   const {
-    originChainId,
-    originTxHash,
+    sourceChainId,
+    sourceTxHash,
     destinationChainId,
     destinationTxHash,
     inputAmountGross
   } = parseRelayResponse(request);
   const destProvider = getClient(clients, destinationChainId);
-  const sourceProvider = getClient(clients, originChainId);
+  const sourceProvider = getClient(clients, sourceChainId);
   const { address: routerAddress } = getRouter(destinationChainId);
   const [destReceipt, sourceReceipt] = await Promise.all([
     destProvider.getTransactionReceipt({ hash: destinationTxHash }),
-    sourceProvider.getTransactionReceipt({ hash: originTxHash })
+    sourceProvider.getTransactionReceipt({ hash: sourceTxHash })
   ]);
   const yodlEvent = decodeYodlFromLogs(destReceipt.logs, routerAddress);
   if (!yodlEvent) {
@@ -406,7 +406,7 @@ async function decodeBridgePayment(hash, clients) {
   const [destBlock, destTx, sender] = await Promise.all([
     destProvider.getBlock({ blockNumber: destReceipt.blockNumber }),
     destProvider.getTransaction({ hash: destinationTxHash }),
-    extractSenderFromSource(sourceReceipt, sourceProvider, originTxHash)
+    extractSenderFromSource(sourceReceipt, sourceProvider, sourceTxHash)
   ]);
   const tokens = resolveBridgeTokens(
     sourceReceipt,
@@ -414,12 +414,12 @@ async function decodeBridgePayment(hash, clients) {
     yodlEvent,
     sender,
     inputAmountGross,
-    originChainId,
+    sourceChainId,
     destinationChainId
   );
   const bridge = {
-    originChainId,
-    originTxHash,
+    sourceChainId,
+    sourceTxHash,
     destinationChainId,
     destinationTxHash,
     ...tokens,
@@ -476,33 +476,35 @@ async function decodePayment(hash, chainId, clients) {
 // src/yodl-payment.ts
 import { getTokenByAddress as getTokenByAddress2 } from "@yodlpay/tokenlists";
 import { formatUnits, zeroAddress } from "viem";
-function formatTokenAmounts(params) {
-  const { decimals: inDecimals } = getTokenByAddress2(
-    params.tokenIn,
-    params.inChainId
-  );
-  const { decimals: outDecimals } = getTokenByAddress2(
-    params.tokenOut,
-    params.outChainId
-  );
-  const tokenOutAmountGross = formatUnits(
-    params.tokenOutAmountGross,
-    outDecimals
-  );
-  const tokenOutAmountNet = formatUnits(params.tokenOutAmountNet, outDecimals);
+function buildTokenInfo(params) {
+  const inToken = getTokenByAddress2(params.tokenIn, params.inChainId);
+  const outToken = getTokenByAddress2(params.tokenOut, params.outChainId);
   return {
-    tokenInAddress: params.tokenIn,
-    tokenInAmount: formatUnits(params.tokenInAmount, inDecimals),
-    tokenOutAddress: params.tokenOut,
-    tokenOutAmountGross,
-    tokenOutAmountNet
+    tokenIn: {
+      ...inToken,
+      amount: params.tokenInAmount,
+      amountFormatted: formatUnits(params.tokenInAmount, inToken.decimals)
+    },
+    tokenOut: {
+      ...outToken,
+      amountGross: params.tokenOutAmountGross,
+      amountGrossFormatted: formatUnits(
+        params.tokenOutAmountGross,
+        outToken.decimals
+      ),
+      amountNet: params.tokenOutAmountNet,
+      amountNetFormatted: formatUnits(
+        params.tokenOutAmountNet,
+        outToken.decimals
+      )
+    }
   };
 }
 function extractTokenInfo(paymentInfo, chainId, txHash) {
   switch (paymentInfo.type) {
     case "direct": {
       return {
-        ...formatTokenAmounts({
+        ...buildTokenInfo({
           tokenIn: paymentInfo.token,
           tokenInAmount: paymentInfo.amount,
           tokenOut: paymentInfo.token,
@@ -511,8 +513,8 @@ function extractTokenInfo(paymentInfo, chainId, txHash) {
           inChainId: chainId,
           outChainId: chainId
         }),
-        originChainId: chainId,
-        originTxHash: txHash,
+        sourceChainId: chainId,
+        sourceTxHash: txHash,
         destinationChainId: chainId,
         destinationTxHash: txHash,
         solver: null
@@ -520,7 +522,7 @@ function extractTokenInfo(paymentInfo, chainId, txHash) {
     }
     case "swap": {
       return {
-        ...formatTokenAmounts({
+        ...buildTokenInfo({
           tokenIn: paymentInfo.tokenIn,
           tokenInAmount: paymentInfo.tokenInAmount,
           tokenOut: paymentInfo.token,
@@ -529,8 +531,8 @@ function extractTokenInfo(paymentInfo, chainId, txHash) {
           inChainId: chainId,
           outChainId: chainId
         }),
-        originChainId: chainId,
-        originTxHash: txHash,
+        sourceChainId: chainId,
+        sourceTxHash: txHash,
         destinationChainId: chainId,
         destinationTxHash: txHash,
         solver: paymentInfo.service ?? null
@@ -538,17 +540,17 @@ function extractTokenInfo(paymentInfo, chainId, txHash) {
     }
     case "bridge": {
       return {
-        ...formatTokenAmounts({
+        ...buildTokenInfo({
           tokenIn: paymentInfo.tokenIn,
           tokenInAmount: paymentInfo.tokenInAmount,
           tokenOut: paymentInfo.tokenOut,
           tokenOutAmountGross: paymentInfo.tokenOutAmountGross,
           tokenOutAmountNet: paymentInfo.amount,
-          inChainId: paymentInfo.originChainId,
+          inChainId: paymentInfo.sourceChainId,
           outChainId: paymentInfo.destinationChainId
         }),
-        originChainId: paymentInfo.originChainId,
-        originTxHash: paymentInfo.originTxHash,
+        sourceChainId: paymentInfo.sourceChainId,
+        sourceTxHash: paymentInfo.sourceTxHash,
         destinationChainId: paymentInfo.destinationChainId,
         destinationTxHash: paymentInfo.destinationTxHash,
         solver: paymentInfo.service ?? null

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yodlpay/payment-decoder",
-	"version": "1.1.0",
+	"version": "1.2.1",
 	"description": "Decode Yodl payment hashes into structured payment data",
 	"keywords": [
 		"yodl",