Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

update for latest abi #35

Open
liunina wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update for latest abi #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/SwiftyEOS/Contract/account/AccountUtil.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
}
Expand All @@ -36,7 +36,7 @@ import Foundation

let param = NewAccountParam()
param.creator = creator
param.name = account
param.newact = account
param.owner = ownerRequiredAuth
param.active = activeRequiredAuth

Expand Down
16 changes: 8 additions & 8 deletions Sources/SwiftyEOS/Contract/resource/ResourceUtil.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ import Foundation
@objcMembers class DelegateParam: NSObject, Codable {
var from: String = ""
var receiver: String = ""
var stakeNetQuantity: String = ""
var stakeCpuQuantity: String = ""
Copy link
Contributor

@croath croath Nov 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这块 Codable 协议最后走的是 SnakeCase 的 keyEncodingStrategy，所以转换成 json 的时候会自动变成 stake_net_quantity 这样，在 Swift 中使用 stakeNetQuantity 更符合变量声明的标准。

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
}

Expand All @@ -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()
Expand All @@ -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()
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftyEOS/Network/Base/BaseRouter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class BaseRouter : APIConfiguration {
if EOSRPC.endpoint != nil {
return EOSRPC.endpoint! + "/v1"
}
return "http://jungle.cryptolions.io:18888/v1"
Copy link
Contributor

@croath croath Nov 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里没必要做改动。如果想要用自己的节点，设置 EOSRPC.endpont = "" 就可以了

return "https://api.eosnewyork.io/v1"
}
}
76 changes: 38 additions & 38 deletions Sources/SwiftyEOS/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down