Overview
Comment: | Start of LMDB backend |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
778ee6244632407d525059ada9ebec6b |
User & Date: | rkeene on 2018-07-11 23:05:43 |
Other Links: | manifest | tags |
Context
2018-07-12
| ||
00:05 | Added support for clearing and adding pending via LMDB check-in: a8e052677e user: rkeene tags: trunk | |
2018-07-11
| ||
23:05 | Start of LMDB backend check-in: 778ee62446 user: rkeene tags: trunk | |
19:24 | Added start of node support check-in: 7a0acb917e user: rkeene tags: trunk | |
Changes
Modified nano.tcl from [0b965a2bdd] to [64c7d0e6c0].
︙ | ︙ | |||
1141 1142 1143 1144 1145 1146 1147 | setFrontier $account $newFrontierHash $balance $representative return $block } # Ledger | | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > | > > > > > > | | | > | > > > > > | > > > | > > > | > > > > > > > > > > > > > > < | | < | | | 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 | setFrontier $account $newFrontierHash $balance $representative return $block } # Ledger proc ::nano::ledger::lmdb::init {configDict} { package require lmdb array set config $configDict if {[info exists config(configDirectory)]} { set config(file) [file join $config(configDirectory) $config(file)] } set config(file) [file normalize $config(file)] set envHandle [lmdb env] $envHandle set_maxdbs 32 $envHandle set_mapsize 1099511627776 $envHandle open -path $config(file) -nosubdir true -readonly false set lmdbInfo [dict create \ envHandle $envHandle \ ] set handle [list apply {{lmdbInfo proc args} { tailcall ::nano::ledger::lmdb::$proc $lmdbInfo {*}$args }} $lmdbInfo] return $handle } proc ::nano::ledger::lmdb::_transaction {lmdbInfo table cursorVar code} { set table [split $table /] set readOnly true foreach arg [lrange $table 1 end] { switch -- $arg { "write" { set readOnly false } "read" { set readOnly true } } } set table [lindex $table 0] set envHandle [dict get $lmdbInfo envHandle] set dbHandle [lmdb open -env $envHandle -name $table] set sessionHandle [$envHandle txn -readonly $readOnly] set cursor [$dbHandle cursor -txn $sessionHandle] uplevel 1 [list set $cursorVar $cursor] set retcode [catch [list uplevel 1 $code] retval options] $cursor close if {$retcode == 0} { $sessionHandle commit } else { if {$readOnly} { $sessionHandle reset } else { $sessionHandle abort } } $sessionHandle close $dbHandle close -env $envHandle if {$retcode == 0} { return $retval } return {*}$options $retval } proc ::nano::ledger::lmdb::getPending {lmdbInfo account args} { set accountPubKey [::nano::address::toPublicKey $account -binary] set searchKey $accountPubKey if {[llength $args] > 0} { set blockHash [lindex $args 0] if {[string length $blockHash] != $::nano::block::hashLength} { set blockHash [binary decode hex $blockHash] append searchKey $blockHash } set args [lrange $args 1 end] } set retval [list] _transaction $lmdbInfo "pending" cursor { set work [$cursor getBinary -set_range $searchKey] while true { set key [lindex $work 0] set value [lindex $work 1] set keyAccountPubKey [string range $key 0 31] if {$keyAccountPubKey ne $accountPubKey} { break } set keyBlockHash [string range $key 32 63] if {[info exists blockHash] && $keyBlockHash ne $blockHash} { break } set from [string range $value 0 31] set amount [string range $value 32 47] set work [$cursor getBinary -next] set itemDict [dict create \ amount [format "%lli" 0x[binary encode hex $amount]] \ from [::nano::address::fromPublicKey $from] \ ] if {[info exists blockHash]} { set retval $itemDict break } set keyBlockHashHex [string toupper [binary encode hex $keyBlockHash]] dict set retval $keyBlockHashHex $itemDict } } if {[info exists blockHash] && [llength $args] > 0} { set retval [dict get $retval {*}$args] } return $retval } proc ::nano::ledger::lmdb::clearPending {lmdbInfo account args} { set accountPubKey [::nano::address::toPublicKey $account -hex] } # Node Configuration proc ::nano::node::_configDictToJSON {configDict {prefix ""}} { set values [list] foreach key [dict keys $configDict] { set value [dict get $configDict $key] switch -- ${prefix}${key} { "rpc" - "node" - "opencl" - "node/logging" - "node/database" { set value [_configDictToJSON $value "$key/"] } "node/preconfigured_peers" - "node/preconfigured_representatives" - "node/work_peers" { set value [json::write array {*}[lmap item $value { json::write string $item }]] } default { set value [json::write string $value] } } lappend values $key $value } set json [json::write object {*}$values] return $json } proc ::nano::node::_defaultConfig {basis network} { # XXX:TODO: Finish setting up the defaults set default_topLevel [dict create \ "version" 2 \ "rpc_enable" false \ ] catch { set basis_rpc [dict create] set basis_rpc [dict get $basis "rpc"] } set default_rpc [dict create \ "address" "::ffff:127.0.0.1" \ "port" 7076 \ ] catch { set basis_node [dict create] set basis_node [dict get $basis "node"] } set default_node [dict create] catch { set basis_node_database [dict create] set basis_node_database [dict get $basis "node" "database"] } set default_node_database [dict create \ "backend" "lmdb" \ "file" "data.ldb" \ ] set basis [dict merge $default_topLevel $basis] set basis_rpc [dict merge $default_rpc $basis_rpc] set basis_node [dict merge $default_node $basis_node] set basis_node_database [dict merge $default_node_database $basis_node_database] dict set basis rpc $basis_rpc dict set basis node $basis_node dict set basis node database $basis_node_database return $basis } # Side-effect: Sets ::nano::node::configuration proc ::nano::node::_loadConfigFile {file network} { set json "{}" catch { set fd [open $file] set json [read $fd] } catch { close $fd } set configuration [::json::json2dict $json] set configuration [_defaultConfig $configuration $network] set ::nano::node::configuration $configuration return $::nano::node::configuration } proc ::nano::node::_saveConfigFile {file args} { if {[llength $args] == 0} { set configDict $::nano::node::configuration |
︙ | ︙ | |||
1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 | set fd [open "${tmpfile}" "w"] puts $fd $json close $fd file rename -force -- "${tmpfile}" "${file}" return true } proc ::nano::node::configure {network args} { # Set default options set info(-configDirectory) [file normalize ~/RaiBlocks] # Parse options to the configure array set info $args # Load configuration file set configFile [file join $info(-configDirectory) "config.json"] _loadConfigFile $configFile $network } # RPC Client proc ::nano::rpc::client::init args { if {![info exists ::nano::rpc::client::config]} { set ::nano::rpc::client::config [dict create \ | > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 | set fd [open "${tmpfile}" "w"] puts $fd $json close $fd file rename -force -- "${tmpfile}" "${file}" return true } proc ::nano::node::setLedgerHandle {handle} { set procs { getPending } namespace eval ::nano::node::ledger {} foreach proc $procs { proc ::nano::node::ledger::$proc args [concat [list tailcall {*}$handle $proc] {{*}$args}] } } proc ::nano::node::configure {network args} { # Set default options ## XXX:TODO: Handle other networks if {$network ne "main"} { return -code error "Only main network is supported right now" } set info(-configDirectory) [file normalize ~/RaiBlocks] # Parse options to the configure array set info $args # Load configuration file set configFile [file join $info(-configDirectory) "config.json"] _loadConfigFile $configFile $network # Determine database backend and access information set database_config [dict get $::nano::node::configuration "node" "database"] set database_backend [dict get $database_config "backend"] if {![dict exists $database_config "configDirectory"]} { dict set database_config "configDirectory" $info(-configDirectory) } set dbHandle [::nano::ledger::${database_backend}::init $database_config] ::nano::node::setLedgerHandle $dbHandle } # RPC Client ## Side-effect: Sets ::nano::rpc::client::config proc ::nano::rpc::client::init args { if {![info exists ::nano::rpc::client::config]} { set ::nano::rpc::client::config [dict create \ url "http://localhost:7076/" \ ] } if {[llength $args] > 0} { set ::nano::rpc::client::config [dict merge $::nano::rpc::client::config $args] } |
︙ | ︙ |