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
6 changes: 3 additions & 3 deletions server/api/backend-wallet/getBalance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ export async function getBalance(fastify: FastifyInstance) {
},
},
handler: async (request, reply) => {
const { chain, wallet_address } = request.params;
const { chain, walletAddress } = request.params;
const chainId = getChainIdFromChain(chain);
const sdk = await getSdk({ chainId });

let balanceData = await sdk.getBalance(wallet_address);
let balanceData = await sdk.getBalance(walletAddress);

reply.status(StatusCodes.OK).send({
result: {
walletAddress: wallet_address,
walletAddress,
...balanceData,
value: balanceData.value.toString(),
},
Expand Down
16 changes: 8 additions & 8 deletions server/api/backend-wallet/transfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import { getSdk } from "../../utils/cache/getSdk";
import { getChainIdFromChain } from "../../utils/chain";

// INPUTS
const requestSchema = Type.Omit(walletParamSchema, ["wallet_address"]);
const requestSchema = Type.Omit(walletParamSchema, ["walletAddress"]);
const requestBodySchema = Type.Object({
to: Type.String({
description: "Address of the wallet to transfer to",
}),
currency_address: Type.String({
currencyAddress: Type.String({
description: "Address of the token to transfer",
default: [constants.AddressZero],
}),
Expand Down Expand Up @@ -57,7 +57,7 @@ export async function transfer(fastify: FastifyInstance) {
},
handler: async (request, reply) => {
const { chain } = request.params;
const { to, amount, currency_address } = request.body;
const { to, amount, currencyAddress } = request.body;
const walletAddress = request.headers[
"x-backend-wallet-address"
] as string;
Expand All @@ -72,10 +72,10 @@ export async function transfer(fastify: FastifyInstance) {
const normalizedValue = await normalizePriceValue(
sdk.getProvider(),
amount,
currency_address,
currencyAddress,
);

if (isNativeToken(currency_address)) {
if (isNativeToken(currencyAddress)) {
const walletAddress = await sdk.getSigner()?.getAddress();
if (!walletAddress) throw new Error("No wallet address");

Expand All @@ -92,19 +92,19 @@ export async function transfer(fastify: FastifyInstance) {
toAddress: to,
fromAddress: walletAddress,
value: normalizedValue.toHexString(),
currencyAddress: currency_address,
currencyAddress: currencyAddress,
},
});
} else {
const contract = await getContract({
chainId,
contractAddress: currency_address,
contractAddress: currencyAddress,
walletAddress,
});

const { displayValue } = await fetchCurrencyValue(
sdk.getProvider(),
currency_address,
currencyAddress,
normalizedValue,
);
const tx = await contract.erc20.transfer.prepare(to, displayValue);
Expand Down
12 changes: 6 additions & 6 deletions server/api/contract/events/getAllEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export async function getAllEvents(fastify: FastifyInstance) {
Querystring: Static<typeof querySringSchema>;
}>({
method: "GET",
url: "/contract/:chain/:contract_address/events/get-all",
url: "/contract/:chain/:contractAddress/events/get-all",
schema: {
summary: "Get all events",
description: "Get a list of all blockchain events for this contract.",
Expand All @@ -78,18 +78,18 @@ export async function getAllEvents(fastify: FastifyInstance) {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { from_block, to_block, order } = request.query;
const { chain, contractAddress } = request.params;
const { fromBlock, toBlock, order } = request.query;

const chainId = getChainIdFromChain(chain);
const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
});

let returnData = await contract.events.getAllEvents({
fromBlock: from_block,
toBlock: to_block,
fromBlock,
toBlock,
order,
});

Expand Down
16 changes: 8 additions & 8 deletions server/api/contract/events/getEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const requestSchema = contractParamSchema;

const requestBodyParams = Type.Object(
{
event_name: Type.String({ examples: ["Transfer"] }),
eventName: Type.String({ examples: ["Transfer"] }),
...eventsQuerystringSchema.properties,
filters: Type.Optional(Type.Object({})),
},
Expand Down Expand Up @@ -68,7 +68,7 @@ export async function getEvents(fastify: FastifyInstance) {
Body: Static<typeof requestBodyParams>;
}>({
method: "POST",
url: "/contract/:chain/:contract_address/events/get",
url: "/contract/:chain/:contractAddress/events/get",
schema: {
summary: "Get events",
description:
Expand All @@ -83,18 +83,18 @@ export async function getEvents(fastify: FastifyInstance) {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { from_block, to_block, order, event_name, filters } = request.body;
const { chain, contractAddress } = request.params;
const { fromBlock, toBlock, order, eventName, filters } = request.body;

const chainId = getChainIdFromChain(chain);
const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
});

let returnData = await contract.events.getEvents(event_name, {
fromBlock: from_block,
toBlock: to_block,
let returnData = await contract.events.getEvents(eventName, {
fromBlock,
toBlock,
order,
filters,
});
Expand Down
6 changes: 3 additions & 3 deletions server/api/contract/extensions/account/read/getAllAdmins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const getAllAdmins = async (fastify: FastifyInstance) => {
Reply: Static<typeof ReplySchema>;
}>({
method: "GET",
url: "/contract/:chain/:contract_address/account/admins/get-all",
url: "/contract/:chain/:contractAddress/account/admins/get-all",
schema: {
summary: "Get all admins",
description: "Get all admins for a smart account.",
Expand All @@ -33,12 +33,12 @@ export const getAllAdmins = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { chain, contractAddress } = request.params;
const chainId = getChainIdFromChain(chain);

const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
});
const accountAddresses = await contract.account.getAllAdmins();

Expand Down
6 changes: 3 additions & 3 deletions server/api/contract/extensions/account/read/getAllSessions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const getAllSessions = async (fastify: FastifyInstance) => {
Reply: Static<typeof ReplySchema>;
}>({
method: "GET",
url: "/contract/:chain/:contract_address/account/sessions/get-all",
url: "/contract/:chain/:contractAddress/account/sessions/get-all",
schema: {
summary: "Get all session keys",
description: "Get all session keys for a smart account.",
Expand All @@ -32,12 +32,12 @@ export const getAllSessions = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { chain, contractAddress } = request.params;
const chainId = getChainIdFromChain(chain);

const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
});
const sessions = await contract.account.getAllSigners();

Expand Down
14 changes: 7 additions & 7 deletions server/api/contract/extensions/account/write/grantAdmin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
import { getChainIdFromChain } from "../../../../../utils/chain";

const BodySchema = Type.Object({
signer_address: Type.String({
signerAddress: Type.String({
description: "Address to grant admin permissions to",
}),
});

BodySchema.examples = [
{
signer_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
signerAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
},
];

Expand All @@ -30,7 +30,7 @@ export const grantAdmin = async (fastify: FastifyInstance) => {
Body: Static<typeof BodySchema>;
}>({
method: "POST",
url: "/contract/:chain/:contract_address/account/admins/grant",
url: "/contract/:chain/:contractAddress/account/admins/grant",
schema: {
summary: "Grant admin",
description: "Grant a smart account's admin permission.",
Expand All @@ -45,8 +45,8 @@ export const grantAdmin = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { signer_address } = request.body;
const { chain, contractAddress } = request.params;
const { signerAddress } = request.body;
const walletAddress = request.headers[
"x-backend-wallet-address"
] as string;
Expand All @@ -55,13 +55,13 @@ export const grantAdmin = async (fastify: FastifyInstance) => {

const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
walletAddress,
accountAddress,
});

const tx = await contract.account.grantAdminPermissions.prepare(
signer_address,
signerAddress,
);
const queueId = await queueTx({ tx, chainId, extension: "account" });

Expand Down
6 changes: 3 additions & 3 deletions server/api/contract/extensions/account/write/grantSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const grantSession = async (fastify: FastifyInstance) => {
Body: Static<typeof BodySchema>;
}>({
method: "POST",
url: "/contract/:chain/:contract_address/account/sessions/create",
url: "/contract/:chain/:contractAddress/account/sessions/create",
schema: {
summary: "Create session key",
description: "Create a session key for a smart account.",
Expand All @@ -46,7 +46,7 @@ export const grantSession = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { chain, contractAddress } = request.params;
const { signerAddress, ...permissions } = request.body;
const walletAddress = request.headers[
"x-backend-wallet-address"
Expand All @@ -56,7 +56,7 @@ export const grantSession = async (fastify: FastifyInstance) => {

const contract = await getContract({
chainId,
contractAddress: contract_address,
contractAddress,
walletAddress,
accountAddress,
});
Expand Down
18 changes: 9 additions & 9 deletions server/api/contract/extensions/account/write/revokeAdmin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
import { getChainIdFromChain } from "../../../../../utils/chain";

const BodySchema = Type.Object({
wallet_address: Type.String({
walletAddress: Type.String({
description: "Address to revoke admin permissions from",
}),
});

BodySchema.examples = [
{
wallet_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
walletAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
},
];

Expand All @@ -30,7 +30,7 @@ export const revokeAdmin = async (fastify: FastifyInstance) => {
Body: Static<typeof BodySchema>;
}>({
method: "POST",
url: "/contract/:chain/:contract_address/account/admins/revoke",
url: "/contract/:chain/:contractAddress/account/admins/revoke",
schema: {
summary: "Revoke admin",
description: "Revoke a smart account's admin permission.",
Expand All @@ -45,23 +45,23 @@ export const revokeAdmin = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { wallet_address } = request.body;
const walletAddress = request.headers[
const { chain, contractAddress } = request.params;
const { walletAddress } = request.body;
const backendWalletAddress = request.headers[
"x-backend-wallet-address"
] as string;
const accountAddress = request.headers["x-account-address"] as string;
const chainId = getChainIdFromChain(chain);

const contract = await getContract({
chainId,
contractAddress: contract_address,
walletAddress,
contractAddress,
walletAddress: backendWalletAddress,
accountAddress,
});

const tx = await contract.account.revokeAdminPermissions.prepare(
wallet_address,
walletAddress,
);
const queueId = await queueTx({ tx, chainId, extension: "account" });

Expand Down
18 changes: 9 additions & 9 deletions server/api/contract/extensions/account/write/revokeSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
import { getChainIdFromChain } from "../../../../../utils/chain";

const BodySchema = Type.Object({
wallet_address: Type.String({
walletAddress: Type.String({
description: "Address to revoke session from",
}),
});

BodySchema.examples = [
{
wallet_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
walletAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
},
];

Expand All @@ -30,7 +30,7 @@ export const revokeSession = async (fastify: FastifyInstance) => {
Body: Static<typeof BodySchema>;
}>({
method: "POST",
url: "/contract/:chain/:contract_address/account/sessions/revoke",
url: "/contract/:chain/:contractAddress/account/sessions/revoke",
schema: {
summary: "Revoke session key",
description: "Revoke a session key for a smart account.",
Expand All @@ -45,21 +45,21 @@ export const revokeSession = async (fastify: FastifyInstance) => {
},
},
handler: async (request, reply) => {
const { chain, contract_address } = request.params;
const { wallet_address } = request.body;
const walletAddress = request.headers[
const { chain, contractAddress } = request.params;
const { walletAddress } = request.body;
const backendWalletAddress = request.headers[
"x-backend-wallet-address"
] as string;
const accountAddress = request.headers["x-account-address"] as string;
const chainId = getChainIdFromChain(chain);

const contract = await getContract({
chainId,
contractAddress: contract_address,
walletAddress,
contractAddress,
walletAddress: backendWalletAddress,
accountAddress,
});
const tx = await contract.account.revokeAccess.prepare(wallet_address);
const tx = await contract.account.revokeAccess.prepare(walletAddress);
const queueId = await queueTx({ tx, chainId, extension: "account" });

reply.status(StatusCodes.OK).send({
Expand Down
Loading