Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 8 additions & 18 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import '@nomicfoundation/hardhat-chai-matchers'
import 'hardhat-deploy'
import '@nomiclabs/hardhat-ethers'
import '@nomicfoundation/hardhat-verify'
import '@nomiclabs/hardhat-ethers'
import '@typechain/hardhat'
import 'solidity-coverage'
import 'hardhat-gas-reporter'
import dotenv from 'dotenv'
import 'hardhat-contract-sizer'
import 'hardhat-deploy'
import 'hardhat-gas-reporter'
import 'hardhat-ignore-warnings'
import dotenv from 'dotenv'
import 'solidity-coverage'

dotenv.config()

Expand Down Expand Up @@ -144,7 +144,7 @@ module.exports = {
},
},
mainnet: {
url: 'https://mainnet.infura.io/v3/' + process.env['INFURA_KEY'],
url: process.env['MAINNET_RPC_URL'],
accounts: process.env['MAINNET_PRIVKEY']
? [process.env['MAINNET_PRIVKEY']]
: [],
Expand Down Expand Up @@ -192,7 +192,7 @@ module.exports = {
: [],
},
base: {
url: 'https://mainnet.base.org',
url: process.env['BASE_RPC_URL'],
accounts: process.env['MAINNET_PRIVKEY']
? [process.env['MAINNET_PRIVKEY']]
: [],
Expand All @@ -211,17 +211,7 @@ module.exports = {
},
},
etherscan: {
apiKey: {
mainnet: process.env['ETHERSCAN_API_KEY'],
sepolia: process.env['ETHERSCAN_API_KEY'],
holesky: process.env['ETHERSCAN_API_KEY'],
arbitrumOne: process.env['ARBISCAN_API_KEY'],
nova: process.env['NOVA_ARBISCAN_API_KEY'],
arbSepolia: process.env['ARBISCAN_API_KEY'],
base: process.env['BASESCAN_API_KEY'],
baseSepolia: process.env['BASESCAN_API_KEY'],
custom: process.env['CUSTOM_ETHERSCAN_API_KEY'],
},
apiKey: process.env['ETHERSCAN_API_KEY'],
customChains: [
{
network: 'nova',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@arbitrum/sdk": "^3.7.3",
"@ethersproject/providers": "^5.8.0",
"@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
"@nomicfoundation/hardhat-verify": "^2.0.13",
"@nomicfoundation/hardhat-verify": "^2.0.14",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@typechain/ethers-v5": "^10.2.1",
"@typechain/hardhat": "^6.1.6",
Expand Down
11 changes: 5 additions & 6 deletions scripts/deployment.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { ethers } from 'hardhat'
import '@nomiclabs/hardhat-ethers'
import { deployAllContracts, _isRunningOnArbitrum } from './deploymentUtils'
import { maxDataSize, disableMessageFromOriginEvent } from './config'
import { ethers } from 'hardhat'
import { disableMessageFromOriginEvent, maxDataSize } from './config'
import { _isRunningOnArbitrum, deployAllContracts } from './deploymentUtils'

import { ArbSys__factory } from '../build/types'

async function main() {
const [signer] = await ethers.getSigners()

console.log('Deploying contracts with maxDataSize:', maxDataSize)
if (process.env['IGNORE_MAX_DATA_SIZE_WARNING'] !== 'true') {
let isArbitrum = await _isRunningOnArbitrum(signer)
Expand All @@ -26,7 +24,7 @@ async function main() {

try {
// Deploying all contracts
const verify = false;
const verify = true;
const contracts = await deployAllContracts(
signer,
ethers.BigNumber.from(maxDataSize),
Expand All @@ -48,6 +46,7 @@ async function main() {
)
console.log('Template is set on the Rollup Creator')
} catch (error) {
console.error(error)
console.error(
'Deployment failed:',
error instanceof Error ? error.message : error
Expand Down
7 changes: 4 additions & 3 deletions scripts/deploymentUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ export async function deployContract(
): Promise<Contract> {
const factory: ContractFactory = await ethers.getContractFactory(contractName)
const connectedFactory: ContractFactory = factory.connect(signer)

let deploymentArgs = [...constructorArgs]
if (overrides) {
deploymentArgs.push(overrides)
Expand All @@ -87,17 +86,19 @@ export async function deployContract(
// }
// deploymentArgs.push(overrides)
}

const contract: Contract = await connectedFactory.deploy(...deploymentArgs)
await contract.deployTransaction.wait()
console.log(
`* New ${contractName} created at address: ${
contract.address
} ${constructorArgs.join(' ')}`
)


if (verify)
if (verify) {
await new Promise(r => setTimeout(r, 5_000));
await verifyContract(contractName, contract.address, constructorArgs)
}

return contract
}
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -680,10 +680,10 @@
deep-eql "^4.0.1"
ordinal "^1.0.3"

"@nomicfoundation/hardhat-verify@^2.0.13":
version "2.0.13"
resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.0.13.tgz#41691adc32e01dc5cf6b725615f64958fba2100b"
integrity sha512-i57GX1sC0kYGyRVnbQrjjyBTpWTKgrvKC+jH8CMKV6gHp959Upb8lKaZ58WRHIU0espkulTxLnacYeUDirwJ2g==
"@nomicfoundation/hardhat-verify@^2.0.14":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.1.1.tgz#0af5fc4228df860062865fcafb4a01bc0b89f8a3"
integrity sha512-K1plXIS42xSHDJZRkrE2TZikqxp9T4y6jUMUNI/imLgN5uCcEQokmfU0DlyP9zzHncYK92HlT5IWP35UVCLrPw==
dependencies:
"@ethersproject/abi" "^5.1.2"
"@ethersproject/address" "^5.0.2"
Expand Down
Loading