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
00425984
Commit
00425984
authored
Apr 03, 2016
by
Alex Beregszaszi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Accomodate the API change in ethereumjs/browser-builds
parent
3e71bae0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
universal-dapp.js
assets/js/universal-dapp.js
+6
-6
No files found.
assets/js/universal-dapp.js
View file @
00425984
...
...
@@ -7,13 +7,13 @@ function UniversalDApp (contracts, options) {
if
(
!
options
.
vm
&&
web3
.
currentProvider
)
{
}
else
if
(
options
.
vm
)
{
this
.
BN
=
Eth
Vm
.
deps
.
ethUtil
.
BN
;
this
.
stateTrie
=
new
Eth
Vm
.
deps
.
Trie
();
this
.
vm
=
new
Eth
Vm
(
this
.
stateTrie
);
this
.
BN
=
Eth
JS
.
BN
;
this
.
stateTrie
=
new
Eth
JS
.
Trie
();
this
.
vm
=
new
Eth
JS
.
VM
(
this
.
stateTrie
);
this
.
secretKey
=
'3cd7232cd6f3fc66a57a6bedc1a8ed6c228fff0a327e169c2bcc5e869ed49511'
this
.
publicKey
=
'0406cc661590d48ee972944b35ad13ff03c7876eae3fd191e8a2f77311b0a3c6613407b5005e63d7d8d76b89d5f900cde691497688bb281e07a5052ff61edebdc0'
this
.
address
=
ethUtil
.
pubToAddress
(
new
Buffer
(
this
.
publicKey
,
'hex'
),
true
);
this
.
account
=
new
Eth
Vm
.
deps
.
Account
();
this
.
account
=
new
Eth
JS
.
Account
();
this
.
account
.
balance
=
'f00000000000000001'
;
this
.
nonce
=
0
;
this
.
vm
.
stateManager
.
trie
.
put
(
this
.
address
,
this
.
account
.
serialize
());
...
...
@@ -437,7 +437,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
}
}
else
{
try
{
var
tx
=
new
Eth
Vm
.
deps
.
Transaction
({
var
tx
=
new
Eth
JS
.
Tx
({
nonce
:
new
Buffer
([
this
.
nonce
++
]),
//@todo count beyond 255
gasPrice
:
1
,
gasLimit
:
3000000000
,
//plenty
...
...
@@ -446,7 +446,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
data
:
new
Buffer
(
data
.
slice
(
2
),
'hex'
)
});
tx
.
sign
(
new
Buffer
(
this
.
secretKey
,
'hex'
));
this
.
vm
.
runTx
({
tx
:
tx
,
skipBalance
:
true
,
skipNonce
:
true
},
cb
);
this
.
vm
.
runTx
({
tx
:
tx
,
skipBalance
:
true
,
skipNonce
:
true
,
enableHomestead
:
true
},
cb
);
}
catch
(
e
)
{
cb
(
e
,
null
);
}
...
...
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