@ercworldio/blockchain-shared 1.0.5-dev.7-PROJ-1469.1 → 1.0.5-dev.7-PROJ-1469.2

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

@@ -3,6 +3,7 @@ import { Program } from "@coral-xyz/anchor";
 import { Commitment, Keypair, PublicKey, TransactionSignature } from "@solana/web3.js";
 import { Escrow } from "../types/escrow";
 import { BatchReceiver } from "../types/types";
+import { ChainId } from "../../../../interfaces";
 export declare class EscrowAdminUtility {
     program: Program<Escrow>;
     provider: anchor.AnchorProvider;
@@ -84,12 +85,13 @@ export declare class EscrowAdminUtility {
     /**
      *  Accepts an array of receivers and amounts and performs a batch withdrawal to the specified receivers
      * for the specified token (SOL or SPL)
+     * @param chain_id Network's chain id
      * @param token_address Address of the token to withdraw
      * @param recipients Array of receivers and their amounts
      * @param signer optional signer keypair
      * @returns string - signature
      */
-    withdraw_batch(token_address: string, recipients: BatchReceiver[], signer?: Keypair): Promise<string>;
+    withdraw_batch(chain_id: ChainId, 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;

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;AAG/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;IA6BzB;;;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"}
+{"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,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,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;IA6BzB;;;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;;;;;;;;OAQG;IACU,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,OAAO;IAUnH,0GAA0G;YAC5F,kBAAkB;YAuClB,kBAAkB;YA6ClB,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

@@ -358,29 +358,31 @@ class EscrowAdminUtility {
     /**
      *  Accepts an array of receivers and amounts and performs a batch withdrawal to the specified receivers
      * for the specified token (SOL or SPL)
+     * @param chain_id Network's chain id
      * @param token_address Address of the token to withdraw
      * @param recipients Array of receivers and their amounts
      * @param signer optional signer keypair
      * @returns string - signature
      */
-    withdraw_batch(token_address, recipients, signer) {
+    withdraw_batch(chain_id, token_address, recipients, signer) {
         return __awaiter(this, void 0, void 0, function* () {
             const token_pubkey = new web3_js_1.PublicKey(token_address);
             switch (token_pubkey.toBase58()) {
                 case (web3_js_1.SystemProgram.programId.toBase58()):
-                    return this.batch_withdraw_sol(recipients, signer);
+                    return this.batch_withdraw_sol(chain_id, recipients, signer);
                 default:
-                    return this.batch_withdraw_spl(token_pubkey, recipients, signer);
+                    return this.batch_withdraw_spl(chain_id, token_pubkey, recipients, signer);
             }
         });
     }
     /** @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) {
+    batch_withdraw_spl(chainId, mint, recipients, signer) {
         return __awaiter(this, void 0, void 0, function* () {
             const escrowConfigPda = EscrowService.findEscrowConfigPda(this.program.programId);
             const vaultAuthority = EscrowService.findVaultAuthorityPda(this.program.programId);
             const vaultTokenAccount = EscrowService.findVaultAta(mint, this.program.programId);
             const amounts = recipients.map(r => new anchor.BN(r.amount_in_lamports));
+            const net_amounts = recipients.map(r => new anchor.BN(r.net_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));
@@ -391,7 +393,7 @@ class EscrowAdminUtility {
                 };
             });
             const ix = yield this.program.methods
-                .batchWithdrawTokens(request_ids, amounts)
+                .batchWithdrawTokens(new anchor.BN(chainId), request_ids, amounts, net_amounts)
                 .accountsPartial({
                 escrowConfig: escrowConfigPda,
                 vaultAuthority: vaultAuthority,
@@ -407,11 +409,12 @@ class EscrowAdminUtility {
             return signature;
         });
     }
-    batch_withdraw_sol(recipients, signer) {
+    batch_withdraw_sol(chainId, recipients, signer) {
         return __awaiter(this, void 0, void 0, function* () {
             const escrowConfigPda = EscrowService.findEscrowConfigPda(this.program.programId);
             const vaultAuthority = EscrowService.findVaultAuthorityPda(this.program.programId);
             const amounts = recipients.map(r => new anchor.BN(r.amount_in_lamports));
+            const net_amounts = recipients.map(r => new anchor.BN(r.net_amount_in_lamports));
             const receivers = recipients.map(r => {
                 return {
                     isSigner: false,
@@ -421,7 +424,7 @@ class EscrowAdminUtility {
             });
             const request_ids = recipients.map(r => new anchor.BN(r.request_id));
             const ix = yield this.program.methods
-                .batchWithdrawSol(request_ids, amounts)
+                .batchWithdrawSol(new anchor.BN(chainId), request_ids, amounts, net_amounts)
                 .accountsPartial({
                 escrowConfig: escrowConfigPda,
                 vaultAuthority: vaultAuthority,