@leofcoin/messages 1.2.0 → 1.3.1

package/exports/index.js

@@ -0,0 +1,8 @@
+export { default as BlockMessage } from './messages/block.js';
+export { default as BWMessage } from './messages/bw.js';
+export { default as BWRequestMessage } from './messages/bw-request.js';
+export { default as ContractMessage } from './messages/contract.js';
+export { default as LastBlockMessage } from './messages/last-block.js';
+export { default as LastBlockRequestMessage } from './messages/last-block-request.js';
+export { default as TransactionMessage } from './messages/transaction.js';
+export { default as ValidatorMessage } from './messages/validator.js';

package/exports/messages/block.js

@@ -0,0 +1,55 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+import TransactionMessage from './transaction.js';
+import ValidatorMessage from './validator.js';
+import smartConcat from '@vandeurenglenn/typed-array-smart-concat';
+import smartDeconcat from '@vandeurenglenn/typed-array-smart-deconcat';
+
+var proto = {
+  index: Number(),
+  previousHash: String(),
+  timestamp: Number(),
+  reward: Number(),
+  fees: Number(),
+  transactions: new Uint8Array(),
+  validators: new Uint8Array()
+};
+
+class BlockMessage extends FormatInterface {
+    get messageName() {
+        return 'BlockMessage';
+    }
+    constructor(buffer) {
+        const name = 'block-message';
+        super(buffer, proto, { name });
+    }
+    encode() {
+        const decoded = this.decoded;
+        const validators = [];
+        const transactions = [];
+        for (const validator of decoded.validators) {
+            if (validator instanceof ValidatorMessage)
+                validators.push(validator.encoded);
+            else
+                validators.push(new ValidatorMessage(validator).encoded);
+        }
+        for (const transaction of decoded.transactions) {
+            if (transaction instanceof TransactionMessage)
+                transactions.push(transaction.encoded);
+            else
+                transactions.push(new TransactionMessage(transaction).encoded);
+        }
+        return super.encode({
+            ...decoded,
+            validators: smartConcat(validators),
+            transactions: smartConcat(transactions)
+        });
+    }
+    decode() {
+        super.decode();
+        this.decoded.transactions = smartDeconcat(this.decoded.transactions).map(transaction => new TransactionMessage(transaction).decoded);
+        this.decoded.validators = smartDeconcat(this.decoded.validators).map(validator => new ValidatorMessage(validator).decoded);
+        return this.decoded;
+    }
+}
+
+export { BlockMessage as default };

package/exports/messages/bw-request.js

@@ -0,0 +1,16 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+};
+
+class BWRequestMessage extends FormatInterface {
+    get messageName() {
+        return 'BWRequestMessage';
+    }
+    constructor(buffer) {
+        const name = 'bw-request-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { BWRequestMessage as default };

package/exports/messages/bw.js

@@ -0,0 +1,18 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+  up: Number(),
+  down: Number()
+};
+
+class BWMessage extends FormatInterface {
+    get messageName() {
+        return 'BWMessage';
+    }
+    constructor(buffer) {
+        const name = 'bw-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { BWMessage as default };

package/exports/messages/contract.js

@@ -0,0 +1,18 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+  creator: String(),
+  contract: new Uint8Array(),
+  constructorParameters: Array()
+};
+
+class ContractMessage extends FormatInterface {
+    get messageName() {
+        return 'ContractMessage';
+    }
+    constructor(buffer) {
+        super(buffer, proto, { name: 'contract-message' });
+    }
+}
+
+export { ContractMessage as default };

package/exports/messages/last-block-request.js

@@ -0,0 +1,16 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+};
+
+class LastBlockRequestMessage extends FormatInterface {
+    get messageName() {
+        return 'LastBlockRequestMessage';
+    }
+    constructor(buffer) {
+        const name = 'last-block-request-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { LastBlockRequestMessage as default };

package/exports/messages/last-block.js

@@ -0,0 +1,18 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+  hash: String(),
+  index: Number()
+};
+
+class LastBlockMessage extends FormatInterface {
+    get messageName() {
+        return 'LastBlockMessage';
+    }
+    constructor(buffer) {
+        const name = 'last-block-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { LastBlockMessage as default };

package/exports/messages/transaction.js

@@ -0,0 +1,23 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+  timestamp: Number(),
+  from: String(),
+  to: String(),
+  nonce: Number(),
+  method: String(),
+  params: Array(),
+  signature: new Uint8Array()
+};
+
+class TransactionMessage extends FormatInterface {
+    get messageName() {
+        return 'TransactionMessage';
+    }
+    constructor(buffer) {
+        const name = 'transaction-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { TransactionMessage as default };

package/exports/messages/validator.js

@@ -0,0 +1,18 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+
+var proto = {
+  address: String(),
+  reward: Number()
+};
+
+class ValidatorMessage extends FormatInterface {
+    get messageName() {
+        return 'ValidatorMessage';
+    }
+    constructor(buffer) {
+        const name = 'validator-message';
+        super(buffer, proto, { name });
+    }
+}
+
+export { ValidatorMessage as default };

package/exports/typings/index.d.ts

@@ -0,0 +1,8 @@
+export { default as BlockMessage } from './messages/block.js';
+export { default as BWMessage } from './messages/bw.js';
+export { default as BWRequestMessage } from './messages/bw-request.js';
+export { default as ContractMessage } from './messages/contract.js';
+export { default as LastBlockMessage } from './messages/last-block.js';
+export { default as LastBlockRequestMessage } from './messages/last-block-request.js';
+export { default as TransactionMessage } from './messages/transaction.js';
+export { default as ValidatorMessage } from './messages/validator.js';

package/exports/typings/messages/block.d.ts

@@ -0,0 +1,24 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class BlockMessage extends FormatInterface {
+    decoded: {
+        index: Number;
+        previousHash: String;
+        timestamp: String;
+        reward: Number;
+        fees: Number;
+        transactions: Uint8Array[] | Object[] | Uint8Array;
+        validators: Uint8Array[] | Object[] | Uint8Array;
+    };
+    get messageName(): string;
+    constructor(buffer: messageInput);
+    encode(): Uint8Array;
+    decode(): {
+        index: Number;
+        previousHash: String;
+        timestamp: String;
+        reward: Number;
+        fees: Number;
+        transactions: Uint8Array | Uint8Array[] | Object[];
+        validators: Uint8Array | Uint8Array[] | Object[];
+    };
+}

package/exports/typings/messages/bw-request.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class BWRequestMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/bw.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class BWMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/contract.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class ContractMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/last-block-request.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class LastBlockRequestMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/last-block.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class LastBlockMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/transaction.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class TransactionMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/messages/validator.d.ts

@@ -0,0 +1,5 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
+export default class ValidatorMessage extends FormatInterface {
+    get messageName(): string;
+    constructor(buffer: messageInput);
+}

package/exports/typings/protos/block.proto.d.ts

@@ -0,0 +1,10 @@
+declare namespace _default {
+    const index: number;
+    const previousHash: string;
+    const timestamp: number;
+    const reward: number;
+    const fees: number;
+    const transactions: Uint8Array;
+    const validators: Uint8Array;
+}
+export default _default;

package/exports/typings/protos/bw-request.proto.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/exports/typings/protos/bw.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const up: number;
+    const down: number;
+}
+export default _default;

package/exports/typings/protos/contract.proto.d.ts

@@ -0,0 +1,6 @@
+declare namespace _default {
+    const creator: string;
+    const contract: Uint8Array;
+    const constructorParameters: any[];
+}
+export default _default;

package/exports/typings/protos/last-block-request.proto.d.ts

@@ -0,0 +1,2 @@
+declare const _default: {};
+export default _default;

package/exports/typings/protos/last-block.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const hash: string;
+    const index: number;
+}
+export default _default;

package/exports/typings/protos/transaction.proto.d.ts

@@ -0,0 +1,10 @@
+declare namespace _default {
+    const timestamp: number;
+    const from: string;
+    const to: string;
+    const nonce: number;
+    const method: string;
+    const params: any[];
+    const signature: Uint8Array;
+}
+export default _default;

package/exports/typings/protos/validator.proto.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    const address: string;
+    const reward: number;
+}
+export default _default;

package/exports/typings/workers/transaction-worker.d.ts

@@ -0,0 +1 @@
+export {};

package/exports/workers/transaction-worker.js

@@ -0,0 +1,23 @@
+import '../messages/block.js';
+import '../messages/bw.js';
+import '../messages/bw-request.js';
+import '../messages/contract.js';
+import '../messages/last-block.js';
+import '../messages/last-block-request.js';
+import TransactionMessage from '../messages/transaction.js';
+import '../messages/validator.js';
+import EasyWorker from '@vandeurenglenn/easy-worker';
+
+globalThis.peernet = globalThis.peernet || {};
+globalThis.contracts = {};
+const worker = new EasyWorker();
+worker.onmessage(async (transactions) => {
+    globalThis.peernet.codecs = {
+        'transaction-message': {
+            codec: parseInt('746d', 16),
+            hashAlg: 'keccak-256'
+        }
+    };
+    transactions = await Promise.all(transactions.map(async (message) => (message instanceof TransactionMessage ? new Uint8Array(message.encoded) : new TransactionMessage({ ...message, signature: new Uint8Array(message.signature) }).encoded)));
+    worker.postMessage(transactions);
+});

package/package.json

@@ -1,21 +1,33 @@
 {
   "name": "@leofcoin/messages",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "",
-  "main": "dist/messages.js",
-  "module": "src/messages.js",
+  "exports": {
+    ".": "./exports/index.js",
+    "./block": "./exports/block.js",
+    "./bw-request": "./exports/bw-request.js",
+    "./bw": "./exports/bw.js",
+    "./contract": "./exports/contract.js",
+    "./last-block-request": "./exports/last-block-request.js",
+    "./last-block": "./exports/last-block.js",
+    "./transaction": "./exports/transaction.js"
+  },
+  "type": "module",
+  "typings": "./exports/typings/index.d.ts",
   "scripts": {
-    "build": "rollup -c && webpack",
+    "build": "rollup -c",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "webpack": "^5.73.0",
-    "webpack-cli": "^4.9.2"
+    "@rollup/plugin-typescript": "^11.0.0",
+    "rollup": "^3.10.0",
+    "tslib": "^2.4.1"
   },
   "dependencies": {
-    "@leofcoin/codec-format-interface": "^1.2.2"
+    "@leofcoin/codec-format-interface": "^1.4.0",
+    "@vandeurenglenn/easy-worker": "^1.0.2"
   }
 }

package/rollup.config.js

@@ -1,7 +1,56 @@
+import typescript from "@rollup/plugin-typescript"
+import tsConfig from './tsconfig.json' assert { type: 'json'}
+
+
 export default [{
-  input: ['./src/messages.js'],
+  input: ['./src/index.ts'],
   output: {
-    dir: './dist',
-    format: 'cjs'
-  }
-}]
+    format: 'es',
+    dir: './exports'
+  },
+  external: [
+    './messages/block.js', 
+    './messages/bw.js',
+    './messages/bw-request.js',
+    './messages/contract.js',
+    './messages/last-block.js',
+    './messages/last-block-request.js',
+    './messages/transaction.js',
+    './messages/validator.js'
+  ],  
+  plugins: [
+    typescript(tsConfig)
+  ]
+}, {
+  input: [
+    './src/messages/block.ts',
+    './src/messages/bw.ts',
+    './src/messages/bw-request.ts',
+    './src/messages/contract.ts',
+    './src/messages/last-block.ts',
+    './src/messages/last-block-request.ts',
+    './src/messages/transaction.ts',
+    './src/messages/validator.ts'
+  ],
+  output: {
+    format: 'es',
+    dir: './exports/messages'
+  },
+  external: [
+    './messages/block.js', 
+    './messages/bw.js',
+    './messages/bw-request.js',
+    './messages/contract.js',
+    './messages/last-block.js',
+    './messages/last-block-request.js',
+    './messages/transaction.js',
+    './messages/validator.js'
+  ],  
+  plugins: [
+    typescript({"module": "ES2022",
+    "target": "es2022",
+    "moduleResolution":"NodeNext",
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true, declaration: false, declarationDir: './exports/messages', outDir: './exports/messages'})
+  ]
+}]

package/src/index.ts

@@ -0,0 +1,10 @@
+declare type messageInput = Uint8Array | String | Object | ArrayBuffer
+
+export { default as BlockMessage } from './messages/block.js'
+export { default as BWMessage } from './messages/bw.js'
+export { default as BWRequestMessage } from './messages/bw-request.js'
+export { default as ContractMessage } from './messages/contract.js'
+export { default as LastBlockMessage } from './messages/last-block.js'
+export { default as LastBlockRequestMessage } from './messages/last-block-request.js'
+export { default as TransactionMessage } from './messages/transaction.js'
+export { default as ValidatorMessage } from './messages/validator.js'

package/src/messages/block.ts

@@ -0,0 +1,56 @@
+import proto from '../protos/block.proto.js'
+import { FormatInterface } from '@leofcoin/codec-format-interface'
+import TransactionMessage from './transaction.js'
+import ValidatorMessage from './validator.js'
+import smartConcat from '@vandeurenglenn/typed-array-smart-concat'
+import smartDeconcat from '@vandeurenglenn/typed-array-smart-deconcat'
+
+export default class BlockMessage extends FormatInterface {
+  declare decoded: {
+    index: Number,
+    previousHash: String,
+    timestamp: String,
+    reward: Number,
+    fees: Number,
+    transactions: Uint8Array[] | Object[] | Uint8Array,
+    validators: Uint8Array[] | Object[] | Uint8Array
+  }
+
+  get messageName() {
+    return 'BlockMessage'
+  }
+
+  constructor(buffer: messageInput) {
+    const name = 'block-message'
+    super(buffer, proto, {name})
+  }
+
+  encode(): Uint8Array {
+    const decoded = this.decoded
+    const validators: Uint8Array[] = []
+    const transactions: Uint8Array[] = []
+    
+    for (const validator of decoded.validators) {
+      if (validator instanceof ValidatorMessage) validators.push(validator.encoded)
+      else validators.push(new ValidatorMessage(validator).encoded)
+    }
+
+    for (const transaction of decoded.transactions) {
+      if (transaction instanceof TransactionMessage) transactions.push(transaction.encoded)
+      else transactions.push(new TransactionMessage(transaction).encoded)
+    }
+
+    return super.encode({
+      ...decoded,
+      validators: smartConcat(validators),
+      transactions: smartConcat(transactions)
+    })
+  }
+
+  decode() {
+    super.decode()    
+    this.decoded.transactions = smartDeconcat(this.decoded.transactions as Uint8Array).map(transaction => new TransactionMessage(transaction).decoded)
+    this.decoded.validators = smartDeconcat(this.decoded.validators as Uint8Array).map(validator => new ValidatorMessage(validator).decoded)
+    return this.decoded
+  }
+}

package/src/messages/{bw-request.js → bw-request.ts}

@@ -1,16 +1,12 @@
-import proto from './../protos/bw-request.proto.js'
+import proto from '../protos/bw-request.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class BWRequestMessage extends FormatInterface {
-  get keys() {
-    return []
-  }
-
   get messageName() {
     return 'BWRequestMessage'
   }
 
-  constructor(buffer) {
+  constructor(buffer: messageInput) {
     const name = 'bw-request-message'
     super(buffer, proto, {name})
   }

package/src/messages/{bw.js → bw.ts}

@@ -1,16 +1,12 @@
-import proto from './../protos/bw.proto.js'
+import proto from '../protos/bw.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class BWMessage extends FormatInterface {
-  get keys() {
-    return ['up', 'down']
-  }
-
   get messageName() {
     return 'BWMessage'
   }
 
-  constructor(buffer) {
+  constructor(buffer: messageInput) {
     const name = 'bw-message'
     super(buffer, proto, {name})
   }

package/src/messages/{contract.js → contract.ts}

@@ -1,16 +1,12 @@
-import proto from './../protos/contract.proto.js'
+import proto from '../protos/contract.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class ContractMessage extends FormatInterface {
-  get keys() {
-    return ['creator', 'contract', 'constructorParameters']
-  }
-
   get messageName() {
     return 'ContractMessage'
   }
 
-  constructor(buffer) {
+  constructor(buffer: messageInput) {
     super(buffer, proto, {name: 'contract-message'})
   }
 }

package/src/messages/{last-block-request.js → last-block-request.ts}

@@ -1,16 +1,12 @@
-import proto from './../protos/last-block-request.proto.js'
+import proto from '../protos/last-block-request.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class LastBlockRequestMessage extends FormatInterface {
-  get keys() {
-    return []
-  }
-
   get messageName() {
     return 'LastBlockRequestMessage'
   }
 
-  constructor(buffer) {
+  constructor(buffer: messageInput) {
     const name = 'last-block-request-message'
     super(buffer, proto, {name})
   }

package/src/messages/{last-block.js → last-block.ts}

@@ -1,16 +1,12 @@
-import proto from './../protos/last-block.proto.js'
+import proto from '../protos/last-block.proto.js'
 import { FormatInterface } from '@leofcoin/codec-format-interface'
 
 export default class LastBlockMessage extends FormatInterface {
-  get keys() {
-    return ['hash', 'index']
-  }
-
   get messageName() {
     return 'LastBlockMessage'
   }
 
-  constructor(buffer) {
+  constructor(buffer: messageInput) {
     const name = 'last-block-message'
     super(buffer, proto, {name})
   }