diff --git a/src/contracts/address-mapper.ts b/src/contracts/address-mapper.ts index bd3893c7..0dfbf1b2 100644 --- a/src/contracts/address-mapper.ts +++ b/src/contracts/address-mapper.ts @@ -76,8 +76,8 @@ export class AddressMapper extends Contract { ) return { - from: Address.UmarshalPB(result.getFrom()!), - to: Address.UmarshalPB(result.getTo()!) + from: Address.UnmarshalPB(result.getFrom()!), + to: Address.UnmarshalPB(result.getTo()!) } as IAddressMapping } } diff --git a/src/contracts/dpos.ts b/src/contracts/dpos.ts index b62ac2c1..b63a6ea7 100644 --- a/src/contracts/dpos.ts +++ b/src/contracts/dpos.ts @@ -73,7 +73,7 @@ export class DPOS extends Contract { return result.getCandidatesList().map((canditate: Candidate) => { return { - address: Address.UmarshalPB(canditate.getAddress()!), + address: Address.UnmarshalPB(canditate.getAddress()!), pubKey: canditate.getPubKey_asU8()! } }) as Array diff --git a/src/contracts/dpos2.ts b/src/contracts/dpos2.ts index fab384a0..ad962757 100644 --- a/src/contracts/dpos2.ts +++ b/src/contracts/dpos2.ts @@ -92,7 +92,7 @@ export class DPOS2 extends Contract { return result.getCandidatesList().map((candidate: CandidateV2) => ({ pubKey: candidate.getPubKey_asU8()!, - address: Address.UmarshalPB(candidate.getAddress()!), + address: Address.UnmarshalPB(candidate.getAddress()!), fee: new BN(candidate.getFee()!), newFee: new BN(candidate.getNewfee()!), feeDelayCounter: new BN(candidate.getFeedelaycounter()!), @@ -111,7 +111,7 @@ export class DPOS2 extends Contract { ) return result.getStatisticsList().map((validator: ValidatorStatisticV2) => ({ - address: Address.UmarshalPB(validator.getAddress()!), + address: Address.UnmarshalPB(validator.getAddress()!), pubKey: validator.getPubKey_asU8()!, upblockCount: validator.getUpblockCount(), blockCount: validator.getBlockCount(), @@ -144,11 +144,11 @@ export class DPOS2 extends Contract { const delegation = result.getDelegation() return delegation ? { - validator: Address.UmarshalPB(delegation.getValidator()!), + validator: Address.UnmarshalPB(delegation.getValidator()!), updateValidator: delegation.getUpdateValidator() - ? Address.UmarshalPB(delegation.getUpdateValidator()!) + ? Address.UnmarshalPB(delegation.getUpdateValidator()!) : undefined, - delegator: Address.UmarshalPB(delegation.getDelegator()!), + delegator: Address.UnmarshalPB(delegation.getDelegator()!), amount: delegation.getAmount() ? unmarshalBigUIntPB(delegation.getAmount()!) : new BN(0), updateAmount: delegation.getUpdateAmount() ? unmarshalBigUIntPB(delegation.getAmount()!) diff --git a/src/contracts/transfer-gateway.ts b/src/contracts/transfer-gateway.ts index a4d106cf..2a5b3591 100644 --- a/src/contracts/transfer-gateway.ts +++ b/src/contracts/transfer-gateway.ts @@ -109,8 +109,8 @@ export class TransferGateway extends Contract { } this.emit(TransferGateway.EVENT_TOKEN_WITHDRAWAL, { - tokenOwner: Address.UmarshalPB(eventData.getTokenOwner()!), - tokenContract: Address.UmarshalPB(eventData.getTokenContract()!), + tokenOwner: Address.UnmarshalPB(eventData.getTokenOwner()!), + tokenContract: Address.UnmarshalPB(eventData.getTokenContract()!), tokenKind, tokenId, tokenAmount, @@ -123,8 +123,8 @@ export class TransferGateway extends Contract { ) this.emit(TransferGateway.EVENT_CONTRACT_MAPPING_CONFIRMED, { - foreignContract: Address.UmarshalPB(contractMappingConfirmed.getForeignContract()!), - localContract: Address.UmarshalPB(contractMappingConfirmed.getLocalContract()!) + foreignContract: Address.UnmarshalPB(contractMappingConfirmed.getForeignContract()!), + localContract: Address.UnmarshalPB(contractMappingConfirmed.getLocalContract()!) } as IContractMappingConfirmedEventArgs) } }) @@ -295,8 +295,8 @@ export class TransferGateway extends Contract { break } return { - tokenOwner: Address.UmarshalPB(receipt.getTokenOwner()!), - tokenContract: Address.UmarshalPB(receipt.getTokenContract()!), + tokenOwner: Address.UnmarshalPB(receipt.getTokenOwner()!), + tokenContract: Address.UnmarshalPB(receipt.getTokenContract()!), tokenKind, tokenId, tokenAmount, diff --git a/src/plasma-cash/plasma-cash-tx.ts b/src/plasma-cash/plasma-cash-tx.ts index 734b62ba..81759dc6 100644 --- a/src/plasma-cash/plasma-cash-tx.ts +++ b/src/plasma-cash/plasma-cash-tx.ts @@ -96,13 +96,13 @@ export function unmarshalPlasmaTxPB(rawTx: PlasmaTx): PlasmaCashTx { denomination: rawTx.hasDenomination() ? unmarshalBigUIntPB(rawTx.getDenomination()!) : new BN(0), - newOwner: Address.UmarshalPB(rawTx.getNewOwner()!).local.toString(), + newOwner: Address.UnmarshalPB(rawTx.getNewOwner()!).local.toString(), sig: rawTx.getSignature_asU8(), proof: rawTx.getProof_asU8() }) const sender = rawTx.getSender() if (sender) { - tx.prevOwner = Address.UmarshalPB(sender).local.toString() + tx.prevOwner = Address.UnmarshalPB(sender).local.toString() } return tx }