Upstream merge #11

wilwade · 2024-03-27T20:00:30Z

Merging the upstream changes

Created a new page with the Westend chain. Added a popup so you can easily change the chin. Updated the content so it automatically assigns information based on the chain. Added the network data object of the westend network. Added a new page `/westend` where the chain is automatically set based on that information. Added a network selection dropdown to switch between rococo and westend

Fixed errors caused when the base of the project is not `/`. This changes get into consideration having a different base for the occasion that it is being built in a root directory, or, like in github pages, in a `/polkadot-testnet-faucet` directory.

Fixed missing configuration that would enable relative path when the base is enabled. With the previous configuration it was looking for files at `./polkadot-testnet-faucet` (so, when you are in `/polkadot-testnet-faucet` it will search for files in `/polkadot-testnet-faucet/polkadot-testnet-faucet`. This setting disables relatives path when the variable `BASE` is enabled.

Made the "Questions" button hide in mobile. This is because too many buttons in the UI sometimes overflow the width on the screen.

Updated the success screen to use the url from the block explorer instead of a hardcoded one. This commit closes paritytech#293 Deleted residual code from before the existence of the success and failure screens. Also, modified margins on mobile so the FAQ section isn't that far away and you don't need to scroll that much.

1. UI image. The problem with that one, is that it's not being used. We deploy UI to GitHub pages currently, and even if we potentially will switch from it, deploying static site as a docker image is far from a good solution with much higher operation costs and downtimes on deployment. Also, fixes paritytech#279 2. docker-compose.yml's These were made for the local development by DevOps, however, they aren't fit for the local development (the don't provide watch mode, re-building is painful, debug...), and they are actually fit for running it locally if you aren't developing the app.

This is a step to move client/ to src/, furthermore joining what was three different repos before. I tried to minimize the amount of changes here, so there is still client/.eslintrc.cjs, and still a separate package.json. However, the lint and format commands and checks are unified.

Apply common codestyle to client

1. Merging configs for BOT and SERVER together. As the faucet is now only one application, the division brings more trouble than it solves 2. Network configuration data now lives in src/networkData.ts. This allows us to add new configuration options without updating whole deployment pipeline in three places. 3. Dropped explicit `validateConfig` invocation. Now config is validated when module is imported during startup. 4. As I traced "dripAmount" configuration down to its usages, I've discovered double conversions like "bigint->float->bigint", which cancels whole idea of using bigint in order to escape rounding errors. Reworked it to operate only on bigint, and use conversion only for output. 5. For some reason, e2e tests didn't want to work on HTTP endpoints anymore (probably, local environment issues). Changed it to WS as it should've been done a long time ago. IMPORTANT: this PR will have its counterparts in helm-charts and cloud-infra. Do not merge unless changes there are merged first Fixes paritytech#298

In the config file, we used both `required` and `mandatory` properties. `mandatory` is the right one. But instead of fixing it in this case, we're relaxing requirements for `MATRIX_ACCESS_TOKEN` and `MATRIX_BOT_USER_ID` as it's currently consciously unset for rococo web faucet

It's shoudln't be "UNIT", it actually has a name: "WOOK"

Reintroducing subscan links, for supported networks

These parts are in the same process now, so the data can be queried directly

…uests Removing http requests between bot and server

…palm Subscan url fix

This time, actually tested locally

…palm-2 Subscan URL fix [2]

…rade Upgrading matrix-js-sdk package

Node.js and dependencies upgrade

Seems that balance cap being 10 times drip amount is an established rule of thumb, so aligned it for all networks

This removes the base url, making the website work on the root of the domain. Also, by doing this change, and having set up the dns, this resolves paritytech#348

It generates a JSON object inside the header following the instructions from: https://developers.google.com/search/docs/appearance/structured-data/faqpage It parses the information of the markdown text to generate this json object. This resolves paritytech#277

We currently don't have an artifact retention period, so it defaults to 90 days. While the artifact for the site is not too big, having one build per push and PR can quickly accumulate the amount and make us hit our hard limit. By adding a limit to the retention day of 5 days we ensure that we get rid of the old artifacts faster than waiting for two whole months. I also updated all the actions version to latest release

# Conflicts: # .github/workflows/E2E.yml # .github/workflows/deploy-site.yml # Dockerfile # client/.env # client/.prettierrc # client/src/app.css # client/src/app.html # client/src/lib/assets/FAQ.md # client/src/lib/assets/circle.svg # client/src/lib/assets/polkadot.png # client/src/lib/components/Card.svelte # client/src/lib/components/Footer.svelte # client/src/lib/components/Form.svelte # client/src/lib/components/NetworkInput.svelte # client/src/lib/components/SocialTags.svelte # client/src/lib/components/screens/Success.svelte # client/src/lib/utils/networkData.ts # client/tests/test.ts # docker/docker-compose.rococo-external.yml # docker/docker-compose.rococo.yml # e2e/README.md # e2e/bootstrap.sh # src/faucet.e2e.ts

Dockerfile

client/src/lib/components/Faucet.svelte

wilwade · 2024-03-27T20:33:59Z

client/src/lib/utils/networkData.ts

@aramikm Lots in here.

client/src/lib/utils/networkData.ts

src/bot/index.ts

wilwade · 2024-03-27T20:49:13Z

src/networkData.ts

+  matrixWhitelistPatterns: parityWhitelist,
+};
+
+const frequencyRococo: NetworkData = {


Here's the new network data for the drip

aramikm

I've only looked at the code and from that perspective looks good.

I think it might be easier to wholesale accept all upstream changes and then we can apply our changes considering that our changes are minimal compared to what changed upstream and I think that's what you are trying to do.
Another major change was using postgres instead of SQLight which would require devops to consider that during deployment

aramikm · 2024-03-27T21:20:48Z

client/src/lib/utils/networkData.ts

-		return this.chains[index].name;
-	}
+	chains: [{ name: "Frequency Rococo Testnet", id: -1 }],
+	endpoint: faucetUrl(PUBLIC_FAUCET_URL),


nit: this does not follow their pattern of default being used if PUBLIC_FAUCET_URL is not set, as a backup setting. but I think will work if we are setting PUBLIC_FAUCET_URL explicitly

I am going to be updating this again so we can have one backend support both the Rococo and Paseo testnets. I'll see what I can do at that time.

src/networkData.ts

Bullrich and others added 30 commits June 8, 2023 13:03

question btn hidden on mobile (paritytech#290)

09e2577

Made the "Questions" button hide in mobile. This is because too many buttons in the UI sometimes overflow the width on the screen.

Update the E2E tests to run against Polkadot v0.9.42 (paritytech#295)

ea96350

Internal dependencies update (paritytech#297)

af98ba1

Bump XCM types to V3 (paritytech#303)

b8cc267

Merge pull request paritytech#300 from paritytech/yuri/client-codestyle

8a6f865

Apply common codestyle to client

Change teleportAssets to limitedTeleportAssets (paritytech#304)

fcf771c

Remove unnecessary code construct (paritytech#306)

2938a1a

Removed unused injectedTypes

2b32907

Fixed wococo currency name

ef23c76

It's shoudln't be "UNIT", it actually has a name: "WOOK"

Reintroducing subscan links, for supported networks

5d85ac6

Merge pull request paritytech#308 from paritytech/yuri/subscan-links

e702811

Reintroducing subscan links, for supported networks

Removing http requests between bot and server

54256d1

These parts are in the same process now, so the data can be queried directly

Merge pull request paritytech#309 from paritytech/yuri/no-backend-req…

115851d

…uests Removing http requests between bot and server

Subscan url fix

f6f8cf8

Merge pull request paritytech#310 from paritytech/yuri/extrinsic-face…

74e09d7

…palm Subscan url fix

Subscan URL fix [2]

3924b91

This time, actually tested locally

Merge pull request paritytech#311 from paritytech/yuri/extrinsic-face…

343eba6

…palm-2 Subscan URL fix [2]

Upgrading matrix-js-sdk package

16e8277

Merge pull request paritytech#312 from paritytech/yuri/matrix-sdk-upg…

76c1182

…rade Upgrading matrix-js-sdk package

Node.js and dependencies upgrade

ab68723

Merge pull request paritytech#314 from paritytech/yuri/deps-upgrade

9fcac8c

Node.js and dependencies upgrade

10 WND drip amount for westend, fixed balance cap for other networks

f4cb960

Seems that balance cap being 10 times drip amount is an established rule of thumb, so aligned it for all networks

Bullrich and others added 5 commits March 20, 2024 12:57

removed base url (paritytech#382)

1eea1f6

This removes the base url, making the website work on the root of the domain. Also, by doing this change, and having set up the dns, this resolves paritytech#348

Fix issues with other networks

ec42165