diff options
| author | Guillaume Ballet <gballet@gmail.com> | 2019-07-02 15:52:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 15:52:58 +0800 |
| commit | 6bf5555c4f79b8161b4cbedc19da9d29ca6e2305 (patch) | |
| tree | 5f6b026b2375548aeea83b6b5629b8fb70f51391 /common/compiler/solidity.go | |
| parent | 0b26a826e988ba2493d89f00383d110fb1566ff2 (diff) | |
| download | go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar.gz go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar.bz2 go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar.lz go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar.xz go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.tar.zst go-tangerine-6bf5555c4f79b8161b4cbedc19da9d29ca6e2305.zip | |
accounts/abi/bind: Accept function ptr parameter (#19755)
* accounts/abi/bind: Accept function ptr parameter
They are translated as [24]byte
* Add Java template version
* accounts/abi/bind: fix merge issue
* Fix CI
Diffstat (limited to 'common/compiler/solidity.go')
| -rw-r--r-- | common/compiler/solidity.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index 7ed9c2633..56e01ee33 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -39,6 +39,7 @@ type solcOutput struct { BinRuntime string `json:"bin-runtime"` SrcMapRuntime string `json:"srcmap-runtime"` Bin, SrcMap, Abi, Devdoc, Userdoc, Metadata string + Hashes map[string]string } Version string } @@ -49,7 +50,7 @@ func (s *Solidity) makeArgs() []string { "--optimize", // code optimizer switched on } if s.Major > 0 || s.Minor > 4 || s.Patch > 6 { - p[1] += ",metadata" + p[1] += ",metadata,hashes" } return p } @@ -161,6 +162,7 @@ func ParseCombinedJSON(combinedJSON []byte, source string, languageVersion strin contracts[name] = &Contract{ Code: "0x" + info.Bin, RuntimeCode: "0x" + info.BinRuntime, + Hashes: info.Hashes, Info: ContractInfo{ Source: source, Language: "Solidity", |