Skip to content

Commit 89d10c7

Browse files
madhurMongiamadhurMongia
committed
chore(test): upgraded test and deploy files
1 parent ada4710 commit 89d10c7

17 files changed

+4366
-4739
lines changed

‎contracts/deploy/01-outbox/01-arb-sepolia-to-chiado-outbox.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
44
import getContractAddress from "../../deploy-helpers/getContractAddress";
55
import { ethers } from "hardhat";
6-
import { BigNumber } from "@ethersproject/bignumber";
76

87
enum ReceiverChains {
98
GNOSIS_CHIADO = 10200,
@@ -97,11 +96,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
9796

9897
// ----------------------------------------------------------------------------------------------
9998
const liveDeployer = async () => {
100-
const gasOptions = {
101-
maxFeePerGas: BigNumber.from(1000000000), // 1 gwei
102-
maxPriorityFeePerGas: BigNumber.from(1000000000), // 1 gwei
103-
};
104-
10599
const senderChainProvider = new ethers.JsonRpcProvider(senderNetworks[ReceiverChains[chainId]].url);
106100
let nonce = await senderChainProvider.getTransactionCount(deployer);
107101

@@ -126,7 +120,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
126120
WETH,
127121
],
128122
log: true,
129-
...gasOptions,
130123
});
131124

132125
console.log("VeaOutboxArbToGnosisDevnet deployed to:", txn.address);

‎contracts/deploy/01-outbox/01-arb-sepolia-to-sepolia-outbox.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { parseEther } from "ethers";
1+
import { parseEther, parseUnits } from "ethers";
22
import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
44
import getContractAddress from "../../deploy-helpers/getContractAddress";
55
import { ethers } from "hardhat";
6-
import { BigNumber } from "@ethersproject/bignumber";
76

87
enum ReceiverChains {
98
ETHEREUM_SEPOLIA = 11155111,
@@ -91,7 +90,7 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
9190
from: deployer,
9291
contract: "ReceiverGatewayMock",
9392
args: [veaOutbox.address, senderGatewayAddress],
94-
gasLimit: BigNumber.from(4000000),
93+
gasLimit: 4000000,
9594
log: true,
9695
});
9796
};

‎contracts/deploy/01-outbox/01-arb-to-eth-outbox.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
44
import getContractAddress from "../../deploy-helpers/getContractAddress";
55
import { ethers } from "hardhat";
6-
import { BigNumber } from "@ethersproject/bignumber";
76

87
enum ReceiverChains {
98
ETHEREUM_MAINNET = 1,
@@ -112,7 +111,7 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
112111
from: deployer,
113112
contract: "ReceiverGatewayMock",
114113
args: [veaOutbox.address, senderGatewayAddress],
115-
gasLimit: BigNumber.from(4000000),
114+
gasLimit: 4000000,
116115
log: true,
117116
});
118117
};

‎contracts/deploy/01-outbox/01-arb-to-gnosis-outbox.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
161161
WETH,
162162
],
163163
log: true,
164-
gasPrice: BigNumber.from(10 ** 9), // chiado rpc response underprices gas, 1 gwei
164+
gasPrice: String(10 ** 9), // chiado rpc response underprices gas, 1 gwei
165165
});
166166

167167
console.log("VeaOutboxArbToGnosis deployed to:", txn.address);

‎contracts/deploy/01-outbox/01-chiado-to-arb-sepolia-outbox.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
44
import getContractAddress from "../../deploy-helpers/getContractAddress";
55
import { ethers } from "hardhat";
6-
import { BigNumber } from "@ethersproject/bignumber";
76

87
enum ReceiverChains {
98
ARBITRUM_SEPOLIA = 421614,
@@ -91,11 +90,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
9190

9291
// ----------------------------------------------------------------------------------------------
9392
const liveDeployer = async () => {
94-
const gasOptions = {
95-
maxFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
96-
maxPriorityFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
97-
};
98-
9993
const senderChainProvider = new ethers.JsonRpcProvider(senderNetworks[ReceiverChains[chainId]].url);
10094
let nonce = await senderChainProvider.getTransactionCount(deployer);
10195

@@ -117,7 +111,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
117111
sequencerFutureLimit,
118112
],
119113
log: true,
120-
...gasOptions,
121114
});
122115

123116
console.log("VeaOutboxGnosisToArbDevnet deployed to:", txn.address);

‎contracts/deploy/01-outbox/01-gnosis-to-arb-outbox.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import { parseEther } from "ethers";
22
import { HardhatRuntimeEnvironment } from "hardhat/types";
33
import { DeployFunction } from "hardhat-deploy/types";
44
import getContractAddress from "../../deploy-helpers/getContractAddress";
5-
import { ethers } from "hardhat";
6-
import { BigNumber } from "@ethersproject/bignumber";
75

86
enum ReceiverChains {
97
ARBITRUM_SEPOLIA = 421614,
@@ -97,11 +95,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
9795

9896
// ----------------------------------------------------------------------------------------------
9997
const liveDeployer = async () => {
100-
const gasOptions = {
101-
maxFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
102-
maxPriorityFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
103-
};
104-
10598
const senderChainProvider = new ethers.JsonRpcProvider(senderNetworks[ReceiverChains[chainId]].url);
10699
let nonce = await senderChainProvider.getTransactionCount(deployer);
107100

@@ -124,7 +117,6 @@ const deployOutbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
124117
sequencerFutureLimit,
125118
],
126119
log: true,
127-
...gasOptions,
128120
});
129121

130122
console.log("VeaOutboxGnosisToArb" + (chainId === 42161 ? "" : "Testnet") + " deployed to:", txn.address);

‎contracts/deploy/02-inbox/02-arb-to-gnosis-inbox.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
33
import getContractAddress from "../../deploy-helpers/getContractAddress";
4-
import { ethers } from "hardhat";
5-
import { providers } from "ethers";
64

75
enum SenderChains {
86
ARBITRUM = 42161,
@@ -84,7 +82,7 @@ const deployInbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
8482

8583
// ----------------------------------------------------------------------------------------------
8684
const liveDeployer = async () => {
87-
const routerChainProvider = new providers.JsonRpcProvider(routerNetworks[SenderChains[chainId]].url);
85+
const routerChainProvider = new ethers.JsonRpcProvider(routerNetworks[SenderChains[chainId]].url);
8886
let nonceRouter = await routerChainProvider.getTransactionCount(deployer);
8987

9088
const routerAddress = getContractAddress(deployer, nonceRouter);

‎contracts/deploy/02-inbox/02-chiado-to-arb-sepolia-inbox.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
33
import { ethers } from "hardhat";
4-
import { BigNumber } from "@ethersproject/bignumber";
54

65
enum SenderChains {
76
GNOSIS_CHIADO = 10200,
@@ -34,17 +33,11 @@ const deployInbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
3433

3534
const veaOutboxArb = await hre.companionNetworks.arbitrumSepolia.deployments.get("VeaOutboxGnosisToArbDevnet");
3635

37-
const gasOptions = {
38-
maxFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
39-
maxPriorityFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
40-
};
41-
4236
const inbox = await deploy("VeaInboxGnosisToArbDevnet", {
4337
from: deployer,
4438
contract: "VeaInboxGnosisToArb",
4539
args: [epochPeriod, veaOutboxArb.address, amb],
4640
log: true,
47-
...gasOptions,
4841
});
4942

5043
console.log("VeaInboxGnosisToArbDevnet deployed to: %s", inbox.address);

‎contracts/deploy/02-inbox/02-gnosis-to-arb-inbox.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,11 @@ const deployInbox: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
3939
"VeaOutboxGnosisToArb" + (chainId === 100 ? "" : "Testnet")
4040
);
4141

42-
const gasOptions = {
43-
maxFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
44-
maxPriorityFeePerGas: BigNumber.from(10 ** 9), // 1 gwei
45-
};
46-
4742
const inbox = await deploy("VeaInboxGnosisToArb" + (chainId === 100 ? "" : "Testnet"), {
4843
from: deployer,
4944
contract: "VeaInboxGnosisToArb",
5045
args: [epochPeriod, veaOutboxArb.address, amb],
5146
log: true,
52-
...(chainId === 100 ? {} : gasOptions),
5347
});
5448

5549
console.log("VeaInboxGnosisToArb" + (chainId === 100 ? "" : "Testnet") + " deployed to: %s", inbox.address);

‎contracts/deploy/03-routers/03-arb-to-gnosis-router.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { HardhatRuntimeEnvironment } from "hardhat/types";
22
import { DeployFunction } from "hardhat-deploy/types";
3-
import { ethers } from "hardhat";
43
import { ZeroAddress } from "ethers";
54

65
enum RouterChains {

0 commit comments

Comments
 (0)