diff --git a/Sources/SwiftyEOS/Contract/account/AccountUtil.swift b/Sources/SwiftyEOS/Contract/account/AccountUtil.swift index 14500e8..ff2044b 100644 --- a/Sources/SwiftyEOS/Contract/account/AccountUtil.swift +++ b/Sources/SwiftyEOS/Contract/account/AccountUtil.swift @@ -10,7 +10,7 @@ import Foundation @objcMembers class NewAccountParam: NSObject, Codable { var creator: String = "" - var name: String = "" + var newact: String = "" var owner: RequiredAuth? var active: RequiredAuth? } @@ -36,7 +36,7 @@ import Foundation let param = NewAccountParam() param.creator = creator - param.name = account + param.newact = account param.owner = ownerRequiredAuth param.active = activeRequiredAuth diff --git a/Sources/SwiftyEOS/Contract/resource/ResourceUtil.swift b/Sources/SwiftyEOS/Contract/resource/ResourceUtil.swift index c853bf4..56e9c86 100644 --- a/Sources/SwiftyEOS/Contract/resource/ResourceUtil.swift +++ b/Sources/SwiftyEOS/Contract/resource/ResourceUtil.swift @@ -11,16 +11,16 @@ import Foundation @objcMembers class DelegateParam: NSObject, Codable { var from: String = "" var receiver: String = "" - var stakeNetQuantity: String = "" - var stakeCpuQuantity: String = "" + var stake_net_quantity: String = "" + var stake_cpu_quantity: String = "" var transfer: UInt = 0 } @objcMembers class UndelegateParam: NSObject, Codable { var from: String = "" var receiver: String = "" - var unstakeNetQuantity: String = "" - var unstakeCpuQuantity: String = "" + var unstake_net_quantity: String = "" + var unstake_cpu_quantity: String = "" var transfer: UInt = 0 } @@ -44,8 +44,8 @@ import Foundation let param = DelegateParam() param.from = from param.receiver = receiver - param.stakeNetQuantity = String(format: "%.4f EOS", net) - param.stakeCpuQuantity = String(format: "%.4f EOS", cpu) + param.stake_net_quantity = String(format: "%.4f EOS", net) + param.stake_cpu_quantity = String(format: "%.4f EOS", cpu) param.transfer = transfer let encoder = JSONEncoder() @@ -70,8 +70,8 @@ import Foundation let param = UndelegateParam() param.from = account param.receiver = account - param.unstakeNetQuantity = String(format: "%.4f EOS", net) - param.unstakeCpuQuantity = String(format: "%.4f EOS", cpu) + param.unstake_net_quantity = String(format: "%.4f EOS", net) + param.unstake_cpu_quantity = String(format: "%.4f EOS", cpu) param.transfer = 0 let encoder = JSONEncoder() diff --git a/Sources/SwiftyEOS/Network/Base/BaseRouter.swift b/Sources/SwiftyEOS/Network/Base/BaseRouter.swift index df2089b..fcbc6c1 100644 --- a/Sources/SwiftyEOS/Network/Base/BaseRouter.swift +++ b/Sources/SwiftyEOS/Network/Base/BaseRouter.swift @@ -75,6 +75,7 @@ class BaseRouter : APIConfiguration { if EOSRPC.endpoint != nil { return EOSRPC.endpoint! + "/v1" } + return "http://jungle.cryptolions.io:18888/v1" return "https://api.eosnewyork.io/v1" } } diff --git a/Sources/SwiftyEOS/main.swift b/Sources/SwiftyEOS/main.swift index 1ca204a..813e0f0 100644 --- a/Sources/SwiftyEOS/main.swift +++ b/Sources/SwiftyEOS/main.swift @@ -10,27 +10,27 @@ import Foundation print("Hello, SwiftyEOS!") -//EOSRPC.sharedInstance.chainInfo { (chainInfo, error) in -// if error == nil { -// print("Success: \(chainInfo!)") -// } else { -// print("Error: \(error!.localizedDescription)") -// } -//} -// -//EOSRPC.sharedInstance.getBlock(blockNumOrId: 5 as AnyObject) { (blockInfo, error) in -// if error == nil { -// print("Success: \(blockInfo!)") -// } else { -// print("Error: \(error!.localizedDescription)") -// } -//} +EOSRPC.sharedInstance.chainInfo { (chainInfo, error) in + if error == nil { + print("Success: \(chainInfo!)") + } else { + print("Error: \(error!.localizedDescription)") + } +} + +EOSRPC.sharedInstance.getBlock(blockNumOrId: 5 as AnyObject) { (blockInfo, error) in + if error == nil { + print("Success: \(blockInfo!)") + } else { + print("Error: \(error!.localizedDescription)") + } +} //MARK: Jungle TestNet let liuAccount = "liulian12345" let privateKey = "5Hsk6wB2MPqGPrU53jSVGHm3uvoqWJk3rCrnkGzEGc7HrH28n7t" let privatePk = try PrivateKey(keyString: privateKey) -let testNeedCreateAccount = "liunian12341" +let testNeedCreateAccount = "liunian12342" let testNeedCreatePubKey = "EOS5uLxwJQgpEJteBxBTKiqWnyWiJTQAzAqx71M5AuMZ917oMv4g4" AccountUtil.stakeCreateAccount(account: testNeedCreateAccount, @@ -58,28 +58,28 @@ AccountUtil.stakeCreateAccount(account: testNeedCreateAccount, //print("public key : \(pub!.rawPublicKey())") -let importedPk = try PrivateKey(keyString: "5HsaHvRCPrjU3yhapB5rLRyuKHuFTsziidA13Uw6WnQTeJAG3t4") -let importedPub = PublicKey(privateKey: importedPk!) -print("imported private key: \(importedPk!.wif())") -print("imported public key : \(importedPub.wif())") - -var transfer = Transfer() -transfer.from = "raoji" -transfer.to = "raojiraoji12" -transfer.quantity = "1.0000 EOS" -transfer.memo = "test" - -Currency.transferCurrency(transfer: transfer, code: "eosio", privateKey: importedPk!, completion: { (result, error) in - if error != nil { - if (error! as NSError).code == RPCErrorResponse.ErrorCode { - print("\(((error! as NSError).userInfo[RPCErrorResponse.ErrorKey] as! RPCErrorResponse).errorDescription())") - } else { - print("other error: \(String(describing: error?.localizedDescription))") - } - } else { - print("Ok. Txid: \(result!.transactionId)") - } -}) +//let importedPk = try PrivateKey(keyString: privateKey) +//let importedPub = PublicKey(privateKey: importedPk!) +//print("imported private key: \(importedPk!.wif())") +//print("imported public key : \(importedPub.wif())") +// +//var transfer = Transfer() +//transfer.from = liuAccount +//transfer.to = testNeedCreateAccount +//transfer.quantity = "1.0000 EOS" +//transfer.memo = "test" +// +//Currency.transferCurrency(transfer: transfer, code: "eosio.token", privateKey: importedPk!, completion: { (result, error) in +// if error != nil { +// if (error! as NSError).code == RPCErrorResponse.ErrorCode { +// print("\(((error! as NSError).userInfo[RPCErrorResponse.ErrorKey] as! RPCErrorResponse).errorDescription())") +// } else { +// print("other error: \(String(describing: error?.localizedDescription))") +// } +// } else { +// print("Ok. Txid: \(result!.transactionId)") +// } +//}) // //let account = "raoji" //let asset = "1.0000 EPRA"