From c37d64c9f6f522edcd934d821885e67c219ec59e Mon Sep 17 00:00:00 2001 From: dbeal Date: Fri, 11 Oct 2024 05:50:07 +0900 Subject: [PATCH] misc fixes (#2324) random things I found while working on the repo * turns out that for verification of USDProxy and AccountProxy, these contracts required UUPSProxyWithOwner instead of Proxy wrapper (verified this was case by manually verifying on etherscan) * arbitrum mainnet was not included in hardhat networks spec --- protocol/synthetix/cannonfile.toml | 4 ++-- utils/common-config/hardhat.config.ts | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/protocol/synthetix/cannonfile.toml b/protocol/synthetix/cannonfile.toml index 03b82d3620..3e2086c852 100644 --- a/protocol/synthetix/cannonfile.toml +++ b/protocol/synthetix/cannonfile.toml @@ -160,7 +160,7 @@ args = [ ] depends = ["invoke.upgrade_core_proxy", "router.AccountRouter"] factory.AccountProxy.abiOf = ["AccountRouter"] -factory.AccountProxy.artifact = "Proxy" +factory.AccountProxy.artifact = "UUPSProxyWithOwner" factory.AccountProxy.event = "AssociatedSystemSet" factory.AccountProxy.arg = 2 factory.AccountProxy.highlight = true @@ -178,7 +178,7 @@ args = [ ] depends = ["invoke.upgrade_core_proxy", "router.USDRouter"] factory.USDProxy.abiOf = ["USDRouter"] -factory.USDProxy.artifact = "Proxy" +factory.USDProxy.artifact = "UUPSProxyWithOwner" factory.USDProxy.event = "AssociatedSystemSet" factory.USDProxy.arg = 2 factory.USDProxy.highlight = true diff --git a/utils/common-config/hardhat.config.ts b/utils/common-config/hardhat.config.ts index 892529c717..0db36d1435 100644 --- a/utils/common-config/hardhat.config.ts +++ b/utils/common-config/hardhat.config.ts @@ -74,6 +74,13 @@ const config = { accounts: process.env.DEPLOYER_PRIVATE_KEY ? [process.env.DEPLOYER_PRIVATE_KEY] : [], chainId: 421614, }, + ['arbitrum-mainnet']: { + url: + process.env.NETWORK_ENDPOINT || + `https://arbitrum-mainnet.infura.io/v3/${process.env.INFURA_API_KEY}`, + accounts: process.env.DEPLOYER_PRIVATE_KEY ? [process.env.DEPLOYER_PRIVATE_KEY] : [], + chainId: 42161, + }, ['optimistic-mainnet']: { url: process.env.NETWORK_ENDPOINT || @@ -138,6 +145,7 @@ const config = { optimisticEthereum: process.env.OVM_ETHERSCAN_API_KEY, optimisticSepolia: process.env.OVM_ETHERSCAN_API_KEY, avalancheFujiTestnet: process.env.ETHERSCAN_API_KEY, + arbitrumMainnet: process.env.ARBITRUM_ETHERSCAN_API_KEY, }, }, tenderly: {