@ardrive/turbo-sdk 1.33.1 → 1.34.0

package/lib/cjs/cli/cli.js

@@ -41,7 +41,7 @@ const utils_js_1 = require("./utils.js");
 (0, utils_js_1.applyOptions)(commander_1.program.command('top-up').description('Top up a Turbo address with Fiat'), [...options_js_1.walletOptions, options_js_1.optionMap.address, options_js_1.optionMap.value, options_js_1.optionMap.currency]).action(async (_commandOptions, command) => {
     await (0, utils_js_1.runCommand)(command, index_js_1.topUp);
 });
-(0, utils_js_1.applyOptions)(commander_1.program.command('crypto-fund').description('Top up a wallet with crypto'), [...options_js_1.walletOptions, options_js_1.optionMap.value, options_js_1.optionMap.txId]).action(async (_commandOptions, command) => {
+(0, utils_js_1.applyOptions)(commander_1.program.command('crypto-fund').description('Top up a wallet with crypto'), [...options_js_1.walletOptions, options_js_1.optionMap.value, options_js_1.optionMap.txId, options_js_1.optionMap.address]).action(async (_commandOptions, command) => {
     await (0, utils_js_1.runCommand)(command, index_js_1.cryptoFund);
 });
 (0, utils_js_1.applyOptions)(commander_1.program.command('upload-folder').description('Upload a folder using Turbo'), options_js_1.uploadFolderOptions).action(async (_commandOptions, command) => {

package/lib/cjs/cli/commands/cryptoFund.js

@@ -28,6 +28,7 @@ const utils_js_1 = require("../utils.js");
 async function cryptoFund(options) {
     const value = options.value;
     const txId = options.txId;
+    const address = options.address;
     if (txId !== undefined) {
         const turbo = factory_js_1.TurboFactory.unauthenticated((0, utils_js_1.configFromOptions)(options));
         const result = await turbo.submitFundTransaction({ txId: txId });
@@ -47,7 +48,7 @@ async function cryptoFund(options) {
         const { confirm } = await (0, prompts_1.default)({
             type: 'confirm',
             name: 'confirm',
-            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${await turbo.signer.getNativeAddress()}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
+            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${address ?? (await turbo.signer.getNativeAddress())}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
             initial: true,
         });
         if (!confirm) {
@@ -57,6 +58,7 @@ async function cryptoFund(options) {
     }
     const result = await turbo.topUpWithTokens({
         tokenAmount,
+        turboCreditDestinationAddress: address,
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
 }

package/lib/cjs/common/payment.js

@@ -18,6 +18,7 @@ exports.TurboAuthenticatedPaymentService = exports.TurboUnauthenticatedPaymentSe
  */
 const bignumber_js_1 = require("bignumber.js");
 const axiosClient_js_1 = require("../utils/axiosClient.js");
+const common_js_1 = require("../utils/common.js");
 const http_js_1 = require("./http.js");
 const logger_js_1 = require("./logger.js");
 const index_js_1 = require("./token/index.js");
@@ -151,31 +152,37 @@ class TurboUnauthenticatedPaymentService {
             return {
                 id: response.creditedTransaction.transactionId,
                 quantity: response.creditedTransaction.transactionQuantity,
-                owner: response.creditedTransaction.destinationAddress,
+                owner: response.creditedTransaction.transactionSenderAddress ??
+                    response.creditedTransaction.destinationAddress,
                 winc: response.creditedTransaction.winstonCreditAmount,
                 token: response.creditedTransaction.tokenType,
                 status: 'confirmed',
                 block: response.creditedTransaction.blockHeight,
+                recipient: response.creditedTransaction.destinationAddress,
             };
         }
         else if ('pendingTransaction' in response) {
             return {
                 id: response.pendingTransaction.transactionId,
                 quantity: response.pendingTransaction.transactionQuantity,
-                owner: response.pendingTransaction.destinationAddress,
+                owner: response.pendingTransaction.transactionSenderAddress ??
+                    response.pendingTransaction.destinationAddress,
                 winc: response.pendingTransaction.winstonCreditAmount,
                 token: response.pendingTransaction.tokenType,
                 status: 'pending',
+                recipient: response.pendingTransaction.destinationAddress,
             };
         }
         else if ('failedTransaction' in response) {
             return {
                 id: response.failedTransaction.transactionId,
                 quantity: response.failedTransaction.transactionQuantity,
-                owner: response.failedTransaction.destinationAddress,
+                owner: response.failedTransaction.transactionSenderAddress ??
+                    response.failedTransaction.destinationAddress,
                 winc: response.failedTransaction.winstonCreditAmount,
                 token: response.failedTransaction.tokenType,
                 status: 'failed',
+                recipient: response.failedTransaction.destinationAddress,
             };
         }
         throw new Error('Unknown response from payment service: ' + response);
@@ -271,10 +278,15 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
         }
         return walletAddress;
     }
-    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, }) {
+    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, turboCreditDestinationAddress, }) {
         if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
+        if (turboCreditDestinationAddress !== undefined) {
+            if ((0, common_js_1.isAnyValidUserAddress)(turboCreditDestinationAddress) === false) {
+                throw new Error(`Invalid turboCreditDestinationAddress provided: ${turboCreditDestinationAddress}`);
+            }
+        }
         const tokenAmount = new bignumber_js_1.BigNumber(tokenAmountV);
         const target = await this.getTargetWalletForFund();
         this.logger.debug('Funding account...', {
@@ -287,6 +299,7 @@ class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymentServic
             tokenAmount,
             feeMultiplier,
             signer: this.signer,
+            turboCreditDestinationAddress,
         });
         const txId = fundTx.id;
         try {

package/lib/cjs/common/signer.js

@@ -34,6 +34,8 @@ const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const types_js_1 = require("../types.js");
 const base64_js_1 = require("../utils/base64.js");
 const logger_js_1 = require("./logger.js");
+const ethereum_js_1 = require("./token/ethereum.js");
+const solana_js_1 = require("./token/solana.js");
 /**
  * Abstract class for signing TurboDataItems.
  */
@@ -81,7 +83,7 @@ class TurboDataItemAbstractSigner {
         return this.ownerToNativeAddress((0, base64_js_1.toB64Url)(await this.getPublicKey()), this.token);
     }
     /** Let the signer handle sending tx for better compat with cross chain libraries/web wallets */
-    async sendTransaction({ target, amount, gatewayUrl, }) {
+    async sendTransaction({ target, amount, gatewayUrl, turboCreditDestinationAddress, }) {
         if (this.walletAdapter) {
             if ((0, types_js_1.isSolanaWalletAdapter)(this.walletAdapter)) {
                 const connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
@@ -95,6 +97,14 @@ class TurboDataItemAbstractSigner {
                     toPubkey: new web3_js_1.PublicKey(target),
                     lamports: +new bignumber_js_1.BigNumber(amount),
                 }));
+                if (turboCreditDestinationAddress !== undefined) {
+                    tx.add(new web3_js_1.TransactionInstruction({
+                        programId: new web3_js_1.PublicKey(solana_js_1.memoProgramId),
+                        keys: [],
+                        data: Buffer.from('turboCreditDestinationAddress=' +
+                            turboCreditDestinationAddress),
+                    }));
+                }
                 const signedTx = await this.walletAdapter.signTransaction(tx);
                 const id = await connection.sendRawTransaction(signedTx.serialize());
                 return id;
@@ -109,6 +119,7 @@ class TurboDataItemAbstractSigner {
             const { hash } = await signer.sendTransaction({
                 to: target,
                 value: (0, ethers_1.parseEther)(amount.toFixed(18)),
+                data: (0, ethereum_js_1.ethDataFromTurboCreditDestinationAddress)(turboCreditDestinationAddress),
             });
             return hash;
         }
@@ -121,6 +132,7 @@ class TurboDataItemAbstractSigner {
         const tx = await ethWalletAndProvider.sendTransaction({
             to: target,
             value: (0, ethers_1.parseEther)(amount.toFixed(18)),
+            data: (0, ethereum_js_1.ethDataFromTurboCreditDestinationAddress)(turboCreditDestinationAddress),
         });
         this.logger.debug('Sent transaction', { tx });
         return tx.hash;

package/lib/cjs/common/token/ario.js

@@ -35,34 +35,42 @@ class ARIOToken {
         this.pollingOptions = pollingOptions;
         this.logger = logger;
     }
-    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, }) {
+    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, turboCreditDestinationAddress, }) {
+        const tags = [
+            {
+                name: 'Action',
+                value: 'Transfer',
+            },
+            {
+                name: 'Recipient',
+                value: target,
+            },
+            {
+                name: 'Quantity',
+                value: tokenAmount.toString(),
+            },
+            {
+                name: 'Turbo-SDK',
+                value: version_js_1.version,
+            },
+        ];
+        if (turboCreditDestinationAddress !== undefined) {
+            tags.push({
+                name: 'Turbo-Credit-Destination-Address',
+                value: turboCreditDestinationAddress,
+            });
+        }
         const txId = await this.ao.message({
             signer: createAoSigner(signer),
             process: this.processId,
-            tags: [
-                {
-                    name: 'Action',
-                    value: 'Transfer',
-                },
-                {
-                    name: 'Recipient',
-                    value: target,
-                },
-                {
-                    name: 'Quantity',
-                    value: tokenAmount.toString(),
-                },
-                {
-                    name: 'Turbo-SDK',
-                    value: version_js_1.version,
-                },
-            ],
+            tags,
         });
         this.logger.debug('Submitted Transfer message to ARIO process...', {
             id: txId,
             target,
             tokenAmount,
             processId: this.processId,
+            tags,
         });
         return { id: txId, target, reward: '0' };
     }

package/lib/cjs/common/token/arweave.js

@@ -46,7 +46,7 @@ class ArweaveToken {
         this.mintU = mintU;
         this.pollingOptions = pollingOptions;
     }
-    async createAndSubmitTx({ feeMultiplier, target, tokenAmount, signer, }) {
+    async createAndSubmitTx({ feeMultiplier, target, tokenAmount, signer, turboCreditDestinationAddress, }) {
         const tx = await this.arweave.createTransaction({
             target,
             quantity: tokenAmount.toString(),
@@ -63,6 +63,9 @@ class ArweaveToken {
             tx.addTag('Contract', 'KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw'); // cspell:enable
             tx.addTag('Input', JSON.stringify({ function: 'mint' }));
         }
+        if (turboCreditDestinationAddress !== undefined) {
+            tx.addTag('Turbo-Credit-Destination-Address', turboCreditDestinationAddress);
+        }
         const publicKeyB64Url = (0, base64_js_1.toB64Url)(await signer.getPublicKey());
         tx.setOwner(publicKeyB64Url);
         const dataToSign = await tx.getSignatureData();

package/lib/cjs/common/token/ethereum.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumToken = exports.ETHToTokenAmount = exports.weiToTokenAmount = void 0;
+exports.ethDataFromTurboCreditDestinationAddress = ethDataFromTurboCreditDestinationAddress;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -28,25 +29,37 @@ class EthereumToken {
     constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.ethereum, pollingOptions = {
         maxAttempts: 10,
         pollingIntervalMs: 4_000,
-        initialBackoffMs: 10_000,
+        initialBackoffMs: 25_000,
     }, } = {}) {
         this.logger = logger;
         this.gatewayUrl = gatewayUrl;
         this.pollingOptions = pollingOptions;
         this.rpcProvider = new ethers_1.ethers.JsonRpcProvider(gatewayUrl);
     }
-    async createAndSubmitTx({ target, tokenAmount, signer, }) {
-        // convert wei to eth
-        const eth = tokenAmount.shiftedBy(-18);
-        const txId = await signer.sendTransaction({
-            target,
-            amount: eth,
-            gatewayUrl: this.gatewayUrl,
-        });
-        return {
-            id: txId,
-            target,
-        };
+    async createAndSubmitTx({ target, tokenAmount, signer, turboCreditDestinationAddress, }) {
+        try {
+            // convert wei to eth
+            const eth = tokenAmount.shiftedBy(-18);
+            const txId = await signer.sendTransaction({
+                target,
+                amount: eth,
+                gatewayUrl: this.gatewayUrl,
+                turboCreditDestinationAddress,
+            });
+            return {
+                id: txId,
+                target,
+            };
+        }
+        catch (e) {
+            this.logger.error('Error creating and submitting Ethereum tx', {
+                error: e instanceof Error ? e.message : e,
+                target,
+                tokenAmount,
+                rpcEndpoint: this.gatewayUrl,
+            });
+            throw e;
+        }
     }
     async getTxAvailability(txId) {
         const tx = await this.rpcProvider.getTransaction(txId);
@@ -77,3 +90,9 @@ class EthereumToken {
     }
 }
 exports.EthereumToken = EthereumToken;
+function ethDataFromTurboCreditDestinationAddress(turboCreditDestinationAddress) {
+    if (turboCreditDestinationAddress !== undefined) {
+        return (0, ethers_1.hexlify)((0, ethers_1.toUtf8Bytes)('turboCreditDestinationAddress=' + turboCreditDestinationAddress));
+    }
+    return undefined;
+}

package/lib/cjs/common/token/solana.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaToken = exports.SOLToTokenAmount = exports.lamportToTokenAmount = void 0;
+exports.SolanaToken = exports.memoProgramId = exports.SOLToTokenAmount = exports.lamportToTokenAmount = void 0;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -30,6 +30,7 @@ const lamportToTokenAmount = (winston) => winston;
 exports.lamportToTokenAmount = lamportToTokenAmount;
 const SOLToTokenAmount = (sol) => new bignumber_js_1.BigNumber(sol).times(1e9).valueOf();
 exports.SOLToTokenAmount = SOLToTokenAmount;
+exports.memoProgramId = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 class SolanaToken {
     constructor({ logger = logger_js_1.TurboWinstonLogger.default, gatewayUrl = common_js_1.defaultProdGatewayUrls.solana, pollingOptions = {
         maxAttempts: 10,
@@ -41,12 +42,13 @@ class SolanaToken {
         this.connection = new web3_js_1.Connection(gatewayUrl, 'confirmed');
         this.pollingOptions = pollingOptions;
     }
-    async createAndSubmitTx({ target, tokenAmount, signer, }) {
+    async createAndSubmitTx({ target, tokenAmount, signer, turboCreditDestinationAddress, }) {
         if (signer.signer instanceof arbundles_1.HexInjectedSolanaSigner) {
             const id = await signer.sendTransaction({
                 amount: tokenAmount,
                 target,
                 gatewayUrl: this.gatewayUrl,
+                turboCreditDestinationAddress,
             });
             return { target, id };
         }
@@ -60,6 +62,13 @@ class SolanaToken {
             toPubkey: new web3_js_1.PublicKey(target),
             lamports: +new bignumber_js_1.BigNumber(tokenAmount),
         }));
+        if (turboCreditDestinationAddress !== undefined) {
+            tx.add(new web3_js_1.TransactionInstruction({
+                programId: new web3_js_1.PublicKey(exports.memoProgramId),
+                keys: [],
+                data: Buffer.from('turboCreditDestinationAddress=' + turboCreditDestinationAddress),
+            }));
+        }
         const serializedTx = tx.serializeMessage();
         const signature = await signer.signData(Uint8Array.from(serializedTx));
         tx.addSignature(publicKey, Buffer.from(signature));

package/lib/cjs/utils/common.js

@@ -7,6 +7,12 @@ exports.createTurboSigner = createTurboSigner;
 exports.signerFromKyvePrivateKey = signerFromKyvePrivateKey;
 exports.signerFromKyveMnemonic = signerFromKyveMnemonic;
 exports.isBlob = isBlob;
+exports.isValidArweaveBase64URL = isValidArweaveBase64URL;
+exports.isValidSolanaAddress = isValidSolanaAddress;
+exports.isValidECDSAAddress = isValidECDSAAddress;
+exports.isValidKyveAddress = isValidKyveAddress;
+exports.isValidUserAddress = isValidUserAddress;
+exports.isAnyValidUserAddress = isAnyValidUserAddress;
 /**
  * Copyright (C) 2022-2024 Permanent Data Solutions, Inc.
  *
@@ -28,6 +34,7 @@ const encoding_1 = require("@cosmjs/encoding");
 const arbundles_1 = require("@dha-team/arbundles");
 const bytes_1 = require("@ethersproject/bytes");
 const signing_key_1 = require("@ethersproject/signing-key");
+const web3_js_1 = require("@solana/web3.js");
 const ethers_1 = require("ethers");
 const types_js_1 = require("../types.js");
 function sleep(ms) {
@@ -123,3 +130,48 @@ async function signerFromKyveMnemonic(mnemonic) {
 function isBlob(val) {
     return typeof Blob !== 'undefined' && val instanceof Blob;
 }
+// check if it is a valid arweave base64url for a wallet public address, transaction id or smartweave contract
+function isValidArweaveBase64URL(base64URL) {
+    const base64URLRegex = new RegExp('^[a-zA-Z0-9_-]{43}$');
+    return base64URLRegex.test(base64URL);
+}
+function isValidSolanaAddress(address) {
+    try {
+        return web3_js_1.PublicKey.isOnCurve(address);
+    }
+    catch {
+        return false;
+    }
+}
+function isValidECDSAAddress(address) {
+    const ethAddressRegex = new RegExp('^0x[a-fA-F0-9]{40}$');
+    return ethAddressRegex.test(address);
+}
+function isValidKyveAddress(address) {
+    const kyveAddressRegex = new RegExp('^kyve[a-zA-Z0-9]{39}$');
+    return kyveAddressRegex.test(address);
+}
+function isValidUserAddress(address, type) {
+    switch (type) {
+        case 'arweave':
+        case 'ario':
+            return isValidArweaveBase64URL(address);
+        case 'solana':
+            return isValidSolanaAddress(address);
+        case 'ethereum':
+        case 'base-eth':
+        case 'matic':
+        case 'pol':
+            return isValidECDSAAddress(address);
+        case 'kyve':
+            return isValidKyveAddress(address);
+    }
+}
+function isAnyValidUserAddress(address) {
+    for (const type of types_js_1.tokenTypes) {
+        if (isValidUserAddress(address, type)) {
+            return type;
+        }
+    }
+    return false;
+}

package/lib/cjs/version.js

@@ -17,4 +17,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-exports.version = '1.33.1';
+exports.version = '1.34.0';

package/lib/esm/cli/cli.js

@@ -39,7 +39,7 @@ applyOptions(program.command('balance').description('Get balance of a Turbo addr
 applyOptions(program.command('top-up').description('Top up a Turbo address with Fiat'), [...walletOptions, optionMap.address, optionMap.value, optionMap.currency]).action(async (_commandOptions, command) => {
     await runCommand(command, topUp);
 });
-applyOptions(program.command('crypto-fund').description('Top up a wallet with crypto'), [...walletOptions, optionMap.value, optionMap.txId]).action(async (_commandOptions, command) => {
+applyOptions(program.command('crypto-fund').description('Top up a wallet with crypto'), [...walletOptions, optionMap.value, optionMap.txId, optionMap.address]).action(async (_commandOptions, command) => {
     await runCommand(command, cryptoFund);
 });
 applyOptions(program.command('upload-folder').description('Upload a folder using Turbo'), uploadFolderOptions).action(async (_commandOptions, command) => {

package/lib/esm/cli/commands/cryptoFund.js

@@ -22,6 +22,7 @@ import { configFromOptions, tokenFromOptions, turboFromOptions, } from '../utils
 export async function cryptoFund(options) {
     const value = options.value;
     const txId = options.txId;
+    const address = options.address;
     if (txId !== undefined) {
         const turbo = TurboFactory.unauthenticated(configFromOptions(options));
         const result = await turbo.submitFundTransaction({ txId: txId });
@@ -41,7 +42,7 @@ export async function cryptoFund(options) {
         const { confirm } = await prompts({
             type: 'confirm',
             name: 'confirm',
-            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${await turbo.signer.getNativeAddress()}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
+            message: `\nTransaction details:\n\n  Amount: ${value} ${token}\n  Target: ${targetWallet}\n  Est Credits to receive: ${credits}\n  Credit recipient: ${address ?? (await turbo.signer.getNativeAddress())}\n  Note: Network Dependent Gas Fees May Apply\n\nThis payment is non-refundable.  Proceed with transaction?`,
             initial: true,
         });
         if (!confirm) {
@@ -51,6 +52,7 @@ export async function cryptoFund(options) {
     }
     const result = await turbo.topUpWithTokens({
         tokenAmount,
+        turboCreditDestinationAddress: address,
     });
     console.log('Sent crypto fund transaction: \n', JSON.stringify(result, null, 2));
 }

package/lib/esm/common/payment.js

@@ -15,6 +15,7 @@
  */
 import { BigNumber } from 'bignumber.js';
 import { defaultRetryConfig } from '../utils/axiosClient.js';
+import { isAnyValidUserAddress } from '../utils/common.js';
 import { TurboHTTPService } from './http.js';
 import { TurboWinstonLogger } from './logger.js';
 import { exponentMap, tokenToBaseMap } from './token/index.js';
@@ -148,31 +149,37 @@ export class TurboUnauthenticatedPaymentService {
             return {
                 id: response.creditedTransaction.transactionId,
                 quantity: response.creditedTransaction.transactionQuantity,
-                owner: response.creditedTransaction.destinationAddress,
+                owner: response.creditedTransaction.transactionSenderAddress ??
+                    response.creditedTransaction.destinationAddress,
                 winc: response.creditedTransaction.winstonCreditAmount,
                 token: response.creditedTransaction.tokenType,
                 status: 'confirmed',
                 block: response.creditedTransaction.blockHeight,
+                recipient: response.creditedTransaction.destinationAddress,
             };
         }
         else if ('pendingTransaction' in response) {
             return {
                 id: response.pendingTransaction.transactionId,
                 quantity: response.pendingTransaction.transactionQuantity,
-                owner: response.pendingTransaction.destinationAddress,
+                owner: response.pendingTransaction.transactionSenderAddress ??
+                    response.pendingTransaction.destinationAddress,
                 winc: response.pendingTransaction.winstonCreditAmount,
                 token: response.pendingTransaction.tokenType,
                 status: 'pending',
+                recipient: response.pendingTransaction.destinationAddress,
             };
         }
         else if ('failedTransaction' in response) {
             return {
                 id: response.failedTransaction.transactionId,
                 quantity: response.failedTransaction.transactionQuantity,
-                owner: response.failedTransaction.destinationAddress,
+                owner: response.failedTransaction.transactionSenderAddress ??
+                    response.failedTransaction.destinationAddress,
                 winc: response.failedTransaction.winstonCreditAmount,
                 token: response.failedTransaction.tokenType,
                 status: 'failed',
+                recipient: response.failedTransaction.destinationAddress,
             };
         }
         throw new Error('Unknown response from payment service: ' + response);
@@ -267,10 +274,15 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
         }
         return walletAddress;
     }
-    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, }) {
+    async topUpWithTokens({ feeMultiplier = 1, tokenAmount: tokenAmountV, turboCreditDestinationAddress, }) {
         if (!this.tokenTools) {
             throw new Error(`Token type not supported for crypto fund ${this.token}`);
         }
+        if (turboCreditDestinationAddress !== undefined) {
+            if (isAnyValidUserAddress(turboCreditDestinationAddress) === false) {
+                throw new Error(`Invalid turboCreditDestinationAddress provided: ${turboCreditDestinationAddress}`);
+            }
+        }
         const tokenAmount = new BigNumber(tokenAmountV);
         const target = await this.getTargetWalletForFund();
         this.logger.debug('Funding account...', {
@@ -283,6 +295,7 @@ export class TurboAuthenticatedPaymentService extends TurboUnauthenticatedPaymen
             tokenAmount,
             feeMultiplier,
             signer: this.signer,
+            turboCreditDestinationAddress,
         });
         const txId = fundTx.id;
         try {

package/lib/esm/common/signer.js

@@ -18,7 +18,7 @@ import { Secp256k1 } from '@cosmjs/crypto';
 import { toBase64 } from '@cosmjs/encoding';
 import { EthereumSigner, HexSolanaSigner } from '@dha-team/arbundles';
 import { computePublicKey } from '@ethersproject/signing-key';
-import { Connection, PublicKey, SystemProgram, Transaction, } from '@solana/web3.js';
+import { Connection, PublicKey, SystemProgram, Transaction, TransactionInstruction, } from '@solana/web3.js';
 import { BigNumber } from 'bignumber.js';
 import bs58 from 'bs58';
 import { randomBytes } from 'crypto';
@@ -28,6 +28,8 @@ import nacl from 'tweetnacl';
 import { isEthereumWalletAdapter, isSolanaWalletAdapter, } from '../types.js';
 import { fromB64Url, ownerToAddress as ownerToB64Address, toB64Url, } from '../utils/base64.js';
 import { TurboWinstonLogger } from './logger.js';
+import { ethDataFromTurboCreditDestinationAddress } from './token/ethereum.js';
+import { memoProgramId } from './token/solana.js';
 /**
  * Abstract class for signing TurboDataItems.
  */
@@ -75,7 +77,7 @@ export class TurboDataItemAbstractSigner {
         return this.ownerToNativeAddress(toB64Url(await this.getPublicKey()), this.token);
     }
     /** Let the signer handle sending tx for better compat with cross chain libraries/web wallets */
-    async sendTransaction({ target, amount, gatewayUrl, }) {
+    async sendTransaction({ target, amount, gatewayUrl, turboCreditDestinationAddress, }) {
         if (this.walletAdapter) {
             if (isSolanaWalletAdapter(this.walletAdapter)) {
                 const connection = new Connection(gatewayUrl, 'confirmed');
@@ -89,6 +91,14 @@ export class TurboDataItemAbstractSigner {
                     toPubkey: new PublicKey(target),
                     lamports: +new BigNumber(amount),
                 }));
+                if (turboCreditDestinationAddress !== undefined) {
+                    tx.add(new TransactionInstruction({
+                        programId: new PublicKey(memoProgramId),
+                        keys: [],
+                        data: Buffer.from('turboCreditDestinationAddress=' +
+                            turboCreditDestinationAddress),
+                    }));
+                }
                 const signedTx = await this.walletAdapter.signTransaction(tx);
                 const id = await connection.sendRawTransaction(signedTx.serialize());
                 return id;
@@ -103,6 +113,7 @@ export class TurboDataItemAbstractSigner {
             const { hash } = await signer.sendTransaction({
                 to: target,
                 value: parseEther(amount.toFixed(18)),
+                data: ethDataFromTurboCreditDestinationAddress(turboCreditDestinationAddress),
             });
             return hash;
         }
@@ -115,6 +126,7 @@ export class TurboDataItemAbstractSigner {
         const tx = await ethWalletAndProvider.sendTransaction({
             to: target,
             value: parseEther(amount.toFixed(18)),
+            data: ethDataFromTurboCreditDestinationAddress(turboCreditDestinationAddress),
         });
         this.logger.debug('Sent transaction', { tx });
         return tx.hash;

package/lib/esm/common/token/ario.js

@@ -32,34 +32,42 @@ export class ARIOToken {
         this.pollingOptions = pollingOptions;
         this.logger = logger;
     }
-    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, }) {
+    async createAndSubmitTx({ target, signer: { signer }, tokenAmount, turboCreditDestinationAddress, }) {
+        const tags = [
+            {
+                name: 'Action',
+                value: 'Transfer',
+            },
+            {
+                name: 'Recipient',
+                value: target,
+            },
+            {
+                name: 'Quantity',
+                value: tokenAmount.toString(),
+            },
+            {
+                name: 'Turbo-SDK',
+                value: version,
+            },
+        ];
+        if (turboCreditDestinationAddress !== undefined) {
+            tags.push({
+                name: 'Turbo-Credit-Destination-Address',
+                value: turboCreditDestinationAddress,
+            });
+        }
         const txId = await this.ao.message({
             signer: createAoSigner(signer),
             process: this.processId,
-            tags: [
-                {
-                    name: 'Action',
-                    value: 'Transfer',
-                },
-                {
-                    name: 'Recipient',
-                    value: target,
-                },
-                {
-                    name: 'Quantity',
-                    value: tokenAmount.toString(),
-                },
-                {
-                    name: 'Turbo-SDK',
-                    value: version,
-                },
-            ],
+            tags,
         });
         this.logger.debug('Submitted Transfer message to ARIO process...', {
             id: txId,
             target,
             tokenAmount,
             processId: this.processId,
+            tags,
         });
         return { id: txId, target, reward: '0' };
     }