@sentio/runtime 2.54.0-rc.10 → 2.54.0-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.54.0-rc.10",
+  "version": "2.54.0-rc.12",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/full-service.ts

@@ -19,6 +19,7 @@ import fs from 'fs-extra'
 import path from 'path'
 import os from 'os'
 import { GLOBAL_CONFIG } from './global-config.js'
+import { compareSemver, parseSemver, Semver } from './utils.js'
 
 const require = createRequire(import.meta.url)
 
@@ -41,14 +42,11 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
 
     console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)
 
-    const version = sdkPackageJson.version.split('.')
-    this.sdkMinorVersion = parseInt(version[1])
-    this.patchVersion = version[2]
+    this.sdkVersion = parseSemver(sdkPackageJson.version)
   }
 
   instance: ProcessorServiceImplementation
-  sdkMinorVersion: number
-  patchVersion: string
+  sdkVersion: Semver
 
   async getConfig(request: ProcessConfigRequest, context: CallContext) {
     const config = await this.instance.getConfig(request, context)
@@ -95,7 +93,7 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
       }
       return result
     } catch (e) {
-      if (this.sdkMinorVersion <= 16) {
+      if (this.sdkVersion.minor <= 16) {
         // Old sdk doesn't handle this well
         if (
           e.code === os.constants.errno.ECONNRESET ||
@@ -132,7 +130,7 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
     }
     switch (dataBinding.handlerType) {
       case HandlerType.FUEL_TRANSACTION:
-        if (this.sdkMinorVersion <= 54 && this.patchVersion < 'rc.7') {
+        if (compareSemver(this.sdkVersion, fuelProtoUpdateVersion) < 0) {
           dataBinding.handlerType = HandlerType.FUEL_CALL
           if (dataBinding.data) {
             dataBinding.data.fuelCall = dataBinding.data?.fuelTransaction
@@ -140,7 +138,7 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
         }
         break
       case HandlerType.FUEL_RECEIPT:
-        if (this.sdkMinorVersion <= 54 && this.patchVersion < 'rc.7') {
+        if (compareSemver(this.sdkVersion, fuelProtoUpdateVersion) < 0) {
           dataBinding.handlerType = HandlerType.FUEL_CALL
           if (dataBinding.data) {
             dataBinding.data.fuelCall = dataBinding.data?.fuelLog
@@ -216,3 +214,5 @@ function getSecondary(d: DataBinding) {
     d.data?.ethTrace?.trace?.transactionPosition
   )
 }
+
+const fuelProtoUpdateVersion = parseSemver('2.54.0-rc.7')

package/src/utils.ts

@@ -36,3 +36,58 @@ export function makeEthCallKey(param: EthCallParam) {
   const { chainId, address, blockTag } = param.context
   return `${chainId}|${address}|${blockTag}|${param.calldata}`.toLowerCase()
 }
+
+export type Semver = {
+  semVer?: string
+  major: number
+  minor: number
+  patch: number
+  prerelease?: string
+  buildmetadata?: string
+}
+
+export function parseSemver(version: string): Semver {
+  const [semVer, major, minor, patch, prerelease, buildmetadata] =
+    version.match(
+      /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+    ) ?? []
+  return {
+    semVer,
+    major: parseInt(major),
+    minor: parseInt(minor),
+    patch: parseInt(patch),
+    prerelease,
+    buildmetadata
+  }
+}
+
+export function compareSemver(a: Semver, b: Semver) {
+  const { major: ma, minor: mia, patch: pa, prerelease: pra } = a
+  const { major: mb, minor: mib, patch: pb, prerelease: prb } = b
+
+  if (ma !== mb) {
+    return ma - mb
+  }
+  if (mia !== mib) {
+    return mia - mib
+  }
+
+  if (pa !== pb) {
+    return pa - pb
+  }
+  if (pra && prb) {
+    const [sa, va] = pra.split('.')
+    const [sb, vb] = prb.split('.')
+
+    if (sa !== sb) {
+      return sa.localeCompare(sb)
+    }
+
+    return parseInt(va) - parseInt(vb)
+  } else if (pra) {
+    return 1
+  } else if (prb) {
+    return -1
+  }
+  return 0
+}