Merge pull request #24 from HorizenOfficial/development

Allow pubkeyhash input, Update to Zend 3.0.3

Author: cronicc

Dockerfile

@@ -20,9 +20,9 @@ MAINTAINER cronic@horizen.io
 
 SHELL ["/bin/bash", "-c"]
 
-# Latest release zen 3.0.2
+# Latest release zen 3.0.3
 # TODO: Update ZEN_COMMITTISH to newest tag
-ARG ZEN_COMMITTISH=v3.0.2
+ARG ZEN_COMMITTISH=v3.0.3
 ARG IS_RELEASE=false
 # cronic <cronic@zensystem.io> http://pool.sks-keyservers.net:11371/pks/lookup?search=0x219F55740BBF7A1CE368BA45FB7053CE4991B669&op=vindex
 # Luigi Varriale <luigi@zensystem.io> http://pool.sks-keyservers.net:11371/pks/lookup?search=0x7C20EDC1CABFC9D1005EADBF3C80D9DD9F971AB6&op=vindex

services/construction_service.go

@@ -101,7 +101,7 @@ func (s *ConstructionAPIService) estimateSize(operations []*types.Operation) flo
 				continue
 			}
 			hashReplay, _ := hex.DecodeString("0000000000000000000000000000000000000000000000000000000000000000")
-			script, err := txscript.PayToAddrReplayOutScript(addr, hashReplay,100)
+			script, err := txscript.PayToAddrReplayOutScript(addr, hashReplay, 100)
 			if err != nil {
 				size += zen.P2PKHReplayScriptPubkeySize
 				continue
@@ -342,7 +342,7 @@ func (s *ConstructionAPIService) ConstructionPayloads(
 		inputAddresses[i] = address
 		inputAmounts[i] = matches[0].Amounts[i].String()
 
-		if class != txscript.PubKeyHashReplayOutTy {
+		if class != txscript.PubKeyHashReplayOutTy && class != txscript.PubKeyHashTy {
 			return nil, wrapErr(
 				ErrUnsupportedScriptType,
 				fmt.Errorf("unupported script type: %s", class),
@@ -452,7 +452,7 @@ func (s *ConstructionAPIService) ConstructionCombine(
 		fullsig := normalizeSignature(request.Signatures[i].Bytes)
 		pkData := request.Signatures[i].PublicKey.Bytes
 
-		if class != txscript.PubKeyHashReplayOutTy {
+		if class != txscript.PubKeyHashReplayOutTy && class != txscript.PubKeyHashTy {
 			return nil, wrapErr(
 				ErrUnsupportedScriptType,
 				fmt.Errorf("unupported script type: %s", class),

services/network_service_test.go

@@ -30,7 +30,7 @@ var (
 	defaultNetworkOptions = &types.NetworkOptionsResponse{
 		Version: &types.Version{
 			RosettaVersion:    types.RosettaAPIVersion,
-			NodeVersion:       "3.0.2",
+			NodeVersion:       "3.0.3",
 			MiddlewareVersion: &middlewareVersion,
 		},
 		Allow: &types.Allow{

services/types.go

@@ -24,7 +24,7 @@ import (
 const (
 	// NodeVersion is the version of
 	// zend core we are using.
-	NodeVersion = "3.0.2"
+	NodeVersion = "3.0.3"
 
 	// HistoricalBalanceLookup indicates
 	// that historical balance lookup is supported.