mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

arg trying to get vm to work

Browse Source
pull/1/head
d11e9 9 years ago
parent 477b766071
commit b0d2e867a7
2 changed files with 2 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 4
      libs/universal-dapp.js

2
index.html
Unescape View File

@ -42,8 +42,6 @@ THE SOFTWARE.
<script src="libs/mode-solidity.js"></script> <script src="libs/mode-solidity.js"></script>
<script src="bin/soljson-latest.js"></script> <script src="bin/soljson-latest.js"></script>
<script src="libs/ethereumjs-vm.js"></script> <script src="libs/ethereumjs-vm.js"></script>
<script src="libs/ethereumjs-account.js"></script>
<script src="libs/ethereumjs-tx.js"></script>
<script src="libs/universal-dapp.js"></script> <script src="libs/universal-dapp.js"></script>
<script src="libs/web3.min.js"></script> <script src="libs/web3.min.js"></script>
<script src="ballot.sol.js"></script> <script src="ballot.sol.js"></script>

4
libs/universal-dapp.js
Unescape View File

@ -15,7 +15,7 @@ function UniversalDApp (contracts, options) {
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'));
this.account = new EthAccount(); this.account = new Account();
this.account.balance = 'f00000000000000001'; this.account.balance = 'f00000000000000001';
this.nonce = 0; this.nonce = 0;
this.vm.stateManager.trie.put(this.address, this.account.serialize()); this.vm.stateManager.trie.put(this.address, this.account.serialize());
@ -406,7 +406,7 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
} }
} else { } else {
try { try {
var tx = new EthTx({ var tx = new Tx({
nonce: new Buffer([this.nonce++]), //@todo count beyond 255 nonce: new Buffer([this.nonce++]), //@todo count beyond 255
gasPrice: '01', gasPrice: '01',
gasLimit: '3000000000', //plenty gasLimit: '3000000000', //plenty

Write Preview
Loading…
Cancel
Save