Skip to content

Commit

Permalink
feat: update genesis tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidtaikocha
davidtaikocha committed Feb 12, 2025
1 parent d338b4f commit c8fb645
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 66 deletions.
44 changes: 29 additions & 15 deletions packages/protocol/test/genesis/GenerateGenesis.g.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ contract TestGenerateGenesis is Test {
);

assertEq(bridgeProxy.paused(), false);
assertEq(address(0), address(bridgeProxy.quotaManager()));
assertEq(
getPredeployedContractAddress("SignalService"), address(bridgeProxy.signalService())
);

vm.startPrank(contractOwner);
bridgeProxy.pause();
Expand Down Expand Up @@ -205,12 +209,27 @@ contract TestGenerateGenesis is Test {
vm.stopPrank();
}

// function testBridgedERC20() public view {
// address bridgedERC20 = getPredeployedContractAddress("BridgedERC20");
// assertEq(
// getPredeployedContractAddress("ERC20Vault"), BridgedERC20(bridgedERC20).erc20Vault()
// );
// }
function testBridgedERC20() public view {
address bridgedERC20 = getPredeployedContractAddress("BridgedERC20Impl");
assertEq(
getPredeployedContractAddress("ERC20Vault"), BridgedERC20(bridgedERC20).erc20Vault()
);
}

function testBridgedERC721() public view {
address bridgedERC721 = getPredeployedContractAddress("BridgedERC721Impl");
assertEq(
getPredeployedContractAddress("ERC721Vault"), BridgedERC721(bridgedERC721).erc721Vault()
);
}

function testBridgedERC1155() public view {
address bridgedERC1155 = getPredeployedContractAddress("BridgedERC1155Impl");
assertEq(
getPredeployedContractAddress("ERC1155Vault"),
BridgedERC1155(bridgedERC1155).erc1155Vault()
);
}

function testSingletonERC20Vault() public {
address erc20VaultAddress = getPredeployedContractAddress("ERC20Vault");
Expand All @@ -236,7 +255,7 @@ contract TestGenerateGenesis is Test {
vm.stopPrank();
}

function testSingletonERC721Vault() public {
function testERC721Vault() public {
address erc721VaultAddress = getPredeployedContractAddress("ERC721Vault");
address bridgeAddress = getPredeployedContractAddress("Bridge");

Expand All @@ -260,7 +279,7 @@ contract TestGenerateGenesis is Test {
vm.stopPrank();
}

function testSingletonERC1155Vault() public {
function testERC1155Vault() public {
address erc1155VaultProxyAddress = getPredeployedContractAddress("ERC1155Vault");
address bridgeProxyAddress = getPredeployedContractAddress("Bridge");

Expand All @@ -275,8 +294,6 @@ contract TestGenerateGenesis is Test {
addressManager.registerAddress(1, "erc1155_vault", erc1155VaultProxyAddress);
vm.stopPrank();

// address erc1155VaultAddress = getPredeployedContractAddress("ERC1155VaultImpl");

vm.startPrank(erc1155VaultProxy.owner());

erc1155VaultProxy.upgradeTo(
Expand All @@ -286,7 +303,7 @@ contract TestGenerateGenesis is Test {
vm.stopPrank();
}

function testSingletonSignalService() public {
function testSignalService() public {
SignalService signalServiceProxy =
SignalService(getPredeployedContractAddress("SignalService"));

Expand All @@ -296,9 +313,6 @@ contract TestGenerateGenesis is Test {

vm.startPrank(contractOwner);

// SignalService signalService =
// SignalService(payable(getPredeployedContractAddress("SignalServiceImpl")));

signalServiceProxy.upgradeTo(
address(new SignalService(getPredeployedContractAddress("SharedResolver")))
);
Expand Down Expand Up @@ -335,7 +349,7 @@ contract TestGenerateGenesis is Test {

function checkProxyImplementation(string memory proxyName, address owner) private {
vm.startPrank(owner);
// address contractAddress = getPredeployedContractAddress(contractName);

address proxyAddress = getPredeployedContractAddress(proxyName);

EssentialContract proxy = EssentialContract(payable(proxyAddress));
Expand Down
78 changes: 27 additions & 51 deletions packages/protocol/test/genesis/generate/taikoAnchor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ async function generateContractConfigs(
address: addressMap.SharedResolverImpl,
deployedBytecode: replaceImmutableValue(
contractArtifacts.SharedResolverImpl,
uupsImmutableReferencesMap.UUPSUpgradeable.__self.id,
uupsImmutableReferencesMap.__self.id,
ethers.utils.hexZeroPad(addressMap.SharedResolverImpl, 32),
).deployedBytecode.object,
variables: {
Expand Down Expand Up @@ -307,23 +307,21 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.BridgeImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.BridgeImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
),
},
{
id: bridgeReferencesMap.Bridge.signalService.id,
id: bridgeReferencesMap.signalService.id,
value: ethers.utils.hexZeroPad(
addressMap.SignalService,
32,
Expand Down Expand Up @@ -359,16 +357,14 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.ERC20VaultImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC20VaultImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
Expand Down Expand Up @@ -405,16 +401,14 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.ERC721VaultImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC721VaultImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
Expand Down Expand Up @@ -451,16 +445,14 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.ERC1155VaultImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC1155VaultImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
Expand Down Expand Up @@ -497,24 +489,21 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.BridgedERC20Impl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.BridgedERC20Impl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
),
},
{
id: bridgedERC20ReferencesMap.BridgedERC20.erc20Vault
.id,
id: bridgedERC20ReferencesMap.erc20Vault.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC20Vault,
32,
Expand All @@ -529,24 +518,21 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.BridgedERC721Impl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.BridgedERC721Impl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
),
},
{
id: bridgedERC721ReferencesMap.BridgedERC721.erc721Vault
.id,
id: bridgedERC721ReferencesMap.erc721Vault.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC721Vault,
32,
Expand All @@ -561,24 +547,21 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.BridgedERC1155Impl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.BridgedERC1155Impl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
),
},
{
id: bridgedERC1155ReferencesMap.BridgedERC1155
.erc1155Vault.id,
id: bridgedERC1155ReferencesMap.erc1155Vault.id,
value: ethers.utils.hexZeroPad(
addressMap.ERC1155Vault,
32,
Expand All @@ -593,16 +576,14 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.SignalServiceImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.SignalServiceImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
Expand Down Expand Up @@ -643,31 +624,28 @@ async function generateContractConfigs(
deployedBytecode: linkContractLibs(
replaceImmutableValues(contractArtifacts.TaikoAnchorImpl, [
{
id: uupsImmutableReferencesMap.UUPSUpgradeable.__self
.id,
id: uupsImmutableReferencesMap.__self.id,
value: ethers.utils.hexZeroPad(
addressMap.TaikoAnchorImpl,
32,
),
},
{
id: essentialContractReferencesMap.EssentialContract
.__resolver.id,
id: essentialContractReferencesMap.__resolver.id,
value: ethers.utils.hexZeroPad(
addressMap.SharedResolver,
32,
),
},
{
id: taikoAnchorReferencesMap.TaikoAnchor.id,
id: taikoAnchorReferencesMap.pacayaForkHeight.id,
value: ethers.utils.hexZeroPad(
ethers.utils.hexlify(pacayaForkHeight),
32,
),
},
{
id: taikoAnchorReferencesMap.TaikoAnchor.signalService
.id,
id: taikoAnchorReferencesMap.signalService.id,
value: ethers.utils.hexZeroPad(
addressMap.SignalService,
32,
Expand Down Expand Up @@ -720,7 +698,7 @@ async function generateContractConfigs(
address: addressMap.RollupResolverImpl,
deployedBytecode: replaceImmutableValue(
contractArtifacts.RollupResolverImpl,
uupsImmutableReferencesMap.UUPSUpgradeable.__self.id,
uupsImmutableReferencesMap.__self.id,
ethers.utils.hexZeroPad(addressMap.RollupResolverImpl, 32),
).deployedBytecode.object,
variables: {
Expand Down Expand Up @@ -824,9 +802,7 @@ function getImmutableReference(
for (const immutableValueName of immutableValueNames) {
for (const subNode of node.nodes) {
if (subNode.name !== immutableValueName) continue;
if (!references[`${contractName}`])
references[`${contractName}`] = {};
references[`${contractName}`][immutableValueName] = {
references[immutableValueName] = {
name: immutableValueName,
id: subNode.id,
};
Expand Down

0 comments on commit c8fb645

Please sign in to comment.