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
a0f35d32
Commit
a0f35d32
authored
Apr 28, 2014
by
Casey Kuhlman
Browse files
Options
Downloads
Patches
Plain Diff
PreProcess moved to Mutan package
parent
68e55688
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ethereal/ui/ui_lib.go
+2
-1
2 additions, 1 deletion
ethereal/ui/ui_lib.go
utils/compile.go
+1
-2
1 addition, 2 deletions
utils/compile.go
with
3 additions
and
3 deletions
ethereal/ui/ui_lib.go
+
2
−
1
View file @
a0f35d32
...
@@ -6,6 +6,7 @@ import (
...
@@ -6,6 +6,7 @@ import (
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/mutan"
"github.com/ethereum/go-ethereum/utils"
"github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"github.com/go-qml/qml"
"os"
"os"
...
@@ -172,7 +173,7 @@ func DefaultAssetPath() string {
...
@@ -172,7 +173,7 @@ func DefaultAssetPath() string {
func
(
ui
*
UiLib
)
DebugTx
(
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
data
string
)
{
func
(
ui
*
UiLib
)
DebugTx
(
recipient
,
valueStr
,
gasStr
,
gasPriceStr
,
data
string
)
{
state
:=
ui
.
eth
.
BlockChain
()
.
CurrentBlock
.
State
()
state
:=
ui
.
eth
.
BlockChain
()
.
CurrentBlock
.
State
()
mainInput
,
_
:=
ethutil
.
PreProcess
(
data
)
mainInput
,
_
:=
mutan
.
PreProcess
(
data
)
callerScript
,
err
:=
utils
.
Compile
(
mainInput
)
callerScript
,
err
:=
utils
.
Compile
(
mainInput
)
if
err
!=
nil
{
if
err
!=
nil
{
ethutil
.
Config
.
Log
.
Debugln
(
err
)
ethutil
.
Config
.
Log
.
Debugln
(
err
)
...
...
This diff is collapsed.
Click to expand it.
utils/compile.go
+
1
−
2
View file @
a0f35d32
...
@@ -2,7 +2,6 @@ package utils
...
@@ -2,7 +2,6 @@ package utils
import
(
import
(
"fmt"
"fmt"
"github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/mutan"
"github.com/obscuren/mutan"
"strings"
"strings"
)
)
...
@@ -25,7 +24,7 @@ func Compile(script string) ([]byte, error) {
...
@@ -25,7 +24,7 @@ func Compile(script string) ([]byte, error) {
func
CompileScript
(
script
string
)
([]
byte
,
[]
byte
,
error
)
{
func
CompileScript
(
script
string
)
([]
byte
,
[]
byte
,
error
)
{
// Preprocess
// Preprocess
mainInput
,
initInput
:=
ethutil
.
PreProcess
(
script
)
mainInput
,
initInput
:=
mutan
.
PreProcess
(
script
)
// Compile main script
// Compile main script
mainScript
,
err
:=
Compile
(
mainInput
)
mainScript
,
err
:=
Compile
(
mainInput
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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