git ssb - passing tests :) · wanderer🌟/js-primea-hypervisor@c2c35a42

Commit c2c35a4216304056cc0acac26cf1f3791353f429

passing tests :)

wanderer committed on 3/1/2017, 3:32:30 PM
Parent: 60b86f48100a3b8a9db14f54689cabe117acdff3

Files changed

EVMinterface.js	changed
defaultAgent.js	changed
stateInterface.js	changed
tests/interfaceRunner.js	changed
wasmAgent.js	changed

EVMinterface.jsView
		@@ -128,17 +128,17 @@
128	128	*/
129	129	getBalance (addressOffset, offset, cbIndex) {
130	130	this.takeGas(20)
131	131
132		- const path = [common.PARENT, '0x' + new Buffer(this.getMemory(addressOffset, ADDRESS_SIZE_BYTES)).toString('hex')]
133		- const opPromise = this.kernel.send(common.PARENT, new Message({
	132	+ const path = [common.PARENT, common.PARENT, '0x' + new Buffer(this.getMemory(addressOffset, ADDRESS_SIZE_BYTES)).toString('hex')]
	133	+ const opPromise = this.kernel.send(new Message({
134	134	to: path,
135	135	data: {
136	136	getValue: 'balance'
137	137	},
138	138	sync: true
139	139	}))
140		- .catch(() => new U256(0))
	140	+ .catch(() => new Buffer([]))
141	141
142	142	this.api.pushOpsQueue(opPromise, cbIndex, balance => {
143	143	this.setMemory(offset, U128_SIZE_BYTES, new U256(balance).toMemory(U128_SIZE_BYTES))
144	144	})
		@@ -152,9 +152,9 @@
152	152	*/
153	153	getTxOrigin (offset) {
154	154	this.takeGas(2)
155	155
156		- const origin = new Buffer(this.message.from[1].slice(2), 'hex')
	156	+ const origin = new Buffer(this.message.from[2].slice(2), 'hex')
157	157	this.setMemory(offset, ADDRESS_SIZE_BYTES, origin)
158	158	}
159	159
160	160	/**
		@@ -311,9 +311,9 @@
311	311	*/
312	312	getBlockHash (number, offset, cbOffset) {
313	313	this.takeGas(20)
314	314
315		- const diff = this.block.number - number
	315	+ const diff = this.message.block.number - number
316	316	let opPromise
317	317
318	318	if (diff > 256 \|\| diff <= 0) {
319	319	opPromise = Promise.resolve(new U256(0))
		@@ -333,9 +333,9 @@
333	333	*/
334	334	getBlockCoinbase (offset) {
335	335	this.takeGas(2)
336	336
337		- this.setMemory(offset, ADDRESS_SIZE_BYTES, this.block.header.coinbase)
	337	+ this.setMemory(offset, ADDRESS_SIZE_BYTES, this.message.block.header.coinbase)
338	338	}
339	339
340	340	/**
341	341	* Get the block’s timestamp.
		@@ -343,9 +343,9 @@
343	343	*/
344	344	getBlockTimestamp () {
345	345	this.takeGas(2)
346	346
347		- return this.block.timestamp
	347	+ return this.message.block.timestamp
348	348	}
349	349
350	350	/**
351	351	* Get the block’s number.
		@@ -353,9 +353,9 @@
353	353	*/
354	354	getBlockNumber () {
355	355	this.takeGas(2)
356	356
357		- return this.block.number
	357	+ return this.message.block.number
358	358	}
359	359
360	360	/**
361	361	* Get the block’s difficulty.
		@@ -363,9 +363,9 @@
363	363	*/
364	364	getBlockDifficulty (offset) {
365	365	this.takeGas(2)
366	366
367		- this.setMemory(offset, U256_SIZE_BYTES, this.block.difficulty.toMemory())
	367	+ this.setMemory(offset, U256_SIZE_BYTES, this.message.block.difficulty.toMemory())
368	368	}
369	369
370	370	/**
371	371	* Get the block’s gas limit.
		@@ -552,28 +552,28 @@
552	552	* @param {interger} valueOffset the memory offset to load the value from
553	553	*/
554	554	storageStore (pathOffset, valueOffset, cbIndex) {
555	555	this.takeGas(5000)
556		- const path = [new Buffer(this.getMemory(pathOffset, U256_SIZE_BYTES)).toString('hex')]
	556	+ const key = new Buffer(this.getMemory(pathOffset, U256_SIZE_BYTES)).toString('hex')
557	557	// copy the value
558	558	const value = this.getMemory(valueOffset, U256_SIZE_BYTES).slice(0)
559	559	const valIsZero = value.every((i) => i === 0)
560		- const opPromise = this.kernel.getValue(path)
	560	+ const opPromise = this.kernel.stateInterface.get(key)
561	561	.then(vertex => vertex.value)
562	562	.catch(() => null)
563	563
564	564	this.api.pushOpsQueue(opPromise, cbIndex, oldValue => {
565	565	if (valIsZero && oldValue) {
566	566	// delete a value
567	567	this.results.gasRefund += 15000
568		- this.kernel.deleteValue(path)
	568	+ this.kernel.storageInterface.del(key)
569	569	} else {
570	570	if (!valIsZero && !oldValue) {
571	571	// creating a new value
572	572	this.takeGas(15000)
573	573	}
574	574	// update
575		- this.kernel.setValue(path, new Vertex({
	575	+ this.kernel.stateInterface.set(key, new Vertex({
576	576	value: value
577	577	}))
578	578	}
579	579	})
		@@ -587,11 +587,11 @@
587	587	storageLoad (pathOffset, resultOffset, cbIndex) {
588	588	this.takeGas(50)
589	589
590	590	// convert the path to an array
591		- const path = [new Buffer(this.getMemory(pathOffset, U256_SIZE_BYTES)).toString('hex')]
	591	+ const key = new Buffer(this.getMemory(pathOffset, U256_SIZE_BYTES)).toString('hex')
592	592	// get the value from the state
593		- const opPromise = this.kernel.getValue(path)
	593	+ const opPromise = this.kernel.stateInterface.get(key)
594	594	.then(vertex => vertex.value)
595	595	.catch(() => new Uint8Array(32))
596	596
597	597	this.api.pushOpsQueue(opPromise, cbIndex, value => {

defaultAgent.jsView
		@@ -2,7 +2,8 @@
2	2	const to = message.to[message.hops]
3	3	if (to) {
4	4	return kernel.send(message)
5	5	} else if (message.data.getValue) {
	6	+ console.log('get value')
6	7	return (await kernel.state.get(message.data.getValue)).value
7	8	}
8	9	}

stateInterface.jsView
		@@ -13,8 +13,8 @@
13	13	get (name) {
14	14	return this.state.get([name])
15	15	}
16	16
17		- delete (name) {
	17	+ del (name) {
18	18	return this.state.del([name])
19	19	}
20	20	}

tests/interfaceRunner.jsView
		@@ -13,9 +13,9 @@
13	13
14	14	const dir = path.join(__dirname, '/interface')
15	15	// get the test names
16	16	let tests = fs.readdirSync(dir).filter((file) => file.endsWith('.wast'))
17		-// tests = ['call.wast']
	17	+// tests = ['sstore.wast']
18	18
19	19	runTests(tests)
20	20
21	21	function runTests (tests) {
		@@ -48,32 +48,26 @@
48	48	const path = ['accounts', address]
49	49	rootVertex.set(path, accountVertex)
50	50	}
51	51
52		- const block = new Block()
53		- block.header.coinbase = new Address(envData.coinbase)
54		-
55		- rootVertex.set('block', new Vertex({
56		- value: block
57		- }))
58		-
59	52	rootVertex.set('blockchain', new Vertex({
60	53	value: fakeBlockChain
61	54	}))
62	55
	56	+ const block = new Block()
	57	+ block.header.coinbase = new Address(envData.coinbase)
	58	+
63	59	const message = new Message()
64	60	message.to = ['accounts', envData.caller, common.PARENT, envData.address, 'code']
65	61	message.data = new Buffer(envData.callData.slice(2), 'hex')
66	62	message.value = new U256(envData.callValue)
67	63	message.gas = 1000000
	64	+ message.block = block
	65	+ message.blockchain = fakeBlockChain
68	66
69		- try {
70		- await hypervisor.send(message)
71		- } catch (e) {
72		- t.fail('Exception: ' + e)
73		- } finally {
74		- t.pass(testName)
75		- }
	67	+ const results = await hypervisor.send(message)
	68	+ // console.log(results)
	69	+ t.equals(results.exception, undefined)
76	70	t.end()
77	71	})
78	72	}
79	73	}

wasmAgent.jsView
		@@ -17,10 +17,10 @@
17	17	function buildImports (kernelApi, kernel, imports) {
18	18	const importMap = {}
19	19	for (const Import of imports) {
20	20	const response = responses[Import.name] = {}
21		- const newIterface = new Import(kernelApi, message, response)
22		- importMap[Import.name] = newIterface.exports
	21	+ const newInterface = new Import(kernelApi, message, response)
	22	+ importMap[Import.name] = newInterface.exports
23	23	}
24	24	return importMap
25	25	}
26	26

Built with git-ssb-web

wanderer🌟 / js-primea-hypervisor

Commit c2c35a4216304056cc0acac26cf1f3791353f429

passing tests :)

Files changed