Skip to content

BLK-193 Updated faucet UI with Chiliz logo, colors, font, background #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RilRil merged 14 commits into from
Mar 30, 2022
Merged

BLK-193 Updated faucet UI with Chiliz logo, colors, font, background #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
40b2be7
BLK-193: Updated golang version in Dockerfile.faucet, deleted unneede…
gabuladze Mar 25, 2022
2dd9ce7
BLK-193: Added light client serving to bootnode, added faucet
gabuladze Mar 25, 2022
d24ca47
BLK-193: Updated UI, Added font endpoint to faucet backend.
gabuladze Mar 25, 2022
b2b2c48
BLK-193: Updated ABI, Added bep2eNames config flag.
gabuladze Mar 28, 2022
23a2605
BLK-193: Added bep2eContracts, bep2eSymbols, bep2eNames, bep2eAmounts…
gabuladze Mar 28, 2022
5ba66fa
BLK-193: Added instructions, updated fan tokens dropdown
gabuladze Mar 28, 2022
554265b
BLK-193: Regenerated website
gabuladze Mar 28, 2022
67c9ec0
BLK-193: Added github.com/joho/godotenv to dependencies
gabuladze Mar 29, 2022
5c28088
BLK-193: Grab token data (addresses, names, symbols,amounts) from .env
gabuladze Mar 29, 2022
5826f03
BLK-193: Copy .env.faucet to container after build
gabuladze Mar 29, 2022
b4245f3
BLK-193: Added env_file. Removed flags for token data
gabuladze Mar 29, 2022
5c118fc
BLK-193: Added .env.faucet
gabuladze Mar 29, 2022
292e44a
BLK-193: Fetch faucetName, mintNftsUrl, devLandingUrl from .env
gabuladze Mar 29, 2022
af84ebd
BLK-193: Added FAUCET_NAME, CHAIN_NAME, MINT_NFTS_URL, DEV_LANDING_UR…
gabuladze Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .env.faucet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FAUCET_NAME="Scoville Faucet"
CHAIN_NAME=Scoville
MINT_NFTS_URL=https://scoville-nft.chiliz.com/
DEV_LANDING_URL=https://www.chiliz.com/en/chain/

VOTE_TOKEN_CONTRACTS_ADDRESSES=0x931497160a90cE18c361b49F007d7285951A1A3e,0x4BadFd82f7eF1772E848A2482B570F95FE4cBff9,0xb4b27b9e52dC421FF82b74f9d36bAa39b1181Dc2,0xd9CbFcd6Ed02032a2591C5a7c0dFB34e9d7F7F2D,0x48E32f760fA1dabCd585C20d235fa6Dbef324d80,0x8377C51D89a3F143464AD0280CAcFEd82691d5B1,0x094DeedE5D44C549D9a28AE946761e36513C5f72,0xE8DcBf10217eB753729c2e30A5F641b5f582bBbf,0xEeE279AD3C283BC34A5Be567bb889Ce2617f2288,0x4eAD97E7D8A477fE5df88B4CD5025E255c42Ff26,0x16Ca3C932F497Eb2BED8820249698B9d6006Eb41,0x8c6Ba7dd73436ba35FC645CCb7a80B2d71F48A85
VOTE_TOKEN_SYMBOLS=testSSU,testGAL,testCITY,testPSG,testBAR,testJUV,testMENGO,testTRA,testACM,testATM,testAFC,testINTER
VOTE_TOKEN_NAMES=Socios United,Galatasaray S.K.,Manchester City FC,Paris Saint-Germai,FC Barcelona,Juventus,Flamengo,Trabzonspor,AC Milan,Atlético de Madrid,Arsenal FC,Inter Milan
VOTE_TOKEN_AMOUNTS=1,1,1,1,1,1,1,1,1,1,1,1
10 changes: 3 additions & 7 deletions Dockerfile.faucet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
FROM golang:1.15-alpine as builder
FROM golang:1.16-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers git bash

# Temporarily pull a custom Go bundle
ADD https://golang.org/dl/go1.15.5.src.tar.gz /tmp/go.tar.gz
RUN (cd /tmp && tar -xf go.tar.gz)
RUN (cd /tmp/go/src && ./make.bash)
ENV PATH="/tmp/go/bin:${PATH}"

ADD . /go-ethereum
RUN cd /go-ethereum && make faucet

Expand All @@ -16,6 +10,8 @@ FROM alpine:latest

RUN apk add --no-cache ca-certificates curl jq tini
COPY --from=builder /go-ethereum/build/bin/faucet /usr/local/bin/
COPY --from=builder /go-ethereum/.env.faucet /.env

WORKDIR /
EXPOSE 8080
ENTRYPOINT ["faucet"]
Binary file added cmd/faucet/CircularStd-Book.otf
View file
Open in desktop
Binary file not shown.
82 changes: 62 additions & 20 deletions cmd/faucet/faucet.go
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 101 additions & 7 deletions cmd/faucet/faucet.html
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 28 additions & 5 deletions cmd/faucet/website.go
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions docker-compose.dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ services:
- "--http.port=8545"
- "--http.corsdomain=*"
- "--http.vhosts=*"
- "--light.serve=50"
- "--light.maxpeers=2"
volumes:
- "./genesis/devnet.json:/datadir/devnet.json"
ports:
Expand All @@ -39,3 +41,27 @@ services:
- "./genesis/keystore:/datadir/keystore"
- "./genesis/password.txt:/datadir/password.txt"
restart: always
faucet:
build:
context: "./"
dockerfile: Dockerfile.faucet
command:
- "--genesis=/datadir/devnet.json"
- "--bootnodes=enode://5c8e90050fabb7e14e4921dc107caf533140112245e7a231d0edc49861cd779760ad4804e7034952a5cc79422fa9d31c54e9a6141fb4995af7a6bfce7a39140f@bootnode:30303"
- "--network=17243"
- "--faucet.name='Chiliz Testnet'"
- "--faucet.amount=1"
- "--account.json=/datadir/keystore/UTC--2021-04-15T12-00-01.000Z--00a601f45688dba8a070722073b015277cf36725"
- "--account.pass=/datadir/password.txt"
- "--noauth=true"
- "--faucet.minutes=1"
- "--faucet.fixedprice=7000000000"
env_file:
- ".env.faucet"
volumes:
- "./genesis/devnet.json:/datadir/devnet.json"
- "./genesis/keystore:/datadir/keystore"
- "./genesis/password.txt:/datadir/password.txt"
restart: always
ports:
- "8087:8080"
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ require (
github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/joho/godotenv v1.4.0 // indirect
github.com/julienschmidt/httprouter v1.2.0
github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356
github.com/kr/pretty v0.2.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U=
github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ=
github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
Expand Down