add roots to genTxWithSign

sero-cash · Aug 8, 2019 · 6481100 · 6481100
1 parent f35cf34
commit 6481100
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/internal/ethapi/api_exchange.go b/internal/ethapi/api_exchange.go
@@ -128,7 +128,12 @@ func (s *PublicExchangeAPI) GenTxWithSign(ctx context.Context, param GenTxArgs)
 	if err := param.check(); err != nil {
 		return nil, err
 	}
-	_, tx, e := exchange.CurrentExchange().GenTxWithSign(param.toTxParam())
+	txParam, tx, e := exchange.CurrentExchange().GenTxWithSign(param.toTxParam())
+	if tx != nil {
+		for _, in := range txParam.Ins {
+			tx.Roots = append(tx.Roots, in.Out.Root)
+		}
+	}
 	return tx, e
 }
 

diff --git a/params/version.go b/params/version.go
@@ -24,7 +24,7 @@ const (
 	VersionMajor = 1     // Major version component of the current release
 	VersionMinor = 0     // Minor version component of the current release
 	VersionPatch = 0     // Patch version component of the current release
-	VersionMeta  = "rc6" // Version metadata to append to the version string
+	VersionMeta  = "rc7" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.

diff --git a/zero/txtool/iface.go b/zero/txtool/iface.go
@@ -27,6 +27,7 @@ type GTx struct {
 	GasPrice hexutil.Big
 	Tx       stx.T
 	Hash     keys.Uint256
+	Roots    []keys.Uint256
 }
 
 type GPkgCloseCmd struct {