Skip to content

sets a default bitmask for 2019/10 TokenScripts #1495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesANZ merged 1 commit into from
Oct 11, 2019
Merged

sets a default bitmask for 2019/10 TokenScripts #1495

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
7 changes: 5 additions & 2 deletions AlphaWallet/TokenScriptClient/Models/FunctionOrigin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,11 @@ struct FunctionOrigin {
let resultSubscribable = Subscribable<AssetInternalValue>(nil)
subscribable.subscribe { value in
guard let value = value else { return }
guard let bitmask = self.bitmask else { return }
resultSubscribable.value = self.castReturnValue(value: value, bitmask: bitmask)
if let bitmask = self.bitmask {
resultSubscribable.value = self.castReturnValue(value: value, bitmask: bitmask)
} else {
resultSubscribable.value = value
}
}
return .subscribable(resultSubscribable)
}
Expand Down
7 changes: 3 additions & 4 deletions AlphaWallet/TokenScriptClient/Models/Origin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,21 @@ enum Origin {
}

init?(forTokenIdElement tokenIdElement: XMLElement, xmlContext: XmlContext) {
guard let bitmask = XMLHandler.getBitMask(fromTokenIdElement: tokenIdElement) else { return nil }
let bitmask = XMLHandler.getBitMask(fromTokenIdElement: tokenIdElement) ?? TokenScript.defaultBitmask
guard let asType = tokenIdElement["as"].flatMap({ OriginAsType(rawValue: $0) }) else { return nil }

let bitShift = Origin.bitShiftCount(forBitMask: bitmask)
self = .tokenId(.init(originElement: tokenIdElement, xmlContext: xmlContext, bitmask: bitmask, bitShift: bitShift, asType: asType))
}

init?(forEthereumFunctionElement ethereumFunctionElement: XMLElement, attributeId: AttributeId, originContract: AlphaWallet.Address, xmlContext: XmlContext) {
guard let bitmask = XMLHandler.getBitMask(fromTokenIdElement: ethereumFunctionElement) else { return nil }
let bitmask = XMLHandler.getBitMask(fromTokenIdElement: ethereumFunctionElement) ?? TokenScript.defaultBitmask
let bitShift = Origin.bitShiftCount(forBitMask: bitmask)
guard let result = FunctionOrigin(forEthereumFunctionCallElement: ethereumFunctionElement, attributeId: attributeId, originContract: originContract, xmlContext: xmlContext, bitmask: bitmask, bitShift: bitShift) else { return nil }
self = .function(result)
}

init?(forUserEntryElement userEntryElement: XMLElement, attributeId: AttributeId, xmlContext: XmlContext) {
guard let bitmask = XMLHandler.getBitMask(fromTokenIdElement: userEntryElement) else { return nil }
let bitmask = XMLHandler.getBitMask(fromTokenIdElement: userEntryElement) ?? TokenScript.defaultBitmask
let bitShift = Origin.bitShiftCount(forBitMask: bitmask)
guard let asType = userEntryElement["as"].flatMap({ OriginAsType(rawValue: $0) }) else { return nil }
self = .userEntry(.init(originElement: userEntryElement, xmlContext: xmlContext, attributeId: attributeId, asType: asType, bitmask: bitmask, bitShift: bitShift))
Expand Down
1 change: 1 addition & 0 deletions AlphaWallet/TokenScriptClient/Models/TokenScript.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ extension TokenScript {
static let supportedTokenScriptNamespaceVersion = "2019/10"
static let supportedTokenScriptNamespace = "\(tokenScriptNamespacePrefix)\(supportedTokenScriptNamespaceVersion)/tokenscript"
static let indicesFileName = "indices"
static let defaultBitmask: BigUInt = BigUInt("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", radix: 16)!
}