@leofcoin/workers 1.4.18 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @leofcoin/workers
 
+## 1.5.0
+
+### Minor Changes
+
+- Update chain & machine-worker to support LIP1
+
+## 1.4.19
+
+### Patch Changes
+
+- 78299bf: bump
+- Updated dependencies [78299bf]
+  - @leofcoin/addresses@1.0.23
+  - @leofcoin/lib@1.2.43
+  - @leofcoin/messages@1.4.13
+  - @leofcoin/utils@1.1.18
+
 ## 1.4.18
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/workers",
-  "version": "1.4.18",
+  "version": "1.5.0",
   "description": "Workers used in @leofcoin/chain",
   "type": "module",
   "private": false,
@@ -21,11 +21,11 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.22",
-    "@leofcoin/lib": "^1.2.42",
-    "@leofcoin/messages": "^1.4.12",
-    "@leofcoin/storage": "^3.5.24",
-    "@leofcoin/utils": "^1.1.17",
+    "@leofcoin/addresses": "^1.0.23",
+    "@leofcoin/lib": "^1.2.43",
+    "@leofcoin/messages": "^1.4.13",
+    "@leofcoin/storage": "^3.5.28",
+    "@leofcoin/utils": "^1.1.18",
     "@vandeurenglenn/easy-worker": "^1.0.2"
   }
 }

package/src/machine-worker.js

@@ -58,7 +58,9 @@ const get = ({ contract, method, params }) => {
   return result
 }
 
-const resolveContract = (address) => askFor('contract', address)
+const resolveContract = (hash) => askFor('contract', hash)
+
+const resolveTransaction = (hash) => askFor('transaction', hash)
 
 const respond = (id, value) => {
   worker.postMessage({
@@ -135,9 +137,18 @@ const _executeTransaction = async (transaction) => {
     await _.execute({ contract: to, method, params })
     if (to === nativeToken) {
       nativeCalls += 1
-      if (method === 'burn') nativeBurns += 1
-      if (method === 'mint') nativeMints += 1
-      if (method === 'transfer') nativeTransfers += 1
+      if (method === 'burn') {
+        nativeBurns += 1
+        totalBurnAmount += params[0]
+      }
+      if (method === 'mint') {
+        nativeMints += 1
+        totalMintAmount += params[0]
+      }
+      if (method === 'transfer') {
+        nativeTransfers += 1
+        totalTransferAmount += params[0]
+      }
     }
     totalTransactions += 1
 
@@ -153,10 +164,19 @@ const _executeTransaction = async (transaction) => {
 }
 
 _.init = async (message) => {
-  let { peerid, fromState, state } = message
+  let { peerid, fromState, state, info } = message
   globalThis.peerid = peerid
   console.log({ fromState })
   if (fromState) {
+    nativeCalls = info.nativeCalls
+    nativeBurns = info.nativeBurns
+    nativeMints = info.nativeMints
+    nativeTransfers = info.nativeTransfers
+    totalTransactions = info.totalTransactions
+    totalBurnAmount = info.totalBurnAmount
+    totalMintAmount = info.totalMintAmount
+    totalTransferAmount = info.totalTransferAmount
+
     lastBlock = message.lastBlock
     const setState = async (address, state) => {
       const contractBytes = await resolveContract(address)
@@ -196,47 +216,52 @@ _.init = async (message) => {
     )
     console.log({ blocks: message.blocks })
     if (message.blocks?.length > 0) {
-      let pre
-
-      try {
-        const importee = await import('url')
-        const url = importee.default
-        if (url) pre = url.fileURLToPath(new URL('.', import.meta.url))
-      } catch {
-        // browser env
-        pre = './'
-      }
+      // let pre
+
+      // try {
+      //   const importee = await import('url')
+      //   const url = importee.default
+      //   if (url) pre = url.fileURLToPath(new URL('.', import.meta.url))
+      // } catch {
+      //   // browser env
+      //   pre = './'
+      // }
 
-      let _worker = await new EasyWorker(pre + '@leofcoin/workers/block-worker.js', {
-        serialization: 'advanced',
-        type: 'module'
-      })
-      blocks = await _worker.once(message.blocks)
-      _worker = null
+      // let _worker = await new EasyWorker(pre + '@leofcoin/workers/block-worker.js', {
+      //   serialization: 'advanced',
+      //   type: 'module'
+      // })
+      // blocks = await _worker.once(message.blocks)
+      // _worker = null
       // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
       // for (let i = 0; i < blocks.length; i++) {
 
       // }
+      blocks = message.blocks
       for (const block of blocks) {
         // we only revalidate the latest 24 blocks
         // every 24 blocks a snapshot is taken and stored in state
         // this means contracts will be restored from this state
         // this also means devs NEED to make sure the state can be restored
         // on contract deploy an error will be thrown if state wasn't recoverable
-        if (block.index > 24) {
-          const transactionCount = blocks[block.index - 1].transactions.length
-          latestTransactions.splice(-(transactionCount - 1), latestTransactions.length)
+        if (block.index >= blocks.length - 24) {
+          const transactionCount = blocks[block.index].transactions.length
+          latestTransactions.splice(-transactionCount, latestTransactions.length)
         }
-
         if (!block.loaded && !fromState) {
-          const priority = block.transactions.filter((transaction) => transaction.priority)
-          if (priority.length > 0)
-            await Promise.all(
-              priority.sort((a, b) => a.nonce - b.nonce).map((transaction) => _executeTransaction(transaction))
+          const transactions = await Promise.all(
+            block.transactions.map(async (transaction) =>
+              new TransactionMessage(await resolveTransaction(transaction)).decode()
             )
+          )
+          const priority = transactions.filter((transaction) => transaction.priority)?.sort((a, b) => a.nonce - b.nonce)
+          if (priority.length > 0)
+            for (const transaction of priority) {
+              await _executeTransaction(transaction)
+            }
 
           await Promise.all(
-            block.transactions
+            transactions
               .filter((transaction) => !transaction.priority)
               .map(async (transaction) => _executeTransaction(transaction))
           )
@@ -244,9 +269,7 @@ _.init = async (message) => {
         block.loaded = true
         worker.postMessage({
           type: 'debug',
-          message: `loaded transactions for block: ${block.blockInfo.hash} @${block.blockInfo.index} ${formatBytes(
-            block.blockInfo.size
-          )}`
+          message: `loaded transactions for block: ${block.hash} @${block.index}`
         })
       }
 
@@ -330,6 +353,15 @@ worker.onmessage(({ id, type, input }) => {
     case 'nativeTransfers':
       respond(id, nativeTransfers)
       break
+    case 'totalBurnAmount':
+      respond(id, totalBurnAmount)
+      break
+    case 'totalMintAmount':
+      respond(id, totalMintAmount)
+      break
+    case 'totalTransferAmount':
+      respond(id, totalTransferAmount)
+      break
     case 'totalTransfers':
       respond(id, totalTransfers)
       break