Skip to content

Commit b8f276c

Browse files
d4mrd4mr
authored
Merge branch 'main' into pb/eip-7702
2 parents 1f3f481 + 503f37e commit b8f276c

File tree

77 files changed

+3472
-235
lines changed

Some content is hidden

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

77 files changed

+3472
-235
lines changed

‎.env.test

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ ENABLE_HTTPS="true"
77
REDIS_URL="redis://127.0.0.1:6379/0"
88
THIRDWEB_API_SECRET_KEY="my-thirdweb-secret-key"
99

10-
TEST_AWS_KMS_KEY_ID=""
11-
TEST_AWS_KMS_ACCESS_KEY_ID=""
12-
TEST_AWS_KMS_SECRET_ACCESS_KEY=""
13-
TEST_AWS_KMS_REGION=""
10+
TEST_AWS_KMS_KEY_ID="UNIMPLEMENTED"
11+
TEST_AWS_KMS_ACCESS_KEY_ID="UNIMPLEMENTED"
12+
TEST_AWS_KMS_SECRET_ACCESS_KEY="UNIMPLEMENTED"
13+
TEST_AWS_KMS_REGION="UNIMPLEMENTED"
1414

15-
TEST_GCP_KMS_RESOURCE_PATH=""
16-
TEST_GCP_KMS_EMAIL=""
17-
TEST_GCP_KMS_PK=""
15+
TEST_GCP_KMS_RESOURCE_PATH="UNIMPLEMENTED"
16+
TEST_GCP_KMS_EMAIL="UNIMPLEMENTED"
17+
TEST_GCP_KMS_PK="UNIMPLEMENTED"

‎package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"dependencies": {
3030
"@aws-sdk/client-kms": "^3.679.0",
3131
"@bull-board/fastify": "^5.23.0",
32+
"@circle-fin/developer-controlled-wallets": "^7.0.0",
3233
"@cloud-cryptographic-wallet/cloud-kms-signer": "^0.1.2",
3334
"@cloud-cryptographic-wallet/signer": "^0.0.5",
3435
"@ethersproject/json-wallets": "^5.7.0",
@@ -63,11 +64,13 @@
6364
"knex": "^3.1.0",
6465
"mnemonist": "^0.39.8",
6566
"node-cron": "^3.0.2",
67+
"ox": "^0.6.9",
6668
"pg": "^8.11.3",
6769
"prisma": "^5.14.0",
6870
"prom-client": "^15.1.3",
6971
"superjson": "^2.2.1",
7072
"thirdweb": "^5.83.0",
73+
"undici": "^6.20.1",
7174
"uuid": "^9.0.1",
7275
"viem": "^2.21.54",
7376
"winston": "^3.14.1",

‎sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@thirdweb-dev/engine",
3-
"version": "0.0.18",
3+
"version": "0.0.19",
44
"main": "dist/thirdweb-dev-engine.cjs.js",
55
"module": "dist/thirdweb-dev-engine.esm.js",
66
"files": [

‎sdk/src/Engine.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ import { MarketplaceOffersService } from './services/MarketplaceOffersService';
3030
import { PermissionsService } from './services/PermissionsService';
3131
import { RelayerService } from './services/RelayerService';
3232
import { TransactionService } from './services/TransactionService';
33+
import { WalletCredentialsService } from './services/WalletCredentialsService';
34+
import { WalletSubscriptionsService } from './services/WalletSubscriptionsService';
3335
import { WebhooksService } from './services/WebhooksService';
3436

3537
type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
@@ -60,6 +62,8 @@ class EngineLogic {
6062
public readonly permissions: PermissionsService;
6163
public readonly relayer: RelayerService;
6264
public readonly transaction: TransactionService;
65+
public readonly walletCredentials: WalletCredentialsService;
66+
public readonly walletSubscriptions: WalletSubscriptionsService;
6367
public readonly webhooks: WebhooksService;
6468

6569
public readonly request: BaseHttpRequest;
@@ -101,6 +105,8 @@ class EngineLogic {
101105
this.permissions = new PermissionsService(this.request);
102106
this.relayer = new RelayerService(this.request);
103107
this.transaction = new TransactionService(this.request);
108+
this.walletCredentials = new WalletCredentialsService(this.request);
109+
this.walletSubscriptions = new WalletSubscriptionsService(this.request);
104110
this.webhooks = new WebhooksService(this.request);
105111
}
106112
}

‎sdk/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,6 @@ export { MarketplaceOffersService } from './services/MarketplaceOffersService';
3434
export { PermissionsService } from './services/PermissionsService';
3535
export { RelayerService } from './services/RelayerService';
3636
export { TransactionService } from './services/TransactionService';
37+
export { WalletCredentialsService } from './services/WalletCredentialsService';
38+
export { WalletSubscriptionsService } from './services/WalletSubscriptionsService';
3739
export { WebhooksService } from './services/WebhooksService';

‎sdk/src/services/BackendWalletService.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,27 @@ export class BackendWalletService {
1717
* @throws ApiError
1818
*/
1919
public create(
20-
requestBody?: {
20+
requestBody?: ({
2121
label?: string;
22+
type?: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local');
23+
} | {
24+
label?: string;
25+
type: ('circle' | 'smart:circle');
2226
/**
23-
* Type of new wallet to create. It is recommended to always provide this value. If not provided, the default wallet type will be used.
27+
* If your engine is configured with a testnet API Key for Circle, you can only create testnet wallets and send testnet transactions. Enable this field for testnet wallets. NOTE: A production API Key cannot be used for testnet transactions, and a testnet API Key cannot be used for production transactions. See: https://developers.circle.com/w3s/sandbox-vs-production
2428
*/
25-
type?: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local');
26-
},
29+
isTestnet?: boolean;
30+
credentialId: string;
31+
walletSetId?: string;
32+
}),
2733
): CancelablePromise<{
2834
result: {
2935
/**
3036
* A contract or wallet address
3137
*/
3238
walletAddress: string;
3339
status: string;
34-
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local');
40+
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local' | 'circle' | 'smart:circle');
3541
};
3642
}> {
3743
return this.httpRequest.request({
@@ -721,7 +727,7 @@ export class BackendWalletService {
721727
gasPrice?: string;
722728
data?: string;
723729
value?: string;
724-
chainId?: number;
730+
chainId: number;
725731
type?: number;
726732
accessList?: any;
727733
maxFeePerGas?: string;
@@ -1032,7 +1038,7 @@ export class BackendWalletService {
10321038
* @throws ApiError
10331039
*/
10341040
public resetNonces(
1035-
requestBody?: {
1041+
requestBody: {
10361042
/**
10371043
* The chain ID to reset nonces for.
10381044
*/
@@ -1041,6 +1047,10 @@ export class BackendWalletService {
10411047
* The backend wallet address to reset nonces for. Omit to reset all backend wallets.
10421048
*/
10431049
walletAddress?: string;
1050+
/**
1051+
* Resync nonces to match the onchain transaction count for your backend wallets. (Default: true)
1052+
*/
1053+
syncOnchainNonces: boolean;
10441054
},
10451055
): CancelablePromise<{
10461056
result: {

‎sdk/src/services/ConfigurationService.ts

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class ConfigurationService {
1717
*/
1818
public getWalletsConfiguration(): CancelablePromise<{
1919
result: {
20-
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local');
20+
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local' | 'circle' | 'smart:circle');
2121
awsAccessKeyId: (string | null);
2222
awsRegion: (string | null);
2323
gcpApplicationProjectId: (string | null);
@@ -55,10 +55,12 @@ export class ConfigurationService {
5555
gcpKmsKeyRingId: string;
5656
gcpApplicationCredentialEmail: string;
5757
gcpApplicationCredentialPrivateKey: string;
58+
} | {
59+
circleApiKey: string;
5860
}),
5961
): CancelablePromise<{
6062
result: {
61-
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local');
63+
type: ('local' | 'aws-kms' | 'gcp-kms' | 'smart:aws-kms' | 'smart:gcp-kms' | 'smart:local' | 'circle' | 'smart:circle');
6264
awsAccessKeyId: (string | null);
6365
awsRegion: (string | null);
6466
gcpApplicationProjectId: (string | null);
@@ -329,7 +331,8 @@ export class ConfigurationService {
329331
*/
330332
public getAuthConfiguration(): CancelablePromise<{
331333
result: {
332-
domain: string;
334+
authDomain: string;
335+
mtlsCertificate: (string | null);
333336
};
334337
}> {
335338
return this.httpRequest.request({
@@ -351,12 +354,21 @@ export class ConfigurationService {
351354
* @throws ApiError
352355
*/
353356
public updateAuthConfiguration(
354-
requestBody: {
355-
domain: string;
357+
requestBody?: {
358+
authDomain?: string;
359+
/**
360+
* Engine certificate used for outbound mTLS requests. Must provide the full certificate chain.
361+
*/
362+
mtlsCertificate?: string;
363+
/**
364+
* Engine private key used for outbound mTLS requests.
365+
*/
366+
mtlsPrivateKey?: string;
356367
},
357368
): CancelablePromise<{
358369
result: {
359-
domain: string;
370+
authDomain: string;
371+
mtlsCertificate: (string | null);
360372
};
361373
}> {
362374
return this.httpRequest.request({

‎sdk/src/services/ContractEventsService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export class ContractEventsService {
2323
public getAllEvents(
2424
chain: string,
2525
contractAddress: string,
26-
fromBlock?: (number | string),
27-
toBlock?: (number | string),
26+
fromBlock?: (number | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized'),
27+
toBlock?: (number | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized'),
2828
order?: ('asc' | 'desc'),
2929
): CancelablePromise<{
3030
result: Array<Record<string, any>>;
@@ -63,8 +63,8 @@ export class ContractEventsService {
6363
contractAddress: string,
6464
requestBody: {
6565
eventName: string;
66-
fromBlock?: (number | string);
67-
toBlock?: (number | string);
66+
fromBlock?: (number | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized');
67+
toBlock?: (number | 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized');
6868
order?: ('asc' | 'desc');
6969
filters?: any;
7070
},

‎sdk/src/services/WalletCredentialsService.ts

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
/* generated using openapi-typescript-codegen -- do no edit */
2+
/* istanbul ignore file */
3+
/* tslint:disable */
4+
/* eslint-disable */
5+
import type { CancelablePromise } from '../core/CancelablePromise';
6+
import type { BaseHttpRequest } from '../core/BaseHttpRequest';
7+
8+
export class WalletCredentialsService {
9+
10+
constructor(public readonly httpRequest: BaseHttpRequest) {}
11+
12+
/**
13+
* Create wallet credentials
14+
* Create a new set of wallet credentials.
15+
* @param requestBody
16+
* @returns any Default Response
17+
* @throws ApiError
18+
*/
19+
public createWalletCredential(
20+
requestBody: {
21+
label: string;
22+
type: 'circle';
23+
/**
24+
* 32-byte hex string. Consult https://developers.circle.com/w3s/entity-secret-management to create and register an entity secret.
25+
*/
26+
entitySecret: string;
27+
/**
28+
* Whether this credential should be set as the default for its type. Only one credential can be default per type.
29+
*/
30+
isDefault?: boolean;
31+
},
32+
): CancelablePromise<{
33+
result: {
34+
id: string;
35+
type: string;
36+
label: string;
37+
isDefault: (boolean | null);
38+
createdAt: string;
39+
updatedAt: string;
40+
};
41+
}> {
42+
return this.httpRequest.request({
43+
method: 'POST',
44+
url: '/wallet-credentials',
45+
body: requestBody,
46+
mediaType: 'application/json',
47+
errors: {
48+
400: `Bad Request`,
49+
404: `Not Found`,
50+
500: `Internal Server Error`,
51+
},
52+
});
53+
}
54+
55+
/**
56+
* Get all wallet credentials
57+
* Get all wallet credentials with pagination.
58+
* @param page Specify the page number.
59+
* @param limit Specify the number of results to return per page.
60+
* @returns any Default Response
61+
* @throws ApiError
62+
*/
63+
public getAllWalletCredentials(
64+
page: number = 1,
65+
limit: number = 100,
66+
): CancelablePromise<{
67+
result: Array<{
68+
id: string;
69+
type: string;
70+
label: (string | null);
71+
isDefault: (boolean | null);
72+
createdAt: string;
73+
updatedAt: string;
74+
}>;
75+
}> {
76+
return this.httpRequest.request({
77+
method: 'GET',
78+
url: '/wallet-credentials',
79+
query: {
80+
'page': page,
81+
'limit': limit,
82+
},
83+
errors: {
84+
400: `Bad Request`,
85+
404: `Not Found`,
86+
500: `Internal Server Error`,
87+
},
88+
});
89+
}
90+
91+
/**
92+
* Get wallet credential
93+
* Get a wallet credential by ID.
94+
* @param id The ID of the wallet credential to get.
95+
* @returns any Default Response
96+
* @throws ApiError
97+
*/
98+
public getWalletCredential(
99+
id: string,
100+
): CancelablePromise<{
101+
result: {
102+
id: string;
103+
type: string;
104+
label: (string | null);
105+
isDefault: (boolean | null);
106+
createdAt: string;
107+
updatedAt: string;
108+
deletedAt: (string | null);
109+
};
110+
}> {
111+
return this.httpRequest.request({
112+
method: 'GET',
113+
url: '/wallet-credentials/{id}',
114+
path: {
115+
'id': id,
116+
},
117+
errors: {
118+
400: `Bad Request`,
119+
404: `Not Found`,
120+
500: `Internal Server Error`,
121+
},
122+
});
123+
}
124+
125+
/**
126+
* Update wallet credential
127+
* Update a wallet credential's label, default status, and entity secret.
128+
* @param id The ID of the wallet credential to update.
129+
* @param requestBody
130+
* @returns any Default Response
131+
* @throws ApiError
132+
*/
133+
public updateWalletCredential(
134+
id: string,
135+
requestBody?: {
136+
label?: string;
137+
/**
138+
* Whether this credential should be set as the default for its type. Only one credential can be default per type.
139+
*/
140+
isDefault?: boolean;
141+
/**
142+
* 32-byte hex string. Consult https://developers.circle.com/w3s/entity-secret-management to create and register an entity secret.
143+
*/
144+
entitySecret?: string;
145+
},
146+
): CancelablePromise<{
147+
result: {
148+
id: string;
149+
type: string;
150+
label: (string | null);
151+
isDefault: (boolean | null);
152+
createdAt: string;
153+
updatedAt: string;
154+
};
155+
}> {
156+
return this.httpRequest.request({
157+
method: 'PUT',
158+
url: '/wallet-credentials/{id}',
159+
path: {
160+
'id': id,
161+
},
162+
body: requestBody,
163+
mediaType: 'application/json',
164+
errors: {
165+
400: `Bad Request`,
166+
404: `Not Found`,
167+
500: `Internal Server Error`,
168+
},
169+
});
170+
}
171+
172+
}

0 commit comments

Comments
 (0)