@leofcoin/lib 1.2.23 → 1.2.24

package/exports/index.js

@@ -1,4 +1,4 @@
-import { ContractMessage, TransactionMessage } from '@leofcoin/messages';
+import { ContractMessage, TransactionMessage, RawTransactionMessage } from '@leofcoin/messages';
 import { validators as validators$1, contractFactory as contractFactory$1 } from '@leofcoin/addresses';
 export { default as nodeConfig } from './node-config.js';
 import { parseUnits, formatUnits } from '@leofcoin/utils';
@@ -52,8 +52,14 @@ const calculateReward = (validators, fees) => {
     return validators;
 };
 const createTransactionHash = async (transaction) => {
-    transaction = await (await new TransactionMessage(transaction)).hash();
-    return transaction.peernetHash.digest;
+    const isRawTransactionMessage = transaction instanceof RawTransactionMessage;
+    if (!isRawTransactionMessage) {
+        if (transaction.decoded && transaction instanceof TransactionMessage)
+            transaction = await new RawTransactionMessage(transaction.decoded);
+        else
+            transaction = await new RawTransactionMessage(transaction);
+    }
+    return (await transaction.peernetHash).digest;
 };
 const signTransaction = async (transaction, wallet) => {
     const signature = await wallet.sign(await createTransactionHash(transaction));

package/exports/typings/index.d.ts

@@ -1,7 +1,7 @@
-import { ContractMessage } from '@leofcoin/messages';
+import { ContractMessage, TransactionMessage, RawTransactionMessage } from '@leofcoin/messages';
 export { default as nodeConfig } from './node-config.js';
 declare type address = string;
-declare type transaction = {
+declare type rawTransaction = {
     from: address;
     to: address;
     method: string;
@@ -14,9 +14,10 @@ declare type signedTransaction = {
     method: string;
     params: any[];
     timestamp: Number;
+    signature: Uint8Array;
 };
 declare type signable = {
-    sign: (transaction: any) => Uint8Array;
+    sign: (transaction: rawTransaction) => Uint8Array;
 };
 export declare const contractFactoryMessage: string;
 export declare const nativeTokenMessage: string;
@@ -26,9 +27,9 @@ export declare const createContractMessage: (creator: any, contract: any, constr
 export declare const calculateFee: (transaction: any, format?: boolean) => Promise<any>;
 export declare const calculateTransactionFee: (transaction: any) => Promise<any>;
 export declare const calculateReward: (validators: any, fees: any) => [];
-export declare const createTransactionHash: (transaction: transaction) => Promise<Uint8Array>;
-export declare const signTransaction: (transaction: transaction, wallet: signable) => Promise<signedTransaction>;
-export declare const prepareContractTransaction: (owner: any, contract: any, constructorParameters?: any[]) => Promise<transaction>;
+export declare const createTransactionHash: (transaction: rawTransaction | TransactionMessage | RawTransactionMessage) => Promise<Uint8Array>;
+export declare const signTransaction: (transaction: rawTransaction, wallet: signable) => Promise<signedTransaction>;
+export declare const prepareContractTransaction: (owner: any, contract: any, constructorParameters?: any[]) => Promise<rawTransaction>;
 /**
  *
  * @param owner address

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/lib",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "description": "",
   "type": "module",
   "typings": "./exports/typings/index.d.ts",

package/src/index.ts

@@ -1,13 +1,12 @@
 import bytecodes from './bytecodes.json' assert {type: 'json'}
-import { ContractMessage, TransactionMessage } from '@leofcoin/messages'
-import { CodecHash } from '@leofcoin/codec-format-interface'
+import { ContractMessage, TransactionMessage, RawTransactionMessage } from '@leofcoin/messages'
 import { validators, contractFactory} from '@leofcoin/addresses'
 export { default as nodeConfig} from './node-config.js'
 import { BigNumber, formatUnits, parseUnits } from '@leofcoin/utils'
 
 declare type address = string
 
-declare type transaction = {
+declare type rawTransaction = {
   from: address,
   to: address,
   method: string,
@@ -20,11 +19,12 @@ declare type signedTransaction = {
   to: address,
   method: string,
   params: any[],
-  timestamp: Number
+  timestamp: Number,
+  signature: Uint8Array
 }
 
 declare type signable = {
-  sign: (transaction) => Uint8Array
+  sign: (transaction: rawTransaction) => Uint8Array
 }
 
 export const contractFactoryMessage = bytecodes.contractFactory
@@ -72,13 +72,20 @@ export const calculateReward = (validators, fees): [] => {
   return validators
 }
 
-export const createTransactionHash = async (transaction: transaction): Promise<Uint8Array> => {
-  transaction = await (await new TransactionMessage(transaction)).hash()
-  return transaction.peernetHash.digest
+export const createTransactionHash = async (transaction: rawTransaction | TransactionMessage | RawTransactionMessage): Promise<Uint8Array> => {
+  const isRawTransactionMessage = transaction instanceof RawTransactionMessage
+
+  if (!isRawTransactionMessage) {
+    if (transaction.decoded && transaction instanceof TransactionMessage) transaction = await new RawTransactionMessage(transaction.decoded)
+    else transaction = await new RawTransactionMessage(transaction)
+  }
+  
+  return (await transaction.peernetHash).digest
 }
- 
+  
 
-export const signTransaction = async (transaction: transaction, wallet: signable): Promise<signedTransaction> => {
+export const signTransaction = async (transaction: rawTransaction, wallet: signable): Promise<signedTransaction> => {
+  
   const signature = await wallet.sign(await createTransactionHash(transaction))
   const signedTransaction = {...transaction, signature}
   return signedTransaction
@@ -88,7 +95,7 @@ export const prepareContractTransaction = async (owner, contract, constructorPar
   const message = await createContractMessage(owner, contract, constructorParameters)
   const hash = await message.hash()
 
-  const transaction: transaction = {
+  const transaction: rawTransaction = {
     from: owner,
     to: contractFactory,
     timestamp: new Date().getTime(),

package/test.js

@@ -1,14 +1,19 @@
-import {calculateFee} from './exports/index.js'
+import {calculateFee, createTransactionHash} from './exports/index.js'
 import { formatUnits } from '@leofcoin/utils'
-const fee = await calculateFee({
+
+const transaction = {
   from: "YTqzkFatW1LmGXhfHicj3xTirQxYqKezfFter31Pq1RNRa6UWYYWs",
   method:"transfer",
   nonce: 313348,
   params: ['YTqzkFatW1LmGXhfHicj3xTirQxYqKezfFter31Pq1RNRa6UWYYWs', 'YTqwTAojA8aZDPYhSFey3KsYb66YdEa4Xe7L6E484VTfMSVvauLZd', '100000000000000000000'],
   signature: new Uint8Array([0, 196, 7, 133, 115, 24, 136, 210, 114, 80, 122, 34, 154, 44, 76, 216, 18, 142, 75, 102, 12, 237, 85, 184, 115, 196, 222, 220, 132, 156, 201, 79, 190, 122, 123, 114, 112, 95, 84, 36, 225, 11, 175, 0, 236, 100, 5, 20, 128, 23, 249, 153, 206, 2, 103, 178, 14, 93, 66, 115, 8, 63, 110, 128, 180, 219, 42]),
   timestamp: 1678450782309,
-  to: "IHNY2GQHXGQL4URICKLN5SE5ULIPF2QSFWU3DP4GZFOA5DBX4MMVDKJ2I3M"})
+  to: "IHNY2GQHXGQL4URICKLN5SE5ULIPF2QSFWU3DP4GZFOA5DBX4MMVDKJ2I3M"
+}
+
+const fee = await calculateFee(transaction)
 
+console.log(await createTransactionHash(transaction));
   console.log(fee);
 
   console.log(formatUnits(fee));