@alephium/web3 3.0.0-test.6 → 3.0.0-test.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "3.0.0-test.6",
+  "version": "3.0.0-test.7",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "type": "commonjs",
@@ -60,13 +60,13 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "4.2.5",
+    "alephium_version": "4.4.1",
     "explorer_backend_version": "3.3.2"
   },
   "dependencies": {
-    "@noble/curves": "1.6.0",
-    "@noble/hashes": "1.6.1",
-    "@noble/secp256k1": "1.7.1",
+    "@noble/curves": "1.9.7",
+    "@noble/hashes": "1.8.0",
+    "@noble/secp256k1": "1.7.2",
     "base-x": "4.0.0",
     "bignumber.js": "^9.1.1",
     "eventemitter3": "^4.0.7"
@@ -74,33 +74,21 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
     "@babel/eslint-parser": "^7.21.3",
-    "@size-limit/esbuild": "^11.0.0",
-    "@size-limit/file": "^11.0.0",
     "@types/find-up": "^2.1.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^27.5.2",
-    "@types/mock-fs": "^4.13.1",
     "@types/node": "^20.0.0",
-    "@types/rewire": "^2.5.28",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-security": "1.6.0",
-    "jest": "^28.1.3",
-    "jest-localstorage-mock": "^2.4.26",
-    "jest-websocket-mock": "^2.4.0",
-    "mock-fs": "^5.2.0",
-    "mock-socket": "^9.2.1",
     "prettier": "^2.8.7",
     "process": "^0.11.10",
     "publint": "^0.3.18",
-    "rewire": "^6.0.0",
     "shelljs": "^0.8.5",
     "size-limit": "^11.0.0",
     "swagger-typescript-api": "12.0.3",
-    "ts-jest": "^28.0.8",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.8.16",
     "tslib": "^2.5.0",
@@ -111,12 +99,13 @@
     "npm": ">=7.0.0"
   },
   "scripts": {
-    "clean": "rm -rf node_modules dist",
-    "build": "rm -rf dist && pnpm build:cjs && pnpm build:esm",
+    "build": "pnpm clean && pnpm build:cjs && pnpm build:esm",
     "build:cjs": "tsc --project tsconfig.build.json --module commonjs --moduleResolution node --outDir dist/_cjs --declaration --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > dist/_cjs/package.json",
     "build:esm": "tsc --project tsconfig.build.json --outDir dist/_esm --declaration && tsc-alias --project tsconfig.build.json --outDir dist/_esm --resolve-full-paths && printf '{\"type\":\"module\",\"sideEffects\":false}' > dist/_esm/package.json",
+    "clean": "rm -rf dist",
+    "clean:all": "pnpm clean && rm -rf node_modules",
     "check": "publint && attw --pack --ignore-rules internal-resolution-error",
-    "test": "jest -i --config ./jest-config.json",
+    "test": "vitest run",
     "update-schemas": "npm run update-schema:alephium && npm run update-schema:explorer",
     "update-schema:alephium": "npx swagger-typescript-api --disable-throw-on-error -t ./configs -o ./src/api -n api-alephium.ts -p https://raw.githubusercontent.com/alephium/alephium/v${npm_package_config_alephium_version}/api/src/main/resources/openapi.json",
     "update-schema:explorer": "npx swagger-typescript-api --disable-throw-on-error -t ./configs -o ./src/api -n api-explorer.ts -p https://raw.githubusercontent.com/alephium/explorer-backend/v${npm_package_config_explorer_backend_version}/app/src/main/resources/explorer-backend-openapi.json",

package/src/api/api-alephium.ts

@@ -723,6 +723,8 @@ export interface ContractEvent {
   blockHash: string
   /** @format 32-byte-hash */
   txId: string
+  /** @format int64 */
+  timestamp: number
   /** @format int32 */
   eventIndex: number
   fields: Val[]
@@ -732,6 +734,8 @@ export interface ContractEvent {
 export interface ContractEventByBlockHash {
   /** @format 32-byte-hash */
   txId: string
+  /** @format int64 */
+  timestamp: number
   /** @format address */
   contractAddress: string
   /** @format int32 */
@@ -743,6 +747,8 @@ export interface ContractEventByBlockHash {
 export interface ContractEventByTxId {
   /** @format block-hash */
   blockHash: string
+  /** @format int64 */
+  timestamp: number
   /** @format address */
   contractAddress: string
   /** @format int32 */
@@ -1503,7 +1509,7 @@ export interface ValByteVec {
 
 /** ValI256 */
 export interface ValI256 {
-  /** @format bigint */
+  /** @format int256 */
   value: string
   type: string
 }
@@ -1779,7 +1785,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 4.2.5
+ * @version 4.4.1
  * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {

package/src/contract/contract.ts

@@ -371,15 +371,14 @@ export class Contract extends Artifact {
     )
   }
 
-  // support both 'code.ral' and 'code.ral.json'
   static async fromArtifactFile(
     path: string,
+    readFile: (path: string) => Promise<string | Uint8Array>,
     bytecodeDebugPatch: string,
     codeHashDebug: string,
     structs: Struct[] = []
   ): Promise<Contract> {
-    const fs = await import('fs')
-    const content = await fs.promises.readFile(path)
+    const content = await readFile(path)
     const artifact = JSON.parse(content.toString())
     return Contract.fromJson(artifact, bytecodeDebugPatch, codeHashDebug, structs)
   }
@@ -568,6 +567,7 @@ export class Contract extends Artifact {
     return {
       txId: txId,
       blockHash: event.blockHash,
+      timestamp: event.timestamp,
       contractAddress: event.contractAddress,
       name: name,
       eventIndex: event.eventIndex,
@@ -779,9 +779,13 @@ export class Script extends Artifact {
     )
   }
 
-  static async fromArtifactFile(path: string, bytecodeDebugPatch: string, structs: Struct[] = []): Promise<Script> {
-    const fs = await import('fs')
-    const content = await fs.promises.readFile(path)
+  static async fromArtifactFile(
+    path: string,
+    readFile: (path: string) => Promise<string | Uint8Array>,
+    bytecodeDebugPatch: string,
+    structs: Struct[] = []
+  ): Promise<Script> {
+    const content = await readFile(path)
     const artifact = JSON.parse(content.toString())
     return this.fromJson(artifact, bytecodeDebugPatch, structs)
   }
@@ -1011,6 +1015,7 @@ export interface TestContractParams<
 export interface ContractEvent<T extends Fields = Fields> {
   txId: string
   blockHash: string
+  timestamp: number
   contractAddress: string
   eventIndex: number
   name: string
@@ -1304,6 +1309,7 @@ export function decodeContractCreatedEvent(event: node.ContractEvent): Omit<Cont
   return {
     blockHash: event.blockHash,
     txId: event.txId,
+    timestamp: event.timestamp,
     eventIndex: event.eventIndex,
     name: Contract.ContractCreatedEvent.name,
     fields: toContractCreatedEventFields(fields)
@@ -1317,6 +1323,7 @@ export function decodeContractDestroyedEvent(
   return {
     blockHash: event.blockHash,
     txId: event.txId,
+    timestamp: event.timestamp,
     eventIndex: event.eventIndex,
     name: Contract.ContractDestroyedEvent.name,
     fields: { address: fields['address'] as Address }

package/src/utils/sign.ts

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { binToHex, encodeSignature, hexToBinUnsafe, signatureDecode } from '../utils'
+import { binToHex, encodeSignature, hexToBinUnsafe } from '../utils'
 import { KeyType } from '../signer'
 import * as secp from '@noble/secp256k1'
 import { sha256 } from '@noble/hashes/sha256'
@@ -61,8 +61,7 @@ export function verifySignature(hash: string, publicKey: string, signature: stri
 
   try {
     if (keyType === 'default' || keyType === 'gl-secp256k1') {
-      const decoded = signatureDecode(signature)
-      const sig = secp.Signature.fromCompact(decoded.r + decoded.s)
+      const sig = secp.Signature.fromCompact(signature)
       return secp.verify(sig, hexToBinUnsafe(hash), hexToBinUnsafe(publicKey))
     } else {
       return secp.schnorr.verifySync(hexToBinUnsafe(signature), hexToBinUnsafe(hash), hexToBinUnsafe(publicKey))