Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: prepare SingleRequestFactory for deployment with Request Deployer #1473

Merged
merged 2 commits into from
Oct 22, 2024
Merged

refactor: prepare SingleRequestFactory for deployment with Request Deployer #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8648b8
refactor: prepare `SingleRequestFactory` for deployment with Request …
aimensahnoun Oct 22, 2024
3c96183
chore: remove console log from verify
aimensahnoun Oct 22, 2024
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
2 changes: 1 addition & 1 deletion packages/smart-contracts/scripts-create2/constructor-args.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const getConstructorArgs = (
const ethereumFeeProxy = artifacts.ethereumFeeProxyArtifact;
const ethereumFeeProxyAddress = ethereumFeeProxy.getAddress(network);

return [ethereumFeeProxyAddress, erc20FeeProxyAddress];
return [ethereumFeeProxyAddress, erc20FeeProxyAddress, getAdminWalletAddress(contract)];
aimensahnoun marked this conversation as resolved.
Show resolved Hide resolved
}
default:
return [];
Expand Down
3 changes: 2 additions & 1 deletion packages/smart-contracts/scripts-create2/verify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ export async function VerifyCreate2FromList(hre: HardhatRuntimeEnvironmentExtend
case 'Erc20ConversionProxy':
case 'ERC20EscrowToPay':
case 'BatchConversionPayments':
case 'ERC20TransferableReceivable': {
case 'ERC20TransferableReceivable':
case 'SingleRequestProxyFactory': {
aimensahnoun marked this conversation as resolved.
Show resolved Hide resolved
const network = hre.config.xdeploy.networks[0];
EvmChains.assertChainSupported(network);
const constructorArgs = getConstructorArgs(contract, network);
Expand Down
4 changes: 3 additions & 1 deletion packages/smart-contracts/src/contracts/SingleRequestProxyFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ contract SingleRequestProxyFactory is Ownable {
event ERC20FeeProxyUpdated(address indexed newERC20FeeProxy);
event EthereumFeeProxyUpdated(address indexed newEthereumFeeProxy);

constructor(address _ethereumFeeProxy, address _erc20FeeProxy) {
constructor(address _ethereumFeeProxy, address _erc20FeeProxy, address _owner) {
require(_ethereumFeeProxy != address(0), 'EthereumFeeProxy address cannot be zero');
require(_erc20FeeProxy != address(0), 'ERC20FeeProxy address cannot be zero');
require(_owner != address(0), 'Owner address cannot be zero');
ethereumFeeProxy = _ethereumFeeProxy;
erc20FeeProxy = _erc20FeeProxy;
transferOwnership(_owner);
aimensahnoun marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down
1 change: 1 addition & 0 deletions packages/smart-contracts/test/contracts/SingleRequestProxyFactory.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ describe('contract: SingleRequestProxyFactory', () => {
singleRequestProxyFactory = await SingleRequestProxyFactoryFactory.deploy(
ethereumFeeProxy.address,
erc20FeeProxy.address,
ownerAddress,
aimensahnoun marked this conversation as resolved.
Show resolved Hide resolved
);
await singleRequestProxyFactory.deployed();

Expand Down
Loading