Merge branch 'main' into smoldot_read

Author: x3c41a

README.md

@@ -246,4 +246,57 @@ or
 Run on the dedicated machine from the root directory:
 ```
 python3 scripts/cmd/cmd.py bench bulletin-polkadot
+```
+
+# Troubleshooting
+
+## Build Bulletin Mac OS
+
+### Algorithm file not found error
+
+If you encounter an error similar to:
+
+```
+warning: [email protected]: In file included from /Users/ndk/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/cxx-1.0.186/src/cxx.cc:1:
+warning: [email protected]: /Users/ndk/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/cxx-1.0.186/src/../include/cxx.h:2:10: fatal error: 'algorithm' file not found
+warning: [email protected]:     2 | #include <algorithm>
+warning: [email protected]:       |          ^~~~~~~~~~~
+warning: [email protected]: 1 error generated.
+error: failed to run custom build command for `cxx v1.0.186`
+```
+
+This typically means your C++ standard library headers can’t be found by the compiler. This is a toolchain setup issue.
+
+To fix:
+- Run `xcode-select --install`. 
+- If it says “already installed”, reinstall them (sometimes they break after OS updates):
+
+```bash
+sudo rm -rf /Library/Developer/CommandLineTools
+xcode-select --install
+```
+
+- Check the Active Developer Path: `xcode-select -p`. It should output one of: `/Applications/Xcode.app/Contents/Developer`, `/Library/Developer/CommandLineTools`
+- If it’s empty or incorrect, set it manually: `sudo xcode-select --switch /Library/Developer/CommandLineTools`
+- If none of the above helped, see the official Mac OS recommendations for [polkadot-sdk](https://docs.polkadot.com/develop/parachains/install-polkadot-sdk/#macos)
+
+### dyld: Library not loaded: @rpath/libclang.dylib
+
+This means that your build script tried to use `libclang` (from LLVM) but couldn’t find it anywhere on your system or in the `DYLD_LIBRARY_PATH`.
+
+To fix:`brew install llvm` and 
+```
+export LIBCLANG_PATH="$(brew --prefix llvm)/lib"
+export LD_LIBRARY_PATH="$LIBCLANG_PATH:$LD_LIBRARY_PATH"
+export DYLD_LIBRARY_PATH="$LIBCLANG_PATH:$DYLD_LIBRARY_PATH"
+export PATH="$(brew --prefix llvm)/bin:$PATH"
+```
+
+Now verify `libclang.dylib` exists:
+- `ls "$(brew --prefix llvm)/lib/libclang.dylib"`
+
+If that file exists all good, you can rebuild the project now: 
+```
+cargo clean
+cargo build --release
 ```

examples/authorize_and_store.js

@@ -12,6 +12,7 @@ import { cryptoWaitReady, blake2AsU8a } from '@polkadot/util-crypto';
 import { CID } from 'multiformats/cid';
 import * as multihash from 'multiformats/hashes/digest';
 import { create } from 'ipfs-http-client';
+import { waitForNewBlock, cidFromBytes } from './common.js';
 
 async function authorizeAccount(api, pair, who, transactions, bytes) {
     const tx = api.tx.transactionStorage.authorizeAccount(who, transactions, bytes);
@@ -22,20 +23,14 @@ async function authorizeAccount(api, pair, who, transactions, bytes) {
 
 async function store(api, pair, data) {
     console.log('Storing data:', data);
-
-    // 1️⃣ Hash the data using blake2b-256
-    const hash = blake2AsU8a(data)
-    // 2️⃣ Wrap the hash as a multihash
-    const mh = multihash.create(0xb220, hash); // 0xb220 = blake2b-256
-    // 3️⃣ Generate CID (CIDv1, raw codec)
-    const cid = CID.createV1(0x55, mh); // 0x55 = raw codec
+    const cid = cidFromBytes(data);
 
     const tx = api.tx.transactionStorage.store(data);
     const result = await tx.signAndSend(pair);
     console.log('Transaction store result:', result.toHuman());
-    return cid
+    
+    return cid;
 }
-
 // Connect to a local IPFS gateway (e.g. Kubo)
 const ipfs = create({
     url: 'http://127.0.0.1:5001', // Local IPFS API
@@ -44,7 +39,7 @@ const ipfs = create({
 async function read_from_ipfs(cid) {
     // Fetch the block (downloads via Bitswap if not local)
     console.log('Trying to get cid: ', cid);
-    const block = await ipfs.block.get(cid);
+    const block = await ipfs.block.get(cid, {timeout: 10000});
     console.log('Received block: ', block);
     if (block.length !== 0) {
         return block
@@ -79,13 +74,13 @@ async function main() {
 
     console.log('Doing authorization...');
     await authorizeAccount(api, sudo_pair, who, transactions, bytes);
-    await new Promise(resolve => setTimeout(resolve, 8000));
+    await waitForNewBlock();
     console.log('Authorized!');
 
-    console.log('Storing data...');
+    console.log('Storing data ...');
     let cid = await store(api, who_pair, "Hello, Bulletin remote3 - " + new Date().toString());
     console.log('Stored data with CID: ', cid);
-    await new Promise(resolve => setTimeout(resolve, 5000));
+    await waitForNewBlock();
 
     console.log('Reading content... cid: ', cid);
     let content = await read_from_ipfs(cid);

examples/common.js

@@ -0,0 +1,20 @@
+import { blake2AsU8a } from '@polkadot/util-crypto'
+import * as multihash from 'multiformats/hashes/digest'
+import { CID } from 'multiformats/cid'
+
+export async function waitForNewBlock() {
+    // TODO: wait for a new block.
+    console.log('🛰 Waiting for new block...')
+    return new Promise(resolve => setTimeout(resolve, 7000))
+}
+
+/**
+ * helper: create CID for raw data
+ */
+export function cidFromBytes(bytes) {
+    const hash = blake2AsU8a(bytes)
+    // 0xb2 = the multihash algorithm family for BLAKE2b
+    // 0x20 = the digest length in bytes (32 bytes = 256 bits)
+    const mh = multihash.create(0xb220, hash)
+    return CID.createV1(0x55, mh) // 0x55 = raw
+}

examples/store_chunked_data.js

@@ -10,6 +10,7 @@ import * as sha256 from 'multiformats/hashes/sha2';
 import { UnixFS } from 'ipfs-unixfs'
 import { TextDecoder } from 'util'
 import assert from "assert";
+import { waitForNewBlock, cidFromBytes } from './common.js'
 
 // ---- CONFIG ----
 const WS_ENDPOINT = 'ws://127.0.0.1:10000' // Bulletin node
@@ -32,15 +33,6 @@ async function authorizeAccount(api, pair, who, transactions, bytes, nonceMgr) {
     console.log('Transaction authorizeAccount result:', result.toHuman());
 }
 
-/**
- * helper: create CID for raw data
- */
-function cidFromBytes(bytes) {
-    const hash = blake2AsU8a(bytes)
-    const mh = multihash.create(0xb220, hash)
-    return CID.createV1(0x55, mh) // 0x55 = raw
-}
-
 /**
  * Read the file, chunk it, store in Bulletin and return CIDs.
  * Returns { chunks }
@@ -293,12 +285,6 @@ async function authorizeStorage(api, sudoPair, pair, nonceMgr) {
     await waitForNewBlock();
 }
 
-async function waitForNewBlock() {
-    // TODO: wait for a new block.
-    console.log('🛰 Waiting for new block...')
-    return new Promise(resolve => setTimeout(resolve, 7000))
-}
-
 async function main() {
     await cryptoWaitReady()
     if (fs.existsSync(OUT_PATH)) {