Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
a67305ed
Commit
a67305ed
authored
Oct 07, 2015
by
d11e9
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updating to match new EthVm apis
parent
083df317
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
universal-dapp.js
libs/universal-dapp.js
+2
-3
No files found.
libs/universal-dapp.js
View file @
a67305ed
...
@@ -7,12 +7,11 @@ function UniversalDApp (contracts, options) {
...
@@ -7,12 +7,11 @@ function UniversalDApp (contracts, options) {
if
(
!
options
.
vm
&&
web3
.
currentProvider
)
{
if
(
!
options
.
vm
&&
web3
.
currentProvider
)
{
}
else
if
(
options
.
vm
)
{
}
else
if
(
options
.
vm
)
{
this
.
stateTrie
=
new
EthVm
.
Trie
();
this
.
vm
=
new
EthVm
();
this
.
vm
=
new
EthVm
.
VM
(
this
.
stateTrie
);
//@todo this does not calculate the gas costs correctly but gets the job done.
//@todo this does not calculate the gas costs correctly but gets the job done.
this
.
identityCode
=
'return { gasUsed: 1, return: opts.data, exception: 1 };'
;
this
.
identityCode
=
'return { gasUsed: 1, return: opts.data, exception: 1 };'
;
this
.
identityAddr
=
ethUtil
.
pad
(
new
Buffer
(
'04'
,
'hex'
),
20
)
this
.
identityAddr
=
ethUtil
.
pad
(
new
Buffer
(
'04'
,
'hex'
),
20
)
this
.
vm
.
load
Prec
ompiled
(
this
.
identityAddr
,
this
.
identityCode
);
this
.
vm
.
load
C
ompiled
(
this
.
identityAddr
,
this
.
identityCode
);
this
.
secretKey
=
'3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'
this
.
secretKey
=
'3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'
this
.
publicKey
=
'0406cc661590d48ee972944b35ad13ff03c7876eae3fd191e8a2f77311b0a3c6613407b5005e63d7d8d76b89d5f900cde691497688bb281e07a5052ff61edebdc0'
this
.
publicKey
=
'0406cc661590d48ee972944b35ad13ff03c7876eae3fd191e8a2f77311b0a3c6613407b5005e63d7d8d76b89d5f900cde691497688bb281e07a5052ff61edebdc0'
this
.
address
=
ethUtil
.
pubToAddress
(
new
Buffer
(
this
.
publicKey
,
'hex'
));
this
.
address
=
ethUtil
.
pubToAddress
(
new
Buffer
(
this
.
publicKey
,
'hex'
));
...
...
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