good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
0f9539e1
Commit
0f9539e1
authored
Jun 10, 2016
by
Péter Szilágyi
Browse files
Options
Downloads
Patches
Plain Diff
accounts/abi: fix uint64 upper range encoding.
parent
63d1d145
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
accounts/abi/numbers.go
+3
-9
3 additions, 9 deletions
accounts/abi/numbers.go
accounts/abi/numbers_test.go
+30
-12
30 additions, 12 deletions
accounts/abi/numbers_test.go
with
33 additions
and
21 deletions
accounts/abi/numbers.go
+
3
−
9
View file @
0f9539e1
...
@@ -56,27 +56,21 @@ var (
...
@@ -56,27 +56,21 @@ var (
big_ts
=
reflect
.
TypeOf
([]
*
big
.
Int
(
nil
))
big_ts
=
reflect
.
TypeOf
([]
*
big
.
Int
(
nil
))
)
)
// U256
will ensure unsigned 256bit on big nums
// U256
converts a big Int into a 256bit EVM number.
func
U256
(
n
*
big
.
Int
)
[]
byte
{
func
U256
(
n
*
big
.
Int
)
[]
byte
{
return
common
.
LeftPadBytes
(
common
.
U256
(
n
)
.
Bytes
(),
32
)
return
common
.
LeftPadBytes
(
common
.
U256
(
n
)
.
Bytes
(),
32
)
}
}
// S256 will ensure signed 256bit on big nums
func
U2U256
(
n
uint64
)
[]
byte
{
return
U256
(
big
.
NewInt
(
int64
(
n
)))
}
// packNum packs the given number (using the reflect value) and will cast it to appropriate number representation
// packNum packs the given number (using the reflect value) and will cast it to appropriate number representation
func
packNum
(
value
reflect
.
Value
)
[]
byte
{
func
packNum
(
value
reflect
.
Value
)
[]
byte
{
switch
kind
:=
value
.
Kind
();
kind
{
switch
kind
:=
value
.
Kind
();
kind
{
case
reflect
.
Uint
,
reflect
.
Uint8
,
reflect
.
Uint16
,
reflect
.
Uint32
,
reflect
.
Uint64
:
case
reflect
.
Uint
,
reflect
.
Uint8
,
reflect
.
Uint16
,
reflect
.
Uint32
,
reflect
.
Uint64
:
return
U2
U256
(
value
.
Uint
())
return
U256
(
new
(
big
.
Int
)
.
SetUint64
(
value
.
Uint
())
)
case
reflect
.
Int
,
reflect
.
Int8
,
reflect
.
Int16
,
reflect
.
Int32
,
reflect
.
Int64
:
case
reflect
.
Int
,
reflect
.
Int8
,
reflect
.
Int16
,
reflect
.
Int32
,
reflect
.
Int64
:
return
U2
U256
(
uint64
(
value
.
Int
()))
return
U256
(
big
.
NewInt
(
value
.
Int
()))
case
reflect
.
Ptr
:
case
reflect
.
Ptr
:
return
U256
(
value
.
Interface
()
.
(
*
big
.
Int
))
return
U256
(
value
.
Interface
()
.
(
*
big
.
Int
))
}
}
return
nil
return
nil
}
}
...
...
This diff is collapsed.
Click to expand it.
accounts/abi/numbers_test.go
+
30
−
12
View file @
0f9539e1
...
@@ -18,6 +18,7 @@ package abi
...
@@ -18,6 +18,7 @@ package abi
import
(
import
(
"bytes"
"bytes"
"math"
"math/big"
"math/big"
"reflect"
"reflect"
"testing"
"testing"
...
@@ -34,21 +35,38 @@ func TestNumberTypes(t *testing.T) {
...
@@ -34,21 +35,38 @@ func TestNumberTypes(t *testing.T) {
}
}
func
TestPackNumber
(
t
*
testing
.
T
)
{
func
TestPackNumber
(
t
*
testing
.
T
)
{
ubytes
:=
make
([]
byte
,
32
)
tests
:=
[]
struct
{
ubytes
[
31
]
=
1
value
reflect
.
Value
maxunsigned
:=
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
}
packed
[]
byte
}{
// Protocol limits
{
reflect
.
ValueOf
(
0
),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
}},
{
reflect
.
ValueOf
(
1
),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
1
}},
{
reflect
.
ValueOf
(
-
1
),
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
}},
// Type corner cases
{
reflect
.
ValueOf
(
uint8
(
math
.
MaxUint8
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
255
}},
{
reflect
.
ValueOf
(
uint16
(
math
.
MaxUint16
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
255
,
255
}},
{
reflect
.
ValueOf
(
uint32
(
math
.
MaxUint32
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
255
,
255
,
255
,
255
}},
{
reflect
.
ValueOf
(
uint64
(
math
.
MaxUint64
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
}},
packed
:=
packNum
(
reflect
.
ValueOf
(
1
))
{
reflect
.
ValueOf
(
int8
(
math
.
MaxInt8
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
127
}},
if
!
bytes
.
Equal
(
packed
,
ubytes
)
{
{
reflect
.
ValueOf
(
int16
(
math
.
MaxInt16
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
127
,
255
}},
t
.
Errorf
(
"expected %x got %x"
,
ubytes
,
packed
)
{
reflect
.
ValueOf
(
int32
(
math
.
MaxInt32
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
127
,
255
,
255
,
255
}},
{
reflect
.
ValueOf
(
int64
(
math
.
MaxInt64
)),
[]
byte
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
127
,
255
,
255
,
255
,
255
,
255
,
255
,
255
}},
{
reflect
.
ValueOf
(
int8
(
math
.
MinInt8
)),
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
128
}},
{
reflect
.
ValueOf
(
int16
(
math
.
MinInt16
)),
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
128
,
0
}},
{
reflect
.
ValueOf
(
int32
(
math
.
MinInt32
)),
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
128
,
0
,
0
,
0
}},
{
reflect
.
ValueOf
(
int64
(
math
.
MinInt64
)),
[]
byte
{
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
255
,
128
,
0
,
0
,
0
,
0
,
0
,
0
,
0
}},
}
}
packed
=
packNum
(
reflect
.
ValueOf
(
-
1
))
for
i
,
tt
:=
range
tests
{
if
!
bytes
.
Equal
(
packed
,
maxunsigned
)
{
packed
:=
packNum
(
tt
.
value
)
t
.
Errorf
(
"expected %x got %x"
,
maxunsigned
,
packed
)
if
!
bytes
.
Equal
(
packed
,
tt
.
packed
)
{
t
.
Errorf
(
"test %d: pack mismatch: have %x, want %x"
,
i
,
packed
,
tt
.
packed
)
}
}
}
packed
=
packNum
(
reflect
.
ValueOf
(
"string"
))
if
packed
:=
packNum
(
reflect
.
ValueOf
(
"string"
));
packed
!=
nil
{
if
packed
!=
nil
{
t
.
Errorf
(
"expected 'string' to pack to nil. got %x instead"
,
packed
)
t
.
Errorf
(
"expected 'string' to pack to nil. got %x instead"
,
packed
)
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment