fixes after review

src-network-providers/apiNetworkProvider.ts

@@ -14,7 +14,7 @@ import { Nonce } from "./primitives";
 import { ProxyNetworkProvider } from "./proxyNetworkProvider";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -120,17 +120,12 @@ export class ApiNetworkProvider implements INetworkProvider {
     }
 
     async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transactions", tx.toSendable());
-            return response.txHash;
-        }
-
-        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const transaction = prepareTransactionForBroadcasting(tx);
         const response = await this.doPostGeneric("transactions", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
+    async sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]> {
         return await this.backingProxyNetworkProvider.sendTransactions(txs);
     }
 

src-network-providers/errors.ts

@@ -29,7 +29,6 @@ export class ErrNetworkProvider extends Err {
     }
 }
 
-
 /**
  * Signals a generic error in the context of querying Smart Contracts.
  */

src-network-providers/interface.ts

@@ -76,7 +76,7 @@ export interface INetworkProvider {
     /**
      * Broadcasts a list of already-signed transactions.
      */
-    sendTransactions(txs: ITransaction[]): Promise<string[]>;
+    sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]>;
 
     /**
      * Simulates the processing of an already-signed transaction.

src-network-providers/providers.dev.net.spec.ts

@@ -316,7 +316,7 @@ describe("test network providers on devnet: Proxy and API", function () {
         assert.deepEqual(proxyResponse.logs.events[0].additionalData, [TransactionEventData.fromBase64("dGVzdA==")]);
     });
 
-    it.only("should send both `Transaction` and `TransactionNext`", async function () {
+    it("should send both `Transaction` and `TransactionNext`", async function () {
         this.timeout(50000);
 
         const transaction = {
@@ -345,7 +345,7 @@ describe("test network providers on devnet: Proxy and API", function () {
             gasLimit: BigInt(80000),
             chainID: "D",
             version: 2,
-            signature: new Uint8Array(Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex")),
+            signature: Buffer.from("3fa42d97b4f85442850340a11411a3cbd63885e06ff3f84c7a75d0ef59c780f7a18aa4f331cf460300bc8bd99352aea10b7c3bc17e40287337ae9f9842470205", "hex"),
             senderUsername: "",
             receiverUsername: "",
             guardian: "",
@@ -356,8 +356,8 @@ describe("test network providers on devnet: Proxy and API", function () {
         const apiLegacyTxHash = await apiProvider.sendTransaction(transaction);
         const apiTxNextHash = await apiProvider.sendTransaction(transactionNext);
 
-        const proxyLegacyTxHash = await apiProvider.sendTransaction(transaction);
-        const proxyTxNextHash = await apiProvider.sendTransaction(transactionNext);
+        const proxyLegacyTxHash = await proxyProvider.sendTransaction(transaction);
+        const proxyTxNextHash = await proxyProvider.sendTransaction(transactionNext);
 
         assert.equal(apiLegacyTxHash, proxyLegacyTxHash);
         assert.equal(apiTxNextHash, proxyTxNextHash);

src-network-providers/proxyNetworkProvider.ts

@@ -12,7 +12,7 @@ import { NetworkStake } from "./networkStake";
 import { NetworkStatus } from "./networkStatus";
 import { DefinitionOfFungibleTokenOnNetwork, DefinitionOfTokenCollectionOnNetwork } from "./tokenDefinitions";
 import { FungibleTokenOfAccountOnNetwork, NonFungibleTokenOfAccountOnNetwork } from "./tokens";
-import { TransactionOnNetwork, prepareTransactionNextForBroadcasting } from "./transactions";
+import { TransactionOnNetwork, prepareTransactionForBroadcasting } from "./transactions";
 import { TransactionStatus } from "./transactionStatus";
 
 // TODO: Find & remove duplicate code between "ProxyNetworkProvider" and "ApiNetworkProvider".
@@ -123,23 +123,13 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async sendTransaction(tx: ITransaction | ITransactionNext): Promise<string> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transactions", tx.toSendable());
-            return response.txHash;
-        }
-
-        const transaction = prepareTransactionNextForBroadcasting(tx);
-        const response = await this.doPostGeneric("transactions", transaction);
+        const transaction = prepareTransactionForBroadcasting(tx);
+        const response = await this.doPostGeneric("transaction/send", transaction);
         return response.txHash;
     }
 
-    async sendTransactions(txs: ITransaction[] | ITransactionNext[]): Promise<string[]> {
-        let data: any[];
-        if ("toSendable" in txs[0]){
-            data = (txs as ITransaction[]).map(tx => tx.toSendable());
-        } else {
-            data = (txs as ITransactionNext[]).map(tx => prepareTransactionNextForBroadcasting(tx));
-        }
+    async sendTransactions(txs: (ITransaction | ITransactionNext)[]): Promise<string[]> {
+        const data = (txs).map((tx) => prepareTransactionForBroadcasting(tx));
 
         const response = await this.doPostGeneric("transaction/send-multiple", data);
         const hashes = Array(txs.length).fill(null);
@@ -152,12 +142,7 @@ export class ProxyNetworkProvider implements INetworkProvider {
     }
 
     async simulateTransaction(tx: ITransaction | ITransactionNext): Promise<any> {
-        if ("toSendable" in tx){
-            const response = await this.doPostGeneric("transaction/simulate", tx.toSendable());
-            return response;
-        }
-
-        const transaction = prepareTransactionNextForBroadcasting(tx);
+        const transaction = prepareTransactionForBroadcasting(tx);
         const response = await this.doPostGeneric("transaction/simulate", transaction);
         return response;
     }

src-network-providers/transactions.ts

@@ -1,11 +1,15 @@
 import { TransactionStatus } from "./transactionStatus";
 import { ContractResults } from "./contractResults";
 import { Address } from "./primitives";
-import { IAddress, ITransactionNext } from "./interface";
+import { IAddress, ITransaction, ITransactionNext } from "./interface";
 import { TransactionLogs } from "./transactionLogs";
 import { TransactionReceipt } from "./transactionReceipt";
 
-export function prepareTransactionNextForBroadcasting(transaction: ITransactionNext): any {
+export function prepareTransactionForBroadcasting(transaction: ITransaction | ITransactionNext): any {
+    if ("toSendable" in transaction){
+        return transaction.toSendable();
+    }
+
     return {
         nonce: Number(transaction.nonce),
         value: transaction.value.toString(),