Skip to content

Commit 776398c

Browse files
authored
Merge branch 'main' into np/balanceTracking
2 parents 0ca6ecd + 996bb28 commit 776398c

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"prisma": "^5.14.0",
6868
"prom-client": "^15.1.3",
6969
"superjson": "^2.2.1",
70-
"thirdweb": "^5.71.0",
70+
"thirdweb": "^5.78.0",
7171
"uuid": "^9.0.1",
7272
"viem": "^2.21.54",
7373
"winston": "^3.14.1",

src/server/routes/backend-wallet/import.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export const importBackendWallet = async (fastify: FastifyInstance) => {
195195
}
196196

197197
// TODO: with next breaking change, only require GCP KMS resource path
198-
// import endoint does not currently have resource path in the request body
198+
// import endpoint does not currently have resource path in the request body
199199
// so we rely on the global configuration for these values
200200
if (
201201
!(

src/shared/db/wallets/create-wallet-details.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type CreateWalletDetailsParams = {
1515
}
1616
| {
1717
type: "aws-kms";
18-
awsKmsKeyId?: string; // depcrecated and unused, todo: remove with next breaking change
18+
awsKmsKeyId?: string; // deprecated and unused, todo: remove with next breaking change
1919
awsKmsArn: string;
2020

2121
awsKmsSecretAccessKey: string; // will be encrypted and stored, pass plaintext to this function
@@ -24,10 +24,10 @@ type CreateWalletDetailsParams = {
2424
| {
2525
type: "gcp-kms";
2626
gcpKmsResourcePath: string;
27-
gcpKmsKeyRingId?: string; // depcrecated and unused, todo: remove with next breaking change
28-
gcpKmsKeyId?: string; // depcrecated and unused, todo: remove with next breaking change
29-
gcpKmsKeyVersionId?: string; // depcrecated and unused, todo: remove with next breaking change
30-
gcpKmsLocationId?: string; // depcrecated and unused, todo: remove with next breaking change
27+
gcpKmsKeyRingId?: string; // deprecated and unused, todo: remove with next breaking change
28+
gcpKmsKeyId?: string; // deprecated and unused, todo: remove with next breaking change
29+
gcpKmsKeyVersionId?: string; // deprecated and unused, todo: remove with next breaking change
30+
gcpKmsLocationId?: string; // deprecated and unused, todo: remove with next breaking change
3131

3232
gcpApplicationCredentialPrivateKey: string; // will be encrypted and stored, pass plaintext to this function
3333
gcpApplicationCredentialEmail: string;

src/shared/utils/transaction/queue-transation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export type QueuedTransactionParams = {
3636
* Encodes a transaction to generate data, and inserts it into the transaction queue using the insertTransaction()
3737
*
3838
* Note:
39-
* - functionName must be be provided to populate the functionName field in the queued transaction
39+
* - functionName must be provided to populate the functionName field in the queued transaction
4040
* - value and chain details are resolved from the transaction
4141
*/
4242
export async function queueTransaction(args: QueuedTransactionParams) {

src/worker/queues/send-transaction-queue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class SendTransactionQueue {
1919
},
2020
});
2121

22-
// Allow enqueing the same queueId for multiple retries.
22+
// Allow enqueuing the same queueId for multiple retries.
2323
static jobId = (data: SendTransactionData) =>
2424
`${data.queueId}.${data.resendCount}`;
2525

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10176,10 +10176,10 @@ thirdweb@5.29.6:
1017610176
uqr "0.1.2"
1017710177
viem "2.13.7"
1017810178

10179-
thirdweb@^5.71.0:
10180-
version "5.77.0"
10181-
resolved "https://registry.yarnpkg.com/thirdweb/-/thirdweb-5.77.0.tgz#4a2e48ded8e07c6ded0256c1440cf5b7ad740cec"
10182-
integrity sha512-ugrrZSjy8WnY4tQ/OdFn9eXFp/XAfz8lvVF7zUcaY/WRY/x3k69n31oA87FrKsiBIcJuib2lc2sHjjstg8qUcQ==
10179+
thirdweb@^5.78.0:
10180+
version "5.78.0"
10181+
resolved "https://registry.yarnpkg.com/thirdweb/-/thirdweb-5.78.0.tgz#24ef3f773b13353797b72149e8e27e0bb3bb2bbf"
10182+
integrity sha512-S67omjLP0hmqHNEQmIFuliGF9lj0RRpqfPKKRqEMkYolQrCL1l0wtx0jLbzYRPEkopN+51qOXUsyO7AHWokM/Q==
1018310183
dependencies:
1018410184
"@coinbase/wallet-sdk" "4.2.4"
1018510185
"@emotion/react" "11.14.0"

0 commit comments

Comments
 (0)