Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

- deserialize function for DeployModulePayload implemented instead of throwing an exception of not supporting deserialize

- deserialize function for InitContractPayload implemented instead of throwing an exception of not supporting deserialize

## 11.0.0

### Fixed
Expand Down
23 changes: 21 additions & 2 deletions packages/sdk/src/accountTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
import * as AccountAddress from './types/AccountAddress.js';
import * as CcdAmount from './types/CcdAmount.js';
import { DataBlob } from './types/DataBlob.js';
import * as InitName from './types/InitName.js';
import * as Parameter from './types/Parameter.js';
import * as ReceiveName from './types/ReceiveName.js';

Expand Down Expand Up @@ -259,8 +260,26 @@ export class InitContractHandler implements AccountTransactionHandler<InitContra
return Buffer.concat([serializedAmount, serializedModuleRef, serializedInitName, serializedParameters]);
}

deserialize(): InitContractPayload {
throw new Error('deserialize not supported');
deserialize(serializePayload: Cursor): InitContractPayload {
const amount = serializePayload.read(8).readBigUInt64BE(0);
const moduleRef = serializePayload.read(32);

const initNameLength = serializePayload.read(2).readUInt16BE(0);
const initName = serializePayload.read(initNameLength);
const initNameAfterConversion = InitName.fromString(initName.toString('utf8'));

const paramLength = serializePayload.read(2).readUInt16BE(0);
const param = serializePayload.read(paramLength);
const paramBuffer = Parameter.fromBuffer(param.buffer);

return {
amount: CcdAmount.fromMicroCcd(amount),
moduleRef: ModuleReference.fromBuffer(moduleRef),
initName: ContractName.fromInitName(initNameAfterConversion),
param: paramBuffer,
//The execution energy cannot be recovered as it is not part of the payload serialization
maxContractExecutionEnergy: Energy.create(0n),
};
}

toJSON(payload: InitContractPayload): InitContractPayloadJSON {
Expand Down
20 changes: 20 additions & 0 deletions packages/sdk/test/ci/deserialization.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@ import {
CIS2,
CcdAmount,
ContractAddress,
ContractName,
DataBlob,
DeployModulePayload,
Energy,
InitContractPayload,
ModuleReference,
Parameter,
RegisterDataPayload,
SequenceNumber,
SimpleTransferPayload,
Expand Down Expand Up @@ -89,6 +94,21 @@ test('test deserialize DeployModule ', () => {
deserializeAccountTransactionBase(AccountTransactionType.DeployModule, payload);
});

test('test deserialize InitContract ', () => {
const moduleRef = ModuleReference.fromHexString('44434352ddba724930d6b1b09cd58bd1fba6ad9714cf519566d5fe72d80da0d1');
const contractName = ContractName.fromStringUnchecked('weather');

const deserializePayload: InitContractPayload = {
amount: CcdAmount.zero(),
moduleRef: moduleRef,
initName: contractName,
param: Parameter.fromHexString('0a'),
maxContractExecutionEnergy: Energy.create(0),
};

deserializeAccountTransactionBase(AccountTransactionType.InitContract, deserializePayload);
});

test('Expired transactions can be deserialized', () => {
const payload: SimpleTransferPayload = {
amount: CcdAmount.fromMicroCcd(5100000),
Expand Down