Skip to content

Commit 481cfef

Browse files
Merge pull request #160 from threshold-network/remove-goerli
Remove support for Goerli testnet
2 parents 116e669 + 01ffe5e commit 481cfef

File tree

7 files changed

+4
-12928
lines changed

7 files changed

+4
-12928
lines changed

.github/workflows/contracts.yml

+3-24
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,7 @@ jobs:
125125

126126
- name: Deploy contracts
127127
env:
128-
# Using fake ternary expressions to decide which credentials to use,
129-
# depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
130-
# is empty, the expression will be evaluated to
131-
# `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
132-
CHAIN_API_URL: |
133-
${{ inputs.github.event.inputs.environment == 'goerli'
134-
&& secrets.GOERLI_ETH_HOSTNAME_HTTP
135-
|| secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
128+
CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
136129
CONTRACT_OWNER_ACCOUNT_PRIVATE_KEY: ${{ secrets.TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
137130
KEEP_CONTRACT_OWNER_ACCOUNT_PRIVATE_KEY: ${{ secrets.TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
138131
run: yarn deploy --network ${{ github.event.inputs.environment }}
@@ -203,14 +196,7 @@ jobs:
203196
- name: Verify contracts on Etherscan
204197
env:
205198
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
206-
# Using fake ternary expressions to decide which credentials to use,
207-
# depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
208-
# is empty, the expression will be evaluated to
209-
# `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
210-
CHAIN_API_URL: |
211-
${{ inputs.github.event.inputs.environment == 'goerli'
212-
&& secrets.GOERLI_ETH_HOSTNAME_HTTP
213-
|| secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
199+
CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
214200
run: |
215201
yarn run hardhat --network ${{ github.event.inputs.environment }} \
216202
etherscan-verify --license GPL-3.0 --force-license
@@ -245,14 +231,7 @@ jobs:
245231

246232
- name: Deploy contracts
247233
env:
248-
# Using fake ternary expressions to decide which credentials to use,
249-
# depending on chosen environment. Note: if `GOERLI_ETH_HOSTNAME_HTTP`
250-
# is empty, the expression will be evaluated to
251-
# `SEPOLIA_ETH_HOSTNAME_HTTP`'s value.
252-
CHAIN_API_URL: |
253-
${{ inputs.github.event.inputs.environment == 'goerli'
254-
&& secrets.GOERLI_ETH_HOSTNAME_HTTP
255-
|| secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
234+
CHAIN_API_URL: ${{ secrets.SEPOLIA_ETH_HOSTNAME_HTTP }}
256235
CONTRACT_OWNER_ACCOUNT_PRIVATE_KEY: ${{ secrets.DAPP_DEV_TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
257236
KEEP_CONTRACT_OWNER_ACCOUNT_PRIVATE_KEY: ${{ secrets.TESTNET_ETH_CONTRACT_OWNER_PRIVATE_KEY }}
258237
run: yarn deploy --network ${{ github.event.inputs.environment }}

deploy/00_resolve_nucypher_token.ts

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
2222
// TODO: For testnets currently we deploy a stub contract. We should consider
2323
// switching to an actual contract.
2424
hre.network.name !== "sepolia" &&
25-
hre.network.name !== "goerli" &&
2625
(!hre.network.tags.allowStubs ||
2726
(hre.network.config as HardhatNetworkConfig)?.forking?.enabled)
2827
) {

deploy/07_deploy_token_staking.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1717
]
1818
const tokenStakingInitializerArgs = []
1919

20-
// TODO: Consider upgradable deployment also for goerli/sepolia.
20+
// TODO: Consider upgradable deployment also for sepolia.
2121
let tokenStakingAddress
2222
if (hre.network.name == "mainnet") {
2323
const TokenStaking = await ethers.getContractFactory("TokenStaking")

0 commit comments

Comments
 (0)