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
45 changes: 38 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"ajv": "^8.17.1",
"axios": "^1.13.2",
"jwt-decode": "^4.0.0",
"ox": "^0.13.1",
"socket.io-client": "^4.8.1",
"tsup": "^8.5.0",
"viem": "^2.28.2"
Expand Down
19 changes: 15 additions & 4 deletions src/contractClients/acpContractClientV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import {
import { AcpX402 } from "../acpX402";
import { base, baseSepolia } from "viem/chains";
import MEMO_MANAGER_ABI from "../abis/memoManagerAbi";
import { Attribution } from "ox/erc8021";
import { appendBuilderCodeData } from "../utils";

class AcpContractClientV2 extends BaseAcpContractClient {
private RETRY_CONFIG = {
Expand All @@ -47,7 +49,8 @@ class AcpContractClientV2 extends BaseAcpContractClient {
private memoManagerAddress: Address,
private accountManagerAddress: Address,
agentWalletAddress: Address,
config: AcpContractConfig = baseAcpConfigV2
config: AcpContractConfig = baseAcpConfigV2,
private builderCode?: string
) {
super(agentWalletAddress, config);
}
Expand All @@ -56,7 +59,8 @@ class AcpContractClientV2 extends BaseAcpContractClient {
walletPrivateKey: Address,
sessionEntityKeyId: number,
agentWalletAddress: Address,
config: AcpContractConfig = baseAcpConfigV2
config: AcpContractConfig = baseAcpConfigV2,
builderCode?: string
) {
const publicClients: Record<
number,
Expand Down Expand Up @@ -106,7 +110,8 @@ class AcpContractClientV2 extends BaseAcpContractClient {
memoManagerAddress.result as Address,
accountManagerAddress.result as Address,
agentWalletAddress,
config
config,
builderCode
);

acpContractClient.publicClients = publicClients;
Expand Down Expand Up @@ -221,10 +226,16 @@ class AcpContractClientV2 extends BaseAcpContractClient {
throw new AcpError("Session key client not initialized");
}

const dataSuffix = this.builderCode
? Attribution.toDataSuffix({ codes: [this.builderCode] })
: undefined;

const basePayload: any = {
uo: operations.map((operation) => ({
target: operation.contractAddress,
data: operation.data,
data: dataSuffix
? appendBuilderCodeData(operation.data, dataSuffix as Hex)
: operation.data,
value: operation.value,
})),
};
Expand Down
21 changes: 20 additions & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { Address, decodeAbiParameters, encodeAbiParameters } from "viem";
import {
Address,
concatHex,
decodeAbiParameters,
encodeAbiParameters,
Hex,
pad,
} from "viem";
import {
arbitrum,
arbitrumSepolia,
Expand Down Expand Up @@ -118,3 +125,15 @@ export function encodeTransferEventMetadata(

return result;
}

export function appendBuilderCodeData(data: Hex, suffix: Hex): Hex {
const opDataByteLength = (data.length - 2) / 2;
const suffixByteLength = (suffix.length - 2) / 2;
const opDataPaddedSize = Math.ceil(opDataByteLength / 32) * 32;
const suffixPaddedSize = Math.ceil(suffixByteLength / 32) * 32;

const paddedData = pad(data, { size: opDataPaddedSize, dir: "right" });
const paddedSuffix = pad(suffix, { size: suffixPaddedSize });

return concatHex([paddedData, paddedSuffix]);
}
Loading