From d157f70925b3ce8c0ad6b81561bfb61441de1038 Mon Sep 17 00:00:00 2001 From: Theo Date: Wed, 18 Oct 2023 11:05:19 -0700 Subject: [PATCH] Update tornado-relayer repository IPFS cid after mitigating relayer attack: https://forum.tornado.ws/t/relayer-attack-analysis-and-mitigation/199 --- data/ensDomainsIPFSContenthashes.txt | 2 +- data/ipfsV1CIDs.txt | 2 +- scripts/constants.ts | 2 +- src/UpdateENSDataProposal.sol | 2 +- test/GoerliTestProposal.sol | 3 ++- test/UpdateENSDataProposal.t.sol | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/ensDomainsIPFSContenthashes.txt b/data/ensDomainsIPFSContenthashes.txt index 08527a7..38392c5 100644 --- a/data/ensDomainsIPFSContenthashes.txt +++ b/data/ensDomainsIPFSContenthashes.txt @@ -4,6 +4,6 @@ bytes memory downloadScriptSourceContenthash = hex"e301017012208f759bcffb194cb59161916ee7f1f1d225016f03514b5430d3fb4c5fb254a3bb"; bytes memory ipfsHostHelpScriptSourceContenthash = hex"e301017012200c8e358709e32756da156639a8aedbf6950090d4e73c2dc6e1c012fe5b78e4e9"; bytes memory downloadInstructionsHtmlContenthash = hex"e301017012201a9748cd5f0f64c682d309f6af6354944e0d2e572e81c301ea8ce76c11dee1f5"; - bytes memory tornadoRelayerSoftwareSourceContenthash = hex"e3010170122067e3626e5999eccfbe9ad14db95a40bd1c32305f580f37eb3f2c9535026aa7d9"; + bytes memory tornadoRelayerSoftwareSourceContenthash = hex"e301017012205d51d0e5b49830f59f91f6a36e44c40d69474078c5e5b41e0df4f23fddd89b13"; bytes memory docsSourceContenthash = hex"e30101701220a02b6c5846715cae70d0f7a7df09cbc929b5af97d38dd130ffd44aa0adf21daa"; bytes memory docsSiteContenthash = hex"e30101701220615111f92c8087a46a397f77046d8c0eed57b27fbb9221e4d270307f0fb317a4"; diff --git a/data/ipfsV1CIDs.txt b/data/ipfsV1CIDs.txt index e9df478..ec8aafe 100644 --- a/data/ipfsV1CIDs.txt +++ b/data/ipfsV1CIDs.txt @@ -4,6 +4,6 @@ const relayersUiOldSiteIpfsCid = "bafybeicsuuzr6l7vpttvwl5urbyof4pqouwq3iva2yjba const downloadScriptSourceIpfsCid = "bafybeiepown476yzjs2zcymrn3t7d4oseuaw6a2rjnkdbu73jrp3evfdxm"; const ipfsHostHelpScriptSourceIpfsCid = "bafybeiamry2yocpde5lnuflghguk5w7wsuajbvhhhqw4nyoacl7fw6he5e"; const downloadInstructionsHtmlIpfsCid = "bafybeia2s5em2xypmtdifuyj62xwgveujygs4vzoqhbqd2um45wbdxxb6u"; -const tornadoRelayerSoftwareSourceIpfsCid = "bafybeidh4nrg4wmz5th35gwrjw4vuqf5dqzdax2yb436wpzmsu2qe2vh3e"; +const tornadoRelayerSoftwareSourceIpfsCid = "bafybeic5khiolneygd2z7epwunxejrannfdua6gf4w2b4dpu6i753we3cm"; const docsSourceIpfsCid = "bafybeifafnwfqrtrlsxhbuhxu7pqts6jfg227f6trxitb76ujkqk34q5vi"; const docsSiteIpfsCid = "bafybeidbkei7sleaq6sguol7o4cg3dao5vl3e753siq6jutqgb7q7myxuq"; diff --git a/scripts/constants.ts b/scripts/constants.ts index 24ddfc2..31dae7b 100644 --- a/scripts/constants.ts +++ b/scripts/constants.ts @@ -21,7 +21,7 @@ export const ipfsCids = { downloadScriptSource: "QmXzf2Lymv1YStHiiMaFrEDxkD4o4cN8cdS6N82voSaTpv", ipfsHostHelpScriptSource: "QmPBfNYr7hWtpUGNbTgYzaXa6wPp5HcEysZH7pNn9zyEqe", downloadInstructionsHtml: "QmQ8T782t6TDFKoZLeVeQaHabgaGjNnTGk86zKMPE4uHtx", - tornadoRelayerSoftwareSource: "QmVLBoVZAkigrf7x1VHx4aeCHMX5HFwa9cmKGEcC1eUP9i", + tornadoRelayerSoftwareSource: "QmUcvz2A6WbLpQJ3AoGvW8auAPn2PKbfgBZAz2htfKEVLn", docsSource: "QmZ7tLxVF5nwmTNwq61MMf7gnUxh85t5Rs6ixxcwu1gRay", docsSite: "QmUtXxMHnLGxsG3Mqm3hhQ2rByFsehSqS57LiEKpEdEiHR", }; diff --git a/src/UpdateENSDataProposal.sol b/src/UpdateENSDataProposal.sol index d217bd5..5336140 100644 --- a/src/UpdateENSDataProposal.sol +++ b/src/UpdateENSDataProposal.sol @@ -47,7 +47,7 @@ contract UpdateENSDataProposal { bytes memory ipfsHostHelpScriptSourceContenthash = hex"e301017012200c8e358709e32756da156639a8aedbf6950090d4e73c2dc6e1c012fe5b78e4e9"; bytes memory downloadInstructionsHtmlContenthash = hex"e301017012201a9748cd5f0f64c682d309f6af6354944e0d2e572e81c301ea8ce76c11dee1f5"; bytes memory tornadoRelayerSoftwareSourceContenthash = - hex"e3010170122067e3626e5999eccfbe9ad14db95a40bd1c32305f580f37eb3f2c9535026aa7d9"; + hex"e301017012205d51d0e5b49830f59f91f6a36e44c40d69474078c5e5b41e0df4f23fddd89b13"; bytes memory docsSourceContenthash = hex"e30101701220a02b6c5846715cae70d0f7a7df09cbc929b5af97d38dd130ffd44aa0adf21daa"; bytes memory docsSiteContenthash = hex"e30101701220615111f92c8087a46a397f77046d8c0eed57b27fbb9221e4d270307f0fb317a4"; diff --git a/test/GoerliTestProposal.sol b/test/GoerliTestProposal.sol index 4ba5353..979f73d 100644 --- a/test/GoerliTestProposal.sol +++ b/test/GoerliTestProposal.sol @@ -39,11 +39,12 @@ contract GoerliTestProposal { // From data/ensDomainsIPFSContenthashes.txt, calculated via scripts/calculateIPFSContenthashes.ts bytes memory relayersUiSourceContenthash = hex"e3010170122072dd7fe08bc98404c3a2e402dac817562b2533aa549c475e8e85b9a266bc507c"; bytes memory relayersUiSiteContenthash = hex"e3010170122052a5331f2ff57ce75b2fb48870e2f1f0752d0da2a0d612104028ce5930976adb"; + bytes memory relayersUiOldSiteContenthash = hex"e3010170122052a5331f2ff57ce75b2fb48870e2f1f0752d0da2a0d612104028ce5930976adb"; bytes memory downloadScriptSourceContenthash = hex"e301017012208f759bcffb194cb59161916ee7f1f1d225016f03514b5430d3fb4c5fb254a3bb"; bytes memory ipfsHostHelpScriptSourceContenthash = hex"e301017012200c8e358709e32756da156639a8aedbf6950090d4e73c2dc6e1c012fe5b78e4e9"; bytes memory downloadInstructionsHtmlContenthash = hex"e301017012201a9748cd5f0f64c682d309f6af6354944e0d2e572e81c301ea8ce76c11dee1f5"; bytes memory tornadoRelayerSoftwareSourceContenthash = - hex"e3010170122067e3626e5999eccfbe9ad14db95a40bd1c32305f580f37eb3f2c9535026aa7d9"; + hex"e301017012205d51d0e5b49830f59f91f6a36e44c40d69474078c5e5b41e0df4f23fddd89b13"; bytes memory docsSourceContenthash = hex"e30101701220a02b6c5846715cae70d0f7a7df09cbc929b5af97d38dd130ffd44aa0adf21daa"; bytes memory docsSiteContenthash = hex"e30101701220615111f92c8087a46a397f77046d8c0eed57b27fbb9221e4d270307f0fb317a4"; diff --git a/test/UpdateENSDataProposal.t.sol b/test/UpdateENSDataProposal.t.sol index ddb3e6e..b56c378 100644 --- a/test/UpdateENSDataProposal.t.sol +++ b/test/UpdateENSDataProposal.t.sol @@ -51,7 +51,7 @@ contract TestExampleProposal is ProposalUtils { DomainInfo("relayers-ui.tornadocash.eth", "QmTuGF7kKRjWRjmbxg5qMox622T2VftYiZWKjRpRvYkUN6"), DomainInfo("relayers-network.tornadocash.eth", "QmTuGF7kKRjWRjmbxg5qMox622T2VftYiZWKjRpRvYkUN6"), DomainInfo("relayers-ui.sources.tornadocash.eth", "QmW535jPAscFPqh5M38YjLcwJDJjBrT6ZRtqQqCPF19SzF"), - DomainInfo("relayer.sources.tornadocash.eth", "QmVLBoVZAkigrf7x1VHx4aeCHMX5HFwa9cmKGEcC1eUP9i"), + DomainInfo("relayer.sources.tornadocash.eth", "QmUcvz2A6WbLpQJ3AoGvW8auAPn2PKbfgBZAz2htfKEVLn"), DomainInfo("docs.sources.tornadocash.eth", "QmZ7tLxVF5nwmTNwq61MMf7gnUxh85t5Rs6ixxcwu1gRay"), DomainInfo("docs.tornadocash.eth", "QmUtXxMHnLGxsG3Mqm3hhQ2rByFsehSqS57LiEKpEdEiHR") ];