Remove old name OP code in script and wallet

oodumus · oodumus · commit 354db077ccbc · 2018-04-10T03:12:40.000-05:00
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
@@ -101,9 +101,7 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP
     switch (whichTypeRet)
     {
     case TX_NONSTANDARD:
-    case TX_NULL_DATA:
-    case TX_NAME:
-        return false;
+    case TX_NULL_DATA:;
     case TX_PUBKEY:
         keyID = CPubKey(vSolutions[0]).GetID();
         return Sign1(keyID, creator, scriptPubKey, scriptSigRet);
@@ -245,11 +243,6 @@ static CScript CombineSignatures(const CScript& scriptPubKey, const BaseSignatur
     {
     case TX_NONSTANDARD:
     case TX_NULL_DATA:
-    case TX_NAME:
-        // Don't know anything about this, assume bigger one is correct:
-        if (sigs1.size() >= sigs2.size())
-            return PushAll(sigs1);
-        return PushAll(sigs2);
     case TX_PUBKEY:
     case TX_PUBKEYHASH:
         // Signatures are bigger than placeholders or empty scripts:
@@ -361,8 +354,6 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash
     {
     case TX_NONSTANDARD:
     case TX_NULL_DATA:
-    case TX_NAME:
-        return false;
     case TX_PUBKEY:
         keyID = CPubKey(vSolutions[0]).GetID();
         return Sign1(keyID, keystore, hash, nHashType, scriptSigRet);
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
@@ -29,7 +29,6 @@ const char* GetTxnOutputType(txnouttype t)
     case TX_SCRIPTHASH: return "scripthash";
     case TX_MULTISIG: return "multisig";
     case TX_NULL_DATA: return "nulldata";
-    case TX_NAME: return "name";
     }
     return NULL;
 }
diff --git a/src/script/standard.h b/src/script/standard.h
@@ -50,8 +50,7 @@ enum txnouttype
     TX_PUBKEYHASH,
     TX_SCRIPTHASH,
     TX_MULTISIG,
-    TX_NULL_DATA,
-    TX_NAME, //DDNS
+    TX_NULL_DATA
 };
 
 class CNoDestination {
diff --git a/src/wallet/wallet_ismine.cpp b/src/wallet/wallet_ismine.cpp
@@ -62,7 +62,6 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
             return ISMINE_SPENDABLE;
         break;
     case TX_SCRIPTHASH:
-    case TX_NAME:
     {
         CScriptID scriptID = CScriptID(uint160(vSolutions[0]));
         CScript subscript;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ const char* GetTxnOutputType(txnouttype t)`
`29`	`29`	`case TX_SCRIPTHASH: return "scripthash";`
`30`	`30`	`case TX_MULTISIG: return "multisig";`
`31`	`31`	`case TX_NULL_DATA: return "nulldata";`
`32`		`- case TX_NAME: return "name";`
`33`	`32`	`}`
`34`	`33`	`return NULL;`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)`
`62`	`62`	`return ISMINE_SPENDABLE;`
`63`	`63`	`break;`
`64`	`64`	`case TX_SCRIPTHASH:`
`65`		`- case TX_NAME:`
`66`	`65`	`{`
`67`	`66`	`CScriptID scriptID = CScriptID(uint160(vSolutions[0]));`
`68`	`67`	`CScript subscript;`