feat: fix account sequence mismatch

cmd/doracled/cmd/start.go

@@ -6,6 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/medibloc/panacea-doracle/event"
 	datadealevent "github.com/medibloc/panacea-doracle/event/datadeal"
 	oracleevent "github.com/medibloc/panacea-doracle/event/oracle"
 	"github.com/medibloc/panacea-doracle/service"
@@ -29,11 +30,16 @@ func startCmd() *cobra.Command {
 			}
 			defer svc.Close()
 
-			err = svc.StartSubscriptions(
+			voteEvents := []event.Event{
 				oracleevent.NewRegisterOracleEvent(svc),
 				oracleevent.NewUpgradeOracleEvent(svc),
 				datadealevent.NewDataVerificationEvent(svc),
 				datadealevent.NewDataDeliveryVoteEvent(svc),
+			}
+			upgradedOracleEvent := oracleevent.NewUpgradedOracleEvent(svc, voteEvents)
+
+			err = svc.StartSubscriptions(
+				append(voteEvents, upgradedOracleEvent)...,
 			)
 			if err != nil {
 				return fmt.Errorf("failed to start event subscription: %w", err)

event/datadeal/data_delivery_event.go

@@ -18,18 +18,36 @@ import (
 
 type DataDeliveryVoteEvent struct {
 	reactor event.Reactor
+	enable  bool
 }
 
-func NewDataDeliveryVoteEvent(s event.Reactor) DataDeliveryVoteEvent {
-	return DataDeliveryVoteEvent{s}
+func NewDataDeliveryVoteEvent(r event.Reactor) *DataDeliveryVoteEvent {
+	return &DataDeliveryVoteEvent{
+		reactor: r,
+	}
 }
 
-func (e DataDeliveryVoteEvent) GetEventQuery() string {
+func (e *DataDeliveryVoteEvent) Prepare() error {
+	return nil
+}
+
+func (e *DataDeliveryVoteEvent) GetEventName() string {
+	return "DataDeliveryVoteEvent"
+}
+
+func (e *DataDeliveryVoteEvent) GetEventQuery() string {
 	return "tm.event='NewBlock' AND data_delivery.vote_status='started'"
 }
 
-func (e DataDeliveryVoteEvent) EventHandler(event ctypes.ResultEvent) error {
+func (e *DataDeliveryVoteEvent) SetEnable(enable bool) {
+	e.enable = enable
+}
+
+func (e *DataDeliveryVoteEvent) Enabled() bool {
+	return e.enable
+}
 
+func (e *DataDeliveryVoteEvent) EventHandler(event ctypes.ResultEvent) error {
 	dealIDStr := event.Events[datadealtypes.EventTypeDataDeliveryVote+"."+datadealtypes.AttributeKeyDealID][0]
 	dataHash := event.Events[datadealtypes.EventTypeDataDeliveryVote+"."+datadealtypes.AttributeKeyDataHash][0]
 
@@ -81,7 +99,7 @@ func (e DataDeliveryVoteEvent) EventHandler(event ctypes.ResultEvent) error {
 
 }
 
-func (e DataDeliveryVoteEvent) verifyAndGetVoteOption(dealID uint64, dataHash string) (oracletypes.VoteOption, string, error) {
+func (e *DataDeliveryVoteEvent) verifyAndGetVoteOption(dealID uint64, dataHash string) (oracletypes.VoteOption, string, error) {
 
 	dataSale, err := e.reactor.QueryClient().GetDataSale(dataHash, dealID)
 	if err != nil {
@@ -110,7 +128,7 @@ func (e DataDeliveryVoteEvent) verifyAndGetVoteOption(dealID uint64, dataHash st
 
 }
 
-func (e DataDeliveryVoteEvent) convertBuyerDataAndAddToIpfs(deal *datadealtypes.Deal, dataSale *datadealtypes.DataSale, oraclePrivKey *btcec.PrivateKey) (string, error) {
+func (e *DataDeliveryVoteEvent) convertBuyerDataAndAddToIpfs(deal *datadealtypes.Deal, dataSale *datadealtypes.DataSale, oraclePrivKey *btcec.PrivateKey) (string, error) {
 	// get encrypted data from ipfs
 	encryptedDataBz, err := e.reactor.Ipfs().Get(dataSale.VerifiableCid)
 	if err != nil {
@@ -164,7 +182,7 @@ func (e DataDeliveryVoteEvent) convertBuyerDataAndAddToIpfs(deal *datadealtypes.
 	return deliveredCid, nil
 }
 
-func (e DataDeliveryVoteEvent) makeDataDeliveryVote(voterAddress, dataHash, deliveredCid string, dealID uint64, voteOption oracletypes.VoteOption, oraclePrivKey []byte) (*datadealtypes.MsgVoteDataDelivery, error) {
+func (e *DataDeliveryVoteEvent) makeDataDeliveryVote(voterAddress, dataHash, deliveredCid string, dealID uint64, voteOption oracletypes.VoteOption, oraclePrivKey []byte) (*datadealtypes.MsgVoteDataDelivery, error) {
 
 	dataDeliveryVote := &datadealtypes.DataDeliveryVote{
 		VoterAddress: voterAddress,

event/datadeal/data_verification_event.go

@@ -23,17 +23,36 @@ var _ event.Event = (*DataVerificationEvent)(nil)
 
 type DataVerificationEvent struct {
 	reactor event.Reactor
+	enable  bool
 }
 
-func NewDataVerificationEvent(r event.Reactor) DataVerificationEvent {
-	return DataVerificationEvent{r}
+func NewDataVerificationEvent(r event.Reactor) *DataVerificationEvent {
+	return &DataVerificationEvent{
+		reactor: r,
+	}
+}
+
+func (d *DataVerificationEvent) Prepare() error {
+	return nil
+}
+
+func (d *DataVerificationEvent) GetEventName() string {
+	return "DataVerificationEvent"
+}
+
+func (d *DataVerificationEvent) SetEnable(enable bool) {
+	d.enable = enable
+}
+
+func (d *DataVerificationEvent) Enabled() bool {
+	return d.enable
 }
 
-func (e DataVerificationEvent) GetEventQuery() string {
+func (e *DataVerificationEvent) GetEventQuery() string {
 	return "message.action = 'SellData'"
 }
 
-func (e DataVerificationEvent) EventHandler(event ctypes.ResultEvent) error {
+func (e *DataVerificationEvent) EventHandler(event ctypes.ResultEvent) error {
 	dealIDStr := event.Events[datadealtypes.EventTypeDataVerificationVote+"."+datadealtypes.AttributeKeyDealID][0]
 	dataHash := event.Events[datadealtypes.EventTypeDataVerificationVote+"."+datadealtypes.AttributeKeyDataHash][0]
 
@@ -75,18 +94,18 @@ func (e DataVerificationEvent) EventHandler(event ctypes.ResultEvent) error {
 	return nil
 }
 
-func (e DataVerificationEvent) decryptData(decryptedSharedKey, nonce, encryptedDataBz []byte) ([]byte, error) {
+func (e *DataVerificationEvent) decryptData(decryptedSharedKey, nonce, encryptedDataBz []byte) ([]byte, error) {
 	return crypto.DecryptWithAES256(decryptedSharedKey, nonce, encryptedDataBz)
 }
 
-func (e DataVerificationEvent) compareDataHash(dataSale *datadealtypes.DataSale, decryptedData []byte) bool {
+func (e *DataVerificationEvent) compareDataHash(dataSale *datadealtypes.DataSale, decryptedData []byte) bool {
 	decryptedDataHash := sha256.Sum256(decryptedData)
 	decryptedDataHashStr := hex.EncodeToString(decryptedDataHash[:])
 
 	return decryptedDataHashStr == dataSale.DataHash
 }
 
-func (e DataVerificationEvent) convertSellerData(deal *datadealtypes.Deal, dataSale *datadealtypes.DataSale) ([]byte, error) {
+func (e *DataVerificationEvent) convertSellerData(deal *datadealtypes.Deal, dataSale *datadealtypes.DataSale) ([]byte, error) {
 	encryptedDataBz, err := e.reactor.Ipfs().Get(dataSale.VerifiableCid)
 	if err != nil {
 		log.Infof("failed to get data from IPFS: %v", err)
@@ -117,7 +136,7 @@ func (e DataVerificationEvent) convertSellerData(deal *datadealtypes.Deal, dataS
 	return decryptedData, nil
 }
 
-func (e DataVerificationEvent) verifyAndGetVoteOption(dealID uint64, dataHash string) (oracletypes.VoteOption, error) {
+func (e *DataVerificationEvent) verifyAndGetVoteOption(dealID uint64, dataHash string) (oracletypes.VoteOption, error) {
 	deal, err := e.reactor.QueryClient().GetDeal(dealID)
 	if err != nil {
 		return oracletypes.VOTE_OPTION_NO, fmt.Errorf("failed to get deal. %v", err)

event/event.go

@@ -5,6 +5,15 @@ import (
 )
 
 type Event interface {
+	Prepare() error
+
+	GetEventName() string
+
 	GetEventQuery() string
-	EventHandler(event ctypes.ResultEvent) error
+
+	SetEnable(bool)
+
+	Enabled() bool
+
+	EventHandler(ctypes.ResultEvent) error
 }

event/oracle/register_oracle_event.go

@@ -16,17 +16,36 @@ var _ event.Event = (*RegisterOracleEvent)(nil)
 
 type RegisterOracleEvent struct {
 	reactor event.Reactor
+	enable  bool
 }
 
-func NewRegisterOracleEvent(s event.Reactor) RegisterOracleEvent {
-	return RegisterOracleEvent{s}
+func NewRegisterOracleEvent(r event.Reactor) *RegisterOracleEvent {
+	return &RegisterOracleEvent{
+		reactor: r,
+	}
+}
+
+func (e *RegisterOracleEvent) Prepare() error {
+	return nil
+}
+
+func (e *RegisterOracleEvent) GetEventName() string {
+	return "RegisterOracleEvent"
 }
 
-func (e RegisterOracleEvent) GetEventQuery() string {
+func (e *RegisterOracleEvent) GetEventQuery() string {
 	return "message.action = 'RegisterOracle'"
 }
 
-func (e RegisterOracleEvent) EventHandler(event ctypes.ResultEvent) error {
+func (e *RegisterOracleEvent) SetEnable(enable bool) {
+	e.enable = enable
+}
+
+func (e *RegisterOracleEvent) Enabled() bool {
+	return e.enable
+}
+
+func (e *RegisterOracleEvent) EventHandler(event ctypes.ResultEvent) error {
 	uniqueID := event.Events[oracletypes.EventTypeRegistrationVote+"."+oracletypes.AttributeKeyUniqueID][0]
 	votingTargetAddress := event.Events[oracletypes.EventTypeRegistrationVote+"."+oracletypes.AttributeKeyOracleAddress][0]
 
@@ -58,7 +77,9 @@ func (e RegisterOracleEvent) EventHandler(event ctypes.ResultEvent) error {
 	return nil
 }
 
-func (e RegisterOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, votingTargetAddress string) (*oracletypes.MsgVoteOracleRegistration, error) {
+func (e *RegisterOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, votingTargetAddress string) (*oracletypes.MsgVoteOracleRegistration, error) {
+	log.Infof("verifing oracleRegistration. uniqueID(%s), votingTargetAddress(%s)", uniqueID, votingTargetAddress)
+
 	queryClient := e.reactor.QueryClient()
 	voterAddress := e.reactor.OracleAcc().GetAddress()
 	oraclePrivKeyBz := e.reactor.OraclePrivKey().Serialize()
@@ -91,6 +112,8 @@ func (e RegisterOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, vot
 		voteOption, err := e.verifyAndGetVoteOption(oracleRegistration)
 		if err != nil {
 			log.Infof("vote No due to error while verify: %v", err)
+		} else {
+			log.Infof("verification success. uniqueID(%s), votingTargetAddress(%s)", uniqueID, votingTargetAddress)
 		}
 
 		return makeMsgVoteOracleRegistration(
@@ -109,7 +132,7 @@ func (e RegisterOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, vot
 // verifyAndGetVoteOption performs a verification to determine a vote.
 // - Verify that trustedBlockInfo registered in OracleRegistration is valid
 // - Verify that the RemoteReport is valid
-func (e RegisterOracleEvent) verifyAndGetVoteOption(oracleRegistration *oracletypes.OracleRegistration) (oracletypes.VoteOption, error) {
+func (e *RegisterOracleEvent) verifyAndGetVoteOption(oracleRegistration *oracletypes.OracleRegistration) (oracletypes.VoteOption, error) {
 	if err := verifyTrustedBlockInfo(e.reactor.QueryClient(), oracleRegistration.TrustedBlockHeight, oracleRegistration.TrustedBlockHash); err != nil {
 		return oracletypes.VOTE_OPTION_NO, err
 	}

event/oracle/register_oracle_event_test.go

@@ -16,13 +16,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var _ event.Reactor = (*service.TestServiceWithoutSGX)(nil)
+var _ event.Reactor = (*service.Service)(nil)
 
 type registerOracleEventTestSuite struct {
 	suite.TestSuite
 
 	chainID           string
 	validatorMnemonic string
+	uniqueID          string
 }
 
 func TestRegisterOracleEvent(t *testing.T) {
@@ -34,17 +35,20 @@ func TestRegisterOracleEvent(t *testing.T) {
 	require.NoError(t, err)
 	validatorMnemonic, err := bip39.NewMnemonic(entropy)
 	require.NoError(t, err)
+	uniqueID := "uniqueID"
 
 	suite.Run(t, &registerOracleEventTestSuite{
 		suite.NewTestSuite(
 			initScriptPath,
 			[]string{
 				fmt.Sprintf("CHAIN_ID=%s", chainID),
 				fmt.Sprintf("MNEMONIC=%s", validatorMnemonic),
+				fmt.Sprintf("UNIQUE_ID=%s", uniqueID),
 			},
 		),
 		chainID,
 		validatorMnemonic,
+		uniqueID,
 	})
 }
 

event/oracle/upgrade_oracle_event.go

@@ -18,19 +18,38 @@ import (
 
 type UpgradeOracleEvent struct {
 	reactor event.Reactor
+	enable  bool
 }
 
 var _ event.Event = (*UpgradeOracleEvent)(nil)
 
-func NewUpgradeOracleEvent(s event.Reactor) UpgradeOracleEvent {
-	return UpgradeOracleEvent{s}
+func NewUpgradeOracleEvent(r event.Reactor) *UpgradeOracleEvent {
+	return &UpgradeOracleEvent{
+		reactor: r,
+	}
+}
+
+func (e *UpgradeOracleEvent) Prepare() error {
+	return nil
+}
+
+func (e *UpgradeOracleEvent) GetEventName() string {
+	return "UpgradeOracleEvent"
 }
 
-func (e UpgradeOracleEvent) GetEventQuery() string {
+func (e *UpgradeOracleEvent) GetEventQuery() string {
 	return "message.action = 'OracleUpgrade'"
 }
 
-func (e UpgradeOracleEvent) EventHandler(event ctypes.ResultEvent) error {
+func (e *UpgradeOracleEvent) SetEnable(enable bool) {
+	e.enable = enable
+}
+
+func (e *UpgradeOracleEvent) Enabled() bool {
+	return e.enable
+}
+
+func (e *UpgradeOracleEvent) EventHandler(event ctypes.ResultEvent) error {
 	uniqueID := event.Events[oracletypes.EventTypeUpgradeVote+"."+oracletypes.AttributeKeyUniqueID][0]
 	votingTargetAddress := event.Events[oracletypes.EventTypeUpgradeVote+"."+oracletypes.AttributeKeyOracleAddress][0]
 
@@ -62,7 +81,7 @@ func (e UpgradeOracleEvent) EventHandler(event ctypes.ResultEvent) error {
 	return nil
 }
 
-func (e UpgradeOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, votingTargetAddress string) (*oracletypes.MsgVoteOracleRegistration, error) {
+func (e *UpgradeOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, votingTargetAddress string) (*oracletypes.MsgVoteOracleRegistration, error) {
 	queryClient := e.reactor.QueryClient()
 	voterAddress := e.reactor.OracleAcc().GetAddress()
 	oraclePrivKeyBz := e.reactor.OraclePrivKey().Serialize()
@@ -77,6 +96,8 @@ func (e UpgradeOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, voti
 	voteOption, err := e.verifyAndGetVoteOption(oracleRegistration)
 	if err != nil {
 		log.Infof("vote No due to error while verify: %v", err)
+	} else {
+		log.Infof("UpgradeOracle verification success. uniqueID(%s), votingTargetAddress(%s)", uniqueID, votingTargetAddress)
 	}
 
 	return makeMsgVoteOracleRegistration(
@@ -92,7 +113,7 @@ func (e UpgradeOracleEvent) verifyAndGetMsgVoteOracleRegistration(uniqueID, voti
 
 }
 
-func (e UpgradeOracleEvent) verifyAndGetVoteOption(oracleRegistration *oracletypes.OracleRegistration) (oracletypes.VoteOption, error) {
+func (e *UpgradeOracleEvent) verifyAndGetVoteOption(oracleRegistration *oracletypes.OracleRegistration) (oracletypes.VoteOption, error) {
 	queryClient := e.reactor.QueryClient()
 	upgradeInfo, err := queryClient.GetOracleUpgradeInfo()
 	if err != nil {
@@ -117,7 +138,7 @@ func (e UpgradeOracleEvent) verifyAndGetVoteOption(oracleRegistration *oracletyp
 
 }
 
-func (e UpgradeOracleEvent) verifyRemoteReport(oracleRegistration *oracletypes.OracleRegistration) error {
+func (e *UpgradeOracleEvent) verifyRemoteReport(oracleRegistration *oracletypes.OracleRegistration) error {
 	reportBz := oracleRegistration.NodePubKeyRemoteReport
 	expectedNodePubKeyHash := crypto.KDFSHA256(oracleRegistration.NodePubKey)
 	expectedUniqueID := oracleRegistration.UniqueId

event/oracle/upgrade_oracle_event_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var _ event.Reactor = (*service.TestServiceWithoutSGX)(nil)
+var _ event.Reactor = (*service.Service)(nil)
 
 type upgradeOracleEventTestSuite struct {
 	suite.TestSuite