cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6683 from ethereum/updateSwarm

Browse Source 
Update swarm hash.
This commit is contained in:
chriseth
2019-06-27 13:18:29 +02:00
committed by GitHub
parent 53f37f487f 89f0e1e6da
commit 3be21800ac
8 changed files with 133 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/interface/CompilerStack.cpp
+3 -3
View File
@@ -784,7 +784,7 @@ h256 const& CompilerStack::Source::keccak256() const
h256 const& CompilerStack::Source::swarmHash() const
{
if (swarmHashCached == h256{})
swarmHashCached = dev::swarmHash(scanner->source());
swarmHashCached = dev::bzzr1Hash(scanner->source());
return swarmHashCached;
}
@@ -1085,7 +1085,7 @@ string CompilerStack::createMetadata(Contract const& _contract) const
else
{
meta["sources"][s.first]["urls"] = Json::arrayValue;
meta["sources"][s.first]["urls"].append("bzzr://" + toHex(s.second.swarmHash().asBytes()));
meta["sources"][s.first]["urls"].append("bzz-raw://" + toHex(s.second.swarmHash().asBytes()));
meta["sources"][s.first]["urls"].append(s.second.ipfsUrl());
}
}
@@ -1232,7 +1232,7 @@ private:
bytes CompilerStack::createCBORMetadata(string const& _metadata, bool _experimentalMode)
{
MetadataCBOREncoder encoder;
encoder.pushBytes("bzzr0", dev::swarmHash(_metadata).asBytes());
encoder.pushBytes("bzzr1", dev::bzzr1Hash(_metadata).asBytes());
if (_experimentalMode)
encoder.pushBool("experimental", true);
if (m_release)