Sc delegation integration #1730

iulianpascalau · 2020-05-13T10:28:33Z

Reference latest version of Arwen.
Reference latest version of delegation contract.
Adjust gas metering for deployments (less gas used now).
Fix long tests.

# Conflicts: # go.sum

…elrond-go into sc-delegation-integration

SebastianMarian · 2020-05-13T15:36:38Z

integrationTests/vm/arwen/testdata/bad-misc/elrond/bigInt.h

 void      bigIntGetCallValue(bigInt destination);
-void      bigIntGetExternalBalance(byte *address, bigInt result);
+void      bigIntgetExternalBalance(byte *address, bigInt result);


Get instead get ?

I checked in Arwen and it is indeed with a capital G

SebastianMarian · 2020-05-13T15:38:04Z

integrationTests/vm/arwen/testdata/erc20-c-03/elrond/bigInt.h

 void      bigIntGetCallValue(bigInt destination);
-void      bigIntGetExternalBalance(byte *address, bigInt result);
+void      bigIntgetExternalBalance(byte *address, bigInt result);


Get instead get ?

# Conflicts: # genesis/process/genesisBlockCreator_test.go

SebastianMarian · 2020-05-15T13:46:40Z

genesis/process/intermediate/delegationProcessor.go

+}
+
+func (dp *delegationProcessor) sameElements(slice1 [][]byte, slice2 [][]byte) error {
+	for _, elem1 := range slice1 {


If you have sorted here slice1 and slice2 you could have only one for for this check. And also I would add a check for len before any computation if len(slice1) != len(slice2) return err

the len check was done on lines L429:L432. Refactoring...

done, refactored and added unit tests for that area

SebastianMarian · 2020-05-15T14:19:37Z

core/version/versionComparator.go

+	release string
+}
+
+// NewVersionComparator return a new version comparator instance


SebastianMarian · 2020-05-15T14:23:19Z

genesis/errors.go

@@ -130,3 +130,6 @@ var ErrNilQueryService = errors.New("nil query service")

 // ErrMissingElement signals a missing element event
 var ErrMissingElement = errors.New("missing element")
+
+// ErrGetVersionFromSC signals that a coll to "version" function on a contract resulted in an unexpected result


"call" instead "coll" and "on a smart contract" instead "on a contract"

SebastianMarian · 2020-05-15T14:30:43Z

cmd/node/config/nodesSetup.json

@@ -1,49 +1,517 @@
 {


Do we need to change the default values in this file ?

yes, the node, at the current moment can not be started directly (to check the binary works) due to the fact that there is a mismatch between the staked value per node in genesis files (500k) and the economics.toml (2.5 mil)

SebastianMarian · 2020-05-15T14:32:18Z

cmd/node/config/genesis.json

@@ -1,122 +1,1322 @@
 [


Do we need to change the default values in this file ?

yes, the node, at the current moment can not be started directly (to check the binary works) due to the fact that there is a mismatch between the staked value per node in genesis files (500k) and the economics.toml (2.5 mil)

…dded new unit tests.

…Network/elrond-go into sc-delegation-integration

sasurobert · 2020-05-15T14:08:05Z

cmd/node/config/genesisSmartContracts.json

  }
-]
+]


add empty line to end of file

sasurobert · 2020-05-15T14:08:25Z

cmd/node/config/nodesSetup.json

  "metaChainConsensusGroupSize": 3,
  "metaChainMinNodes": 3,
-  "hysteresis": 0.2,
+  "hysteresis": 0,


maybe leave it to 0.2 ?

sasurobert · 2020-05-15T14:08:37Z

cmd/node/config/nodesSetup.json

@@ -1,49 +1,49 @@
 {
  "startTime": 0,
-  "roundDuration": 6000,
+  "roundDuration": 4000,


why to 6seconds ?

sasurobert · 2020-05-15T14:08:45Z

cmd/node/config/nodesSetup.json

    }
  ]
-}
+}


add empty line to end of file

sasurobert · 2020-05-15T14:23:16Z

genesis/process/argGenesisBlockCreator.go

-	ChainID                  string
-	SystemSCConfig           config.SystemSmartContractsConfig
-
+	//TODO remove this: at genesis time the genesis block creator should not write other shard's data in the same storage manager


May delete the TODO - this is a must for hardFork when importing your own trie and accounts. As you have to import to the same storage the node will work after hardfork.

sasurobert · 2020-05-15T15:22:04Z

core/versioning/versionComparator.go

+	"github.com/ElrondNetwork/elrond-go/core"
+)
+
+const numComponents = 3


numComponents maybe removed

I will have a magic number as 3

sasurobert · 2020-05-15T15:25:32Z

genesis/process/intermediate/delegationProcessor.go

+			return err
+		}
+
+		err = dp.executeSetNodePrice(sc)


maybe rename to something more specific as this works only with Elrond stlye delegation contract - maybe standardDelegationProcess ? :)

You mean the whole file? like standardDelegationProcessor?

sasurobert · 2020-05-15T15:26:25Z

genesis/process/intermediate/delegationProcessor.go

+}
+
+func (dp *delegationProcessor) executeSetNumNodes(numNodes int, sc genesis.InitialSmartContractHandler) error {
+	setNumNodesTxData := fmt.Sprintf("%s@%x", setNumNodesFunction, numNodes)


maybe use strings and plus, instead of fmt.sprintf.

I prefer to use fmt.Sprintf where I have more than one addition. I also have a %x and this should get uglier

sasurobert · 2020-05-15T15:27:30Z

genesis/process/intermediate/delegationProcessor.go

+	return hex.EncodeToString(node.PubKeyBytes())
+}
+
+func (dp *delegationProcessor) activate(_ sharding.GenesisNodeInfoHandler) string {


maybe rename the function name.

getBlsKeySig

sasurobert · 2020-05-15T15:27:38Z

genesis/process/intermediate/delegationProcessor.go

 	}

 	return totalDelegated, nil
 }

+func (dp *delegationProcessor) setBlsKey(node sharding.GenesisNodeInfoHandler) string {


…sc-delegation-integration

…Network/elrond-go into sc-delegation-integration

andreibancioiu

Green to merge & release.

LucianMincu

System tests passed.

andrei-marinica added 4 commits May 12, 2020 15:55

integrate Arwen v0.3.17

588526c

new delegation contract

704c377

fixed go.mod

b30af75

fixed cross-shard delegation test

28c5238

iulianpascalau added the type:feature New feature or request label May 13, 2020

iulianpascalau assigned andrei-marinica and iulianpascalau May 13, 2020

andrei-marinica and others added 4 commits May 13, 2020 13:50

Merge branch 'development' into sc-delegation-integration

0864dca

Fix some tests.

4a5d5ab

Merge branch 'development' into sc-delegation-integration

718efe3

# Conflicts: # go.sum

fix after merge

e03a9fa

iulianpascalau assigned andreibancioiu May 13, 2020

andreibancioiu and others added 9 commits May 13, 2020 15:54

Fix some tests.

e81a515

Merge branch 'development' into sc-delegation-integration

59074c6

Fix one more test.

10e12b2

Merge branch 'sc-delegation-integration' of github.com:ElrondNetwork/…

1f5d388

…elrond-go into sc-delegation-integration

Fix tests.

047a24e

Merge branch 'development' into sc-delegation-integration

24fc468

Fix tests.

0a2788b

Fix test.

1eac895

Merge branch 'sc-delegation-integration' of github.com:ElrondNetwork/…

87c36d7

…elrond-go into sc-delegation-integration

SebastianMarian reviewed May 13, 2020

View reviewed changes

andreibancioiu added 8 commits May 13, 2020 20:22

Restore min gas limit.

6373fd5

Merge branch 'development' into sc-delegation-integration

ee421dd

# Conflicts: # genesis/process/genesisBlockCreator_test.go

Fix remaining tests.

5d1d9ac

Fix remaining tests.

39b0019

Fix test.

4ad6cad

Fix test.

4fd8fcb

Reference latest Arwen (with gas adjustments for deploy).

7f5c38a

Fix after review.

6c633db

iulianpascalau and others added 2 commits May 15, 2020 16:29

smaller config files

fb204de

Merge branch 'development' into sc-delegation-integration

66884e3

SebastianMarian reviewed May 15, 2020

View reviewed changes

iulianpascalau and others added 3 commits May 15, 2020 18:08

fixed typos, refactored delegationProcessor.sameElements function + a…

5212957

…dded new unit tests.

Merge branch 'sc-delegation-integration' of https://github.com/Elrond…

0152a85

…Network/elrond-go into sc-delegation-integration

Merge branch 'development' into sc-delegation-integration

54be783

sasurobert requested changes May 15, 2020

View reviewed changes

SebastianMarian previously approved these changes May 15, 2020

View reviewed changes

sasurobert added 2 commits May 15, 2020 19:35

small bugfix.

e46a703

Merge remote-tracking branch 'origin/sc-delegation-integration' into …

08da6dc

…sc-delegation-integration

sasurobert dismissed SebastianMarian’s stale review via 08da6dc May 15, 2020 16:36

sasurobert and others added 3 commits May 15, 2020 19:42

small bugfix and unit test

8207e3d

fixes after review

69d954a

Merge branch 'sc-delegation-integration' of https://github.com/Elrond…

dbcdc3b

…Network/elrond-go into sc-delegation-integration

SebastianMarian previously approved these changes May 15, 2020

View reviewed changes

SebastianMarian and others added 3 commits May 15, 2020 20:33

Merge branch 'development' into sc-delegation-integration

6a4f36b

renamed delegationProcessor to standardDelegationProcessor

5e2c396

Merge branch 'sc-delegation-integration' of https://github.com/Elrond…

c44adae

…Network/elrond-go into sc-delegation-integration

iulianpascalau dismissed SebastianMarian’s stale review via c44adae May 15, 2020 18:15

SebastianMarian previously approved these changes May 15, 2020

View reviewed changes

sasurobert previously approved these changes May 15, 2020

View reviewed changes

iulianpascalau and others added 2 commits May 17, 2020 10:20

Merge branch 'development' into sc-delegation-integration

63b80f1

fixes after merge

87548eb

iulianpascalau dismissed stale reviews from sasurobert and SebastianMarian via 87548eb May 17, 2020 08:12

SebastianMarian approved these changes May 17, 2020

View reviewed changes

andreibancioiu approved these changes May 17, 2020

View reviewed changes

LucianMincu approved these changes May 17, 2020

View reviewed changes

iulianpascalau merged commit 2ef180f into development May 17, 2020

iulianpascalau deleted the sc-delegation-integration branch May 17, 2020 20:39

Sc delegation integration #1730

Sc delegation integration #1730

Conversation

iulianpascalau commented May 13, 2020 • edited by andreibancioiu Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iulianpascalau May 15, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iulianpascalau May 15, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andreibancioiu left a comment

Choose a reason for hiding this comment

LucianMincu left a comment

Choose a reason for hiding this comment

iulianpascalau commented May 13, 2020 •

edited by andreibancioiu

Loading

iulianpascalau May 15, 2020 •

edited

Loading

iulianpascalau May 15, 2020 •

edited

Loading