Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
14a6e6a9
Commit
14a6e6a9
authored
May 05, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the ability to submit byte code for contracts instead of Mutan code.
parent
3e5a7b34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
pub.go
ethpub/pub.go
+17
-6
bytes.go
ethutil/bytes.go
+5
-0
No files found.
ethpub/pub.go
View file @
14a6e6a9
...
...
@@ -103,13 +103,24 @@ func (lib *PEthereum) createTx(key, recipient, valueStr, gasStr, gasPriceStr, in
var
tx
*
ethchain
.
Transaction
// Compile and assemble the given data
if
contractCreation
{
initScript
,
err
:=
ethutil
.
Compile
(
initStr
)
if
err
!=
nil
{
return
nil
,
err
var
initScript
,
mainScript
[]
byte
var
err
error
if
ethutil
.
IsHex
(
initStr
)
{
initScript
=
ethutil
.
FromHex
(
initStr
)
}
else
{
initScript
,
err
=
ethutil
.
Compile
(
initStr
[
2
:
])
if
err
!=
nil
{
return
nil
,
err
}
}
mainScript
,
err
:=
ethutil
.
Compile
(
scriptStr
)
if
err
!=
nil
{
return
nil
,
err
if
ethutil
.
IsHex
(
scriptStr
)
{
mainScript
=
ethutil
.
FromHex
(
scriptStr
[
2
:
])
}
else
{
mainScript
,
err
=
ethutil
.
Compile
(
scriptStr
)
if
err
!=
nil
{
return
nil
,
err
}
}
tx
=
ethchain
.
NewContractCreationTx
(
value
,
gas
,
gasPrice
,
mainScript
,
initScript
)
...
...
ethutil/bytes.go
View file @
14a6e6a9
...
...
@@ -83,3 +83,8 @@ func CopyBytes(b []byte) (copiedBytes []byte) {
return
}
func
IsHex
(
str
string
)
bool
{
l
:=
len
(
str
)
return
l
>=
4
&&
l
%
2
==
0
&&
str
[
0
:
2
]
==
"0x"
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment