patch bee-js stream.js file for node

Kredeum · Feb 1, 2024 · 5c8ad1f · 5c8ad1f
1 parent da921e3
commit 5c8ad1f
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 30 deletions.
diff --git a/common/lib/apis/api-thegraph.ts b/common/lib/apis/api-thegraph.ts
@@ -7,7 +7,6 @@ import { fetchGQL, FETCH_LIMIT } from "@kredeum/common/lib/common/fetch";
 import { keyCollection, keyNft } from "@kredeum/common/lib/common/keys";
 import { networks } from "@kredeum/common/lib/common/networks";
 
-
 const thegraphNftList = async (
   chainId: number,
   collection: CollectionType,

diff --git a/common/lib/collection/collection-get.ts b/common/lib/collection/collection-get.ts
@@ -6,7 +6,12 @@ import { getAbi } from "@kredeum/common/lib/common/artifacts";
 import { resolverGetCollection } from "@kredeum/common/lib/resolver/resolver-get-collection";
 import { providerGetSignerOrProvider } from "@kredeum/common/lib/common/provider-get";
 import { keyCollectionContract, keyCollection } from "@kredeum/common/lib/common/keys";
-import { ADDRESS_ZERO, explorerAddressUrl, getChecksumAddress, isAddressNotZero } from "@kredeum/common/lib/common/config";
+import {
+  ADDRESS_ZERO,
+  explorerAddressUrl,
+  getChecksumAddress,
+  isAddressNotZero
+} from "@kredeum/common/lib/common/config";
 import { isAddress } from "ethers/lib/utils";
 import { collectionSupports } from "./collection";
 

diff --git a/common/lib/resolver/resolver-get-collection.ts b/common/lib/resolver/resolver-get-collection.ts
@@ -1,4 +1,3 @@
-
 import type { CollectionType } from "@kredeum/common/lib/common/types";
 import { resolverConvOpenNFTsCollectionInfos } from "@kredeum/common/lib/resolver/resolver-conv-collection-infos";
 import { resolverGetContract } from "@kredeum/common/lib/resolver/resolver-get";

diff --git a/common/lib/resolver/resolver-get-nft.ts b/common/lib/resolver/resolver-get-nft.ts
@@ -8,7 +8,6 @@ import { FETCH_LIMIT } from "@kredeum/common/lib/common/fetch";
 import { collectionIsERC1155 } from "@kredeum/common/lib/collection/collection";
 import { ADDRESS_ZERO } from "@kredeum/common/lib/common/config";
 
-
 // COLLECTION
 // name
 // symbol

diff --git a/common/package.json b/common/package.json
@@ -7,6 +7,8 @@
     "lib": "lib"
   },
   "scripts": {
+    "patch:stream": "cd patch && source stream.patch.sh",
+    "postinstall": "pnpm patch:stream",
     "clean": "rm -rf node_modules types abis",
     "format": "prettier lib/**/*.ts --write --list-different",
     "check": "eslint lib/**/*.ts"
@@ -47,4 +49,4 @@
     "@kredeum/config": "workspace:^",
     "@kredeum/contracts": "workspace:^"
   }
-}
+}
diff --git a/common/patch/.gitignore b/common/patch/.gitignore
@@ -0,0 +1 @@
+stream.js
diff --git a/common/patch/stream.patch b/common/patch/stream.patch
@@ -0,0 +1,12 @@
+--- a/stream.js
++++ b/stream.js
+@@ -1,7 +1,6 @@
+-import { Readable as NodeReadableNative } from 'stream';
+ import { isStrictlyObject } from "./type.js";
+ import { ReadableStream } from 'web-streams-polyfill';
+-const NodeReadable = NodeReadableNative || class {};
++const NodeReadable = class {};
+ /**
+  * Validates if passed object is either browser's ReadableStream
+  * or Node's Readable.
+--
diff --git a/common/patch/stream.patch.sh b/common/patch/stream.patch.sh
@@ -0,0 +1,11 @@
+#/bin/sh
+
+# `source stream.patch.sh` to apply patch
+# `source stream.patch.sh -R` to revert patch
+
+DIR="../node_modules/@ethersphere/bee-js/dist/mjs/utils"
+cp $DIR/stream.js .
+
+git apply stream.patch $1 2>> /dev/null && cp ./stream.js $DIR
+
+rm stream.js
diff --git a/contracts/package.json b/contracts/package.json
@@ -29,7 +29,7 @@
     "build:forge": "forge build",
     "build:typechain": "pnpx typechain --target ethers-v5 --out-dir types out/**/*.json",
     "check": "pnpm check:solidity",
-    "check:solidity": "solhint --fix src/**/*.sol",
+    "check:solidity": "solhint src/**/*.sol",
     "clean": "pnpm run clean:foundry && rm -rf node_modules lib types artifacts broadcast",
     "clean:foundry": "forge clean && rm -rf cache-forge out",
     "deploy:deploy": "pnpm run deploy:all --fork-url $CHAIN --sender $SENDER --account $ACCOUNT --broadcast",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sveltekit/package.json b/sveltekit/package.json
@@ -15,7 +15,6 @@
     "test:unit": "vitest"
   },
   "devDependencies": {
-
     "@ethersproject/providers": "^5.7.2",
     "@metamask/detect-provider": "^2.0.0",
     "@playwright/test": "^1.41.1",

diff --git a/sveltekit/src/lib/components/Global/ButtonOwner.svelte b/sveltekit/src/lib/components/Global/ButtonOwner.svelte
@@ -16,6 +16,10 @@
   onMount(toggleOwner);
 </script>
 
-<button class="clear" on:click={toggleOwner} title="      {isAddressNotZero(owner) ? 'Click to View All NFTs' : 'Click to View My NFTs'}">
+<button
+  class="clear"
+  on:click={toggleOwner}
+  title="      {isAddressNotZero(owner) ? 'Click to View All NFTs' : 'Click to View My NFTs'}"
+>
   <i class="fas fa-{isAddressNotZero(owner) ? 'users' : 'user'}" />
 </button>
diff --git a/sveltekit/src/lib/components/Global/Navigation.svelte b/sveltekit/src/lib/components/Global/Navigation.svelte
@@ -57,10 +57,6 @@
   </nav>
 </div>
 
-<a
-  class="discord-link"
-  href="https://discord.gg/Vz5AyU2Nfx"
-  target="_blank"
-  rel="noreferrer"
-  title="Discord Kredeum"><i class="icon-discord" /></a
+<a class="discord-link" href="https://discord.gg/Vz5AyU2Nfx" target="_blank" rel="noreferrer" title="Discord Kredeum"
+  ><i class="icon-discord" /></a
 >
diff --git a/sveltekit/src/lib/components/Input/InputAudioMint.svelte b/sveltekit/src/lib/components/Input/InputAudioMint.svelte
@@ -41,9 +41,7 @@
           Your browser does not support the
           <code>audio</code> element.
         </audio>
-        <span
-        role="button" tabindex="0"
-         class="kre-delete-file" on:click={resetFileAudio} on:keydown={resetFileAudio}
+        <span role="button" tabindex="0" class="kre-delete-file" on:click={resetFileAudio} on:keydown={resetFileAudio}
           ><i class="fa fa-trash" aria-hidden="true" /></span
         >
       </div>

diff --git a/sveltekit/src/lib/components/Nft/NftTransfer.svelte b/sveltekit/src/lib/components/Nft/NftTransfer.svelte
@@ -32,7 +32,7 @@
   /////////////////////////////////////////////////
 
   let transfering: number;
-  let transferTxHash: string= "";
+  let transferTxHash: string = "";
   let transferError: string;
 
   let destinationAddress = "";
@@ -83,7 +83,7 @@
     transfering = S2_SIGN_TX;
 
     const transferTxResp = (await transferTxRespYield.next()).value;
-    transferTxHash = transferTxResp?.hash|| "";
+    transferTxHash = transferTxResp?.hash || "";
     if (!transferTxHash)
       return _transferError(`ERROR while sending transaction... ${JSON.stringify(transferTxResp, null, 2)}`);