@cryptoeconomicslab/plasma
Advanced tools
Comparing version 0.0.8 to 0.0.10
@@ -6,7 +6,7 @@ import { Address, Range, BigNumber, Bytes, Struct } from '@cryptoeconomicslab/primitives'; | ||
range: Range; | ||
prevBlockNumber: BigNumber; | ||
maxBlockNumber: BigNumber; | ||
stateObject: Property; | ||
from: Address; | ||
signature: Bytes; | ||
constructor(depositContractAddress: Address, range: Range, prevBlockNumber: BigNumber, stateObject: Property, from: Address, signature?: Bytes); | ||
constructor(depositContractAddress: Address, range: Range, maxBlockNumber: BigNumber, stateObject: Property, from: Address, signature?: Bytes); | ||
static default(): Transaction; | ||
@@ -13,0 +13,0 @@ static getParamTypes(): Struct; |
@@ -7,6 +7,6 @@ "use strict"; | ||
class Transaction { | ||
constructor(depositContractAddress, range, prevBlockNumber, stateObject, from, signature = primitives_1.Bytes.default()) { | ||
constructor(depositContractAddress, range, maxBlockNumber, stateObject, from, signature = primitives_1.Bytes.default()) { | ||
this.depositContractAddress = depositContractAddress; | ||
this.range = range; | ||
this.prevBlockNumber = prevBlockNumber; | ||
this.maxBlockNumber = maxBlockNumber; | ||
this.stateObject = stateObject; | ||
@@ -23,3 +23,3 @@ this.from = from; | ||
{ key: 'range', value: primitives_1.Range.getParamType() }, | ||
{ key: 'prevBlockNumber', value: primitives_1.BigNumber.default() }, | ||
{ key: 'maxBlockNumber', value: primitives_1.BigNumber.default() }, | ||
{ key: 'stateObject', value: ovm_1.Property.getParamType() }, | ||
@@ -33,7 +33,7 @@ { key: 'from', value: primitives_1.Address.default() }, | ||
const range = struct.data[1].value; | ||
const prevBlockNumber = struct.data[2].value; | ||
const maxBlockNumber = 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); | ||
return new Transaction(depositContractAddress, primitives_1.Range.fromStruct(range), maxBlockNumber, ovm_1.Property.fromStruct(stateObject), from, signature); | ||
} | ||
@@ -44,3 +44,3 @@ toStruct() { | ||
{ key: 'range', value: this.range.toStruct() }, | ||
{ key: 'prevBlockNumber', value: this.prevBlockNumber }, | ||
{ key: 'maxBlockNumber', value: this.maxBlockNumber }, | ||
{ key: 'stateObject', value: this.stateObject.toStruct() }, | ||
@@ -55,3 +55,3 @@ { key: 'from', value: this.from }, | ||
{ key: 'range', value: this.range.toStruct() }, | ||
{ key: 'prevBlockNumber', value: this.prevBlockNumber }, | ||
{ key: 'maxBlockNumber', value: this.maxBlockNumber }, | ||
{ key: 'stateObject', value: this.stateObject.toStruct() }, | ||
@@ -68,3 +68,3 @@ { key: 'from', value: this.from } | ||
this.range.toBytes(), | ||
primitives_1.Bytes.fromHexString(this.prevBlockNumber.toHexString()).padZero(32), | ||
primitives_1.Bytes.fromHexString(this.maxBlockNumber.toHexString()).padZero(32), | ||
ovmContext.coder.encode(this.stateObject.toStruct()) | ||
@@ -71,0 +71,0 @@ ]); |
@@ -10,2 +10,3 @@ import { Integer, Address, Range, BigNumber, Bytes, Struct } from '@cryptoeconomicslab/primitives'; | ||
readonly blockNumber: BigNumber; | ||
readonly prevBlockNumbers: BigNumber[]; | ||
readonly range: Range; | ||
@@ -15,3 +16,3 @@ readonly depositContractAddress: Address; | ||
readonly transactionHash: Bytes; | ||
constructor(status: typeof STATUS[keyof typeof STATUS], blockNumber: BigNumber, range: Range, depositContractAddress: Address, from: Address, transactionHash: Bytes); | ||
constructor(status: typeof STATUS[keyof typeof STATUS], blockNumber: BigNumber, prevBlockNumbers: BigNumber[], range: Range, depositContractAddress: Address, from: Address, transactionHash: Bytes); | ||
static default(): TransactionReceipt; | ||
@@ -18,0 +19,0 @@ static getParamType(): Struct; |
@@ -9,5 +9,6 @@ "use strict"; | ||
class TransactionReceipt { | ||
constructor(status, blockNumber, range, depositContractAddress, from, transactionHash) { | ||
constructor(status, blockNumber, prevBlockNumbers, range, depositContractAddress, from, transactionHash) { | ||
this.status = status; | ||
this.blockNumber = blockNumber; | ||
this.prevBlockNumbers = prevBlockNumbers; | ||
this.range = range; | ||
@@ -19,3 +20,3 @@ this.depositContractAddress = depositContractAddress; | ||
static default() { | ||
return new TransactionReceipt(exports.STATUS.TRUE, primitives_1.BigNumber.default(), new primitives_1.Range(primitives_1.BigNumber.default(), primitives_1.BigNumber.default()), primitives_1.Address.default(), primitives_1.Address.default(), primitives_1.Bytes.default()); | ||
return new TransactionReceipt(exports.STATUS.TRUE, primitives_1.BigNumber.default(), [], new primitives_1.Range(primitives_1.BigNumber.default(), primitives_1.BigNumber.default()), primitives_1.Address.default(), primitives_1.Address.default(), primitives_1.Bytes.default()); | ||
} | ||
@@ -26,2 +27,6 @@ static getParamType() { | ||
{ key: 'blockNumber', value: primitives_1.BigNumber.default() }, | ||
{ | ||
key: 'prevBlockNumbers', | ||
value: primitives_1.List.default(primitives_1.BigNumber, primitives_1.BigNumber.default()) | ||
}, | ||
{ key: 'range', value: primitives_1.Range.getParamType() }, | ||
@@ -34,3 +39,3 @@ { key: 'depositContractAddress', value: primitives_1.Address.default() }, | ||
static fromStruct(struct) { | ||
return new TransactionReceipt(struct.data[0].value, struct.data[1].value, primitives_1.Range.fromStruct(struct.data[2].value), struct.data[3].value, struct.data[4].value, struct.data[5].value); | ||
return new TransactionReceipt(struct.data[0].value, struct.data[1].value, struct.data[2].value.data, primitives_1.Range.fromStruct(struct.data[3].value), struct.data[4].value, struct.data[5].value, struct.data[6].value); | ||
} | ||
@@ -41,2 +46,6 @@ toStruct() { | ||
{ key: 'blockNumber', value: this.blockNumber }, | ||
{ | ||
key: 'prevBlockNumbers', | ||
value: primitives_1.List.from(primitives_1.BigNumber, this.prevBlockNumbers) | ||
}, | ||
{ key: 'range', value: this.range.toStruct() }, | ||
@@ -43,0 +52,0 @@ { key: 'depositContractAddress', value: this.depositContractAddress }, |
{ | ||
"name": "@cryptoeconomicslab/plasma", | ||
"version": "0.0.8", | ||
"version": "0.0.10", | ||
"description": "plasma module", | ||
@@ -59,11 +59,11 @@ "author": { | ||
"dependencies": { | ||
"@cryptoeconomicslab/db": "^0.0.8", | ||
"@cryptoeconomicslab/hash": "^0.0.8", | ||
"@cryptoeconomicslab/merkle-tree": "^0.0.8", | ||
"@cryptoeconomicslab/ovm": "^0.0.8" | ||
"@cryptoeconomicslab/db": "^0.0.10", | ||
"@cryptoeconomicslab/hash": "^0.0.10", | ||
"@cryptoeconomicslab/merkle-tree": "^0.0.10", | ||
"@cryptoeconomicslab/ovm": "^0.0.10" | ||
}, | ||
"devDependencies": { | ||
"@cryptoeconomicslab/coder": "^0.0.8", | ||
"@cryptoeconomicslab/context": "^0.0.8", | ||
"@cryptoeconomicslab/primitives": "^0.0.8" | ||
"@cryptoeconomicslab/coder": "^0.0.10", | ||
"@cryptoeconomicslab/context": "^0.0.10", | ||
"@cryptoeconomicslab/primitives": "^0.0.10" | ||
}, | ||
@@ -73,3 +73,3 @@ "peerDependencies": { | ||
}, | ||
"gitHead": "f98ce18df61452e339e3649a2eb9bf0928d51fad" | ||
"gitHead": "00d8c169070b2939491e1b76da0913e837906818" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
53515
552
+ Added@cryptoeconomicslab/coder@0.0.10(transitive)
+ Added@cryptoeconomicslab/context@0.0.10(transitive)
+ Added@cryptoeconomicslab/db@0.0.10(transitive)
+ Added@cryptoeconomicslab/hash@0.0.10(transitive)
+ Added@cryptoeconomicslab/merkle-tree@0.0.10(transitive)
+ Added@cryptoeconomicslab/ovm@0.0.10(transitive)
+ Added@cryptoeconomicslab/primitives@0.0.10(transitive)
+ Added@cryptoeconomicslab/signature@0.0.10(transitive)
+ Added@cryptoeconomicslab/utils@0.0.10(transitive)
- Removed@cryptoeconomicslab/coder@0.0.8(transitive)
- Removed@cryptoeconomicslab/context@0.0.8(transitive)
- Removed@cryptoeconomicslab/db@0.0.8(transitive)
- Removed@cryptoeconomicslab/hash@0.0.8(transitive)
- Removed@cryptoeconomicslab/merkle-tree@0.0.8(transitive)
- Removed@cryptoeconomicslab/ovm@0.0.8(transitive)
- Removed@cryptoeconomicslab/primitives@0.0.8(transitive)
- Removed@cryptoeconomicslab/signature@0.0.8(transitive)
- Removed@cryptoeconomicslab/utils@0.0.8(transitive)