11package main
22
33import (
4+ "context"
45 "encoding/hex"
56 "encoding/json"
67 "errors"
@@ -16,35 +17,42 @@ import (
1617
1718 "github.com/zeta-chain/zetacore/pkg/chains"
1819 observertypes "github.com/zeta-chain/zetacore/x/observer/types"
19- "github.com/zeta-chain/zetacore/zetaclient/context"
20+ zctx "github.com/zeta-chain/zetacore/zetaclient/context"
2021 "github.com/zeta-chain/zetacore/zetaclient/metrics"
2122 mc "github.com/zeta-chain/zetacore/zetaclient/tss"
2223 "github.com/zeta-chain/zetacore/zetaclient/zetacore"
2324)
2425
2526func GenerateTss (
26- appContext * context.AppContext ,
27+ ctx context.Context ,
2728 logger zerolog.Logger ,
2829 client * zetacore.Client ,
2930 peers p2p.AddrList ,
3031 priKey secp256k1.PrivKey ,
3132 ts * metrics.TelemetryServer ,
3233 tssHistoricalList []observertypes.TSS ,
3334 tssPassword string ,
34- hotkeyPassword string ) (* mc.TSS , error ) {
35+ hotkeyPassword string ,
36+ ) (* mc.TSS , error ) {
37+ app , err := zctx .FromContext (ctx )
38+ if err != nil {
39+ return nil , err
40+ }
41+
3542 keygenLogger := logger .With ().Str ("module" , "keygen" ).Logger ()
3643
3744 // Bitcoin chain ID is currently used for using the correct signature format
3845 // TODO: remove this once we have a better way to determine the signature format
3946 // https://github.com/zeta-chain/node/issues/1397
4047 bitcoinChainID := chains .BitcoinRegtest .ChainId
41- btcChain , _ , btcEnabled := appContext .GetBTCChainAndConfig ()
48+ btcChain , _ , btcEnabled := app .GetBTCChainAndConfig ()
4249 if btcEnabled {
4350 bitcoinChainID = btcChain .ChainId
4451 }
4552
4653 tss , err := mc .NewTSS (
47- appContext ,
54+ ctx ,
55+ app ,
4856 peers ,
4957 priKey ,
5058 preParams ,
@@ -74,7 +82,7 @@ func GenerateTss(
7482 // This loop will try keygen at the keygen block and then wait for keygen to be successfully reported by all nodes before breaking out of the loop.
7583 // If keygen is unsuccessful, it will reset the triedKeygenAtBlock flag and try again at a new keygen block.
7684
77- keyGen := appContext .GetKeygen ()
85+ keyGen := app .GetKeygen ()
7886 if keyGen .Status == observertypes .KeygenStatus_KeyGenSuccess {
7987 return tss , nil
8088 }
@@ -86,7 +94,7 @@ func GenerateTss(
8694 // Try generating TSS at keygen block , only when status is pending keygen and generation has not been tried at the block
8795 if keyGen .Status == observertypes .KeygenStatus_PendingKeygen {
8896 // Return error if RPC is not working
89- currentBlock , err := client .GetBlockHeight ()
97+ currentBlock , err := client .GetBlockHeight (ctx )
9098 if err != nil {
9199 keygenLogger .Error ().Err (err ).Msg ("GetBlockHeight RPC error" )
92100 continue
@@ -101,16 +109,21 @@ func GenerateTss(
101109 if currentBlock > lastBlock {
102110 lastBlock = currentBlock
103111 keygenLogger .Info ().
104- Msgf ("Waiting For Keygen Block to arrive or new keygen block to be set. Keygen Block : %d Current Block : %d ChainID %s " , keyGen .BlockNumber , currentBlock , appContext .Config ().ChainID )
112+ Msgf ("Waiting For Keygen Block to arrive or new keygen block to be set. Keygen Block : %d Current Block : %d ChainID %s " , keyGen .BlockNumber , currentBlock , app .Config ().ChainID )
105113 }
106114 continue
107115 }
108116 // Try keygen only once at a particular block, irrespective of whether it is successful or failure
109117 triedKeygenAtBlock = true
110- err = keygenTss (keyGen , tss , keygenLogger )
118+ err = keygenTss (ctx , keyGen , tss , keygenLogger )
111119 if err != nil {
112120 keygenLogger .Error ().Err (err ).Msg ("keygenTss error" )
113- tssFailedVoteHash , err := client .SetTSS ("" , keyGen .BlockNumber , chains .ReceiveStatus_failed )
121+ tssFailedVoteHash , err := client .PostVoteTSS (
122+ ctx ,
123+ "" ,
124+ keyGen .BlockNumber ,
125+ chains .ReceiveStatus_failed ,
126+ )
114127 if err != nil {
115128 keygenLogger .Error ().Err (err ).Msg ("Failed to broadcast Failed TSS Vote to zetacore" )
116129 return nil , err
@@ -128,7 +141,8 @@ func GenerateTss(
128141 }
129142
130143 // If TSS is successful , broadcast the vote to zetacore and set Pubkey
131- tssSuccessVoteHash , err := client .SetTSS (
144+ tssSuccessVoteHash , err := client .PostVoteTSS (
145+ ctx ,
132146 newTss .CurrentPubkey ,
133147 keyGen .BlockNumber ,
134148 chains .ReceiveStatus_success ,
@@ -155,7 +169,7 @@ func GenerateTss(
155169 return nil , errors .New ("unexpected state for TSS generation" )
156170}
157171
158- func keygenTss (keyGen observertypes.Keygen , tss * mc.TSS , keygenLogger zerolog.Logger ) error {
172+ func keygenTss (ctx context. Context , keyGen observertypes.Keygen , tss * mc.TSS , keygenLogger zerolog.Logger ) error {
159173 keygenLogger .Info ().Msgf ("Keygen at blocknum %d , TSS signers %s " , keyGen .BlockNumber , keyGen .GranteePubkeys )
160174 var req keygen.Request
161175 req = keygen .NewRequest (keyGen .GranteePubkeys , keyGen .BlockNumber , "0.14.0" )
@@ -168,7 +182,12 @@ func keygenTss(keyGen observertypes.Keygen, tss *mc.TSS, keygenLogger zerolog.Lo
168182 return err
169183 }
170184 index := fmt .Sprintf ("keygen-%s-%d" , digest , keyGen .BlockNumber )
171- zetaHash , err := tss .ZetacoreClient .PostBlameData (& res .Blame , tss .ZetacoreClient .Chain ().ChainId , index )
185+ zetaHash , err := tss .ZetacoreClient .PostVoteBlameData (
186+ ctx ,
187+ & res .Blame ,
188+ tss .ZetacoreClient .Chain ().ChainId ,
189+ index ,
190+ )
172191 if err != nil {
173192 keygenLogger .Error ().Err (err ).Msg ("error sending blame data to core" )
174193 return err
0 commit comments