@cryptoeconomicslab/plasma
Advanced tools
Comparing version 0.0.5 to 0.0.6
@@ -1,2 +0,2 @@ | ||
import { Address, Range, Bytes, Struct } from '@cryptoeconomicslab/primitives'; | ||
import { Address, Range, BigNumber, Bytes, Struct } from '@cryptoeconomicslab/primitives'; | ||
import { Property } from '@cryptoeconomicslab/ovm'; | ||
@@ -6,6 +6,7 @@ export default class Transaction { | ||
range: Range; | ||
prevBlockNumber: BigNumber; | ||
stateObject: Property; | ||
from: Address; | ||
signature: Bytes; | ||
constructor(depositContractAddress: Address, range: Range, stateObject: Property, from: Address, signature?: Bytes); | ||
constructor(depositContractAddress: Address, range: Range, prevBlockNumber: BigNumber, stateObject: Property, from: Address, signature?: Bytes); | ||
static default(): Transaction; | ||
@@ -17,2 +18,3 @@ static getParamTypes(): Struct; | ||
getHash(): Bytes; | ||
toProperty(deciderAddress: Address): Property; | ||
} |
@@ -7,5 +7,6 @@ "use strict"; | ||
class Transaction { | ||
constructor(depositContractAddress, range, stateObject, from, signature = primitives_1.Bytes.default()) { | ||
constructor(depositContractAddress, range, prevBlockNumber, stateObject, from, signature = primitives_1.Bytes.default()) { | ||
this.depositContractAddress = depositContractAddress; | ||
this.range = range; | ||
this.prevBlockNumber = prevBlockNumber; | ||
this.stateObject = stateObject; | ||
@@ -16,3 +17,3 @@ this.from = from; | ||
static default() { | ||
return new Transaction(primitives_1.Address.default(), new primitives_1.Range(primitives_1.BigNumber.default(), primitives_1.BigNumber.default()), new ovm_1.Property(primitives_1.Address.default(), []), primitives_1.Address.default(), primitives_1.Bytes.default()); | ||
return new Transaction(primitives_1.Address.default(), new primitives_1.Range(primitives_1.BigNumber.default(), primitives_1.BigNumber.default()), primitives_1.BigNumber.default(), new ovm_1.Property(primitives_1.Address.default(), []), primitives_1.Address.default(), primitives_1.Bytes.default()); | ||
} | ||
@@ -23,2 +24,3 @@ static getParamTypes() { | ||
{ key: 'range', value: primitives_1.Range.getParamType() }, | ||
{ key: 'prevBlockNumber', value: primitives_1.BigNumber.default() }, | ||
{ key: 'stateObject', value: ovm_1.Property.getParamType() }, | ||
@@ -32,6 +34,7 @@ { key: 'from', value: primitives_1.Address.default() }, | ||
const range = struct.data[1].value; | ||
const stateObject = struct.data[2].value; | ||
const from = struct.data[3].value; | ||
const signature = struct.data[4].value; | ||
return new Transaction(depositContractAddress, primitives_1.Range.fromStruct(range), ovm_1.Property.fromStruct(stateObject), from, signature); | ||
const prevBlockNumber = struct.data[2].value; | ||
const stateObject = struct.data[3].value; | ||
const from = struct.data[4].value; | ||
const signature = struct.data[5].value; | ||
return new Transaction(depositContractAddress, primitives_1.Range.fromStruct(range), prevBlockNumber, ovm_1.Property.fromStruct(stateObject), from, signature); | ||
} | ||
@@ -42,2 +45,3 @@ toStruct() { | ||
{ key: 'range', value: this.range.toStruct() }, | ||
{ key: 'prevBlockNumber', value: this.prevBlockNumber }, | ||
{ key: 'stateObject', value: this.stateObject.toStruct() }, | ||
@@ -52,2 +56,3 @@ { key: 'from', value: this.from }, | ||
{ key: 'range', value: this.range.toStruct() }, | ||
{ key: 'prevBlockNumber', value: this.prevBlockNumber }, | ||
{ key: 'stateObject', value: this.stateObject.toStruct() }, | ||
@@ -60,4 +65,12 @@ { key: 'from', value: this.from } | ||
} | ||
toProperty(deciderAddress) { | ||
return new ovm_1.Property(deciderAddress, [ | ||
primitives_1.Bytes.fromHexString(this.depositContractAddress.raw).padZero(32), | ||
this.range.toBytes(), | ||
primitives_1.Bytes.fromHexString(this.prevBlockNumber.toHexString()).padZero(32), | ||
ovmContext.coder.encode(this.stateObject.toStruct()) | ||
]); | ||
} | ||
} | ||
exports.default = Transaction; | ||
//# sourceMappingURL=Transaction.js.map |
{ | ||
"name": "@cryptoeconomicslab/plasma", | ||
"version": "0.0.5", | ||
"version": "0.0.6", | ||
"description": "plasma module", | ||
@@ -59,13 +59,16 @@ "author": { | ||
"dependencies": { | ||
"@cryptoeconomicslab/db": "^0.0.5", | ||
"@cryptoeconomicslab/hash": "^0.0.5", | ||
"@cryptoeconomicslab/merkle-tree": "^0.0.5", | ||
"@cryptoeconomicslab/ovm": "^0.0.5", | ||
"@cryptoeconomicslab/primitives": "^0.0.5" | ||
"@cryptoeconomicslab/db": "^0.0.6", | ||
"@cryptoeconomicslab/hash": "^0.0.6", | ||
"@cryptoeconomicslab/merkle-tree": "^0.0.6", | ||
"@cryptoeconomicslab/ovm": "^0.0.6" | ||
}, | ||
"devDependencies": { | ||
"@cryptoeconomicslab/coder": "^0.0.5", | ||
"@cryptoeconomicslab/context": "^0.0.5" | ||
"@cryptoeconomicslab/coder": "^0.0.6", | ||
"@cryptoeconomicslab/context": "^0.0.6", | ||
"@cryptoeconomicslab/primitives": "^0.0.6" | ||
}, | ||
"gitHead": "12317f3664d7aefd4af998e46f7211c1cb6671fc" | ||
"peerDependencies": { | ||
"@cryptoeconomicslab/primitives": "^0.0.5" | ||
}, | ||
"gitHead": "842f994568e7828197cc299f2e33972624f1269c" | ||
} |
Sorry, the diff of this file is not supported yet
52681
542
3
+ Added@cryptoeconomicslab/coder@0.0.6(transitive)
+ Added@cryptoeconomicslab/db@0.0.6(transitive)
+ Added@cryptoeconomicslab/hash@0.0.6(transitive)
+ Added@cryptoeconomicslab/merkle-tree@0.0.6(transitive)
+ Added@cryptoeconomicslab/ovm@0.0.6(transitive)
+ Added@cryptoeconomicslab/signature@0.0.6(transitive)
+ Added@cryptoeconomicslab/utils@0.0.6(transitive)
- Removed@cryptoeconomicslab/coder@0.0.5(transitive)
- Removed@cryptoeconomicslab/db@0.0.5(transitive)
- Removed@cryptoeconomicslab/hash@0.0.5(transitive)
- Removed@cryptoeconomicslab/merkle-tree@0.0.5(transitive)
- Removed@cryptoeconomicslab/ovm@0.0.5(transitive)
- Removed@cryptoeconomicslab/signature@0.0.5(transitive)
- Removed@cryptoeconomicslab/utils@0.0.5(transitive)