@ercworldio/blockchain-shared 1.0.0-dev.4 → 1.0.0

package/build/services/TimerManager.js

@@ -142,7 +142,9 @@ class TimerManager {
     exists_timer(userId, blockchain) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = this.getTimerKey(userId, blockchain);
+            console.log(`Getting existing timer for user ID ${userId} blockchain ${blockchain}`);
             const timer = yield this.redis.get(key);
+            console.log(`Got timer: `, timer);
             if (!timer)
                 return false;
             return true;
@@ -150,12 +152,15 @@ class TimerManager {
     }
     create_if_not_exists(wallet_1, timeout_ms_1, subscription_1) {
         return __awaiter(this, arguments, void 0, function* (wallet, timeout_ms, subscription, bonus_code = "") {
+            console.log(``);
             if (!this.initialized)
                 yield this.initialize();
             const exists = yield this.exists_timer(wallet.userId, wallet.blockchain);
             if (exists)
                 return true;
+            console.log(`Timer does not exist, creating...`);
             yield this.create_timer(wallet, timeout_ms, subscription, bonus_code);
+            console.log(`Created timer...`, { wallet, timeout_ms, subscription, bonus_code });
             return true;
         });
     }
@@ -171,11 +176,14 @@ class TimerManager {
     create_timer(wallet_1, timeout_ms_1, subscription_1) {
         return __awaiter(this, arguments, void 0, function* (wallet, timeout_ms, subscription, bonus_code = "") {
             try {
-                const key = this.getTimerKey(wallet.userId, wallet.blockchain);
+                console.log(`Creating timer, clearing old first..`);
                 // Clear existing timer if any
                 yield this.clear_timer(wallet.userId, wallet.blockchain);
+                console.log(`Cleared timer.`);
                 yield this.set_clear_address_data(wallet, subscription, timeout_ms + 100000);
+                console.log(`Set clear address data..`);
                 yield this._create_timer(wallet, timeout_ms, bonus_code);
+                console.log(`Created timer.`);
                 return true;
             }
             catch (error) {

package/build/services/WithdrawalManager.d.ts

@@ -30,7 +30,7 @@ declare class WithdrawalManager extends Errors {
         estimate_in_decimals: number;
         estimate_in_usdt: bigint;
         estimate_in_usdt_decimals: number;
-        token_price: any;
+        token_price: number;
         estimate_in_usdt_precision: number;
     }>;
     get_estimate_for_batch: (blockchain: BlockchainType, chain_id: ChainId, queue: ClaimJobs[], extra_config?: {

package/build/services/WithdrawalManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WithdrawalManager.d.ts","sourceRoot":"","sources":["../../src/services/WithdrawalManager.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAYxD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAIrF,cAAM,iBAAkB,SAAQ,MAAM;IAClC,OAAO,CAAC,kBAAkB,CAAmB;IAC7C,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAgB;gBAClB,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO;IAQlD,OAAO,CAAC,2BAA2B,CAGlC;IAGM,oBAAoB,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,sBAAsB,CAAC,CAIhF;IAIM,iBAAiB,GAAU,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,YAAY,cAAc,KAAG,OAAO,CAAC,OAAO,CAAC,CAIhH;IAGM,uBAAuB,GAAU,YAAY,MAAM,EAAE,UAAU,OAAO,sBAU5E;IAEM,4BAA4B,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,OAAO,SAAS,EAAE;;;OAoB7G;IAMM,sBAAsB,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,UAAU,MAAM,EAAE,OAAO,MAAM,EAAE,kBAAkB,MAAM,EAAE,SAAS,MAAM;;;;;;;;;;;;;;OA2E/J;IAIM,sBAAsB,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,OAAO,SAAS,EAAE,EAAE,eAAe;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;;;;OAmD/K;IAKD,OAAO,CAAC,sBAAsB,CAoC7B;IAOD,OAAO,CAAC,2BAA2B,CAwDlC;IAED,OAAO,CAAC,sBAAsB,CAuB7B;IAED,OAAO,CAAC,sCAAsC,CAiG7C;CAGJ;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"WithdrawalManager.d.ts","sourceRoot":"","sources":["../../src/services/WithdrawalManager.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAYxD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAIrF,cAAM,iBAAkB,SAAQ,MAAM;IAClC,OAAO,CAAC,kBAAkB,CAAmB;IAC7C,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAgB;gBAClB,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO;IAQlD,OAAO,CAAC,2BAA2B,CAGlC;IAGM,oBAAoB,GAAU,IAAI,MAAM,KAAG,OAAO,CAAC,sBAAsB,CAAC,CAIhF;IAIM,iBAAiB,GAAU,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,YAAY,cAAc,KAAG,OAAO,CAAC,OAAO,CAAC,CAIhH;IAGM,uBAAuB,GAAU,YAAY,MAAM,EAAE,UAAU,OAAO,sBAU5E;IAEM,4BAA4B,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,OAAO,SAAS,EAAE;;;OAgB7G;IAMM,sBAAsB,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,UAAU,MAAM,EAAE,OAAO,MAAM,EAAE,kBAAkB,MAAM,EAAE,SAAS,MAAM;;;;;;;;;;;;;;OA2E/J;IAIM,sBAAsB,GAAU,YAAY,cAAc,EAAE,UAAU,OAAO,EAAE,OAAO,SAAS,EAAE,EAAE,eAAe;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;;;;OAiD/K;IAKD,OAAO,CAAC,sBAAsB,CAoC7B;IAKD,OAAO,CAAC,2BAA2B,CAsDlC;IAED,OAAO,CAAC,sBAAsB,CAuB7B;IAED,OAAO,CAAC,sCAAsC,CAiG7C;CAGJ;AAED,eAAe,iBAAiB,CAAC"}

package/build/services/WithdrawalManager.js

@@ -61,15 +61,14 @@ class WithdrawalManager extends TransactionsErrors_1.default {
         this.estimate_batch_withdraw_cost = (blockchain, chain_id, queue) => __awaiter(this, void 0, void 0, function* () {
             if (blockchain !== "solana" && blockchain !== "evm")
                 throw new Error();
-            const max_batch_size = blockchain === "evm" ? this.config.serverConfig.maxTransactionsPerTxEvm : this.config.serverConfig.maxInstructionsPerTxSolana;
+            if (queue.length === 0)
+                return { estimation_map: new Map(), updated_queue: [] };
             const accounting = new AccountingService_1.default(this.dbPool, this.config);
             // Get native token price in usdt
             const token_price = yield (0, Utility_1.retryWithExponentialBackoff)(() => accounting.get_crypto_rate(chain_id));
-            const user_id_set = new Set();
-            queue.map(j => user_id_set.add(j.user_id));
             // Estimate total transaction cost with batch withdrawal
             const { estimate, tx_count } = yield this.get_estimate_for_batch(blockchain, chain_id, queue);
-            const { estimation_map, updated_queue } = this.calculate_estimate_for_user(blockchain, token_price, Array.from(user_id_set.keys()), estimate, tx_count, queue);
+            const { estimation_map, updated_queue } = this.calculate_estimate_for_user(blockchain, token_price, estimate, tx_count, queue);
             return { estimation_map, updated_queue };
         });
         // Estimates the cost to be paid by the user when their transaction is included in a batch withdrawal
@@ -125,7 +124,7 @@ class WithdrawalManager extends TransactionsErrors_1.default {
             }
             else {
                 // Calculate payable cost for user
-                const { estimation_map, user_cost } = this.calculate_estimate_for_user(blockchain, token_price, [user_id], estimate, tx_count, recent_queue);
+                const { estimation_map, user_cost } = this.calculate_estimate_for_user(blockchain, token_price, estimate, tx_count, recent_queue);
                 const display_exchange_rate = yield accounting.convert_amount_to_currency(user_cost.estimate_in_usdt_decimals, "USD", display_currency);
                 // Return user estimation
                 return {
@@ -151,19 +150,17 @@ class WithdrawalManager extends TransactionsErrors_1.default {
             }
             else if (blockchain === "evm") {
                 // Build evm batch withdraw payload
-                const payloads = queue.map(j => {
-                    return {
-                        amount_in_tokens: j.amount,
-                        requestId: j.request_id,
-                        token: j.token,
-                        receiver: j.receiver
-                    };
-                });
-                // In case queue is empty, push a mock tx
-                if (payloads.length === 0 && extra_config && extra_config.token) {
-                    const amount = extra_config.token === ethers_1.ethers.ZeroAddress ? (0, ethers_1.parseEther)('0.1') : (0, ethers_1.parseUnits)('100', 6);
+                const payloads = queue.map(j => ({
+                    amount_in_tokens: j.amount,
+                    requestId: j.request_id,
+                    token: j.token,
+                    receiver: j.receiver
+                }));
+                // In case queue is empty, push a mock tx for gas estimation only
+                // amount_in_tokens = 1 (minimum unit) to avoid triggering balance checks in the contract
+                if (payloads.length === 0 && (extra_config === null || extra_config === void 0 ? void 0 : extra_config.token)) {
                     payloads.push({
-                        amount_in_tokens: amount,
+                        amount_in_tokens: BigInt(1),
                         requestId: 0,
                         token: extra_config.token,
                         receiver: funds_manager.address
@@ -173,7 +170,7 @@ class WithdrawalManager extends TransactionsErrors_1.default {
                 const transaction_cost = yield (0, custodial_1.estimate_escrow_method_call_cost)(chain_id, payloads, this.dbPool, this.config);
                 return { estimate: transaction_cost, estimate_decimals: Number(ethers_1.ethers.formatEther(transaction_cost)), tx_count: payloads.length };
             }
-            // TODO Implement tron estimation
+            // Implement tron estimation
             else if (blockchain === constants_1.BLOCKCHAINS.TRON) {
                 const tronFeeConfig = (_a = ChainManager_1.default.getInstance(this.config).getChainConfigForChainIdSync(parseInt(chain_id))) === null || _a === void 0 ? void 0 : _a.tronConfig;
                 if (!tronFeeConfig) {
@@ -227,42 +224,36 @@ class WithdrawalManager extends TransactionsErrors_1.default {
             };
             return estimation;
         };
-        // Given an array of user ids and jobs, calculates each user's share of the cost to be paid 
-        // Returns mapping of userid to total cost to be paid in various formats
-        // Weighs the cost factor by number of txs found in the batch for the same user
-        // TODO: CHECK THIS LOGIC
-        this.calculate_estimate_for_user = (blockchain, token_price, user_ids, total_fee, tx_count, queue) => {
+        // Given a queue of jobs, calculates each user's share of the batch cost
+        // Returns mapping of userid to total cost and a queue with adjusted amounts
+        this.calculate_estimate_for_user = (blockchain, token_price, total_fee, tx_count, queue) => {
             // Userid to estimation map
             const user_map = new Map();
             const user_cost = this.calculate_cost_per_job(blockchain, token_price, total_fee, tx_count);
+            // Calculate cost per unit = total_fee / tx_count (user_job_count is always 1 in calculate_cost_per_job)
+            const unit_cost = BigInt(user_cost.estimate_units) / BigInt(user_cost.user_job_count);
             // Calculate new amounts including the payable fee
             const updated_queue = queue.map(j => {
-                // const user_cost = user_map.get(j.user_id);
-                // TODO: Handle error
-                if (!user_cost)
-                    throw new Error();
-                // Calculate cost on avg in native tokens
-                const unit_cost = BigInt(user_cost.estimate_units) / BigInt(user_cost.user_job_count);
                 if (blockchain === constants_1.BLOCKCHAINS.SOLANA) {
-                    // Solana token
+                    // Solana native token
                     if (new web3_js_1.PublicKey(j.token).toBase58() === web3_js_1.SystemProgram.programId.toBase58()) {
-                        if (unit_cost < BigInt(j.amount)) {
+                        // Intentional in-place mutation: mutates the original ClaimJobs object so spread picks up the updated amount
+                        if (unit_cost < BigInt(j.amount))
                             j.amount = BigInt(j.amount) - unit_cost;
-                        }
-                        // TODO: Drop this job since the cost is higher
+                        // TODO: Drop this job since the cost is higher than amount
                         return Object.assign(Object.assign({}, j), { fee_data: user_cost });
                     }
                     else {
-                        // SPL token 
+                        // SPL token
                         return this.parse_cost_stable_coin(blockchain, user_cost, j, unit_cost, token_price);
                     }
                 }
                 else if (blockchain === constants_1.BLOCKCHAINS.EVM) {
-                    // Directly deduct form native amount
+                    // Directly deduct from native amount
                     if (j.token === ethers_1.ethers.ZeroAddress) {
-                        if (unit_cost < BigInt(j.amount)) {
+                        // Intentional in-place mutation: mutates the original ClaimJobs object so spread picks up the updated amount
+                        if (unit_cost < BigInt(j.amount))
                             j.amount = BigInt(j.amount) - unit_cost;
-                        }
                         return Object.assign(Object.assign({}, j), { fee_data: user_cost });
                     }
                     else {
@@ -273,6 +264,19 @@ class WithdrawalManager extends TransactionsErrors_1.default {
                 else
                     throw new Error(this.UnsupportedResource(`blockchain ${blockchain}`));
             });
+            // Populate estimation_map: aggregate per-user total cost (user may have multiple jobs)
+            const user_job_counts = new Map();
+            queue.forEach(j => { var _a; return user_job_counts.set(j.user_id, ((_a = user_job_counts.get(j.user_id)) !== null && _a !== void 0 ? _a : 0) + 1); });
+            for (const [uid, count] of user_job_counts.entries()) {
+                user_map.set(uid, {
+                    user_job_count: count,
+                    estimate_units: user_cost.estimate_units * BigInt(count),
+                    estimate_in_decimals: user_cost.estimate_in_decimals * count,
+                    estimate_in_usdt: user_cost.estimate_in_usdt * BigInt(count),
+                    estimate_in_usdt_decimals: user_cost.estimate_in_usdt_decimals * count,
+                    token_price
+                });
+            }
             return { estimation_map: user_map, updated_queue, user_cost };
         };
         this.parse_cost_stable_coin = (blockchain, user_cost, job, unit_cost, token_price) => {

package/build/services/solana/escrow/SolanaEscrowAdmin.d.ts

@@ -40,7 +40,7 @@ declare class SolanaEscrowAdmin {
      * @returns
      */
     is_payment_token: (token_address: string) => Promise<boolean>;
-    get_balances: () => Promise<[string, any][]>;
+    get_balances: () => Promise<[string, number][]>;
     /**
      * Gets the payment tokens list
      * @returns string[]

package/build/services/solana/escrow/SolanaEscrowAdmin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolanaEscrowAdmin.d.ts","sourceRoot":"","sources":["../../../../src/services/solana/escrow/SolanaEscrowAdmin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAqC,MAAM,iBAAiB,CAAC;AAEpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAkBtG,UAAU,2BAA2B;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,cAAM,iBAAiB;IACZ,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,MAAM,CAAC,CAAU;IAClB,UAAU,EAAE,UAAU,CAAC;gBAG1B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,SAAS,EAC1B,eAAe,EAAE,wBAAwB,EACzC,mBAAmB,EAAE,4BAA4B,EACjD,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,2BAA2B;IA8BlD;;;OAGG;IACH,OAAO,CAAC,OAAO,CAGb;IAEF;;;OAGG;IACI,kBAAkB,wBAGvB;IAKF;;;OAGG;IACI,SAAS,yBAEf;IAED;;;;OAIG;IACI,QAAQ,GAAU,gBAAgB,MAAM,sBAE9C;IAED;;;;OAIG;IACI,gBAAgB,GAAU,eAAe,MAAM,sBAErD;IAEM,YAAY,iCAElB;IAGD;;;OAGG;IACI,kBAAkB,0BAExB;IAED;;;OAGG;IACI,UAAU,0BAEhB;IAED;;;;OAIG;IACI,iBAAiB,GAAU,eAAe,MAAM,qBAEtD;IAED;;;;OAIG;IACI,oBAAoB,GAAU,eAAe,MAAM,qBAEzD;IAED;;;;OAIG;IACI,SAAS,GAAU,gBAAgB,MAAM,qBAE/C;IAGD;;;;OAIG;IACI,YAAY,GAAU,gBAAgB,MAAM,qBAElD;IAED;;;;OAIG;IACI,eAAe,GAAU,cAAc,OAAO,qBAEpD;IAIM,cAAc,GAAU,eAAe,MAAM,EAAE,WAAW,aAAa,EAAE,qBAE/E;IAGD;;;;;;OAMG;IACI,QAAQ,GAAU,eAAe,MAAM,EAAE,oBAAoB,MAAM,EAAE,kBAAkB,MAAM,iCAEnG;IAED;;;;;OAKG;IACI,OAAO,GAAU,eAAe,MAAM,EAAE,oBAAoB,MAAM,qBAExE;CAKJ;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"SolanaEscrowAdmin.d.ts","sourceRoot":"","sources":["../../../../src/services/solana/escrow/SolanaEscrowAdmin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAqC,MAAM,iBAAiB,CAAC;AAEpG,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAkBtG,UAAU,2BAA2B;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,cAAM,iBAAiB;IACZ,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,MAAM,CAAC,CAAU;IAClB,UAAU,EAAE,UAAU,CAAC;gBAG1B,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,SAAS,EAC1B,eAAe,EAAE,wBAAwB,EACzC,mBAAmB,EAAE,4BAA4B,EACjD,OAAO,EAAE,MAAM,EACf,gBAAgB,CAAC,EAAE,2BAA2B;IA8BlD;;;OAGG;IACH,OAAO,CAAC,OAAO,CAGb;IAEF;;;OAGG;IACI,kBAAkB,wBAGvB;IAKF;;;OAGG;IACI,SAAS,yBAEf;IAED;;;;OAIG;IACI,QAAQ,GAAU,gBAAgB,MAAM,sBAE9C;IAED;;;;OAIG;IACI,gBAAgB,GAAU,eAAe,MAAM,sBAErD;IAEM,YAAY,oCAElB;IAGD;;;OAGG;IACI,kBAAkB,0BAExB;IAED;;;OAGG;IACI,UAAU,0BAEhB;IAED;;;;OAIG;IACI,iBAAiB,GAAU,eAAe,MAAM,qBAEtD;IAED;;;;OAIG;IACI,oBAAoB,GAAU,eAAe,MAAM,qBAEzD;IAED;;;;OAIG;IACI,SAAS,GAAU,gBAAgB,MAAM,qBAE/C;IAGD;;;;OAIG;IACI,YAAY,GAAU,gBAAgB,MAAM,qBAElD;IAED;;;;OAIG;IACI,eAAe,GAAU,cAAc,OAAO,qBAEpD;IAIM,cAAc,GAAU,eAAe,MAAM,EAAE,WAAW,aAAa,EAAE,qBAE/E;IAGD;;;;;;OAMG;IACI,QAAQ,GAAU,eAAe,MAAM,EAAE,oBAAoB,MAAM,EAAE,kBAAkB,MAAM,iCAEnG;IAED;;;;;OAKG;IACI,OAAO,GAAU,eAAe,MAAM,EAAE,oBAAoB,MAAM,qBAExE;CAKJ;AAED,eAAe,iBAAiB,CAAC"}

package/build/services/solana/escrow/services/EscrowAdminUtility.d.ts

@@ -24,7 +24,7 @@ export declare class EscrowAdminUtility {
      * @returns
      */
     is_payment_token(target_address: string): Promise<boolean>;
-    get_balances(): Promise<[string, any][]>;
+    get_balances(): Promise<[string, number][]>;
     /**
      * Gets the list of allowed payment tokens registered in the escrow program
      * @returns string[] - array of payment token addresses
@@ -90,6 +90,7 @@ export declare class EscrowAdminUtility {
      * @returns string - signature
      */
     withdraw_batch(token_address: string, recipients: BatchReceiver[], signer?: Keypair): Promise<string>;
+    /** @dev this might fail if the recipient does not have an ATA - take care of it in funding worker task */
     private batch_withdraw_spl;
     private batch_withdraw_sol;
     private withdraw_sol;

package/build/services/solana/escrow/services/EscrowAdminUtility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EscrowAdminUtility.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/EscrowAdminUtility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAoB,SAAS,EAA0E,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGjL,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAKzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,kBAAkB;IACpB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;gBAE3B,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc;IAWrE;;;OAGG;IACU,SAAS;IAYtB;;;;OAIG;IACU,QAAQ,CAAC,cAAc,EAAE,MAAM;IAgB5C;;;;OAIG;IACU,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAgBvC,YAAY;IA2BzB;;;OAGG;IACU,kBAAkB;IAW/B;;;OAGG;IACU,UAAU;IAiBvB;;;;;OAKG;IACU,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAkCtD,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBtE;;;;;OAKG;IACU,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBlE;;;;;OAKG;IACU,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAoBlE;;;;;OAKG;IACU,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO;IAqBpE;;;;;;OAMG;IACU,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAUxF;;;;;;;OAOG;IACU,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAWnH;;;;;;;OAOG;IACU,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO;YAUlF,kBAAkB;YAkClB,kBAAkB;YA2ClB,YAAY;YAyBZ,YAAY;YAgCZ,WAAW;YAwBX,WAAW;IAuCnB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAUlC,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAU9C,eAAe;IA0BhB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,UAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,mBAAmB,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,UAAU,GAAE,WAAW,GAAG,WAAyB,EACnD,SAAS,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;IAKnF;;;;;;OAMG;IACH,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;CAM/H;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"EscrowAdminUtility.d.ts","sourceRoot":"","sources":["../../../../../src/services/solana/escrow/services/EscrowAdminUtility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAoB,SAAS,EAA0E,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGjL,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAKzC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,kBAAkB;IACpB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC;gBAE3B,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc;IAWrE;;;OAGG;IACU,SAAS;IAYtB;;;;OAIG;IACU,QAAQ,CAAC,cAAc,EAAE,MAAM;IAgB5C;;;;OAIG;IACU,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAgBvC,YAAY;IA2BzB;;;OAGG;IACU,kBAAkB;IAY/B;;;OAGG;IACU,UAAU;IAiBvB;;;;;OAKG;IACU,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAkCtD,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBtE;;;;;OAKG;IACU,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAmBlE;;;;;OAKG;IACU,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAoBlE;;;;;OAKG;IACU,eAAe,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO;IAqBpE;;;;;;OAMG;IACU,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAUxF;;;;;;;OAOG;IACU,QAAQ,CAAC,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAWnH;;;;;;;OAOG;IACU,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO;IAUhG,0GAA0G;YAC5F,kBAAkB;YAsClB,kBAAkB;YA2ClB,YAAY;YAyBZ,YAAY;YAgCZ,WAAW;YAwBX,WAAW;IAuCnB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAUlC,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAU9C,eAAe;IA0BhB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,UAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,mBAAmB,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,UAAU,GAAE,WAAW,GAAG,WAAyB,EACnD,SAAS,SAAS,GACnB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;IAKnF;;;;;;OAMG;IACH,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,kBAAkB;CAM/H;AAED,eAAe,kBAAkB,CAAC"}

package/build/services/solana/escrow/services/EscrowAdminUtility.js

@@ -140,7 +140,7 @@ class EscrowAdminUtility {
                         balances.set(token_pubkey.toBase58(), Number(bal.value.amount));
                     }
                 }
-                return Object.entries(balances);
+                return Array.from(balances.entries());
             }
             catch (error) {
                 throw Errors_1.default.decode(error);
@@ -371,6 +371,7 @@ class EscrowAdminUtility {
             }
         });
     }
+    /** @dev this might fail if the recipient does not have an ATA - take care of it in funding worker task */
     batch_withdraw_spl(mint, recipients, signer) {
         return __awaiter(this, void 0, void 0, function* () {
             const escrowConfigPda = EscrowService.findEscrowConfigPda(this.program.programId);
@@ -379,9 +380,10 @@ class EscrowAdminUtility {
             const amounts = recipients.map(r => new anchor.BN(r.amount_in_lamports));
             const request_ids = recipients.map(r => new anchor.BN(r.request_id));
             const receivers = recipients.map(r => {
+                const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, new web3_js_1.PublicKey(r.receiver_pubkey));
                 return {
                     isSigner: false,
-                    pubkey: new web3_js_1.PublicKey(r.receiver_pubkey),
+                    pubkey: ata,
                     isWritable: true
                 };
             });

package/build/services/utils/alchemy.js

@@ -19,7 +19,7 @@ const get_blockchain_type = (network_name) => {
     ];
     const solana_networks = [
         "SOLANA_DEVNET",
-        "SOLANA_MAINNNET"
+        "SOLANA_MAINNET"
     ];
     const tron_networks = [
         "TRON_MAINNET",

package/build/utils/AsyncRateLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AsyncRateLimiter.d.ts","sourceRoot":"","sources":["../../src/utils/AsyncRateLimiter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,KAAK,IAAI,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACjC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,aAAa,CAAK;gBAEd,OAAO,EAAE,kBAAkB;IAKjC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAwB3C,OAAO,CAAC,OAAO;YASD,YAAY;IAS1B,KAAK;;;;CAMR;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,OAAO,SAAI,EACX,OAAO,SAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAcZ"}
+{"version":3,"file":"AsyncRateLimiter.d.ts","sourceRoot":"","sources":["../../src/utils/AsyncRateLimiter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,KAAK,IAAI,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACjC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,aAAa,CAAK;gBAEd,OAAO,EAAE,kBAAkB;IAKjC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAwB3C,OAAO,CAAC,OAAO;YASD,YAAY;IAS1B,KAAK;;;;CAMR;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,OAAO,SAAI,EACX,OAAO,SAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAgBZ"}

package/build/utils/AsyncRateLimiter.js

@@ -72,9 +72,12 @@ function withRetry(task_1) {
         let lastError;
         for (let i = 0; i < retries; i++) {
             try {
+                if (i > 0)
+                    console.log(`Retrying ${i}...`);
                 return yield task();
             }
             catch (err) {
+                console.error(`Error retying: `, err);
                 lastError = err;
                 yield new Promise(r => setTimeout(r, delayMs));
             }

package/build/utils/custodial.js

@@ -177,11 +177,10 @@ const estimate_escrow_method_call_cost = (chain_id, payloads, dbPool, config) =>
     if (payloads.length === 0)
         throw new Error(errors.EmptyPayload("estimating Escrow withdrawal cost"));
     const chain_manager = ChainManager_1.default.getInstance(config);
-    const escrow_config = yield chain_manager.getEscrowContractForChain(parseInt(chain_id));
+    const escrow_config = chain_manager.getEscrowContractForChain(parseInt(chain_id));
     const provider = ProviderManager_1.default.getInstance(config).getNewProvider(chain_id).provider;
     const Escrow = new ethers_1.ethers.Contract(escrow_config.addresses[0], Escrow_json_1.default, provider);
     const batch_payloads = payloads.map(p => {
-        // const target_token = chain_manager.get_payment_token_for_chain("evm", chain_id, p.token);
         return {
             amount: p.amount_in_tokens,
             requestId: p.requestId,
@@ -201,6 +200,7 @@ const estimate_escrow_method_call_cost = (chain_id, payloads, dbPool, config) =>
         chainId: chain_id.toString(),
         value: 0
     };
+    console.log(`BATCh WITHDRAW DAT: `, { batch_payloads, data, txDetails });
     // Estimate gas units and get current gas price
     const [gasUnits, gasPrice] = yield Promise.all([
         (0, Utility_1.retryWithExponentialBackoff)(() => __awaiter(void 0, void 0, void 0, function* () { return yield provider.estimateGas(txDetails); })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ercworldio/blockchain-shared",
-  "version": "1.0.0-dev.4",
+  "version": "1.0.0",
   "description": "Shared library for blockchain projects",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -104,4 +104,4 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   }
-}
+}