8000 Added Goerli network · jscriptcoder/lottery-contract@d6fa18b · GitHub
[go: up one dir, main page]
Skip to content

Commit d6fa18b

Browse files
jscriptcoderjscriptcoder
committed
Added Goerli network
1 parent 0203a39 commit d6fa18b

File tree

6 files changed

+32
-17
lines changed

6 files changed

+32
-17
lines changed

‎components/ConnectButton/useConnectButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default function useConnectButton() {
6262
closable: true,
6363
maskClosable: true,
6464
})
65-
}, [appState.address])
65+
}, [])
6666

6767
return {
6868
appState,

‎components/Content/AlreadyEnteredTitle.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export default function AlreadyEnteredTitle() {
77
className="flex flex-col h-full justify-center text-center !text-[#001529] input !m-0 space-y-8 overflow-auto"
88
>
99
<div>
10-
You've entered the Lottery Contract. Soon the Manager will randomly pick
11-
a winner.
10+
You&#39;ve entered the Lottery Contract. Soon the Manager will randomly
11+
pick a winner.
1212
</div>
1313
<div className="text-4xl">
1414
<div>🤞 Good luck!! 🤞</div>

‎components/Footer/Footer.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ export default function Footer() {
44
return (
55
<Layout.Footer className="text-center">
66
Proudly made in 🇪🇸 by{' '}
7-
<a href="https://www.linkedin.com/in/jscriptcoder" target="_blank">
7+
<a
8+
href="https://www.linkedin.com/in/jscriptcoder"
9+
target="_blank"
10+
rel="noopener"
11+
>
812
Francisco Ramos
913
</a>
1014
</Layout.Footer>

‎package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
"start": "next start",
99
"lint": "next lint",
1010
"generate-types": "typechain --target=truffle-v5 'build/contracts/*.json'",
11-
"migrate": "tsc -p ./tsconfig.migrate.json --outDir ./migrations && truffle migrate",
11+
"tsc-migrate": "tsc -p ./tsconfig.migrate.json --outDir ./migrations",
12+
"premigrate": "npm run tsc-migrate",
13+
"migrate": "truffle migrate",
14+
"premigrate-goerli": "npm run tsc-migrate",
15+
"migrate-goerli": "truffle migrate --network goerli",
1216
"typecheck": "truffle compile && npm run generate-types && tsc --noEmit",
1317
"test": "truffle test"
1418
},

‎truffle-config.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
require('ts-node').register({ files: true, project: './tsconfig.test.json' })
4545
require('dotenv').config()
4646

47-
// const HDWalletProvider = require('@truffle/hdwallet-provider')
47+
const HDWalletProvider = require('@truffle/hdwallet-provider')
4848

49-
// const { MNEMONIC, PROJECT_URL } = process.env
49+
const { MNEMONIC, NEXT_PUBLIC_PROJECT_URL } = process.env
5050

5151
module.exports = {
5252
/**
@@ -84,13 +84,13 @@ module.exports = {
8484
//
8585
// Useful for deploying to a public network.
8686
// Note: It's important to wrap the provider as a function to ensure truffle uses a new provider every time.
87-
// goerli: {
88-
// provider: () => new HDWalletProvider(MNEMONIC, PROJECT_URL),
89-
// network_id: 5, // Goerli's id
90-
// confirmations: 2, // # of confirmations to wait between deployments. (default: 0)
91-
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
92-
// skipDryRun: true, // Skip dry run before migrations? (default: false for public nets )
93-
// },
87+
goerli: {
88+
provider: () => new HDWalletProvider(MNEMONIC, NEXT_PUBLIC_PROJECT_URL),
89+
network_id: 5, // Goerli's id
90+
confirmations: 2, // # of confirmations to wait between deployments. (default: 0)
91+
timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
92+
skipDryRun: true, // Skip dry run before migrations? (default: false for public nets )
93+
},
9494
//
9595
// Useful for private networks
9696
// private: {

‎utils/lotteryContract.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@ import { EventData } from 'web3-eth-contract'
33
import lotteryConfig from '../build/contracts/Lottery.json'
44
import emitter from './emitter'
55

6-
const devProvider = 'http://127.0.0.1:7545'
6+
type NetworkSettings = Record<string, { address: string }>
7+
8+
const projectUrl = process.env['NEXT_PUBLIC_PROJECT_URL']
9+
const networkId = process.env['NEXT_PUBLIC_NETWORK_ID']
10+
11+
const network 1E80 Settings = lotteryConfig.networks as NetworkSettings
712

813
const CONTRACT_ABI = lotteryConfig.abi as unknown as AbiItem
14+
const CONTRACT_ADDRESS = networkSettings[networkId ?? 5777].address
915

10-
const CONTRACT_ADDRESS = lotteryConfig.networks[5777].address
16+
console.log('Web3.givenProvider', Web3.givenProvider)
17+
console.log('devProvider', projectUrl)
1118

12-
export const web3 = new Web3(Web3.givenProvider || devProvider)
19+
export const web3 = new Web3(Web3.givenProvider ?? projectUrl)
1320

1421
export const lotteryContract = new web3.eth.Contract(
1522
CONTRACT_ABI,

0 commit comments

Comments
 (0)
0