Mf/add unjail validator txn type

lib/block_view.go

@@ -1373,6 +1373,10 @@ func (bav *UtxoView) DisconnectTransaction(currentTxn *MsgDeSoTxn, txnHash *Bloc
 	case TxnTypeUnlockStake:
 		return bav._disconnectUnlockStake(
 			OperationTypeUnlockStake, currentTxn, txnHash, utxoOpsForTxn, blockHeight)
+
+	case TxnTypeUnjailValidator:
+		return bav._disconnectUnjailValidator(
+			OperationTypeUnjailValidator, currentTxn, txnHash, utxoOpsForTxn, blockHeight)
 	}
 
 	return fmt.Errorf("DisconnectBlock: Unimplemented txn type %v", currentTxn.TxnMeta.GetTxnType().String())
@@ -3311,6 +3315,9 @@ func (bav *UtxoView) _connectTransaction(txn *MsgDeSoTxn, txHash *BlockHash,
 	case TxnTypeUnlockStake:
 		totalInput, totalOutput, utxoOpsForTxn, err = bav._connectUnlockStake(txn, txHash, blockHeight, verifySignatures)
 
+	case TxnTypeUnjailValidator:
+		totalInput, totalOutput, utxoOpsForTxn, err = bav._connectUnjailValidator(txn, txHash, blockHeight, verifySignatures)
+
 	default:
 		err = fmt.Errorf("ConnectTransaction: Unimplemented txn type %v", txn.TxnMeta.GetTxnType().String())
 	}

lib/block_view_stake_test.go

@@ -12,7 +12,6 @@ import (
 func TestStaking(t *testing.T) {
 	_testStaking(t, false)
 	_testStaking(t, true)
-	_testStakingWithDerivedKey(t)
 }
 
 func _testStaking(t *testing.T, flushToDB bool) {
@@ -103,9 +102,7 @@ func _testStaking(t *testing.T, flushToDB bool) {
 		registerAsValidatorMetadata := &RegisterAsValidatorMetadata{
 			Domains: [][]byte{[]byte("https://example.com")},
 		}
-		_, _, _, err = _submitRegisterAsValidatorTxn(
-			testMeta, m0Pub, m0Priv, registerAsValidatorMetadata, nil, flushToDB,
-		)
+		_, err = _submitRegisterAsValidatorTxn(testMeta, m0Pub, m0Priv, registerAsValidatorMetadata, nil, flushToDB)
 		require.NoError(t, err)
 
 		validatorEntry, err := utxoView().GetValidatorByPKID(m0PKID)
@@ -755,7 +752,7 @@ func _submitUnlockStakeTxn(
 	return fees, nil
 }
 
-func _testStakingWithDerivedKey(t *testing.T) {
+func TestStakingWithDerivedKey(t *testing.T) {
 	var derivedKeyPriv string
 	var err error
 
@@ -957,19 +954,15 @@ func _testStakingWithDerivedKey(t *testing.T) {
 		registerAsValidatorMetadata := &RegisterAsValidatorMetadata{
 			Domains: [][]byte{[]byte("https://example1.com")},
 		}
-		_, _, _, err = _submitRegisterAsValidatorTxn(
-			testMeta, m0Pub, m0Priv, registerAsValidatorMetadata, nil, true,
-		)
+		_, err = _submitRegisterAsValidatorTxn(testMeta, m0Pub, m0Priv, registerAsValidatorMetadata, nil, true)
 		require.NoError(t, err)
 	}
 	{
 		// m1 registers as a validator.
 		registerAsValidatorMetadata := &RegisterAsValidatorMetadata{
 			Domains: [][]byte{[]byte("https://example2.com")},
 		}
-		_, _, _, err = _submitRegisterAsValidatorTxn(
-			testMeta, m1Pub, m1Priv, registerAsValidatorMetadata, nil, true,
-		)
+		_, err = _submitRegisterAsValidatorTxn(testMeta, m1Pub, m1Priv, registerAsValidatorMetadata, nil, true)
 		require.NoError(t, err)
 	}
 	{
@@ -1783,7 +1776,6 @@ func TestStakeLockupEpochDuration(t *testing.T) {
 	chain.snapshot = nil
 
 	// For these tests, we set StakeLockupEpochDuration to 3.
-	// We test the lockup logic in a separate test.
 	params.StakeLockupEpochDuration = 3
 
 	// Mine a few blocks to give the senderPkString some money.
@@ -1843,7 +1835,7 @@ func TestStakeLockupEpochDuration(t *testing.T) {
 		registerMetadata := &RegisterAsValidatorMetadata{
 			Domains: [][]byte{[]byte("https://m1.com")},
 		}
-		_, _, _, err = _submitRegisterAsValidatorTxn(testMeta, m0Pub, m0Priv, registerMetadata, nil, true)
+		_, err = _submitRegisterAsValidatorTxn(testMeta, m0Pub, m0Priv, registerMetadata, nil, true)
 		require.NoError(t, err)
 
 		validatorEntry, err := newUtxoView().GetValidatorByPKID(m0PKID)

lib/block_view_types.go

@@ -156,9 +156,10 @@ const (
 	EncoderTypeStakeTxindexMetadata                 EncoderType = 1000032
 	EncoderTypeUnstakeTxindexMetadata               EncoderType = 1000033
 	EncoderTypeUnlockStakeTxindexMetadata           EncoderType = 1000034
+	EncoderTypeUnjailValidatorTxindexMetadata       EncoderType = 1000035
 
 	// EncoderTypeEndTxIndex encoder type should be at the end and is used for automated tests.
-	EncoderTypeEndTxIndex EncoderType = 1000035
+	EncoderTypeEndTxIndex EncoderType = 1000036
 )
 
 // This function translates the EncoderType into an empty DeSoEncoder struct.
@@ -327,6 +328,8 @@ func (encoderType EncoderType) New() DeSoEncoder {
 		return &UnstakeTxindexMetadata{}
 	case EncoderTypeUnlockStakeTxindexMetadata:
 		return &UnlockStakeTxindexMetadata{}
+	case EncoderTypeUnjailValidatorTxindexMetadata:
+		return &UnjailValidatorTxindexMetadata{}
 	default:
 		return nil
 	}
@@ -626,8 +629,9 @@ const (
 	OperationTypeStake                        OperationType = 41
 	OperationTypeUnstake                      OperationType = 42
 	OperationTypeUnlockStake                  OperationType = 43
+	OperationTypeUnjailValidator              OperationType = 44
 
-	// NEXT_TAG = 44
+	// NEXT_TAG = 45
 )
 
 func (op OperationType) String() string {
@@ -718,6 +722,8 @@ func (op OperationType) String() string {
 		return "OperationTypeUnstake"
 	case OperationTypeUnlockStake:
 		return "OperationTypeUnlockStake"
+	case OperationTypeUnjailValidator:
+		return "OperationTypeUnjailValidator"
 	}
 	return "OperationTypeUNKNOWN"
 }