Remove modifications that has been added in separate PR block-core#348

turcol · Aug 17, 2021 · e1bd296 · e1bd296
1 parent 9248e77
commit e1bd296
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 23 deletions.
diff --git a/src/Features/Blockcore.Features.Wallet/Api/Controllers/WalletController.cs b/src/Features/Blockcore.Features.Wallet/Api/Controllers/WalletController.cs
@@ -699,18 +699,13 @@ public IActionResult BuildTransaction([FromBody] BuildTransactionRequest request
                     }
                 }
 
-                var (opReturnRawData, isValid) = request.OpReturnDataIsHex ? TryGetHexValue(request.OpReturnData) : (null, true);
-                if (!isValid)
-                    return ErrorHelpers.BuildErrorResponse(HttpStatusCode.BadRequest, "Hex OpReturn error.", "The OpReturnData is set as a hex value and could not be decoded");
-
                 var context = new TransactionBuildContext(this.network)
                 {
                     AccountReference = new WalletAccountReference(request.WalletName, request.AccountName),
                     TransactionFee = string.IsNullOrEmpty(request.FeeAmount) ? null : Money.Parse(request.FeeAmount),
                     MinConfirmations = request.AllowUnconfirmed ? 0 : 1,
                     Shuffle = request.ShuffleOutputs ?? true, // We shuffle transaction outputs by default as it's better for anonymity.
                     OpReturnData = request.OpReturnData,
-                    OpReturnRawData = opReturnRawData,
                     OpReturnAmount = string.IsNullOrEmpty(request.OpReturnAmount) ? null : Money.Parse(request.OpReturnAmount),
                     WalletPassword = request.Password,
                     SelectedInputs = request.Outpoints?.Select(u => new OutPoint(uint256.Parse(u.TransactionId), u.Index)).ToList(),
@@ -1607,18 +1602,6 @@ private void SyncFromBestHeightForRecoveredWallets(DateTime walletCreationDate)
             {
                 this.walletSyncManager.SyncFromHeight(blockHeightToSyncFrom);
             }
-        }
-
-        private (byte[], bool) TryGetHexValue(string hexString)
-        {
-            try
-            {
-                return (Encoders.Hex.DecodeData(hexString), true);
-            }
-            catch
-            {
-                return (null, false);
-            }
-        }        
+        }      
     }
 }
diff --git a/src/Features/Blockcore.Features.Wallet/Api/Models/RequestModels.cs b/src/Features/Blockcore.Features.Wallet/Api/Models/RequestModels.cs
@@ -328,11 +328,6 @@ public TxFeeEstimateRequest()
         /// </summary>       
         public string OpReturnData { get; set; }
 
-        /// <summary>
-        /// Sets if the OpReturnData is a hex value and must be decoded
-        /// </summary>
-        public bool OpReturnDataIsHex { get; set; }
-
         /// <summary>
         /// The funds in STRAT (or a sidechain coin) to include with the OP_RETURN output. Currently, specifying
         /// some funds helps OP_RETURN outputs be relayed around the network.