Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix minor issue and add the GENESIS_DELAY option #1725

Merged
merged 9 commits into from
May 13, 2020
Merged

Fix minor issue and add the GENESIS_DELAY option #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e31858f
Fix minor issue and add the GENESIS_DELAY option
camilbancioiu May 12, 2020
d1d465d
Merge branch 'development' into minor-fixes-scripts-trace
andreibancioiu May 12, 2020
00eb856
Merge branch 'development' into minor-fixes-scripts-trace
andreibancioiu May 12, 2020
8eb1b66
Merge branch 'development' into minor-fixes-scripts-trace
andreibancioiu May 13, 2020
336e914
Merge branch 'development' into minor-fixes-scripts-trace
iulianpascalau May 13, 2020
356b2c0
Fix after review
camilbancioiu May 13, 2020
5446046
Merge branch 'minor-fixes-scripts-trace' of https://github.com/Elrond…
camilbancioiu May 13, 2020
0a796a8
Revert default value of NODE_DELAY
camilbancioiu May 13, 2020
10c0422
Merge branch 'development' into minor-fixes-scripts-trace
iulianpascalau May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion process/smartContract/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,12 @@ func (sc *scProcessor) DeploySmartContract(

func (sc *scProcessor) printScDeployed(vmOutput *vmcommon.VMOutput, tx data.TransactionHandler) {
scGenerated := make([]string, 0, len(vmOutput.OutputAccounts))
for addr := range vmOutput.OutputAccounts {
for _, account := range vmOutput.OutputAccounts {
if account == nil {
continue
}

addr := account.Address
if !core.IsSmartContractAddress([]byte(addr)) {
continue
}
Expand Down
3 changes: 2 additions & 1 deletion scripts/testnet/include/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ updateNodeConfig() {

cp nodesSetup.json nodesSetup_edit.json

let startTime="$(date +%s) + $NODE_DELAY + 30"
let startTime="$(date +%s) + $GENESIS_DELAY"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

updateJSONValue nodesSetup_edit.json "startTime" "$startTime"

if [ $ALWAYS_NEW_CHAINID -eq 1 ]; then
Expand All @@ -96,6 +96,7 @@ copyProxyConfig() {
cp $PROXYDIR/config/config.toml ./proxy/config/

cp ./node/config/economics.toml ./proxy/config/
cp ./node/config/external.toml ./proxy/config/
cp ./node/config/walletKey.pem ./proxy/config

echo "Copied configuration for the Proxy."
Expand Down
3 changes: 2 additions & 1 deletion scripts/testnet/variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ export NODE_NICENESS=10

# Delays after running executables.
export SEEDNODE_DELAY=5
export GENESIS_DELAY=30
export NODE_DELAY=10

#types of keys to generate
# Types of keys to generate
export TX_SIGN_FORMAT="bech32"
export BLOCK_SIGN_FORMAT="hex"

Expand Down