koilib 4.0.0 → 4.1.2

package/dist/koinos.js

@@ -9892,7 +9892,7 @@ class Contract {
                     // write contract (sign and send)
                     if (!this.signer)
                         throw new Error("signer not found");
-                    const tx = await this.signer.prepareTransaction({
+                    let tx = await this.signer.prepareTransaction({
                         header: {
                             ...((opts === null || opts === void 0 ? void 0 : opts.chainId) && { chain_id: opts === null || opts === void 0 ? void 0 : opts.chainId }),
                             ...((opts === null || opts === void 0 ? void 0 : opts.rcLimit) && { rc_limit: opts === null || opts === void 0 ? void 0 : opts.rcLimit }),
@@ -9913,7 +9913,7 @@ class Contract {
                             throw new Error("This transaction was not broadcasted");
                         };
                         if (opts.signTransaction)
-                            await this.signer.signTransaction(tx, abis);
+                            tx = await this.signer.signTransaction(tx, abis);
                         return { operation, transaction: { ...tx, wait: noWait } };
                     }
                     const { transaction, receipt } = await this.signer.sendTransaction(tx, abis);
@@ -9982,13 +9982,26 @@ class Contract {
             ...this.options,
             ...options,
         };
+        const contractId = this.id
+            ? (0, utils_1.encodeBase58)(this.id)
+            : this.signer.getAddress();
         const operation = {
             upload_contract: {
-                contract_id: (0, utils_1.decodeBase58)(this.signer.getAddress()),
-                bytecode: this.bytecode,
+                contract_id: contractId,
+                bytecode: (0, utils_1.encodeBase64url)(this.bytecode),
+                ...((opts === null || opts === void 0 ? void 0 : opts.abi) && { abi: opts === null || opts === void 0 ? void 0 : opts.abi }),
+                ...((opts === null || opts === void 0 ? void 0 : opts.authorizesCallContract) && {
+                    authorizes_call_contract: opts === null || opts === void 0 ? void 0 : opts.authorizesCallContract,
+                }),
+                ...((opts === null || opts === void 0 ? void 0 : opts.authorizesTransactionApplication) && {
+                    authorizes_transaction_application: opts === null || opts === void 0 ? void 0 : opts.authorizesTransactionApplication,
+                }),
+                ...((opts === null || opts === void 0 ? void 0 : opts.authorizesUploadContract) && {
+                    authorizes_upload_contract: opts === null || opts === void 0 ? void 0 : opts.authorizesUploadContract,
+                }),
             },
         };
-        const tx = await this.signer.prepareTransaction({
+        let tx = await this.signer.prepareTransaction({
             header: {
                 ...((opts === null || opts === void 0 ? void 0 : opts.chainId) && { chain_id: opts === null || opts === void 0 ? void 0 : opts.chainId }),
                 ...((opts === null || opts === void 0 ? void 0 : opts.rcLimit) && { rc_limit: opts === null || opts === void 0 ? void 0 : opts.rcLimit }),
@@ -9996,24 +10009,7 @@ class Contract {
                 ...((opts === null || opts === void 0 ? void 0 : opts.payer) && { payer: opts === null || opts === void 0 ? void 0 : opts.payer }),
                 ...((opts === null || opts === void 0 ? void 0 : opts.payee) && { payee: opts === null || opts === void 0 ? void 0 : opts.payee }),
             },
-            operations: [
-                {
-                    upload_contract: {
-                        contract_id: (0, utils_1.encodeBase58)(operation.upload_contract.contract_id),
-                        bytecode: (0, utils_1.encodeBase64url)(this.bytecode),
-                        ...((opts === null || opts === void 0 ? void 0 : opts.abi) && { abi: opts === null || opts === void 0 ? void 0 : opts.abi }),
-                        ...((opts === null || opts === void 0 ? void 0 : opts.authorizesCallContract) && {
-                            authorizes_call_contract: opts === null || opts === void 0 ? void 0 : opts.authorizesCallContract,
-                        }),
-                        ...((opts === null || opts === void 0 ? void 0 : opts.authorizesTransactionApplication) && {
-                            authorizes_transaction_application: opts === null || opts === void 0 ? void 0 : opts.authorizesTransactionApplication,
-                        }),
-                        ...((opts === null || opts === void 0 ? void 0 : opts.authorizesUploadContract) && {
-                            authorizes_upload_contract: opts === null || opts === void 0 ? void 0 : opts.authorizesUploadContract,
-                        }),
-                    },
-                },
-            ],
+            operations: [operation],
         });
         // return result if the transaction will not be broadcasted
         if (!(opts === null || opts === void 0 ? void 0 : opts.sendTransaction)) {
@@ -10021,7 +10017,7 @@ class Contract {
                 throw new Error("This transaction was not broadcasted");
             };
             if (opts.signTransaction)
-                await this.signer.signTransaction(tx);
+                tx = await this.signer.signTransaction(tx);
             return { operation, transaction: { ...tx, wait: noWait } };
         }
         const { transaction, receipt } = await this.signer.sendTransaction(tx);
@@ -10395,9 +10391,15 @@ class Provider {
     /**
      * Function to call "chain.submit_transaction" to send a signed
      * transaction to the blockchain.
+     * @returns It returns the receipt received from the RPC node
+     * and the transaction with the arrow function "wait" (see [[wait]])
      */
     async sendTransaction(transaction) {
-        return this.call("chain.submit_transaction", { transaction });
+        const response = await this.call("chain.submit_transaction", { transaction });
+        transaction.wait = async (type = "byBlock", timeout = 60000) => {
+            return this.wait(transaction.id, type, timeout);
+        };
+        return { ...response, transaction: transaction };
     }
     /**
      * Function to call "chain.submit_block" to send a signed
@@ -10961,13 +10963,7 @@ class Signer {
             tx = await this.signTransaction(tx);
         if (!this.provider)
             throw new Error("provider is undefined");
-        const { receipt } = await this.provider.sendTransaction(tx);
-        tx.wait = async (type = "byBlock", timeout = 60000) => {
-            if (!this.provider)
-                throw new Error("provider is undefined");
-            return this.provider.wait(tx.id, type, timeout);
-        };
-        return { receipt, transaction: tx };
+        return this.provider.sendTransaction(tx);
     }
     /**
      * Function to recover the public key from hash and signature