fix: partly revert #15123

client/tx/factory.go

@@ -71,6 +71,9 @@ func NewFactoryCLI(clientCtx client.Context, flagSet *pflag.FlagSet) (Factory, e
 		if flagSet.Changed(flags.FlagAccountNumber) && flagSet.Changed(flags.FlagSequence) {
 			accNum, _ = flagSet.GetUint64(flags.FlagAccountNumber)
 			accSeq, _ = flagSet.GetUint64(flags.FlagSequence)
+			if accNum == 0 || accSeq == 0 {
+				return Factory{}, errors.New("account-number and sequence cannot be both zero when in offline mode")
+			}
 		} else {
 			return Factory{}, errors.New("account-number and sequence must be set in offline mode")
 		}
@@ -471,14 +474,19 @@ func (f Factory) Prepare(clientCtx client.Context) (Factory, error) {
 	}
 
 	initNum, initSeq := fc.accountNumber, fc.sequence
-	if initNum == 0 && initSeq == 0 {
+	if initNum == 0 || initSeq == 0 {
 		num, seq, err := fc.accountRetriever.GetAccountNumberSequence(clientCtx, from)
 		if err != nil {
 			return fc, err
 		}
 
-		fc = fc.WithAccountNumber(num)
-		fc = fc.WithSequence(seq)
+		if initNum == 0 {
+			fc = fc.WithAccountNumber(num)
+		}
+
+		if initSeq == 0 {
+			fc = fc.WithSequence(seq)
+		}
 	}
 
 	return fc, nil