Skip to content

Add Uint256 variable support to DVM and SCEXISTS(), SCLOAD(), TOLOWER(), TOUPPER(), SUBFIELD() functions #71

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

Open
deroholic wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Add Uint256 variable support to DVM and SCEXISTS(), SCLOAD(), TOLOWER(), TOUPPER(), SUBFIELD() functions #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f154301
Add SCEXISTS(), SCLOAD(), TOLOWER(), TOUPPER(), SUBFIELD() functions
Jun 22, 2022
7580402
Add Uint256 Support to DVM
Jul 20, 2022
6c4747b
Updated ITOA(), MIN(), MAX() for Uint256
Jul 22, 2022
9bfc3ff
Store Variable.ValueUint256 as value instead of pointer so that MAP*(…
Jul 22, 2022
aed234c
Count actualy bytes loaded as Uint256 is stored in a compact way
Jul 23, 2022
855a122
Add SQRT() function and unit tests
Jul 23, 2022
dfeb215
Include return code from failing SC call so that at least GasEsimate …
Jul 24, 2022
c4aff4f
Fix external contract state read access
Jul 26, 2022
5552e22
Add external library contract import functionality
Jul 26, 2022
6a8ce01
Add POW() function
Jul 28, 2022
f9f80ce
Fix panic in dvm/simulator.go which occurs when a SC call reverts and…
Jul 28, 2022
4a60307
Allow recursive contract IMPORTs
Jul 31, 2022
6c26028
Add ISMAINNET() DVM function
Aug 9, 2022
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
405 changes: 327 additions & 78 deletions dvm/dvm.go
View file
Open in desktop

Large diffs are not rendered by default.

689 changes: 689 additions & 0 deletions dvm/dvm_execution_test.go
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 273 additions & 27 deletions dvm/dvm_functions.go
View file
Open in desktop

Large diffs are not rendered by default.

233 changes: 233 additions & 0 deletions dvm/dvm_functions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import "testing"
import "encoding/hex"

import "github.com/deroproject/derohe/cryptography/crypto"
import "github.com/holiman/uint256"

// ensure 100% coverage of functions execution
var execution_tests_functions = []struct {
Expand All @@ -32,6 +33,188 @@ var execution_tests_functions = []struct {
Eerr error // execute error
result Variable // execution result
}{
{
"valid function testing MAP*() with 256bit key",
`Function TestRun(a1 Uint64, a2 Uint256) Uint64
20 DIM v1, v2 AS Uint256
30 MAPSTORE(a2, a1)
40 LET v1 = a2
50 IF MAPEXISTS(v1) THEN GOTO 100
60 RETURN 1
100 IF MAPGET(v1) == a1 THEN GOTO 200
110 RETUN 1
200 DIM str AS String
210 LET str = ITOA(v1)
230 LET v2 = UINT256(str)
240 IF MAPGET(v2) == a1 THEN GOTO 300
250 RETURN 1
300 MAPDELETE(v2)
310 IF !MAPEXISTS(v1) THEN GOTO 500
320 RETURN 1
500 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "987654321", "a2": "987654320"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing MAP*() with 64bit key",
`Function TestRun(a1 Uint64, a2 Uint256) Uint64
20 DIM v1, v2 AS Uint64
25 DIM v3 as Uint256
30 MAPSTORE(a1, a2)
40 LET v1 = a1
50 IF MAPEXISTS(v1) THEN GOTO 100
60 RETURN 1
100 IF MAPGET(v1) == a2 THEN GOTO 200
110 RETUN 1
200 DIM str AS String
210 LET str = ITOA(a2)
230 LET v3 = UINT256(str)
240 IF MAPGET(v1) == v3 THEN GOTO 300
250 RETURN 1
300 MAPDELETE(v1)
310 IF !MAPEXISTS(v1) THEN GOTO 500
320 RETURN 1
500 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "987654321", "a2": "987654320"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing MAX() ",
`Function TestRun(a1 Uint64, a2 Uint256) Uint64
10 IF MAX(a1, a2) == a1 THEN GOTO 50
20 RETURN 1
50 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "987654321", "a2": "987654320"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing MIN() ",
`Function TestRun(a1 Uint64, a2 Uint256) Uint64
10 IF MIN(a1, a2) == a2 THEN GOTO 50
20 RETURN 1
50 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "987654321", "a2": "987654320"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing ITOA() ",
`Function TestRun(a1 Uint64, a2 Uint256) Uint64
10 IF ITOA(a1) == "987654321" THEN GOTO 50
20 RETURN 1
50 IF ITOA(a2) == "0x3ade68b1" THEN GOTO 90
60 RETURN 1
90 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "987654321", "a2": "987654321"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing UINT64() ",
`Function TestRun(a1 Uint64,a2 Uint64) Uint64
10 dim s1, s2 as Uint64
20 dim s3, s4 as Uint256
30 LET s1 = 987654321
40 LET s3 = 987654321
50 IF s1 == UINT64(s3) THEN GOTO 100
60 return 0
100 LET s2 = UINT64("987654321")
110 IF s2*s2 == s3*UINT64(s3) THEN GOTO 200
120 RETURN 1
200 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "1", "a2": "1"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing UINT256() ",
`Function TestRun(a1 Uint64,a2 Uint64) Uint64
10 dim s1, s2 as Uint64
20 dim s3, s4 as Uint256
30 LET s1 = 123456
40 LET s3 = UINT256("123456")
50 IF s1 == s3 THEN GOTO 100
60 return 0
100 LET s2 = UINT256("0xffffffffffffffff")
110 IF (UINT256(s1)*s2) == (UINT256(123456) * UINT256("0xffffffffffffffff")) THEN GOTO 200
120 RETURN 1
200 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "1", "a2": "1"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(99)},
},
{
"valid function testing SQRT(Uint64) ",
`Function TestRun(a1 Uint64) Uint64
10 RETURN SQRT(a1)
End Function
`,
"TestRun",
map[string]interface{}{"a1": "1046529"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(1023)},
},
{
"valid function testing SQRT(Uint256) ",
`Function TestRun(a1 Uint256) Uint256
10 DIM square AS Uint256
20 LET square = a1 * a1
30 IF SQRT(square) == a1 THEN GOTO 100
40 RETURN 1
100 RETURN 99
End Function
`,
"TestRun",
map[string]interface{}{"a1": "109876543210"},
nil,
Variable{Type: Uint256, ValueUint256: *uint256.NewInt(99)},
},
{
"valid function testing POW(Uint64) ",
`Function TestRun(a1 Uint64, a2 Uint64) Uint64
10 RETURN POW(a1, a2)
End Function
`,
"TestRun",
map[string]interface{}{"a1": "2", "a2": "33"},
nil,
Variable{Type: Uint64, ValueUint64: uint64(8589934592)},
},
{
"valid function testing POW(Uint256) ",
`Function TestRun(a1 Uint256, a2 Uint256) Uint256
10 RETURN POW(a1, a2)
End Function
`,
"TestRun",
map[string]interface{}{"a1": "2", "a2": "255"},
nil,
Variable{Type: Uint256, ValueUint256: *(uint256.NewInt(0).Exp(uint256.NewInt(2), uint256.NewInt(255)))},
},
{
"valid function testing BLOCK_HEIGHT() ",
`Function TestRun(a1 Uint64,a2 Uint64) Uint64
Expand Down Expand Up @@ -219,6 +402,56 @@ var execution_tests_functions = []struct {
nil,
Variable{Type: String, ValueString: string("")},
},
{
"tolower()",
`Function TestRun(input String) String
30 return tolower(input)
End Function`,
"TestRun",
map[string]interface{}{"input": string("A0b1C2d3E5f6")},
nil,
Variable{Type: String, ValueString: string("a0b1c2d3e5f6")},
},
{
"toupper()",
`Function TestRun(input String) String
30 return toupper(input)
End Function`,
"TestRun",
map[string]interface{}{"input": string("A0b1C2d3E5f6")},
nil,
Variable{Type: String, ValueString: string("A0B1C2D3E5F6")},
},
{
"subfield()",
`Function TestRun(input String) String
30 return subfield(input, ":", 3)
End Function`,
"TestRun",
map[string]interface{}{"input": string("This::is:a:test")},
nil,
Variable{Type: String, ValueString: string("a")},
},
{
"subfield()",
`Function TestRun(input String) String
30 return subfield(input, ":", 5)
End Function`,
"TestRun",
map[string]interface{}{"input": string("This::is:a:test")},
nil,
Variable{Type: String, ValueString: string("")},
},
{
"subfield()",
`Function TestRun(input String) String
30 return subfield(input, ":", 1)
End Function`,
"TestRun",
map[string]interface{}{"input": string("This::is:a:test")},
nil,
Variable{Type: String, ValueString: string("")},
},
{
"mapget()",
`Function TestRun(input String) String
Expand Down
11 changes: 11 additions & 0 deletions dvm/dvm_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package dvm
import "fmt"
import "encoding/binary"
import "github.com/deroproject/derohe/cryptography/crypto"
import "github.com/holiman/uint256"

// this package exports an interface which is used by blockchain to persist/query data

Expand Down Expand Up @@ -194,6 +195,9 @@ func (v Variable) Length() (length int64) {
length += int64(done) + 1
case String:
length = int64(len([]byte(v.ValueString)) + 1)
case Uint256:
buf := (&v.ValueUint256).Bytes()
length = int64(len(buf)) + 1
default:
panic("unknown variable type not implemented")
}
Expand All @@ -211,6 +215,9 @@ func (v Variable) MarshalBinary() (data []byte, err error) {
data = append(data, buf[:done]...)
case String:
data = append(data, ([]byte(v.ValueString))...) // string
case Uint256:
data = (&v.ValueUint256).Bytes()

default:
panic("unknown variable type not implemented2")
}
Expand Down Expand Up @@ -245,6 +252,10 @@ func (v *Variable) UnmarshalBinary(buf []byte) (err error) {
v.Type = String
v.ValueString = string(buf[:len(buf)-1])
return nil
case Uint256:
v.Type = Uint256
v.ValueUint256 = *uint256.NewInt(0).SetBytes(buf[:len(buf)-1])
return nil

default:
panic("unknown variable type not implemented3")
Expand Down
Loading