Paseo faucet to run on Asset Hub instead of Relay (#484)

karolk91 · web-flow · commit 835f929c7acf · 2025-08-22T13:30:21.000+02:00
Implements: #483 Following applies to both networks: Westend and Paseo - Switch faucet to use Asset Hub chain as source / pot instead of Relay - Support teleports to relay network from parachain - - a special value for `parachain` variable == `0` means "parent" / "relay" from the point of view of parachain - - a special value for `parachain` variable == `-1` means `this network` - Introduce `id` attribute to `NetworkData` to be able to recognize transfer funds to self (i.e. when `parachain` == `id` then use simple balance transfer , instead of teleport to `self` which is invalid op)
diff --git a/.papi/descriptors/package.json b/.papi/descriptors/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-autogenerated.4780692817137689359",
+  "version": "0.1.0-autogenerated.16704901249498265833",
   "name": "@polkadot-api/descriptors",
   "files": [
     "dist"
diff --git a/.papi/metadata/paseo.scale b/.papi/metadata/paseo.scale
diff --git a/.papi/metadata/paseo_asset_hub.scale b/.papi/metadata/paseo_asset_hub.scale
diff --git a/.papi/metadata/westend.scale b/.papi/metadata/westend.scale
diff --git a/.papi/metadata/westend_asset_hub.scale b/.papi/metadata/westend_asset_hub.scale
diff --git a/.papi/polkadot-api.json b/.papi/polkadot-api.json
@@ -2,10 +2,6 @@
   "version": 0,
   "descriptorPath": ".papi/descriptors",
   "entries": {
-    "westend": {
-      "chain": "westend2_asset_hub",
-      "metadata": ".papi/metadata/westend.scale"
-    },
     "e2e_relaychain": {
       "wsUrl": "ws://127.0.0.1:9933",
       "metadata": ".papi/metadata/e2e_relaychain.scale"
@@ -18,9 +14,15 @@
       "wsUrl": "wss://versi-rpc-node-0.parity-versi.parity.io",
       "metadata": ".papi/metadata/versi.scale"
     },
-    "paseo": {
-      "wsUrl": "wss://sys.dotters.network/paseo",
-      "metadata": ".papi/metadata/paseo.scale"
+    "paseo_asset_hub": {
+      "wsUrl": "wss://asset-hub-paseo-rpc.n.dwellir.com",
+      "metadata": ".papi/metadata/paseo_asset_hub.scale",
+      "genesis": "0xd6eec26135305a8ad257a20d003357284c8aa03d0bdb2b357ab0a22371e11ef2"
+    },
+    "westend_asset_hub": {
+      "wsUrl": "wss://westend-asset-hub-rpc.polkadot.io",
+      "metadata": ".papi/metadata/westend_asset_hub.scale",
+      "genesis": "0x67f9723393ef76214df0118c34bbbd3dbebc8ed46a10973a8c969d48fe7598c9"
     }
   }
 }
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ```bash
 yarn install
-yarn generate:papi
+yarn codegen
 yarn simple-git-hooks
 ```
 
@@ -40,7 +40,7 @@ Definition with explanation is in `./env.faucet.config.json`
 
 Copy example file to real env and change its values:
 ```bash
-$ cp example.env .env
+$ cp .env.example .env
 ```
 
 ## End-to-end tests
diff --git a/client/src/lib/components/Form.svelte b/client/src/lib/components/Form.svelte
@@ -13,7 +13,7 @@
   export let networkData: NetworkData;
   let token: string = "";
   let formValid: boolean;
-  $: formValid = !!address && !!token && !!network;
+  $: formValid = !!address && !!token && network != null;
 
   let webRequest: Promise<string>;
 
diff --git a/client/src/lib/utils/faucetRequest.ts b/client/src/lib/utils/faucetRequest.ts
@@ -11,7 +11,7 @@ export async function request(
   if (DEMO !== undefined && DEMO !== "") {
     return await boilerplateRequest(address);
   }
-  const chain = parachain && parachain > 0 ? parachain.toString() : undefined;
+  const chain = parachain !== undefined && parachain >= 0 ? parachain.toString() : undefined;
   return await faucetRequest(address, recaptcha, network, chain);
 }
 
diff --git a/client/src/lib/utils/networkData.ts b/client/src/lib/utils/networkData.ts
@@ -26,18 +26,25 @@ export interface NetworkData {
 export const Westend: NetworkData = {
   networkName: "Westend",
   currency: "WND",
-  chains: [{ name: "Westend", id: -1 }],
+  chains: [
+    { name: "AssetHub", id: -1 },
+    { name: "Westend Relay", id: 0 },
+    { name: "Collectives", id: 1001 },
+    { name: "BridgeHub", id: 1002 },
+    { name: "People", id: 1004 },
+    { name: "Coretime", id: 1005 },
+  ],
   endpoint: faucetUrl("https://westend-faucet.polkadot.io/drip/web"),
   explorer: "https://assethub-westend.subscan.io",
-  teleportEnabled: false,
+  teleportEnabled: true,
 };
 
 export const Paseo: NetworkData = {
   networkName: "Paseo",
   currency: "PAS",
   chains: [
-    { name: "Paseo Relay", id: -1 },
-    { name: "AssetHub", id: 1000 },
+    { name: "AssetHub", id: -1 },
+    { name: "Paseo Relay", id: 0 },
     { name: "Passet Hub: smart contracts", id: 1111 },
     { name: "BridgeHub", id: 1002 },
     { name: "People", id: 1004 },
diff --git a/client/tests/faucet.ts b/client/tests/faucet.ts
@@ -258,8 +258,12 @@ export class FaucetTests {
               const request = page.waitForRequest((req) => {
                 if (req.url() === faucetUrl) {
                   const data = req.postDataJSON() as FormSubmit;
-                  const parachain_id = chain.id > 0 ? chain.id.toString() : undefined;
-                  expect(data).toMatchObject({ address: myAddress, parachain_id });
+                  if (chain.id == -1) {
+                    expect(data).toMatchObject({ address: myAddress });
+                  } else {
+                    const parachain_id = chain.id >= 0 ? chain.id.toString() : undefined;
+                    expect(data).toMatchObject({ address: myAddress, parachain_id });
+                  }
                   return !!data.recaptcha;
                 }
                 return false;
diff --git a/client/tests/paseo.test.ts b/client/tests/paseo.test.ts
@@ -1,8 +1,8 @@
 import { FaucetTests } from "./faucet.js";
 
 const chains = [
-  { name: "Paseo Relay", id: -1 },
-  { name: "AssetHub", id: 1000 },
+  { name: "AssetHub", id: -1 },
+  { name: "Paseo Relay", id: 0 },
   { name: "Passet Hub: smart contracts", id: 1111 },
   { name: "BridgeHub", id: 1002 },
   { name: "People", id: 1004 },
diff --git a/client/tests/westend.test.ts b/client/tests/westend.test.ts
@@ -1,13 +1,20 @@
 import { FaucetTests } from "./faucet.js";
 
-const chains = [{ name: "Westend", id: -1 }];
+const chains = [
+  { name: "AssetHub", id: -1 },
+  { name: "Westend Relay", id: 0 },
+  { name: "Collectives", id: 1001 },
+  { name: "BridgeHub", id: 1002 },
+  { name: "People", id: 1004 },
+  { name: "Coretime", id: 1005 },
+];
 
 const tests = new FaucetTests({
   faucetName: "Westend Faucet",
   chains,
   url: "/westend",
   expectTransactionLink: true,
-  teleportEnabled: false,
+  teleportEnabled: true,
 });
 
 tests.runTests();
diff --git a/src/dripper/DripRequestHandler.ts b/src/dripper/DripRequestHandler.ts
@@ -13,7 +13,7 @@ const validateParachainId = (parachain: string): number | null => {
   if (isNaN(id)) {
     return null;
   }
-  if (id < 999 || id > 10_000) {
+  if (id !== 0 && (id < 999 || id >= 10_000)) {
     return null;
   }
   return id;
diff --git a/src/dripper/polkadot/PolkadotActions.ts b/src/dripper/polkadot/PolkadotActions.ts
@@ -183,7 +183,9 @@ export class PolkadotActions {
       // start a counter and log a timeout error if we didn't get an answer in time
       dripTimeout = rpcTimeout("drip");
       if (parachain_id !== null) {
-        if (networkData.data.teleportEnabled) {
+        if (parachain_id == networkData.data.id) {
+          result = await this.transferTokens(amount, address);
+        } else if (networkData.data.teleportEnabled) {
           result = await this.teleportTokens(amount, address, parachain_id);
         } else {
           result = { error: `Teleport is disabled for ${networkData.data.networkName}` };
diff --git a/src/papi/chains/e2e.ts b/src/papi/chains/e2e.ts
@@ -26,6 +26,7 @@ export const networkData: NetworkData = {
   matrixWhitelistPatterns: parityWhitelist,
   ethToSS58FillPrefix: 0xee,
   teleportEnabled: true,
+  id: 0,
 };
 
 export const networkApi: NetworkApi = {
diff --git a/src/papi/chains/index.ts b/src/papi/chains/index.ts
@@ -55,6 +55,7 @@ export interface NetworkData {
   // Should be 0xEE for all our currenly supported chains, but could be different for other chains
   ethToSS58FillPrefix: number;
   teleportEnabled: boolean;
+  id: number;
 }
 
 export function getNetworkData(networkName: string): { data: NetworkData; api: NetworkApi } {
diff --git a/src/papi/chains/paseo.ts b/src/papi/chains/paseo.ts
@@ -1,6 +1,6 @@
 import {
   MultiAddress,
-  paseo,
+  paseo_asset_hub,
   XcmV3Junction,
   XcmV3Junctions,
   XcmV3MultiassetAssetId,
@@ -15,13 +15,20 @@ import { PolkadotClient } from "polkadot-api";
 
 const networkData: NetworkData = {
   balanceCap: 5500,
-  chains: [],
+  chains: [
+    { name: "AssetHub", id: -1 },
+    { name: "Paseo Relay", id: 0 },
+    { name: "Passet Hub: smart contracts", id: 1111 },
+    { name: "BridgeHub", id: 1002 },
+    { name: "People", id: 1004 },
+    { name: "Coretime", id: 1005 },
+  ],
   currency: "PAS",
   decimals: 10,
   dripAmount: "5000",
   explorer: null,
   networkName: "Paseo",
-  rpcEndpoint: "wss://sys.dotters.network/paseo",
+  rpcEndpoint: "wss://asset-hub-paseo-rpc.n.dwellir.com",
   matrixWhitelistPatterns: [
     /^@erin:parity\.io$/,
     /^@mak:parity\.io$/,
@@ -36,17 +43,20 @@ const networkData: NetworkData = {
   ],
   ethToSS58FillPrefix: 0xee,
   teleportEnabled: true,
+  id: 1000,
 };
 
 export const networkApi: NetworkApi = {
   getTeleportTx: async ({ dripAmount, address, parachain_id, client, nonce }): Promise<string> => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
 
-    return await api.tx.XcmPallet.limited_teleport_assets({
-      dest: XcmVersionedLocation.V3({
-        parents: 0,
-        interior: XcmV3Junctions.X1(XcmV3Junction.Parachain(parachain_id)),
-      }),
+    const dest = XcmVersionedLocation.V3({
+      parents: 1,
+      interior: parachain_id === 0 ? XcmV3Junctions.Here() : XcmV3Junctions.X1(XcmV3Junction.Parachain(parachain_id)),
+    });
+
+    return await api.tx.PolkadotXcm.limited_teleport_assets({
+      dest,
       beneficiary: XcmVersionedLocation.V3({
         parents: 0,
         interior: XcmV3Junctions.X1(
@@ -59,7 +69,7 @@ export const networkApi: NetworkApi = {
       assets: XcmVersionedAssets.V3([
         {
           fun: XcmV3MultiassetFungibility.Fungible(dripAmount),
-          id: XcmV3MultiassetAssetId.Concrete({ interior: XcmV3Junctions.Here(), parents: 0 }),
+          id: XcmV3MultiassetAssetId.Concrete({ interior: XcmV3Junctions.Here(), parents: 1 }),
         },
       ]),
       fee_asset_item: 0,
@@ -68,7 +78,7 @@ export const networkApi: NetworkApi = {
   },
 
   getTransferTokensTx: async ({ dripAmount, address, client, nonce }): Promise<string> => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
 
     return await api.tx.Balances.transfer_keep_alive({
       dest: MultiAddress.Id(address),
@@ -77,25 +87,25 @@ export const networkApi: NetworkApi = {
   },
 
   getBalance: async (address: string, client: PolkadotClient): Promise<bigint> => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
 
     const balances = await api.query.System.Account.getValue(address, { at: "finalized" });
 
     return balances.data.free;
   },
 
   watchBalance: (address: string, client: PolkadotClient, callback: (value: bigint) => void): void => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
     api.query.System.Account.watchValue(address, "finalized").forEach((balances) => callback(balances.data.free));
   },
 
   healthcheck: async (client: PolkadotClient): Promise<void> => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
     await api.query.System.Number.getValue();
   },
 
   getNonce: async (address: string, client: PolkadotClient): Promise<number> => {
-    const api = client.getTypedApi(paseo);
+    const api = client.getTypedApi(paseo_asset_hub);
     return await api.apis.AccountNonceApi.account_nonce(address);
   },
 };
diff --git a/src/papi/chains/versi.ts b/src/papi/chains/versi.ts
@@ -26,6 +26,7 @@ const networkData: NetworkData = {
   matrixWhitelistPatterns: parityWhitelist,
   ethToSS58FillPrefix: 0xee,
   teleportEnabled: true,
+  id: 0,
 };
 
 const networkApi: NetworkApi = {
diff --git a/src/papi/chains/westend.ts b/src/papi/chains/westend.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "0.1.0-autogenerated.4780692817137689359",`
	`2`	`+ "version": "0.1.0-autogenerated.16704901249498265833",`
`3`	`3`	`"name": "@polkadot-api/descriptors",`
`4`	`4`	`"files": [`
`5`	`5`	`"dist"`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export async function request(`
`11`	`11`	`if (DEMO !== undefined && DEMO !== "") {`
`12`	`12`	`return await boilerplateRequest(address);`
`13`	`13`	`}`
`14`		`- const chain = parachain && parachain > 0 ? parachain.toString() : undefined;`
	`14`	`+ const chain = parachain !== undefined && parachain >= 0 ? parachain.toString() : undefined;`
`15`	`15`	`return await faucetRequest(address, recaptcha, network, chain);`
`16`	`16`	`}`
`17`	`17`