Skip to content

Commit 950577f

Browse files
authored
Merge branch 'main' into juan/test-sGHO-functionality
2 parents 3f49625 + 713fe69 commit 950577f

File tree

7 files changed

+24
-15
lines changed

7 files changed

+24
-15
lines changed

.github/workflows/pull-request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ jobs:
1313
name: Verify
1414
uses: ./.github/workflows/verify.yml
1515
secrets: inherit
16+
with:
17+
run-acceptance: ${{ startsWith(github.head_ref, 'changeset-release/') }}

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
uses: changesets/action@v1
2929
with:
3030
title: '[Release] Candidate'
31-
commit: 'chore: bump package versions'
31+
commit: 'chore: bumps package versions'
32+
branch: release
3233
publish: pnpm release
3334
env:
3435
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

packages/client/src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ export class AaveClient {
393393
if (isHasProcessedKnownTransactionRequest(result)) {
394394
return this.waitForTransaction(result);
395395
}
396-
return okAsync(result);
396+
return okAsync(result.txHash);
397397
};
398398

399399
/**

packages/client/src/thirdweb.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ function sendTransactionAndWait(
5555
.map(async (hash) =>
5656
waitForReceipt({
5757
client,
58-
chain: request.chainId,
58+
chain: {
59+
id: request.chainId,
60+
rpc: `https://${request.chainId}.rpc.thirdweb.com/${client.clientId}`,
61+
},
5962
transactionHash: hash,
6063
}),
6164
)

packages/graphql/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
},
5252
"dependencies": {
5353
"@aave/types": "workspace:*",
54-
"gql.tada": "^1.8.11",
54+
"gql.tada": "^1.8.13",
5555
"graphql": "^16.11.0",
5656
"type-fest": "^4.41.0"
5757
},

packages/react/src/thirdweb.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,11 @@ export function useSendTransaction(
132132
sendAndConfirmTx({
133133
to: request.to,
134134
data: request.data,
135-
value: request.value,
136-
chain: request.chainId,
135+
value: BigInt(request.value),
136+
chain: {
137+
id: request.chainId,
138+
rpc: `https://${request.chainId}.rpc.thirdweb.com/${thirdwebClient.clientId}`,
139+
},
137140
client: thirdwebClient,
138141
}),
139142
(err) => SigningError.from(err),

pnpm-lock.yaml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)