Skip to content

Commit 6102b5d

Browse files
committed
pulled from main
2 parents 8dd2de0 + d982be9 commit 6102b5d

File tree

131 files changed

+2980
-3361
lines changed

Some content is hidden

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

131 files changed

+2980
-3361
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.github/workflows/build-image-tag.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
include:
1616
- platform: linux/amd64
17-
runner: ubuntu-latest
17+
runner: ubuntu-24.04
1818
arch: amd64
1919
- platform: linux/arm64
2020
runner: ubuntu-24.04-arm64
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
ref: ${{ github.event.release.target_commitish }}
3030

@@ -53,7 +53,7 @@ jobs:
5353

5454
merge-manifests:
5555
needs: build
56-
runs-on: ubuntu-latest
56+
runs-on: ubuntu-24.04
5757
env:
5858
LATEST_TAG: ${{ github.event.release.target_commitish == 'main' && 'thirdweb/engine:latest' || '' }}
5959
steps:
@@ -86,4 +86,4 @@ jobs:
8686
- name: Inspect latest image (if applicable)
8787
if: ${{ env.LATEST_TAG != '' }}
8888
run: |
89-
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest
89+
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:latest

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on: pull_request
44

55
jobs:
66
build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout code
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
with:
1212
ref: ${{ github.ref }}
1313

1414
- name: Set up Node.js
15-
uses: actions/setup-node@v3
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: "18"
1818
cache: "yarn"
19-
19+
2020
- name: Install dependencies
2121
run: yarn install
2222

.github/workflows/lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ on: pull_request
44

55
jobs:
66
lint:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout code
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
with:
1212
ref: ${{ github.ref }}
1313

1414
- name: Set up Node.js
15-
uses: actions/setup-node@v3
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: "18"
1818
cache: "yarn"
19-
19+
2020
- name: Install dependencies
2121
run: yarn install
2222

2323
- name: Run lint
24-
run: yarn lint
24+
run: yarn lint

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
matrix:
1616
include:
1717
- platform: linux/amd64
18-
runner: ubuntu-latest
18+
runner: ubuntu-24.04
1919
arch: amd64
2020
- platform: linux/arm64
2121
runner: ubuntu-24.04-arm64
2222
arch: arm64
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@v3
@@ -48,7 +48,7 @@ jobs:
4848

4949
merge-manifests:
5050
needs: build
51-
runs-on: ubuntu-latest
51+
runs-on: ubuntu-24.04
5252
steps:
5353
- name: Set up Docker Buildx
5454
uses: docker/setup-buildx-action@v3
@@ -67,4 +67,4 @@ jobs:
6767
6868
- name: Inspect image
6969
run: |
70-
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:nightly
70+
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:nightly

.github/workflows/npm-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ on:
55

66
jobs:
77
build:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-24.04
99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
ref: ${{ github.ref }}
1414

1515
- name: Set up Node.js
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: "18"
1919
cache: "yarn"

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ on:
1212
jobs:
1313
stale:
1414

15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
permissions:
1717
issues: write
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/stale@v5
21+
- uses: actions/stale@v9
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-pr-message: 'This PR is stale because it has been open for 7 days with no activity. Remove stale label or comment or this PR will be closed in 3 days.'

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,6 @@ https
149149
# Auto generated OpenAPI file
150150
openapi.json
151151
.aider*
152+
153+
# Jetbrains IDEs
154+
.idea

.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--ignore-engines true
1+
--ignore-engines true

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"superjson": "^2.2.1",
7070
"thirdweb": "^5.71.0",
7171
"uuid": "^9.0.1",
72+
"viem": "^2.21.54",
7273
"winston": "^3.14.1",
7374
"zod": "^3.23.8"
7475
},
@@ -94,8 +95,6 @@
9495
"resolutions": {
9596
"@thirdweb-dev/auth/**/axios": ">=1.7.8",
9697
"@thirdweb-dev/auth/**/web3-utils": ">=4.2.1",
97-
"ethers-gcp-kms-signer/**/protobufjs": ">=7.2.5",
98-
"fastify/**/find-my-way": ">=8.2.2",
9998
"@grpc/grpc-js": ">=1.8.22",
10099
"body-parser": ">=1.20.3",
101100
"cookie": ">=0.7.0",
@@ -104,5 +103,6 @@
104103
"secp256k1": ">=4.0.4",
105104
"ws": ">=8.17.1",
106105
"cross-spawn": ">=7.0.6"
107-
}
106+
},
107+
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
108108
}

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.16",
3+
"version": "0.0.17",
44
"main": "dist/thirdweb-dev-engine.cjs.js",
55
"module": "dist/thirdweb-dev-engine.esm.js",
66
"files": [

sdk/src/services/AccountFactoryService.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class AccountFactoryService {
1212
/**
1313
* Get all smart accounts
1414
* Get all the smart accounts for this account factory.
15-
* @param chain Chain ID or name
15+
* @param chain A chain ID ("137") or slug ("polygon-amoy-testnet"). Chain ID is preferred.
1616
* @param contractAddress Contract address
1717
* @returns any Default Response
1818
* @throws ApiError
@@ -45,7 +45,7 @@ export class AccountFactoryService {
4545
* Get associated smart accounts
4646
* Get all the smart accounts for this account factory associated with the specific admin wallet.
4747
* @param signerAddress The address of the signer to get associated accounts from
48-
* @param chain Chain ID or name
48+
* @param chain A chain ID ("137") or slug ("polygon-amoy-testnet"). Chain ID is preferred.
4949
* @param contractAddress Contract address
5050
* @returns any Default Response
5151
* @throws ApiError
@@ -82,7 +82,7 @@ export class AccountFactoryService {
8282
* Check if deployed
8383
* Check if a smart account has been deployed to the blockchain.
8484
* @param adminAddress The address of the admin to check if the account address is deployed
85-
* @param chain Chain ID or name
85+
* @param chain A chain ID ("137") or slug ("polygon-amoy-testnet"). Chain ID is preferred.
8686
* @param contractAddress Contract address
8787
* @param extraData Extra data to use in predicting the account address
8888
* @returns any Default Response
@@ -122,7 +122,7 @@ export class AccountFactoryService {
122122
* Predict smart account address
123123
* Get the counterfactual address of a smart account.
124124
* @param adminAddress The address of the admin to predict the account address for
125-
* @param chain Chain ID or name
125+
* @param chain A chain ID ("137") or slug ("polygon-amoy-testnet"). Chain ID is preferred.
126126
* @param contractAddress Contract address
127127
* @param extraData Extra data (account salt) to add to use in predicting the account address
128128
* @returns any Default Response
@@ -161,14 +161,14 @@ export class AccountFactoryService {
161161
/**
162162
* Create smart account
163163
* Create a smart account for this account factory.
164-
* @param chain Chain ID or name
164+
* @param chain A chain ID ("137") or slug ("polygon-amoy-testnet"). Chain ID is preferred.
165165
* @param contractAddress Contract address
166166
* @param xBackendWalletAddress Backend wallet address
167167
* @param requestBody
168-
* @param simulateTx Simulate the transaction on-chain without executing
168+
* @param simulateTx Simulates the transaction before adding it to the queue, returning an error if it fails simulation. Note: This step is less performant and recommended only for debugging purposes.
169169
* @param xIdempotencyKey Transactions submitted with the same idempotency key will be de-duplicated. Only the last 100000 transactions are compared.
170170
* @param xAccountAddress Smart account address
171-
* @param xAccountFactoryAddress Smart account factory address. If omitted, engine will try to resolve it from the chain.
171+
* @param xAccountFactoryAddress Smart account factory address. If omitted, Engine will try to resolve it from the contract.
172172
* @param xAccountSalt Smart account salt as string or hex. This is used to predict the smart account address. Useful when creating multiple accounts with the same admin and only needed when deploying the account as part of a userop.
173173
* @returns any Default Response
174174
* @throws ApiError
@@ -191,6 +191,10 @@ export class AccountFactoryService {
191191
* Gas limit for the transaction
192192
*/
193193
gas?: string;
194+
/**
195+
* Gas price for the transaction. Do not use this if maxFeePerGas is set or if you want to use EIP-1559 type transactions. Only use this if you want to use legacy transactions.
196+
*/
197+
gasPrice?: string;
194198
/**
195199
* Maximum fee per gas
196200
*/

0 commit comments

Comments
 (0)