Overview
| Comment: | Improvements to block handling |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7811cddc2ec8ff621f0ba42b855b26cb |
| User & Date: | rkeene on 2018-07-02 23:07:11 |
| Other Links: | manifest | tags |
Context
|
2018-07-02
| ||
| 23:13 | Consolidated some constants check-in: 8670bc6274 user: rkeene tags: trunk | |
| 23:07 | Improvements to block handling check-in: 7811cddc2e user: rkeene tags: trunk | |
| 21:24 | Improved checking for entropy sources check-in: 8fd7944e81 user: rkeene tags: trunk | |
Changes
Modified build/test/test.tcl from [6963bbb20e] to [4f0bb6d25d].
| ︙ | ︙ | |||
132 133 134 135 136 137 138 |
puts "\[1.FAIL\] Exp: $pub"
return false
}
set addrCheck [::nano::address::fromPublicKey $pub]
if {$addrCheck ne $addr} {
| | | > > | > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > | 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 |
puts "\[1.FAIL\] Exp: $pub"
return false
}
set addrCheck [::nano::address::fromPublicKey $pub]
if {$addrCheck ne $addr} {
puts "\[2.FAIL\] Got: $addrCheck"
puts "\[2.FAIL\] Exp: $addr"
return false
}
return true
}
proc test_blocks {} {
set seed [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA]
set key [::nano::key::computeKey $seed 0 -hex]
set address [::nano::address::fromPrivateKey $key -xrb]
# High-level primitives
## Receive/Open
set block [::nano::block::create::receive \
to $address \
amount 1000000000000000000000000000000 \
sourceBlock "207D3043D77B84E892AD4949D147386DE4C2FE4B2C8DC13F9469BC4A764681A7" \
signKey $key
]
set blockDict [::json::json2dict $block]
set blockSignature [string toupper [dict get $blockDict signature]]
set blockSignature_expected "B574DE37F5FFF3DCFB5D0E505FC36B402444777CAA99BA86F89E9B82B6EB901B809554287F0B67D8C2A8306B4F69FE77FD0C9B3D0D10422A02CFEBB3810C7D02"
if {$blockSignature ne $blockSignature_expected} {
puts "\[1.FAIL\] Got: $blockSignature"
puts "\[1.FAIL\] Exp: $blockSignature_expected"
return false
}
## Send
set block [::nano::block::create::send \
from $address \
to "xrb_1unc5hriitrdjq5dnyhr3zmd8t5hm7rhm9a1u3uun5ycbaacpu649yh5c4b5" \
previous "D46BFC2E35B5A3CA4230839D67676F4A8498C2567F571D2B66A7F7B72214DEEE" \
previousBalance 1000000000000000000000000000000 \
amount 1000000000000000000000000000000 \
signKey $key
]
set blockDict [::json::json2dict $block]
set blockSignature [string toupper [dict get $blockDict signature]]
set blockSignature_expected "BFE238A27FFBFBCF722EDC3700CA8E2405F5AE18E353E591917A2CBE393F0759C948E710DD723B3BFB21B491D9D0856EEFCAC0E25C7E5FF06185FE5D633B5204"
if {$blockSignature ne $blockSignature_expected} {
puts "\[2.FAIL\] Got: $blockSignature"
puts "\[2.FAIL\] Exp: $blockSignature_expected"
return false
}
# JSON Parsing a block
set blockDict [::nano::block::toDict [::nano::block::fromJSON $block]]
dict unset blockDict _blockData
dict set blockDict signKey $key
set block [::nano::block::jsonFromDict $blockDict]
set blockDict [::json::json2dict $block]
set blockSignature [string toupper [dict get $blockDict signature]]
if {$blockSignature ne $blockSignature_expected} {
puts "\[3.FAIL\] Got: $blockSignature"
puts "\[3.FAIL\] Exp: $blockSignature_expected"
return false
}
return true
}
set tests {
selftest
signatures
|
| ︙ | ︙ |
Modified nano.tcl from [ea79113063] to [09538af98b].
| ︙ | ︙ | |||
254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 |
default {
return -code error "Invalid block type $block(type)"
}
}
return $blockData
}
proc ::nano::block::_dictToJSON {blockDict} {
array set block $blockDict
if {[info exists block(signKey)] && ([info exists block(_blockData)] || [info exists block(_blockHash)])} {
if {![info exists block(_blockHash)]} {
set block(_blockHash) [binary encode hex [::nano::block::hash $block(_blockData)]]
}
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < | | 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 |
default {
return -code error "Invalid block type $block(type)"
}
}
return $blockData
}
proc ::nano::block::signBlockHash {blockHash key args} {
set outputFormat "bytes"
foreach arg $args {
switch -exact -- $arg {
"-hex" {
set outputFormat "hex"
}
"-binary" {
set outputFormat "bytes"
}
}
}
if {[string length $blockHash] != 32} {
set blockHash [binary decode hex $blockHash]
}
if {[string length $key] != 32} {
set key [binary decode hex $key]
}
set signature [::nano::internal::signDetached $blockHash $key]
if {$outputFormat eq "hex"} {
set signature [string toupper [binary encode hex $signature]]
}
return $signature
}
proc ::nano::block::signBlock {blockData args} {
set blockHash [::nano::block::hash $blockData]
tailcall ::nano::block::signBlockHash $blockHash {*}$args
}
proc ::nano::block::verifyBlockHash {blockHash signature pubKey} {
if {[string length $blockHash] != 32} {
set blockHash [binary decode hex $blockHash]
}
if {[string length $pubKey] != 32} {
set key [binary decode hex $pubKey]
}
set valid [::nano::internal::verifyDetached $blockHash $signature $pubKey]
return $signature
}
proc ::nano::block::verifyBlock {blockData args} {
set blockHash [::nano::block::hash $blockData]
tailcall ::nano::block::verifyBlockHash $blockHash {*}$args
}
proc ::nano::block::_dictToJSON {blockDict} {
array set block $blockDict
if {[info exists block(signKey)] && ([info exists block(_blockData)] || [info exists block(_blockHash)])} {
if {![info exists block(_blockHash)]} {
set block(_blockHash) [binary encode hex [::nano::block::hash $block(_blockData)]]
}
set block(signature) [::nano::block::signBlockHash $block(_blockHash) $block(signKey) -hex]
}
if {$block(type) eq "state"} {
if {![info exists block(link)]} {
set block(link) [::nano::address::toPublicKey $block(link_as_account) -hex]
}
if {![info exists block(link_as_address)]} {
|
| ︙ | ︙ |