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
36 changes: 36 additions & 0 deletions src/abi/calldata/encoder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,39 @@ export function encode(data: CalldataEncodable): Uint8Array {
encodeImpl(arr, data);
return new Uint8Array(arr);
}

// Constructs a calldata object for contract calls, omitting empty args/kwargs for compactness.
export function makeCalldataObject(
method: string | undefined,
args: CalldataEncodable[] | undefined,
kwargs: {[key: string]: CalldataEncodable} | Map<string, CalldataEncodable> | undefined,
): CalldataEncodable {
let ret: {[key: string]: CalldataEncodable} = {};

if (method) {
ret["method"] = method;
}

if (args && args.length > 0) {
ret["args"] = args;
}

if (kwargs) {
if (kwargs instanceof Map) {
if (kwargs.size > 0) {
ret["kwargs"] = kwargs;
}
} else {
let hasVal = false;
for (const _k in kwargs) {
hasVal = true;
break;
}
if (hasVal) {
ret["kwargs"] = kwargs;
}
}
}

return ret;
}
43 changes: 3 additions & 40 deletions src/contracts/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,6 @@ import {
} from "@/types";
import {fromHex, toHex, zeroAddress, encodeFunctionData, PublicClient, parseEventLogs} from "viem";

function makeCalldataObject(
method: string | undefined,
args: CalldataEncodable[] | undefined,
kwargs: {[key: string]: CalldataEncodable} | Map<string, CalldataEncodable> | undefined,
): CalldataEncodable {
// this method omits args or kwargs if they are empty
// it reduces transaction size
let ret: {[key: string]: CalldataEncodable} = {};

if (method) {
ret["method"] = method;
}

if (args && args.length > 0) {
ret["args"] = args;
}

if (kwargs) {
if (kwargs instanceof Map) {
if (kwargs.size > 0) {
ret["kwargs"] = kwargs;
}
} else {
let hasVal = false;
for (const _k in kwargs) {
hasVal = true;
break;
}
if (hasVal) {
ret["kwargs"] = kwargs;
}
}
}

return ret;
}

export const contractActions = (client: GenLayerClient<GenLayerChain>, publicClient: PublicClient) => {
return {
getContractSchema: async (address: Address): Promise<ContractSchema> => {
Expand Down Expand Up @@ -91,7 +54,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
transactionHashVariant = TransactionHashVariant.LATEST_NONFINAL,
} = args;

const encodedData = [calldata.encode(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
const encodedData = [calldata.encode(calldata.makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
const serializedData = serialize(encodedData);

const senderAddress = account?.address ?? client.account?.address;
Expand Down Expand Up @@ -135,7 +98,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
leaderOnly = false,
consensusMaxRotations = client.chain.defaultConsensusMaxRotations,
} = args;
const data = [calldata.encode(makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
const data = [calldata.encode(calldata.makeCalldataObject(functionName, callArgs, kwargs)), leaderOnly];
const serializedData = serialize(data);
const senderAccount = account || client.account;
const encodedData = _encodeAddTransactionData({
Expand Down Expand Up @@ -171,7 +134,7 @@ export const contractActions = (client: GenLayerClient<GenLayerChain>, publicCli
} = args;
const data = [
code,
calldata.encode(makeCalldataObject(undefined, constructorArgs, kwargs)),
calldata.encode(calldata.makeCalldataObject(undefined, constructorArgs, kwargs)),
leaderOnly,
];
const serializedData = serialize(data);
Expand Down
6 changes: 6 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
// src/index.ts
export {createClient} from "./client/client";
export {createAccount, generatePrivateKey} from "./accounts/account";
export {
decodeInputData,
decodeTransaction,
simplifyTransactionReceipt,
decodeLocalnetTransaction
} from "./transactions/decoders";
export * as chains from "./chains";
export * as abi from "./abi";
Loading