bump version (#75)

README.md

@@ -167,7 +167,7 @@ docker run --name gnfd-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -d mysql:8
 
 Create schema in MySQL client:
 
-```shell
+```mysql
 CREATE SCHEMA IF NOT EXISTS `greenfield-relayer` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 ```
 

assembler/bsc_assembler.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"time"
 
 	"cosmossdk.io/errors"
@@ -89,7 +90,7 @@ func (a *BSCAssembler) process(channelId types.ChannelId) error {
 				}
 				return nil
 			}
-			inTurnRelayerStartSeq, err := a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry()
+			inTurnRelayerStartSeq, err := a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry(a.getChainId())
 			if err != nil {
 				return err
 			}
@@ -106,7 +107,7 @@ func (a *BSCAssembler) process(channelId types.ChannelId) error {
 		a.inturnRelayerSequenceStatus.HasRetrieved = false
 		// non-inturn relayer retries every 10 second, gets the sequence from chain
 		time.Sleep(time.Duration(a.config.RelayConfig.GreenfieldSequenceUpdateLatency) * time.Second)
-		startSeq, err = a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry()
+		startSeq, err = a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry(a.getChainId())
 		if err != nil {
 			return err
 		}
@@ -172,7 +173,7 @@ func (a *BSCAssembler) process(channelId types.ChannelId) error {
 					return nonceErr
 				}
 				a.relayerNonce = newNonce
-				newNextDeliveryOracleSeq, seqErr := a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry()
+				newNextDeliveryOracleSeq, seqErr := a.bscExecutor.GetNextDeliveryOracleSequenceWithRetry(a.getChainId())
 				if seqErr != nil {
 					return seqErr
 				}
@@ -239,3 +240,7 @@ func (a *BSCAssembler) updateMetrics(channelId uint8, nextDeliveryOracleSeq uint
 	a.metricService.SetNextSendSequenceForChannel(channelId, nextSendOracleSeq)
 	return nil
 }
+
+func (a *BSCAssembler) getChainId() sdk.ChainID {
+	return sdk.ChainID(a.config.BSCConfig.ChainId)
+}

assembler/greenfield_assembler.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"sync"
 	"time"
 
@@ -148,7 +149,7 @@ func (a *GreenfieldAssembler) process(channelId types.ChannelId, inturnRelayer *
 			return nil
 		}
 	} else {
-		endSeq, err := a.greenfieldExecutor.GetNextSendSequenceForChannelWithRetry(channelId)
+		endSeq, err := a.greenfieldExecutor.GetNextSendSequenceForChannelWithRetry(a.getDestChainId(), channelId)
 		if err != nil {
 			return err
 		}
@@ -233,10 +234,14 @@ func (a *GreenfieldAssembler) getMonitorChannels() []uint8 {
 
 func (a *GreenfieldAssembler) updateMetrics(channelId types.ChannelId, nextDeliverySeq uint64) error {
 	a.metricService.SetNextReceiveSequenceForChannel(uint8(channelId), nextDeliverySeq)
-	nextSendSeq, err := a.greenfieldExecutor.GetNextSendSequenceForChannelWithRetry(channelId)
+	nextSendSeq, err := a.greenfieldExecutor.GetNextSendSequenceForChannelWithRetry(a.getDestChainId(), channelId)
 	if err != nil {
 		return err
 	}
 	a.metricService.SetNextSendSequenceForChannel(uint8(channelId), nextSendSeq)
 	return nil
 }
+
+func (a *GreenfieldAssembler) getDestChainId() sdk.ChainID {
+	return sdk.ChainID(a.config.BSCConfig.ChainId)
+}

executor/bsc_executor.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"math/big"
 	"sync"
 	"time"
@@ -326,9 +327,9 @@ func (e *BSCExecutor) getNextSendOracleSequence() (sequence uint64, err error) {
 }
 
 // GetNextDeliveryOracleSequenceWithRetry gets the next delivery Oracle sequence from Greenfield
-func (e *BSCExecutor) GetNextDeliveryOracleSequenceWithRetry() (sequence uint64, err error) {
+func (e *BSCExecutor) GetNextDeliveryOracleSequenceWithRetry(chainId sdk.ChainID) (sequence uint64, err error) {
 	return sequence, retry.Do(func() error {
-		sequence, err = e.getNextDeliveryOracleSequence()
+		sequence, err = e.getNextDeliveryOracleSequence(chainId)
 		return err
 	}, relayercommon.RtyAttem,
 		relayercommon.RtyDelay,
@@ -338,8 +339,8 @@ func (e *BSCExecutor) GetNextDeliveryOracleSequenceWithRetry() (sequence uint64,
 		}))
 }
 
-func (e *BSCExecutor) getNextDeliveryOracleSequence() (uint64, error) {
-	sequence, err := e.GreenfieldExecutor.GetNextReceiveOracleSequence()
+func (e *BSCExecutor) getNextDeliveryOracleSequence(chainId sdk.ChainID) (uint64, error) {
+	sequence, err := e.GreenfieldExecutor.GetNextReceiveOracleSequence(chainId)
 	if err != nil {
 		return 0, err
 	}

executor/greenfield_executor.go

@@ -182,9 +182,9 @@ func (e *GreenfieldExecutor) getNextDeliverySequenceForChannel(channelID types.C
 }
 
 // GetNextSendSequenceForChannelWithRetry gets the next send sequence of a specified channel from Greenfield
-func (e *GreenfieldExecutor) GetNextSendSequenceForChannelWithRetry(channelID types.ChannelId) (sequence uint64, err error) {
+func (e *GreenfieldExecutor) GetNextSendSequenceForChannelWithRetry(destChainID sdk.ChainID, channelID types.ChannelId) (sequence uint64, err error) {
 	return sequence, retry.Do(func() error {
-		sequence, err = e.getNextSendSequenceForChannel(channelID)
+		sequence, err = e.getNextSendSequenceForChannel(destChainID, channelID)
 		return err
 	}, relayercommon.RtyAttem,
 		relayercommon.RtyDelay,
@@ -194,31 +194,34 @@ func (e *GreenfieldExecutor) GetNextSendSequenceForChannelWithRetry(channelID ty
 		}))
 }
 
-func (e *GreenfieldExecutor) getNextSendSequenceForChannel(channelId types.ChannelId) (uint64, error) {
+func (e *GreenfieldExecutor) getNextSendSequenceForChannel(destChainId sdk.ChainID, channelId types.ChannelId) (uint64, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), RPCTimeout)
 	defer cancel()
 	return e.GetGnfdClient().GetChannelSendSequence(
 		ctx,
+		destChainId,
 		uint32(channelId),
 	)
 }
 
 // GetNextReceiveOracleSequence gets the next receive Oracle sequence from Greenfield
-func (e *GreenfieldExecutor) GetNextReceiveOracleSequence() (uint64, error) {
+func (e *GreenfieldExecutor) GetNextReceiveOracleSequence(destChainId sdk.ChainID) (uint64, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), RPCTimeout)
 	defer cancel()
 	return e.GetGnfdClient().GetChannelReceiveSequence(
 		ctx,
+		destChainId,
 		uint32(relayercommon.OracleChannelId),
 	)
 }
 
 // GetNextReceiveSequenceForChannel gets the sequence specifically for bsc -> gnfd package's channel from Greenfield
-func (e *GreenfieldExecutor) GetNextReceiveSequenceForChannel(channelId types.ChannelId) (uint64, error) {
+func (e *GreenfieldExecutor) GetNextReceiveSequenceForChannel(destChainId sdk.ChainID, channelId types.ChannelId) (uint64, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), RPCTimeout)
 	defer cancel()
 	return e.GetGnfdClient().GetChannelReceiveSequence(
 		ctx,
+		destChainId,
 		uint32(channelId),
 	)
 }

executor/greenfield_executor_test.go

@@ -3,6 +3,7 @@ package executor
 import (
 	"context"
 	"encoding/hex"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"testing"
 
 	cbfttypes "github.com/cometbft/cometbft/types"
@@ -24,14 +25,14 @@ func TestGetLatestBlockHeightWithRetry(t *testing.T) {
 
 func TestGetNextReceiveOracleSequence(t *testing.T) {
 	e := GnfdExecutor()
-	oracleSeq, err := e.GetNextReceiveOracleSequence()
+	oracleSeq, err := e.GetNextReceiveOracleSequence(sdk.ChainID(e.config.BSCConfig.ChainId))
 	require.NoError(t, err)
 	t.Log(oracleSeq)
 }
 
 func TestGetNextSendSequenceForChannel(t *testing.T) {
 	e := GnfdExecutor()
-	sendSeq, err := e.GetNextSendSequenceForChannelWithRetry(1)
+	sendSeq, err := e.GetNextSendSequenceForChannelWithRetry(sdk.ChainID(e.config.BSCConfig.ChainId), 1)
 	require.NoError(t, err)
 	t.Log(sendSeq)
 }

go.mod

@@ -6,9 +6,9 @@ require (
 	cosmossdk.io/errors v1.0.0-beta.7
 	github.com/avast/retry-go/v4 v4.3.1
 	github.com/aws/aws-sdk-go v1.40.45
-	github.com/bnb-chain/greenfield v0.2.4-alpha.1
-	github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.1
-	github.com/cometbft/cometbft v0.37.1
+	github.com/bnb-chain/greenfield v0.2.4-alpha.2
+	github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.2
+	github.com/cometbft/cometbft v0.37.2
 	github.com/cosmos/cosmos-sdk v0.47.3
 	github.com/ethereum/go-ethereum v1.11.3
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
@@ -172,14 +172,13 @@ require (
 )
 
 replace (
-	cosmossdk.io/api => github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9
-	cosmossdk.io/math => github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230425074444-eb5869b05fe9
-	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v0.0.2
+	cosmossdk.io/api => github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210
+	cosmossdk.io/math => github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210
+	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v0.0.3-alpha.1
 	github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
 	github.com/consensys/gnark-crypto => github.com/consensys/gnark-crypto v0.7.0
-	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.1
-	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1-alpha.1
+	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.2
+	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
-
 )

go.sum

@@ -158,24 +158,24 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
-github.com/bnb-chain/greenfield v0.2.4-alpha.1 h1:ZiIHVLPWodpwkX7bid7E3lYtYDpYeTlrBOPHbwfeFOA=
-github.com/bnb-chain/greenfield v0.2.4-alpha.1/go.mod h1:L0xqATrpTBtFgGc2o3hLsRoa6wG86bke+KIrgUcieUY=
-github.com/bnb-chain/greenfield-cometbft v0.0.2 h1:bRamS8Lq1lA3ttRLZBha22uiNG5tqN+diD3hapdUCYI=
-github.com/bnb-chain/greenfield-cometbft v0.0.2/go.mod h1:EBmwmUdaNbGPyGjf1cMuoN3pAeM2tQu7Lfg95813EAw=
+github.com/bnb-chain/greenfield v0.2.4-alpha.2 h1:l/GkTKN3M6TnxC3Ak9Tm8Yd/6qW9bxSMc+/pUGvLgTU=
+github.com/bnb-chain/greenfield v0.2.4-alpha.2/go.mod h1:rqUmxfdTvIwqa56H9QASdKQ7zrytbEY3zLMQAl2FMiU=
+github.com/bnb-chain/greenfield-cometbft v0.0.3-alpha.1 h1:nCLXxYdkDIh5bQMxtb14TBwiut/xq2e0DqPVTLy9vtI=
+github.com/bnb-chain/greenfield-cometbft v0.0.3-alpha.1/go.mod h1:3nGT4Z9fHwgRlBY/rofn0rSarnIcNbuhz/eq0XlLlkg=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI=
 github.com/bnb-chain/greenfield-common/go v0.0.0-20230809025353-fd0519705054 h1:74pdUdHjo9QNgjSifIgzbDcloqFJ2I+qo715tOXy/oM=
 github.com/bnb-chain/greenfield-common/go v0.0.0-20230809025353-fd0519705054/go.mod h1:GEjCahULmz99qx5k8WGWa7cTXIUjoNMNW+J92I+kTWg=
-github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.1 h1:SpkwHzAjIllIQG8av7MybFjJ8mhW1ZZ+P9JqJIsENxI=
-github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.1/go.mod h1:vyZi5fr4gZBVbhV/TLxbm6T8vylHXbfqQmDCUCUPPfo=
-github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9 h1:6fLpmmI0EZvDTfPvI0zy5dBaaTUboHnEkoC5/p/w8TQ=
-github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230425074444-eb5869b05fe9/go.mod h1:rbc4o84RSEvhf09o2+4Qiazsv0snRJLiEZdk17HeIDw=
-github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230425074444-eb5869b05fe9 h1:1ZdK+iR1Up02bOa2YTZCml7PBpP//kcdamOcK6aWO/s=
-github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230425074444-eb5869b05fe9/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k=
-github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.1 h1:ZR4RZC46W9Izf3hRLkmc3X6EXt41fcJxSJWTV7OKt90=
-github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.1/go.mod h1:sDg+JXw9BA3PYaK2anb7pFAp+/ltbuBWWOjzsUofRNQ=
-github.com/bnb-chain/greenfield-iavl v0.20.1-alpha.1 h1:ZnIcvkkQVurg0OaAwmUGn2cK5bZbffjVChFyhh86HMk=
-github.com/bnb-chain/greenfield-iavl v0.20.1-alpha.1/go.mod h1:oLksTs8dfh7DYIKBro7hbRQ+ewls7ghJ27pIXlbEXyI=
+github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.2 h1:mCojTDXd//s34SiHqRolG7saZSG9YHQ9WzPFF8rL4Zo=
+github.com/bnb-chain/greenfield-cosmos-sdk v0.2.4-alpha.2/go.mod h1:2jk2ijERIAv8wxQ/IJSmzQKazCnR6YGvICk4O1YrT9M=
+github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8=
+github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM=
+github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s=
+github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM=
+github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.2 h1:lxrcKghW/Qz8mRvLti5R6/VGTpl4O8hd+xhtnr5EL58=
+github.com/bnb-chain/greenfield-go-sdk v0.2.4-alpha.2/go.mod h1:PO+JKqXkzk2hjC8UDVFExGkscCwmOdAIzNTnQiGrUBU=
+github.com/bnb-chain/greenfield-iavl v0.20.1 h1:y3L64GU99otNp27/xLVBTDbv4eroR6CzoYz0rbaVotM=
+github.com/bnb-chain/greenfield-iavl v0.20.1/go.mod h1:oLksTs8dfh7DYIKBro7hbRQ+ewls7ghJ27pIXlbEXyI=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=

listener/bsc_listener.go

@@ -3,6 +3,7 @@ package listener
 import (
 	"context"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"strings"
 	"time"
 
@@ -20,7 +21,6 @@ import (
 	"github.com/bnb-chain/greenfield-relayer/executor"
 	"github.com/bnb-chain/greenfield-relayer/logging"
 	"github.com/bnb-chain/greenfield-relayer/metric"
-	rtypes "github.com/bnb-chain/greenfield-relayer/types"
 )
 
 type BSCListener struct {
@@ -110,8 +110,8 @@ func (l *BSCListener) monitorCrossChainPkgAt(nextHeight uint64) error {
 		logging.Logger.Infof("get log: %d, %s, %s", log.BlockNumber, log.Topics[0].String(), log.TxHash.String())
 		relayPkg, err := ParseRelayPackage(&l.crossChainAbi,
 			&log, nextHeightBlockHeader.Time,
-			rtypes.ChainId(l.config.GreenfieldConfig.ChainId),
-			rtypes.ChainId(l.config.BSCConfig.ChainId),
+			sdk.ChainID(l.config.GreenfieldConfig.ChainId),
+			sdk.ChainID(l.config.BSCConfig.ChainId),
 			&l.config.RelayConfig,
 		)
 		if err != nil {

listener/event_parser.go

@@ -3,6 +3,7 @@ package listener
 import (
 	"encoding/hex"
 	"fmt"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
@@ -14,12 +15,12 @@ import (
 	rtypes "github.com/bnb-chain/greenfield-relayer/types"
 )
 
-func ParseRelayPackage(abi *abi.ABI, log *types.Log, timestamp uint64, greenfieldChainId, bscChainId rtypes.ChainId, config *config.RelayConfig) (*model.BscRelayPackage, error) {
+func ParseRelayPackage(abi *abi.ABI, log *types.Log, timestamp uint64, greenfieldChainId, bscChainId sdk.ChainID, config *config.RelayConfig) (*model.BscRelayPackage, error) {
 	ev, err := parseCrossChainPackageEvent(abi, log, config)
 	if err != nil {
 		return nil, err
 	}
-	if rtypes.ChainId(ev.SrcChainId) != bscChainId || rtypes.ChainId(ev.DstChainId) != greenfieldChainId {
+	if sdk.ChainID(ev.SrcChainId) != bscChainId || sdk.ChainID(ev.DstChainId) != greenfieldChainId {
 		return nil, fmt.Errorf("event log's chain id(s) not expected, SrcChainId=%d, DstChainId=%d", ev.SrcChainId, ev.DstChainId)
 	}
 	var p model.BscRelayPackage

vote/bsc_vote_processor.go

@@ -353,7 +353,7 @@ func (p *BSCVoteProcessor) isVotePubKeyValid(v *votepool.Vote, validators []*tmt
 }
 
 func (p *BSCVoteProcessor) isOracleSequenceFilled(seq uint64) (bool, error) {
-	nextDeliverySeqOnGreenfield, err := p.bscExecutor.GetNextDeliveryOracleSequenceWithRetry()
+	nextDeliverySeqOnGreenfield, err := p.bscExecutor.GetNextDeliveryOracleSequenceWithRetry(p.getChainId())
 	if err != nil {
 		return false, err
 	}
@@ -367,3 +367,7 @@ func (p *BSCVoteProcessor) reBroadcastVote(localVote *model.Vote) error {
 	}
 	return p.bscExecutor.GreenfieldExecutor.BroadcastVote(v)
 }
+
+func (p *BSCVoteProcessor) getChainId() sdk.ChainID {
+	return sdk.ChainID(p.config.BSCConfig.ChainId)
+}