Forráskód Böngészése

switch from blake3 to blake3-wasm for cross arch docker container to work

Mokhtar Naamani 3 éve
szülő
commit
6a8cde2ddc

+ 1 - 1
cli/package.json

@@ -44,7 +44,7 @@
     "proper-lockfile": "^4.1.1",
     "slug": "^2.1.1",
     "tslib": "^1.11.1",
-    "blake3": "^2.1.4",
+    "blake3-wasm": "^2.1.5",
     "multihashes": "^4.0.3",
     "@apollo/client": "^3.2.5",
     "cross-fetch": "^3.0.6",

+ 1 - 1
cli/src/base/UploadCommandBase.ts

@@ -20,7 +20,7 @@ import mimeTypes from 'mime-types'
 import { Assets } from '../schemas/typings/Assets.schema'
 import chalk from 'chalk'
 import { DataObjectCreationParameters } from '@joystream/types/storage'
-import { createHash } from 'blake3'
+import { createHash } from 'blake3-wasm'
 import * as multihash from 'multihashes'
 import { u8aToHex, formatBalance } from '@polkadot/util'
 import { KeyringPair } from '@polkadot/keyring/types'

+ 1 - 1
distributor-node/package.json

@@ -40,7 +40,7 @@
     "cors": "^2.8.5",
     "inquirer": "^8.1.2",
     "multihashes": "^4.0.3",
-    "blake3": "^2.1.4",
+    "blake3-wasm": "^2.1.5",
     "js-image-generator": "^1.0.3"
   },
   "devDependencies": {

+ 1 - 1
distributor-node/src/commands/dev/batchUpload.ts

@@ -1,6 +1,6 @@
 import AccountsCommandBase from '../../command-base/accounts'
 import DefaultCommandBase, { flags } from '../../command-base/default'
-import { hash } from 'blake3'
+import { hash } from 'blake3-wasm'
 import { FilesApi, Configuration, TokenRequest } from '../../services/networking/storage-node/generated'
 import { u8aToHex } from '@polkadot/util'
 import * as multihash from 'multihashes'

+ 1 - 1
distributor-node/src/services/content/ContentService.ts

@@ -7,7 +7,7 @@ import { FileContinousReadStream, FileContinousReadStreamOptions } from './FileC
 import FileType from 'file-type'
 import { Readable, pipeline } from 'stream'
 import { NetworkingService } from '../networking'
-import { createHash } from 'blake3'
+import { createHash } from 'blake3-wasm'
 import * as multihash from 'multihashes'
 
 export const DEFAULT_CONTENT_TYPE = 'application/octet-stream'

+ 1 - 1
storage-node-v2/package.json

@@ -32,7 +32,7 @@
     "ajv": "^7",
     "await-lock": "^2.1.0",
     "base64url": "^3.0.1",
-    "blake3": "^2.1.4",
+    "blake3-wasm": "^2.1.5",
     "cross-fetch": "^3.1.4",
     "express": "4.17.1",
     "express-openapi-validator": "4.12.4",

+ 1 - 1
storage-node-v2/src/services/helpers/hashing.ts

@@ -1,6 +1,6 @@
 import * as multihash from 'multihashes'
 import fs from 'fs'
-import { createHash } from 'blake3'
+import { createHash } from 'blake3-wasm'
 
 /**
  * Reads the file and calculates its hash. It uses the blake3 hashing algorithm

+ 4 - 4
yarn.lock

@@ -9174,10 +9174,10 @@ bl@^4.0.0, bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blake3@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/blake3/-/blake3-2.1.4.tgz#78117bc9e80941097fdf7d03e897a9ee595ecd62"
-  integrity sha512-70hmx0lPd6zmtNwxPT4/1P0pqaEUlTJ0noUBvCXPLfMpN0o8PPaK3q7ZlpRIyhrqcXxeMAJSowNm/L9oi/x1XA==
+blake3-wasm@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/blake3-wasm/-/blake3-wasm-2.1.5.tgz#b22dbb84bc9419ed0159caa76af4b1b132e6ba52"
+  integrity sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==
 
 blakejs@^1.1.0:
   version "1.1.0"