Overview
Comment: | Added start of high-level interfaces |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2c0ba950ff07e91fd41b9fca9732634c |
User & Date: | rkeene on 2018-07-02 11:29:54 |
Other Links: | manifest | tags |
Context
2018-07-02
| ||
12:09 | Added support for generating seeds and deriving keys from seeds check-in: 5ec19f7afb user: rkeene tags: trunk | |
11:29 | Added start of high-level interfaces check-in: 2c0ba950ff user: rkeene tags: trunk | |
11:29 | Support using a different sized hash result from BLAKE2b check-in: 5b9fcbfff6 user: rkeene tags: trunk | |
Changes
Modified build/test/test.tcl from [e802778f08] to [934087d718].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | #! /usr/bin/env tclsh lappend auto_path [file join [file dirname [info script]] .. ..] package require nano proc test_selftest {} { ::nano::internal::selfTest return true } proc test_signatures {} { # Detached signature set data [binary decode hex 0000000000000000000000000000000000000000000000000000000000000000] set key [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA] set sig [string toupper [binary encode hex [::nano::internal::signDetached $data $key]]] set sig_expected 1C2DE9B8A71215F949A11BBEA7EFA4ECD67A8C2B5A9AD98AE6B1AB7F7A3D2CFD715F570309148C7B39C346FB9B91B321D7E75BD598F271AF31AB60A99D086709 | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #! /usr/bin/env tclsh lappend auto_path [file join [file dirname [info script]] .. ..] package require nano proc test_selftest {} { ::nano::internal::selfTest return true } proc test_signatures {} { # Detached signature set data [binary decode hex 0000000000000000000000000000000000000000000000000000000000000000] set key [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA] set sig [string toupper [binary encode hex [::nano::internal::signDetached $data $key]]] set sig_expected 1C2DE9B8A71215F949A11BBEA7EFA4ECD67A8C2B5A9AD98AE6B1AB7F7A3D2CFD715F570309148C7B39C346FB9B91B321D7E75BD598F271AF31AB60A99D086709 |
︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | set data [binary decode hex 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF] set pubKey [::nano::internal::publicKey $key] set sig [::nano::internal::signDetached $data $key] set verified [::nano::internal::verifyDetached $data $sig $pubKey] if {!$verified} { puts "\[2.FAIL\] Got: $verified" puts "\[2.FAIL\] Exp: true" } return true } set tests { selftest signatures hashing keygeneration } foreach test $tests { if {![test_$test]} { puts "FAILED test $test" exit 1 } else { | > > > > > > > > > > > > > > > > > > > > > > > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | set data [binary decode hex 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF] set pubKey [::nano::internal::publicKey $key] set sig [::nano::internal::signDetached $data $key] set verified [::nano::internal::verifyDetached $data $sig $pubKey] if {!$verified} { puts "\[2.FAIL\] Got: $verified" puts "\[2.FAIL\] Exp: true" return false } return true } proc test_addressformat {} { set addr nano_35ynhw4qd1pam88azf86nk8ka5sthnzaubcw5fawingep1sjydwaiw8xy7t6 set pub 8fd47f057582c8998c8fb4c4a48d240f3a7d3e8da55c1b51c851ccb0331f2f88 set pubCheck [string tolower [::nano::address::toPublicKey $addr -hex -verify]] if {$pubCheck ne $pub} { puts "\[1.FAIL\] Got: $pubCheck" puts "\[1.FAIL\] Exp: $pub" return false } set addrCheck [::nano::address::fromPublicKey $pub] if {$addrCheck ne $addr} { puts "\[1.FAIL\] Got: $addrCheck" puts "\[1.FAIL\] Exp: $addr" return false } return true } set tests { selftest signatures hashing keygeneration addressformat } foreach test $tests { if {![test_$test]} { puts "FAILED test $test" exit 1 } else { |
︙ | ︙ |
Modified nano.tcl from [1cbc1848a1] to [f66c1dc629].
1 2 3 4 | #! /usr/bin/env tclsh namespace eval ::nano {} | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | #! /usr/bin/env tclsh package require json package require json::write namespace eval ::nano {} namespace eval ::nano::block {} namespace eval ::nano::block::account {} namespace eval ::nano::address {} set ::nano::address::base32alphabet {13456789abcdefghijkmnopqrstuwxyz} proc ::nano::address::toPublicKey {address args} { set performChecksumCheck false set outputFormat "bytes" foreach arg $args { switch -exact -- $arg { "-verify" { set performChecksumCheck true } "-no-verify" { set performChecksumCheck false } "-hex" { set outputFormat "hex" } "-binary" { set outputFormat "bytes" } default { return -code error "Invalid option: $arg" } } } switch -glob -- $address { "xrb_*" - "nano_*" {} default { return -code error "Invalid address (format, header)" } } set address [join [lrange [split $address _] 1 end] _] set address [split $address ""] if {[llength $address] != 60} { return -code error "Invalid address (length)" } set alphabet [split $::nano::address::base32alphabet ""] set result 0 foreach byte $address { set fiveBits [lsearch -exact $alphabet $byte] if {$fiveBits < 0} { return -code error "Invalid address (format, alphabet)" } set result [expr {($result << 5) | $fiveBits}] } set checksum [expr {$result & 0xffffffffff}] set result [expr {$result >> 40}] set result [format %064llX $result] if {$performChecksumCheck} { set resultBinary [binary decode hex $result] set checksumVerify [binary encode hex [string reverse [::nano::internal::hashData $resultBinary 5]]] set checksumVerify [expr "0x$checksumVerify"] if {$checksum != $checksumVerify} { return -code error "Invalid address (checksum)" } } if {$outputFormat eq "bytes"} { if {![info exists resultBinary]} { set resultBinary [binary decode hex $result] } set result $resultBinary } return $result } proc ::nano::address::fromPublicKey {pubKey args} { set addressPrefix "nano_" foreach arg $args { switch -exact -- $arg { "-xrb" { set addressPrefix "xrb_" } "-nano" { set addressPrefix "nano_" } "-hex" { set inputFormat "hex" } "-binary" { set inputFormat "bytes" } default { return -code error "Invalid option: $arg" } } } if {![info exists inputFormat]} { if {[string length $pubKey] == 32} { set inputFormat "bytes" } else { set inputFormat "hex" } } if {$inputFormat eq "hex"} { set pubKey [binary decode hex $pubKey] } if {[string length $pubKey] != 32} { return -code error "Invalid key (length)" } set checksum [string reverse [::nano::internal::hashData $pubKey 5]] append pubKey $checksum set pubKey [binary encode hex $pubKey] set pubKey [expr "0x$pubKey"] set alphabet [split $::nano::address::base32alphabet ""] set address "" for {set index 0} {$index < 60} {incr index} { set fiveBits [expr {$pubKey & 0x1F}] set pubKey [expr {$pubKey >> 5}] set byte [lindex $alphabet $fiveBits] append address $byte } set address [string reverse $address] set address "${addressPrefix}${address}" return $address } proc ::nano::block::fromJSON {json} { array set block [json::json2dict $json] switch -- $block(type) { "state" { # XXX:TODO: Find the source of this append blockData [binary decode hex "0000000000000000000000000000000000000000000000000000000000000006"] append blockData [::nano::address::toPublicKey $block(account)] append blockData [binary decode hex $block(previous)] append blockData [::nano::address::toPublicKey $block(representative)] append blockData [binary decode hex [format %032llX $block(balance)]] if {![info exists block(link)] && [info exists block(link_as_account)]} { append blockData [::nano::address::toPublicKey $block(link_as_account)] } else { append blockData [binary decode hex $block(link)] } } "open" { append blockData [binary decode hex $block(source)] append blockData [::nano::address::toPublicKey $block(representative)] append blockData [::nano::address::toPublicKey $block(account)] } "send" { append blockData [binary decode hex $block(previous)] append blockData [::nano::address::toPublicKey $block(destination)] append blockData [binary decode hex [format %032llX $block(balance)]] } "receive" { append blockData [binary decode hex $block(previous)] append blockData [binary decode hex $block(source)] } "change" { append blockData [binary decode hex $block(previous)] append blockData [::nano::address::toPublicKey $block(representative)] } default { return -code error "Invalid block type $block(type)" } } return $blockData } proc ::nano::block::_dictToJSON {blockDict {addArgs_fromPublicKey ""}} { array set block $blockDict set blockJSONFields {type account source destination previous representative balance link link_as_account _blockHash} set blockJSONEntries [lmap field $blockJSONFields { if {![info exists block($field)]} { continue } switch -exact -- $field { "source" - "previous" - "link" - "_blockHash" { set block($field) [string toupper $block($field)] } } return -level 0 [list $field [json::write string $block($field)]] }] set blockJSONEntries [join $blockJSONEntries] set blockJSON [json::write object {*}$blockJSONEntries] return $blockJSON } proc ::nano::block::toJSON {blockData args} { set block(type) "" set addressPrefix "nano_" foreach arg $args { switch -glob -- $arg { "-type=*" { set block(type) [lindex [split $arg =] 1] } "-xrb" { set addressPrefix "xrb_" } "-nano" { set addressPrefix "nano_" } default { return -code error "Invalid option: $arg" } } } if {$block(type) eq ""} { switch -- [string length $blockData] { 176 { set block(type) state } 96 { set block(type) open } 80 { set block(type) send } default { return -code error "Unable to parse block, must specify type" } } } set addArgs_fromPublicKey [list] if {$addressPrefix eq "xrb_"} { lappend addArgs_fromPublicKey "-xrb" } switch -- $block(type) { "state" { binary scan $blockData H64a32H64a32H32H64 \ block(header) \ block(account) \ block(previous) \ block(representative) \ block(balance) \ block(link) if {$block(header) ne "0000000000000000000000000000000000000000000000000000000000000006"} { return -code error "Invalid block" } } "open" { binary scan $blockData H64a32a32 \ block(source) \ block(representative) \ block(account) } "send" { binary scan $blockData H64a32H32 \ block(previous) \ block(destination) \ block(balance) } "receive" { binary scan $blockData H64H64 \ block(previous) \ block(source) } "change" { binary scan $blockData H64a32 \ block(previous) \ block(representative) } default { return -code error "Invalid block type: $block(type)" } } foreach field {account representative link_as_account destination balance} { if {![info exists block($field)]} { continue } switch -exact -- $field { "account" - "representative" - "link_as_account" - "destination" { set block($field) [::nano::address::fromPublicKey $block($field) {*}$addArgs_fromPublicKey] } "balance" { set block($field) [format %lli "0x$block($field)"] } } } set blockJSON [_dictToJSON [array get block] ${addArgs_fromPublicKey}] return $blockJSON } proc ::nano::block::hash {blockData args} { set outputFormat "bytes" foreach arg $args { switch -exact -- $arg { "-hex" { set outputFormat "hex" } "-binary" { set outputFormat "bytes" } default { return -code error "Invalid option: $arg" } } } set hash [::nano::internal::hashData $blockData 32] if {$outputFormat eq "hex"} { set hash [string toupper [binary encode hex $hash]] } return $hash } proc ::nano::block::account::_finalizeBlock {blockDict} { set blockJSON [::nano::block::_dictToJSON $blockDict] set block [::nano::block::fromJSON $blockJSON] set blockHash [::nano::block::hash $block -hex] dict set blockDict "_blockHash" $blockHash set blockJSON [::nano::block::_dictToJSON $blockDict] return $blockJSON } proc ::nano::block::account::send {args} { array set block $args if {![info exists block(representative)]} { set block(representative) $block(from) } set block(balance) [expr {$block(priorBalance) - $block(amount)}] set blockDict [dict create \ "type" state \ "account" $block(from) \ "previous" $block(previous) \ "representative" $block(representative) \ "balance" $block(balance) \ "link_as_account" $block(to) \ ] tailcall _finalizeBlock $blockDict } proc ::nano::block::account::receive {args} { array set block $args if {![info exists block(representative)]} { set block(representative) $block(to) } if {![info exists block(previous)]} { set block(previous) "0000000000000000000000000000000000000000000000000000000000000000" } set block(balance) [expr {$block(priorBalance) + $block(amount)}] set blockDict [dict create \ "type" state \ "account" $block(to) \ "previous" $block(previous) \ "representative" $block(representative) \ "balance" $block(balance) \ "link" $block(sourceBlock) \ ] tailcall _finalizeBlock $blockDict } proc ::nano::block::account::setRepresentative {args} { array set block $args set block(balance) $block(priorBalance) set block(link) "0000000000000000000000000000000000000000000000000000000000000000" set blockDict [dict create \ "type" state \ "account" $block(account) \ "previous" $block(previous) \ "representative" $block(representative) \ "balance" $block(balance) \ "link" $block(link) \ ] tailcall _finalizeBlock $blockDict } package provide nano 0 |