Skip to content

Commit 693ddfd

Browse files
adam-majadam-maj
authored
Rename snake_case to camelCase in body and query params (#266)
* Update contract_address to contractAddress * Use camelCase instead of snake_case * Remove script
1 parent 3e5d5be commit 693ddfd

File tree

125 files changed

+636
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+636
-638
lines changed

‎server/api/backend-wallet/getBalance.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ export async function getBalance(fastify: FastifyInstance) {
5050
},
5151
},
5252
handler: async (request, reply) => {
53-
const { chain, wallet_address } = request.params;
53+
const { chain, walletAddress } = request.params;
5454
const chainId = getChainIdFromChain(chain);
5555
const sdk = await getSdk({ chainId });
5656

57-
let balanceData = await sdk.getBalance(wallet_address);
57+
let balanceData = await sdk.getBalance(walletAddress);
5858

5959
reply.status(StatusCodes.OK).send({
6060
result: {
61-
walletAddress: wallet_address,
61+
walletAddress,
6262
...balanceData,
6363
value: balanceData.value.toString(),
6464
},

‎server/api/backend-wallet/transfer.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import { getSdk } from "../../utils/cache/getSdk";
1919
import { getChainIdFromChain } from "../../utils/chain";
2020

2121
// INPUTS
22-
const requestSchema = Type.Omit(walletParamSchema, ["wallet_address"]);
22+
const requestSchema = Type.Omit(walletParamSchema, ["walletAddress"]);
2323
const requestBodySchema = Type.Object({
2424
to: Type.String({
2525
description: "Address of the wallet to transfer to",
2626
}),
27-
currency_address: Type.String({
27+
currencyAddress: Type.String({
2828
description: "Address of the token to transfer",
2929
default: [constants.AddressZero],
3030
}),
@@ -57,7 +57,7 @@ export async function transfer(fastify: FastifyInstance) {
5757
},
5858
handler: async (request, reply) => {
5959
const { chain } = request.params;
60-
const { to, amount, currency_address } = request.body;
60+
const { to, amount, currencyAddress } = request.body;
6161
const walletAddress = request.headers[
6262
"x-backend-wallet-address"
6363
] as string;
@@ -72,10 +72,10 @@ export async function transfer(fastify: FastifyInstance) {
7272
const normalizedValue = await normalizePriceValue(
7373
sdk.getProvider(),
7474
amount,
75-
currency_address,
75+
currencyAddress,
7676
);
7777

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

@@ -92,19 +92,19 @@ export async function transfer(fastify: FastifyInstance) {
9292
toAddress: to,
9393
fromAddress: walletAddress,
9494
value: normalizedValue.toHexString(),
95-
currencyAddress: currency_address,
95+
currencyAddress: currencyAddress,
9696
},
9797
});
9898
} else {
9999
const contract = await getContract({
100100
chainId,
101-
contractAddress: currency_address,
101+
contractAddress: currencyAddress,
102102
walletAddress,
103103
});
104104

105105
const { displayValue } = await fetchCurrencyValue(
106106
sdk.getProvider(),
107-
currency_address,
107+
currencyAddress,
108108
normalizedValue,
109109
);
110110
const tx = await contract.erc20.transfer.prepare(to, displayValue);

‎server/api/contract/events/getAllEvents.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export async function getAllEvents(fastify: FastifyInstance) {
6464
Querystring: Static<typeof querySringSchema>;
6565
}>({
6666
method: "GET",
67-
url: "/contract/:chain/:contract_address/events/get-all",
67+
url: "/contract/:chain/:contractAddress/events/get-all",
6868
schema: {
6969
summary: "Get all events",
7070
description: "Get a list of all blockchain events for this contract.",
@@ -78,18 +78,18 @@ export async function getAllEvents(fastify: FastifyInstance) {
7878
},
7979
},
8080
handler: async (request, reply) => {
81-
const { chain, contract_address } = request.params;
82-
const { from_block, to_block, order } = request.query;
81+
const { chain, contractAddress } = request.params;
82+
const { fromBlock, toBlock, order } = request.query;
8383

8484
const chainId = getChainIdFromChain(chain);
8585
const contract = await getContract({
8686
chainId,
87-
contractAddress: contract_address,
87+
contractAddress,
8888
});
8989

9090
let returnData = await contract.events.getAllEvents({
91-
fromBlock: from_block,
92-
toBlock: to_block,
91+
fromBlock,
92+
toBlock,
9393
order,
9494
});
9595

‎server/api/contract/events/getEvents.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const requestSchema = contractParamSchema;
1616

1717
const requestBodyParams = Type.Object(
1818
{
19-
event_name: Type.String({ examples: ["Transfer"] }),
19+
eventName: Type.String({ examples: ["Transfer"] }),
2020
...eventsQuerystringSchema.properties,
2121
filters: Type.Optional(Type.Object({})),
2222
},
@@ -68,7 +68,7 @@ export async function getEvents(fastify: FastifyInstance) {
6868
Body: Static<typeof requestBodyParams>;
6969
}>({
7070
method: "POST",
71-
url: "/contract/:chain/:contract_address/events/get",
71+
url: "/contract/:chain/:contractAddress/events/get",
7272
schema: {
7373
summary: "Get events",
7474
description:
@@ -83,18 +83,18 @@ export async function getEvents(fastify: FastifyInstance) {
8383
},
8484
},
8585
handler: async (request, reply) => {
86-
const { chain, contract_address } = request.params;
87-
const { from_block, to_block, order, event_name, filters } = request.body;
86+
const { chain, contractAddress } = request.params;
87+
const { fromBlock, toBlock, order, eventName, filters } = request.body;
8888

8989
const chainId = getChainIdFromChain(chain);
9090
const contract = await getContract({
9191
chainId,
92-
contractAddress: contract_address,
92+
contractAddress,
9393
});
9494

95-
let returnData = await contract.events.getEvents(event_name, {
96-
fromBlock: from_block,
97-
toBlock: to_block,
95+
let returnData = await contract.events.getEvents(eventName, {
96+
fromBlock,
97+
toBlock,
9898
order,
9999
filters,
100100
});

‎server/api/contract/extensions/account/read/getAllAdmins.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const getAllAdmins = async (fastify: FastifyInstance) => {
2020
Reply: Static<typeof ReplySchema>;
2121
}>({
2222
method: "GET",
23-
url: "/contract/:chain/:contract_address/account/admins/get-all",
23+
url: "/contract/:chain/:contractAddress/account/admins/get-all",
2424
schema: {
2525
summary: "Get all admins",
2626
description: "Get all admins for a smart account.",
@@ -33,12 +33,12 @@ export const getAllAdmins = async (fastify: FastifyInstance) => {
3333
},
3434
},
3535
handler: async (request, reply) => {
36-
const { chain, contract_address } = request.params;
36+
const { chain, contractAddress } = request.params;
3737
const chainId = getChainIdFromChain(chain);
3838

3939
const contract = await getContract({
4040
chainId,
41-
contractAddress: contract_address,
41+
contractAddress,
4242
});
4343
const accountAddresses = await contract.account.getAllAdmins();
4444

‎server/api/contract/extensions/account/read/getAllSessions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const getAllSessions = async (fastify: FastifyInstance) => {
1919
Reply: Static<typeof ReplySchema>;
2020
}>({
2121
method: "GET",
22-
url: "/contract/:chain/:contract_address/account/sessions/get-all",
22+
url: "/contract/:chain/:contractAddress/account/sessions/get-all",
2323
schema: {
2424
summary: "Get all session keys",
2525
description: "Get all session keys for a smart account.",
@@ -32,12 +32,12 @@ export const getAllSessions = async (fastify: FastifyInstance) => {
3232
},
3333
},
3434
handler: async (request, reply) => {
35-
const { chain, contract_address } = request.params;
35+
const { chain, contractAddress } = request.params;
3636
const chainId = getChainIdFromChain(chain);
3737

3838
const contract = await getContract({
3939
chainId,
40-
contractAddress: contract_address,
40+
contractAddress,
4141
});
4242
const sessions = await contract.account.getAllSigners();
4343

‎server/api/contract/extensions/account/write/grantAdmin.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
1212
import { getChainIdFromChain } from "../../../../../utils/chain";
1313

1414
const BodySchema = Type.Object({
15-
signer_address: Type.String({
15+
signerAddress: Type.String({
1616
description: "Address to grant admin permissions to",
1717
}),
1818
});
1919

2020
BodySchema.examples = [
2121
{
22-
signer_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
22+
signerAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
2323
},
2424
];
2525

@@ -30,7 +30,7 @@ export const grantAdmin = async (fastify: FastifyInstance) => {
3030
Body: Static<typeof BodySchema>;
3131
}>({
3232
method: "POST",
33-
url: "/contract/:chain/:contract_address/account/admins/grant",
33+
url: "/contract/:chain/:contractAddress/account/admins/grant",
3434
schema: {
3535
summary: "Grant admin",
3636
description: "Grant a smart account's admin permission.",
@@ -45,8 +45,8 @@ export const grantAdmin = async (fastify: FastifyInstance) => {
4545
},
4646
},
4747
handler: async (request, reply) => {
48-
const { chain, contract_address } = request.params;
49-
const { signer_address } = request.body;
48+
const { chain, contractAddress } = request.params;
49+
const { signerAddress } = request.body;
5050
const walletAddress = request.headers[
5151
"x-backend-wallet-address"
5252
] as string;
@@ -55,13 +55,13 @@ export const grantAdmin = async (fastify: FastifyInstance) => {
5555

5656
const contract = await getContract({
5757
chainId,
58-
contractAddress: contract_address,
58+
contractAddress,
5959
walletAddress,
6060
accountAddress,
6161
});
6262

6363
const tx = await contract.account.grantAdminPermissions.prepare(
64-
signer_address,
64+
signerAddress,
6565
);
6666
const queueId = await queueTx({ tx, chainId, extension: "account" });
6767

‎server/api/contract/extensions/account/write/grantSession.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const grantSession = async (fastify: FastifyInstance) => {
3131
Body: Static<typeof BodySchema>;
3232
}>({
3333
method: "POST",
34-
url: "/contract/:chain/:contract_address/account/sessions/create",
34+
url: "/contract/:chain/:contractAddress/account/sessions/create",
3535
schema: {
3636
summary: "Create session key",
3737
description: "Create a session key for a smart account.",
@@ -46,7 +46,7 @@ export const grantSession = async (fastify: FastifyInstance) => {
4646
},
4747
},
4848
handler: async (request, reply) => {
49-
const { chain, contract_address } = request.params;
49+
const { chain, contractAddress } = request.params;
5050
const { signerAddress, ...permissions } = request.body;
5151
const walletAddress = request.headers[
5252
"x-backend-wallet-address"
@@ -56,7 +56,7 @@ export const grantSession = async (fastify: FastifyInstance) => {
5656

5757
const contract = await getContract({
5858
chainId,
59-
contractAddress: contract_address,
59+
contractAddress,
6060
walletAddress,
6161
accountAddress,
6262
});

‎server/api/contract/extensions/account/write/revokeAdmin.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
1212
import { getChainIdFromChain } from "../../../../../utils/chain";
1313

1414
const BodySchema = Type.Object({
15-
wallet_address: Type.String({
15+
walletAddress: Type.String({
1616
description: "Address to revoke admin permissions from",
1717
}),
1818
});
1919

2020
BodySchema.examples = [
2121
{
22-
wallet_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
22+
walletAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
2323
},
2424
];
2525

@@ -30,7 +30,7 @@ export const revokeAdmin = async (fastify: FastifyInstance) => {
3030
Body: Static<typeof BodySchema>;
3131
}>({
3232
method: "POST",
33-
url: "/contract/:chain/:contract_address/account/admins/revoke",
33+
url: "/contract/:chain/:contractAddress/account/admins/revoke",
3434
schema: {
3535
summary: "Revoke admin",
3636
description: "Revoke a smart account's admin permission.",
@@ -45,23 +45,23 @@ export const revokeAdmin = async (fastify: FastifyInstance) => {
4545
},
4646
},
4747
handler: async (request, reply) => {
48-
const { chain, contract_address } = request.params;
49-
const { wallet_address } = request.body;
50-
const walletAddress = request.headers[
48+
const { chain, contractAddress } = request.params;
49+
const { walletAddress } = request.body;
50+
const backendWalletAddress = request.headers[
5151
"x-backend-wallet-address"
5252
] as string;
5353
const accountAddress = request.headers["x-account-address"] as string;
5454
const chainId = getChainIdFromChain(chain);
5555

5656
const contract = await getContract({
5757
chainId,
58-
contractAddress: contract_address,
59-
walletAddress,
58+
contractAddress,
59+
walletAddress: backendWalletAddress,
6060
accountAddress,
6161
});
6262

6363
const tx = await contract.account.revokeAdminPermissions.prepare(
64-
wallet_address,
64+
walletAddress,
6565
);
6666
const queueId = await queueTx({ tx, chainId, extension: "account" });
6767

‎server/api/contract/extensions/account/write/revokeSession.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import { getContract } from "../../../../../utils/cache/getContract";
1212
import { getChainIdFromChain } from "../../../../../utils/chain";
1313

1414
const BodySchema = Type.Object({
15-
wallet_address: Type.String({
15+
walletAddress: Type.String({
1616
description: "Address to revoke session from",
1717
}),
1818
});
1919

2020
BodySchema.examples = [
2121
{
22-
wallet_address: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
22+
walletAddress: "0x3ecdbf3b911d0e9052b64850693888b008e18373",
2323
},
2424
];
2525

@@ -30,7 +30,7 @@ export const revokeSession = async (fastify: FastifyInstance) => {
3030
Body: Static<typeof BodySchema>;
3131
}>({
3232
method: "POST",
33-
url: "/contract/:chain/:contract_address/account/sessions/revoke",
33+
url: "/contract/:chain/:contractAddress/account/sessions/revoke",
3434
schema: {
3535
summary: "Revoke session key",
3636
description: "Revoke a session key for a smart account.",
@@ -45,21 +45,21 @@ export const revokeSession = async (fastify: FastifyInstance) => {
4545
},
4646
},
4747
handler: async (request, reply) => {
48-
const { chain, contract_address } = request.params;
49-
const { wallet_address } = request.body;
50-
const walletAddress = request.headers[
48+
const { chain, contractAddress } = request.params;
49+
const { walletAddress } = request.body;
50+
const backendWalletAddress = request.headers[
5151
"x-backend-wallet-address"
5252
] as string;
5353
const accountAddress = request.headers["x-account-address"] as string;
5454
const chainId = getChainIdFromChain(chain);
5555

5656
const contract = await getContract({
5757
chainId,
58-
contractAddress: contract_address,
59-
walletAddress,
58+
contractAddress,
59+
walletAddress: backendWalletAddress,
6060
accountAddress,
6161
});
62-
const tx = await contract.account.revokeAccess.prepare(wallet_address);
62+
const tx = await contract.account.revokeAccess.prepare(walletAddress);
6363
const queueId = await queueTx({ tx, chainId, extension: "account" });
6464

6565
reply.status(StatusCodes.OK).send({

0 commit comments

Comments
 (0)