Merge branch 'development' into deploy

multiversx · May 17, 2020 · 62229a5 · 62229a5
2 parents 40e42e6 + 2ef180f
commit 62229a5
Show file tree

Hide file tree

Showing 225 changed files with 5,543 additions and 2,063 deletions.
diff --git a/cmd/node/config/config.toml b/cmd/node/config/config.toml
@@ -187,7 +187,7 @@
      MaxOpenFiles = 10
 
 [TrieStorageManagerConfig]
-    PruningBufferLen = 1000
+    PruningBufferLen = 100000
     SnapshotsBufferLen = 1000000
     MaxSnapshots = 2
 
@@ -220,7 +220,9 @@
 
 [TxDataPool]
     Size = 900000
+    SizePerSender = 1000
     SizeInBytes = 524288000
+    SizeInBytesPerSender = 614400
     Type = "TxCache"
     Shards = 16
 
@@ -397,6 +399,8 @@
     CheckpointRoundsModulus = 100
     AccountsStatePruningEnabled = true
     PeerStatePruningEnabled = true
+    MaxStateTrieLevelInMemory = 5
+    MaxPeerTrieLevelInMemory = 5
 
 [BlockSizeThrottleConfig]
     MinSizeInBytes = 104857 # 104857 is 10% from 1MB

diff --git a/cmd/node/config/genesis.json b/cmd/node/config/genesis.json
@@ -1,122 +1,122 @@
 [
   {
-    "address": "erd1m87mx5x20lkmj3tcskv0yw0vc2m8d40mnlfyvep4lcqkyvnvlussjdkulc",
-    "supply": "1666791666666666666666666674",
-    "balance": "1666291666666666666666666674",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1vfvqxa8geg42qsp3f6nhmu447j5n7ceaww62y4lkjmzv06jdt5ssaru9hx",
+    "supply": "1667291666666666666666666674",
+    "balance": "1664791666666666666666666674",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1rfyjyuxl25rsp3q8j6r6y2z5tdzauu463dzdtl2293fj5yc842ssx7pdam",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1x46jdswqyfgr5h4l2lgkk7avydx8thl3thet6htx8pa3ngu50kfstgv5p5",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd18cux4ftul77k478chttklwa94q8g205ftefam8g9z0ds253mwm8qw54xn3",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1w4hc4q8j8twnq47cr838hkkzfzpfv7gfqkeh073vtgka8xzr9pps7y7qn4",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1r6m0x3p5lf635g8ce3nhh0mhzv4ufsctarm2uamexxplzf3t5t2q05aqzk",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd12g7px93mzj808dw0edf05zp7lxdq9zdafuj7q3atmdpje0v9clgs0nqj2q",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1u6fw4egq8pv8ufpk5g3nguyf42hnfknq7w7rfhvrta6p5dss5zdsmn69sz",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd17g5jmjpdlhq5fygg8qs8u85cmud7g6uc0f0yhz7k5734tcp64p0sdak5au",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1sw93x2nrtsnsa0n3vukjke2vaknwvyyp5e0gsfe5swwxnpf9dxrs6ek2xz",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd12epqk0m225ushnvrey9tz5pp3cftt6h85xtsqcz93x369mnckx3sj4jt2m",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1fh8xt5gw9rvextpdrkwrmwatszyl7sld4mcj0cy6nsmhxs8mpldqmwp4vz",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1t8ztgmvu0hr0tu686kmxj4artk08njsjgpdz9plakcd09vk698cqgz2tvq",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd1jmufwnqe06dvdvy5mse79k04qvm3h9yllhup884udknd4u9l0feq5xqatx",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1qac8llthxn8965t2adtkctjyhqfnku9mgzdqulvkkpxmdmj83xkqfyqh48",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd16h4f6u5n346kfp77k6lhnxu27c3y4sc0urwcye3q6kjgus28ywpqyfnuh8",
-    "supply": "1666791666666666666666666666",
-    "balance": "1666291666666666666666666666",
-    "stakingvalue": "500000000000000000000000",
+    "address": "erd1gxg3nnnlc7muq92auyku5un9e3a0x6q76ge6w4qtmt526sc28yfsa7shnn",
+    "supply": "1667291666666666666666666666",
+    "balance": "1664791666666666666666666666",
+    "stakingvalue": "0",
     "delegation": {
-      "address": "",
-      "value": "0"
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj",
+      "value": "2500000000000000000000000"
     }
   },
   {
-    "address": "erd15khnvy0vpcfdvxd000622a3es0muct9jh9wm7klsm8nrwn3tzneqqnjhae",
-    "supply": "1666291666666666666666666666",
-    "balance": "1666291666666666666666666666",
+    "address": "erd1lly4c0qgl00lg2upkvjytstnge3r89385gkhlfaqyq0te6x3u2rqlz23fs",
+    "supply": "1664791666666666666666666666",
+    "balance": "1664791666666666666666666666",
     "stakingvalue": "0",
     "delegation": {
       "address": "",
       "value": "0"
     }
   },
   {
-    "address": "erd183nlfwerse0nljvvlvu4d7r6d04p9hd40h5u0hxkkf378y66e3gqhw0n85",
-    "supply": "1666291666666666666666666666",
-    "balance": "1666291666666666666666666666",
+    "address": "erd1qwxpsuray9dyg6s7tywgp33wlm4af64h2ls5wmr8dytfr2prhtlsuq5j9a",
+    "supply": "1664791666666666666666666666",
+    "balance": "1664791666666666666666666666",
     "stakingvalue": "0",
     "delegation": {
       "address": "",
       "value": "0"
     }
   },
   {
-    "address": "erd1pajyy0hn3kw5s9dn5pf8980fdy2d0evklrj03699uxtl4k0fyudqrzxf8j",
-    "supply": "1666291666666666666666666666",
-    "balance": "1666291666666666666666666666",
+    "address": "erd17lk50mlps7q39wktnvkg3xlzer3nst225twenjqj9880347q06jqt7t5re",
+    "supply": "1664791666666666666666666666",
+    "balance": "1664791666666666666666666666",
     "stakingvalue": "0",
     "delegation": {
       "address": "",
       "value": "0"
     }
   }
-]
+]
diff --git a/cmd/node/config/genesisContracts/delegation.wasm b/cmd/node/config/genesisContracts/delegation.wasm
diff --git a/cmd/node/config/genesisSmartContracts.json b/cmd/node/config/genesisSmartContracts.json
@@ -1,9 +1,10 @@
 [
   {
-    "owner": "erd1pajyy0hn3kw5s9dn5pf8980fdy2d0evklrj03699uxtl4k0fyudqrzxf8j",
-    "filename": "./config/genesisContracts/answer.wasm",
+    "owner": "erd16grmckn46ry7fwyvass8e8pz88klazzpc0c5f0pnrv643td4797sgnvjkm",
+    "filename": "./config/genesisContracts/delegation.wasm",
     "vm-type": "0500",
-    "init-parameters": "",
-    "type": "test"
+    "init-parameters": "0BB8@%auction_sc_address%@0A61D0",
+    "type": "delegation",
+    "version": "0.2.*"
   }
 ]
diff --git a/cmd/node/config/nodesSetup.json b/cmd/node/config/nodesSetup.json
@@ -3,47 +3,47 @@
   "roundDuration": 6000,
   "consensusGroupSize": 3,
   "minNodesPerShard": 3,
+  "chainID": "testnet",
   "metaChainConsensusGroupSize": 3,
   "metaChainMinNodes": 3,
   "hysteresis": 0.2,
   "adaptivity": false,
-  "chainID": "undefined",
   "initialNodes": [
     {
-      "pubkey": "d5f3a29643ad04cf80645f95070cfc212f023e1088e3b5afc7de8085797a52ad13d46e6ea1f8b4c229e384b7a9e1fd183e3e4d5acdcc6db213e6237ef50d29e6fe1862b91cafb5137c8989982ced6cc84740e03b2d5a14568835663507364394",
-      "address": "erd1m87mx5x20lkmj3tcskv0yw0vc2m8d40mnlfyvep4lcqkyvnvlussjdkulc"
+      "pubkey": "ea6ad23ec8694dcc42d3f4c8adb81e2b72f08ca33241cb8910044ec1e9cb0da2635a64551319b8a744d2ef4dedf762178d1e57f8a40462378e1205e969018a94214862ec249d61cd9725ba729c1fe1acf7839de7a2ac852582e6e842dde60e13",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "a4358d8219476921fc952eb6ae1b4e10d4783751abf0f4ae0d85612ed9b23938769e14691afa0573bd203b71ad08eb014ac31392bf67c89853f4b2406cccf3010624aeeb7f25e4df6a13ed724ef9c5087e8817e0323bbfb2fa7113dfdbc6f390",
-      "address": "erd1rfyjyuxl25rsp3q8j6r6y2z5tdzauu463dzdtl2293fj5yc842ssx7pdam"
+      "pubkey": "27c210a3d9942437ff2e8dfcbb601162caf2deba7f133015b2bdb8b63c5483eb1ec5747b2ed4e3ce4b13ed89888c120365a08003de5e6c76d7c7702ffd06123c096fac4720611e278687bcab717f83bc2dd6e4832ed67aff0546c7a0a69b7000",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "5b460b8d018ddc51854632d6217f855df162cda320f4e19f6e1d80425fb123b53c324ef5765e9ea7ce017628b85a8c16e85355ab72c0718ba260f14635ed108ed06948db50a7cd852f85ecafcd6aa93cd3297c31924bbe03dd1e36eafd5b1412",
-      "address": "erd18cux4ftul77k478chttklwa94q8g205ftefam8g9z0ds253mwm8qw54xn3"
+      "pubkey": "1d834ece2215313a992dd8ef349908483addaa6d8019c72e1fbc24cdc47784ba881f12b9e4351bc42ebb78ecde5b4313edecfdce31ff29baedb00e0723871e0d02d17582e7a06e9725894267dcdfac930c86feb5d806d5c3917db6ff9eb9d98b",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "7f4c290290fb5e1fb523fd0fdc480c687f4bc8e7637b1b0d23625c58a993566ed9211bd00095b316e67d2efb5e5dcf15ce602fed89267d1f8631558dfd679e64a4feac09ccd86f55a84a6c6e47c87037da311a654c1b6303bdbb2cf27aba1416",
-      "address": "erd1r6m0x3p5lf635g8ce3nhh0mhzv4ufsctarm2uamexxplzf3t5t2q05aqzk"
+      "pubkey": "b6c9e341d68948b6259c31f64bfe3c6a5a6363db8be3eefd818c24b5bcba00e4a47227cda7c998a57d9ce60c5952b81275e342299e16129b267e4e39a4f4175ac57090060867554646c81d766279a1b6d8aea7b25a4128f81df977cb60f32589",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "be3125478c06d8ad303e1c08ffb1a7643de44c15c613888f09319658c9027536b5524d75d37f8551e24b4eb0b6583b0bc85b28ed500627a01a2fae6a95a6e888952633025d6b6770b30355d4deffd13e62e44ca91d2dd1efeb7a6e11eb5cab8e",
-      "address": "erd1u6fw4egq8pv8ufpk5g3nguyf42hnfknq7w7rfhvrta6p5dss5zdsmn69sz"
+      "pubkey": "9bb55759790bd11971f8368f302d1a933516ea99a8381e3a93c03c753df8455942a85c41b929672474b7d63223cb6511747fc5ee3db4aac84c138f7799f1b19766e8b89b66ee296eda6b5ecac364ae54557338e03bf702ed179587602f693118",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "a1fe183b6d3b18755d3e4fb809d903ac2bd814ba0a57eaae51e6810b2a5b798c686808681eed4e605f2cf6e39bac9a0fe3dd1825f3f8dc7149310c16afd112bbacda31762486d8d4597d65e6b4bd0f2f8d57d2c3fb1767b1c29edaf01c1c0b15",
-      "address": "erd1sw93x2nrtsnsa0n3vukjke2vaknwvyyp5e0gsfe5swwxnpf9dxrs6ek2xz"
+      "pubkey": "54bc783b7e1c409f95f51174983f819b7b35ec5f0250098fca14a34ecbeb0ba28c9d5b0ce4cecb7a6d1ce2579922ce139623734e4b3ccc731867224511df11233519130b9922bdbae100e456e9cba23d19ede37f59faac90585f635cde366b19",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "7e8ee608fd43806fef1b883867b4250e3d268ff15c377887ec5af02937e5d426da29ce403a452f3d15a55fa3b2ffa51609a0296aaefe4d627955f9c5474c3a9114f507c5176dac90aa6321c71174a62011c805542203bafde753c77a6cc7c68d",
-      "address": "erd1fh8xt5gw9rvextpdrkwrmwatszyl7sld4mcj0cy6nsmhxs8mpldqmwp4vz"
+      "pubkey": "beffaa62eb14acc2ee7229432b76a978012631a341fb7cd415a613e0305b99830faaec773a9df990e938dc7704e21f076684d65449c09b5e4a52c97a1591deab90765aacc7e5356b5c5ac53e605fbd638a13e4bf55ee63d40d7ccd08c6fbdf16",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "e8bc4e021386ac00f2c103798c280308edebae5deff00260d097d8e286e37940708f65643a79ec824278d014a6140a086b5a9e6247ee5b9680c141001edb6deebf82d440296355b178a19bb2a78caa65a94f849e80b015c905884dcd3e22bd15",
-      "address": "erd1jmufwnqe06dvdvy5mse79k04qvm3h9yllhup884udknd4u9l0feq5xqatx"
+      "pubkey": "91876f8a421cc64459116bed6fe3b676104aa4fc94a81626f6b19b4b69739c32093eea35ce1d0f7fbea7923cf5cb2e042cd214dea58143584c8504484921b1a1adba67000e2613e2895a6ebfa8d16ec8ac8d4185ebf58544809cf83d452a598a",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     },
     {
-      "pubkey": "f5066141eb750c154b4fb048487c38947e2f5a3e591adf0e87af0c9c7858bf0e7b381eb5d1ccad1db2c5d7d255272a0220d562ea5e8c50d77f4c351fc16a1e292c97b025377d8330ebd1018d3171be96ac21d160b10464d7ab9003f936294f18",
-      "address": "erd16h4f6u5n346kfp77k6lhnxu27c3y4sc0urwcye3q6kjgus28ywpqyfnuh8"
+      "pubkey": "e34f508d647b6bb7747a0d4ce2140e34ae02ff553ec1f8804fdeddb9a6d2608d7cfdb6352d88b0771b8f41e66be36c05d67c585f0971977287d7f959e915f010b628c4b5db465f348a04084c14a3ffc4dd5f6f7eb1cd3709d46b0c0b9163dd8e",
+      "address": "erd1qqqqqqqqqqqqqpgqtvuqj62mlpzptgfzp69thcv49z3ruang797s8204fj"
     }
   ]
 }
diff --git a/cmd/node/factory/structs.go b/cmd/node/factory/structs.go
@@ -345,7 +345,7 @@ func ProcessComponentsFactory(args *processComponentsFactoryArgs) (*Process, err
 		return nil, err
 	}
 
-	_, err = poolsCleaner.NewMiniBlocksPoolsCleaner(
+	mbsPoolsCleaner, err := poolsCleaner.NewMiniBlocksPoolsCleaner(
 		args.data.Datapool.MiniBlocks(),
 		args.rounder,
 		args.shardCoordinator,
@@ -354,7 +354,9 @@ func ProcessComponentsFactory(args *processComponentsFactoryArgs) (*Process, err
 		return nil, err
 	}
 
-	_, err = poolsCleaner.NewTxsPoolsCleaner(
+	mbsPoolsCleaner.StartCleaning()
+
+	txsPoolsCleaner, err := poolsCleaner.NewTxsPoolsCleaner(
 		args.state.AddressPubkeyConverter,
 		args.data.Datapool,
 		args.rounder,
@@ -364,6 +366,8 @@ func ProcessComponentsFactory(args *processComponentsFactoryArgs) (*Process, err
 		return nil, err
 	}
 
+	txsPoolsCleaner.StartCleaning()
+
 	interceptorContainerFactory, blackListHandler, err := newInterceptorContainerFactory(
 		args.shardCoordinator,
 		args.nodesCoordinator,

diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -603,7 +603,7 @@ func startNode(ctx *cli.Context, log logger.Logger, version string) error {
 	log.Debug("config", "file", ctx.GlobalString(nodesFile.Name))
 
 	syncer := ntp.NewSyncTime(generalConfig.NTPConfig, nil)
-	go syncer.StartSync()
+	syncer.StartSyncingTime()
 
 	log.Debug("NTP average clock offset", "value", syncer.ClockOffset())
 

diff --git a/config/config.go b/config/config.go
@@ -2,10 +2,12 @@ package config
 
 // CacheConfig will map the json cache configuration
 type CacheConfig struct {
-	Type        string `json:"type"`
-	Size        uint32 `json:"size"`
-	SizeInBytes uint32 `json:"sizeInBytes"`
-	Shards      uint32 `json:"shards"`
+	Type                 string `json:"type"`
+	Size                 uint32 `json:"size"`
+	SizePerSender        uint32 `json:"sizePerSender"`
+	SizeInBytes          uint32 `json:"sizeInBytes"`
+	SizeInBytesPerSender uint32 `json:"sizeInBytesPerSender"`
+	Shards               uint32 `json:"shards"`
 }
 
 //HeadersPoolConfig will map the headers cache configuration
@@ -189,6 +191,8 @@ type StateTriesConfig struct {
 	CheckpointRoundsModulus     uint
 	AccountsStatePruningEnabled bool
 	PeerStatePruningEnabled     bool
+	MaxStateTrieLevelInMemory   uint
+	MaxPeerTrieLevelInMemory    uint
 }
 
 // TrieStorageManagerConfig will hold config information about trie storage manager