Optimizations to script builder

O3/New Group/Clients/Wallet.swift

@@ -495,21 +495,7 @@ public class Wallet {
         let txid = self.unsignedPayloadToTransactionId(rawTransactionData)
         return (txid, finalPayload)
     }
-
-
-    private func buildNEP5TransferScript(scriptHash: String, decimals: Int, fromAddress: String,
-                                         toAddress: String, amount: Double) -> [UInt8] {
 
-        let amountToSend = Int(amount * pow(10, Double(decimals)))
-        let fromAddressHash = fromAddress.hashFromAddress()
-        let toAddressHash = toAddress.hashFromAddress()
-        let scriptBuilder = ScriptBuilder()
-        scriptBuilder.pushContractInvoke(scriptHash: scriptHash, operation: "transfer",
-                                         args: [amountToSend, toAddressHash, fromAddressHash])
-        let script = scriptBuilder.rawBytes
-        return [UInt8(script.count)] + script
-    }
-
     enum InvokeError: Error {
         case invokeFailed
     }

O3/New Group/Contracts/ScriptBuilder.swift

@@ -37,7 +37,7 @@ public class ScriptBuilder {
             rawBytes.append(rawValue)
         default:
             let intBytes = toByteArray(intValue)
-            pushData(intBytes.fullHexString)
+            pushHexString(intBytes.fullHexString)
         }
     }
 
@@ -61,14 +61,6 @@ public class ScriptBuilder {
         }
     }
 
-    private func pushArray(_ arrayValue: [Any?]) {
-        for elem in arrayValue {
-            pushData(elem)
-        }
-        pushInt(arrayValue.count)
-        pushOPCode(.PACK)
-    }
-
     private func pushTypedArray(_ arrayValue: [dAppProtocol.Arg?]) {
         for elem in arrayValue {
             pushTypedData(elem)
@@ -77,26 +69,6 @@ public class ScriptBuilder {
         pushOPCode(.PACK)
     }
 
-    public func resetScript() {
-        rawBytes.removeAll()
-    }
-
-    public func pushData(_ data: Any?) {
-        if let boolValue = data as? Bool {
-            pushBool(boolValue)
-        } else if let intValue = data as? Int {
-            pushInt(intValue)
-        } else if let stringValue = data as? String {
-            pushHexString(stringValue)
-        } else if let arrayValue = data as? [Any?] {
-            pushArray(arrayValue)
-        } else if data == nil {
-            pushBool(false)
-        } else {
-            fatalError("Unsupported Data Type Pushed on stack")
-        }
-    }
-
     public func pushTypedData(_ data: dAppProtocol.Arg?) {
         guard let unwrappedData = data else {
             pushBool(false)
@@ -121,45 +93,24 @@ public class ScriptBuilder {
         }
     }
 
-    public func pushContractInvoke(scriptHash: String, operation: String? = nil, args: Any? = nil, useTailCall: Bool = false) {
-        pushData(args)
-
-        if let operation = operation {
-            let hex = operation.unicodeScalars.filter { $0.isASCII }.map { String(format: "%X", $0.value) }.joined()
-            pushData(hex)
-        }
-        if scriptHash.count != 40 {
-            fatalError("Attempting to invoke invalid contract")
-        }
-        if useTailCall {
-            pushOPCode(.TAILCALL)
-        } else {
-            pushOPCode(.APPCALL)
-            let toAppendBytes = scriptHash.dataWithHexString().bytes.reversed()
-            rawBytes += toAppendBytes
-        }
-    }
-
-    public func pushTypedContractInvoke(scriptHash: String, operation: String? = nil, args: [dAppProtocol.Arg?], useTailCall: Bool = false) {
+    public func pushTypedContractInvoke(scriptHash: String, operation: String? = nil, args: [dAppProtocol.Arg?]) {
         if (!args.isEmpty) {
             pushTypedArray(args.reversed())
         } else {
             pushBool(false)
         }
-        
+
         if let operation = operation {
             let hex = operation.unicodeScalars.filter { $0.isASCII }.map { String(format: "%X", $0.value) }.joined()
-            pushData(hex)
+            pushHexString(hex)
         }
+
         if scriptHash.count != 40 {
             fatalError("Attempting to invoke invalid contract")
         }
-        if useTailCall {
-            pushOPCode(.TAILCALL)
-        } else {
-            pushOPCode(.APPCALL)
-            let toAppendBytes = scriptHash.dataWithHexString().bytes.reversed()
-            rawBytes += toAppendBytes
-        }
+
+        pushOPCode(.APPCALL)
+        let toAppendBytes = scriptHash.dataWithHexString().bytes.reversed()
+        rawBytes += toAppendBytes
     }
 }