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

fixed more tests and made mocks follow new vmcommon interface #2020

Merged
merged 20 commits into from
Jun 25, 2020
Merged

fixed more tests and made mocks follow new vmcommon interface #2020

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1c0da9f
fixed more tests and made mocks follow new vmcommon interface
ccorcoveanu Jun 25, 2020
eb481cb
Merge branch 'feat/new-features' into integrate-new-hooks
sasurobert Jun 25, 2020
70bf1ba
fix after review
ccorcoveanu Jun 25, 2020
2a8d1ed
fix test after merge
sasurobert Jun 25, 2020
346a5bd
delete unused tests
sasurobert Jun 25, 2020
80ba426
merged origin
ccorcoveanu Jun 25, 2020
240a13d
delete test
sasurobert Jun 25, 2020
90ef3f4
update gas schedule
ccorcoveanu Jun 25, 2020
34c01e2
Merge branch 'integrate-new-hooks' of https://github.com/ElrondNetwor…
ccorcoveanu Jun 25, 2020
b9acfc7
new contracts
sasurobert Jun 25, 2020
623a01e
Merge branch 'integrate-new-hooks' of https://github.com/ElrondNetwor…
ccorcoveanu Jun 25, 2020
08026dc
delete one test, put back another one
sasurobert Jun 25, 2020
7cfd119
fix test after merge
sasurobert Jun 25, 2020
8966b32
fixed more tests, rebuilt contracts with new api
ccorcoveanu Jun 25, 2020
5936651
fix test after merge
sasurobert Jun 25, 2020
0408822
fixing testing jsons
sasurobert Jun 25, 2020
4853491
config back
sasurobert Jun 25, 2020
6ed0dcf
small fixes
sasurobert Jun 25, 2020
509e001
unit test done
sasurobert Jun 25, 2020
5809523
delete log level
sasurobert Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/node/config/gasSchedule.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
CompilePerByte = 300

[ElrondAPICost]
GetOwner = 100
GetSCAddress = 100
GetOwnerAddress = 100
IsSmartContract = 100
GetShardOfAddress = 100
GetExternalBalance = 7000
GetBlockHash = 1000
TransferValue = 150000
Expand Down
Binary file modified cmd/node/config/genesisContracts/delegation.wasm
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified cmd/node/config/genesisContracts/dns.wasm
100644 → 100755
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions cmd/node/config/genesisSmartContracts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"owner": "erd17326yupjy7cq7qv94n704ttxrh4lrhl7qt7mppdu9evwmj5mwt8s794sua",
"filename": "./config/genesisContracts/delegation.wasm",
"vm-type": "0500",
"init-parameters": "0BB8@%auction_sc_address%@0A61D0",
"init-parameters": "%auction_sc_address%@03E8@03E8@03E8",
"type": "delegation",
"version": "0.2.*"
"version": "0.3.*"
},
{
"owner": "erd16grmckn46ry7fwyvass8e8pz88klazzpc0c5f0pnrv643td4797sgnvjkm",
Expand Down
8 changes: 8 additions & 0 deletions core/converters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,11 @@ func ConvertToEvenHexBigInt(value *big.Int) string {

return str
}

// BooleanToInt takes a bool argument and returns 0 for false, 1 for true
func BooleanToInt(b bool) int {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not tested

if b {
return 1
}
return 0
}
Binary file modified genesis/process/testdata/delegation.wasm
100644 → 100755
View file
Open in desktop
Binary file not shown.
10 changes: 4 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ module github.com/ElrondNetwork/elrond-go
go 1.13

require (
github.com/ElrondNetwork/arwen-wasm-vm v0.3.20
github.com/ElrondNetwork/arwen-wasm-vm v0.3.22
github.com/ElrondNetwork/concurrent-map v0.1.2
github.com/ElrondNetwork/elrond-go-logger v1.0.4
github.com/ElrondNetwork/elrond-vm v0.0.25
github.com/ElrondNetwork/elrond-vm-common v0.1.20
github.com/ElrondNetwork/elrond-vm-common v0.1.21
github.com/beevik/ntp v0.2.0
github.com/btcsuite/btcd v0.20.1-beta
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
github.com/denisbrodbeck/machineid v1.0.1
github.com/elastic/go-elasticsearch/v7 v7.1.0
github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a
github.com/gin-contrib/pprof v1.2.0
github.com/gin-gonic/gin v1.3.0
github.com/gin-gonic/gin v1.6.3
github.com/gizak/termui/v3 v3.1.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.3.5
Expand All @@ -37,11 +36,10 @@ require (
github.com/multiformats/go-multiaddr v0.2.2
github.com/pelletier/go-toml v1.6.0
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.3.0
github.com/shirou/gopsutil v0.0.0-20190731134726-d80c43f9c984
github.com/stretchr/testify v1.5.1
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965
github.com/urfave/cli v1.20.0
github.com/urfave/cli v1.22.4
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476
Expand Down
61 changes: 44 additions & 17 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion integrationTests/agar_v1_min.hex
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion integrationTests/agarioV3.hex
View file
Open in desktop

This file was deleted.