fix: update runtime metadata

Author: aidan46

.github/workflows/ci.yml

@@ -26,10 +26,11 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: 1.83.0
           targets: wasm32-unknown-unknown
 
       - name: Install wasm-pack
-        run: cargo install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
       # Need to build the WASM before type-checking
       # otherwise we're missing code and tsc will fail

.github/workflows/deploy-runtime-upgrade.yml

@@ -0,0 +1,59 @@
+name: Deploy Runtime Upgrade to GitHub Pages
+
+on:
+  push:
+    branches: [paseo-runtime-upgrade]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages-paseo-runtime-upgrade"
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js 22.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.x
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.83.0
+          targets: wasm32-unknown-unknown
+
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: latest
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm build
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/deploy.yml

@@ -34,6 +34,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: 1.83.0
           targets: wasm32-unknown-unknown
 
       - name: Install wasm-pack

.papi/metadata/polkaStorage.scale

@@ -3,10 +3,10 @@
   "descriptorPath": ".papi/descriptors",
   "entries": {
     "polkaStorage": {
-      "wsUrl": "ws://localhost:42069",
+      "wsUrl": "ws:/localhost:8000",
       "metadata": ".papi/metadata/polkaStorage.scale",
-      "genesis": "0x4545454545454545454545454545454545454545454545454545454545454545",
-      "codeHash": "0xb84fe515e735f6a2ca1032f6d1ff7befc5a29c5c48ea56bd90eebb0d509533ee"
+      "genesis": "0xa6f9a4facafa6157734b6a52503070304d34919a8299f46e6c7bde2ee000ccd6",
+      "codeHash": "0x164f37eaf7ceb43de9b9a79dd6105105931269478212669e2c99a0801378c92e"
     }
   }
 }

.papi/polkadot-api.json

@@ -1,3 +1,4 @@
+import type { Multiaddr, NodeAddress } from "@multiformats/multiaddr";
 import { BLOCK_TIME } from "./consts";
 
 export function blockToTime(
@@ -60,3 +61,26 @@ export function formatDuration(duration: {
   }
   return `${result.join(", ")}`;
 }
+
+export function baseURLFromP2pMultiaddr(nodeAddress: NodeAddress): string {
+  const { address, port } = nodeAddress;
+
+  // address can be an IP or a hostname depending on the multiaddr
+  // We only rewrite when it's our p2p DNS name.
+  const uploadHost =
+    typeof address === "string" && address.startsWith("p2p.")
+      ? address.replace(/^p2p\./, "upload.")
+      : address;
+
+  // If the p2p multiaddr is tcp/443/wss, upload should be https on 443
+  // If you're on some other port locally, keep it consistent.
+  const isStandardHttps = port === 443 || port === 0 || port == null;
+
+  return isStandardHttps ? `https://${uploadHost}` : `https://${uploadHost}:${port}`;
+}
+
+export type ProviderInfo = {
+  accountId: string;
+  multiaddr: Multiaddr;
+  pricePerBlock: number;
+};

pnpm-lock.yaml

@@ -2,18 +2,19 @@ import { type Multiaddr, multiaddr } from "@multiformats/multiaddr";
 import { fileTypeFromBuffer } from "file-type";
 import { CID } from "multiformats";
 import type { PolkaStorageApi } from "../GlobalCtx";
+import { baseURLFromP2pMultiaddr } from "./conversion";
 import type { Deal } from "./deals";
 
 export async function downloadDeal(api: PolkaStorageApi | null, deal: Deal) {
   if (!api) throw new Error("API not ready");
 
   // look up provider addr
   const maddr = await getProviderMultiaddr(api, deal.value.provider);
-  const { address, port } = maddr.nodeAddress();
+  const baseUrl = baseURLFromP2pMultiaddr(maddr.nodeAddress());
 
   // fetch the raw piece
   const pieceCid = CID.decode(deal.value.piece_cid.asBytes()).toString();
-  const res = await fetch(`http://${address}:${port}/api/v0/download/${pieceCid}`);
+  const res = await fetch(`${baseUrl}/api/v0/download/${pieceCid}`);
   if (!res.ok) throw new Error(res.statusText);
   const blob = await res.blob();
 

src/lib/conversion.ts

@@ -15,7 +15,7 @@ export async function uploadFile(
   body.append("file", file);
 
   const addr = secure_addr ? secure_addr : `http://${address.ip}:${address.port}`;
-
+  console.log(`Uploading to: ${addr}`);
   return await fetch(`${addr}/api/v0/upload/${dealCid}`, {
     method: "PUT",
     body,
@@ -32,6 +32,7 @@ export async function proposeDeal(
   }
 
   const addr = secure_addr ? secure_addr : `http://${address.ip}:${address.port}`;
+  console.log(`Proposing to: ${addr}`);
   const response = await fetch(`${addr}/api/v0/propose_deal`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },

src/lib/download.ts

@@ -1,4 +1,3 @@
-import type { Multiaddr } from "@multiformats/multiaddr";
 import type { InjectedAccountWithMeta } from "@polkadot/extension-inject/types";
 import type { TypeRegistry } from "@polkadot/types";
 import { Loader2 } from "lucide-react";
@@ -12,6 +11,7 @@ import {
 } from "../components/deal-proposal-form/DealProposalForm";
 import type { FormValues } from "../components/deal-proposal-form/types";
 import { DEFAULT_MAX_PROVE_COMMIT_DURATION, fetchMaxProveCommitDurationConst } from "../lib/consts";
+import { type ProviderInfo, baseURLFromP2pMultiaddr } from "../lib/conversion";
 import { createSignedRpc, toRpc } from "../lib/dealProposal";
 import { proposeDeal, publishDeal, uploadFile } from "../lib/fileUpload";
 import { loadWrapper } from "../lib/loadWrapper";
@@ -28,12 +28,6 @@ type DealInfo = {
   endBlock: number;
 };
 
-type ProviderInfo = {
-  accountId: string;
-  multiaddr: Multiaddr;
-  pricePerBlock: number;
-};
-
 type DealId = number;
 
 async function executeDeal(
@@ -43,6 +37,8 @@ async function executeDeal(
   registry: TypeRegistry,
 ): Promise<DealId> {
   const { address, port } = providerInfo.multiaddr.nodeAddress();
+  const uploadAddress = baseURLFromP2pMultiaddr(providerInfo.multiaddr.nodeAddress());
+  console.log(uploadAddress);
 
   const clientAccount = accounts.find((v) => v.address === dealInfo.proposal.client);
   if (!clientAccount) {
@@ -61,12 +57,18 @@ async function executeDeal(
       ip: address,
       port: port,
     },
+    uploadAddress,
   );
 
-  const response = await uploadFile(dealInfo.file, proposeDealResponse, {
-    ip: address,
-    port: port,
-  });
+  const response = await uploadFile(
+    dealInfo.file,
+    proposeDealResponse,
+    {
+      ip: address,
+      port: port,
+    },
+    uploadAddress,
+  );
   if (!response.ok) {
     throw new Error(response.statusText);
   }
@@ -80,10 +82,14 @@ async function executeDeal(
     registry,
     clientAccount,
   );
-  const dealId = await publishDeal(signedRpc, {
-    ip: address,
-    port: port,
-  });
+  const dealId = await publishDeal(
+    signedRpc,
+    {
+      ip: address,
+      port: port,
+    },
+    uploadAddress,
+  );
 
   return dealId;
 }