From 6bf5555c4f79b8161b4cbedc19da9d29ca6e2305 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Tue, 2 Jul 2019 09:52:58 +0200 Subject: 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 --- common/compiler/solidity.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'common/compiler/solidity.go') 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", -- cgit v1.2.3