Skip to content

Commit 7ff1cf5

Browse files
farhanW3farhanW3
authored
updated sdk version, added getDefaultGasOverride() (#106)
1 parent 963f4de commit 7ff1cf5

File tree

3 files changed

+165
-4
lines changed

3 files changed

+165
-4
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@sinclair/typebox": "^0.28",
4040
"@t3-oss/env-core": "^0.6.0",
4141
"@thirdweb-dev/chains": "^0.1.46",
42-
"@thirdweb-dev/sdk": "^3.10.54",
42+
"@thirdweb-dev/sdk": "3.10.59",
4343
"@thirdweb-dev/service-utils": "^0.4.2",
4444
"@thirdweb-dev/wallets": "^1.1.18",
4545
"body-parser": "^1.20.2",

‎worker/controller/processTransaction.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { getDefaultGasOverrides } from "@thirdweb-dev/sdk";
12
import { BigNumber, ethers, providers } from "ethers";
23
import { FastifyInstance } from "fastify";
34
import { StatusCodes } from "http-status-codes";
@@ -65,8 +66,16 @@ export const processTransaction = async (
6566
const sdk = await getSDK(tx.chainId, {
6667
walletAddress: tx.walletAddress,
6768
awsKmsKeyId: walletData?.awsKmsKeyId,
69+
gcpKmsKeyId: walletData?.gcpKmsKeyId,
70+
gcpKmsKeyRingId: walletData?.gcpKmsKeyRingId,
71+
gcpKmsLocationId: walletData?.gcpKmsLocationId,
72+
gcpKmsKeyVersionId: walletData?.gcpKmsKeyVersionId,
6873
});
69-
let blockchainNonce = await sdk.wallet.getNonce("pending");
74+
75+
let [blockchainNonce, gasData] = await Promise.all([
76+
sdk.wallet.getNonce("pending"),
77+
getDefaultGasOverrides(sdk.getProvider()),
78+
]);
7079

7180
let lastUsedNonce = BigNumber.from(walletData?.lastUsedNonce ?? -1);
7281
let txSubmittedNonce = BigNumber.from(0);
@@ -82,13 +91,13 @@ export const processTransaction = async (
8291

8392
// Submit transaction to the blockchain
8493
// Create transaction object
85-
8694
const txObject: providers.TransactionRequest = {
8795
to: tx.contractAddress ?? tx.toAddress,
8896
from: tx.walletAddress,
8997
data: tx.encodedInputData,
9098
nonce: txSubmittedNonce,
9199
value: tx.txValue,
100+
...gasData,
92101
};
93102

94103
// Send transaction to the blockchain

‎yarn.lock

Lines changed: 153 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,16 @@
472472
eip1193-provider "^1.0.1"
473473
js-sha3 "^0.8.0"
474474

475+
"@chainlink/contracts@^0.6.1":
476+
version "0.6.1"
477+
resolved "https://registry.yarnpkg.com/@chainlink/contracts/-/contracts-0.6.1.tgz#8842b57e755793cbdbcbc45277fb5d179c993e19"
478+
integrity sha512-EuwijGexttw0UjfrW+HygwhQIrGAbqpf1ue28R55HhWMHBzphEH0PhWm8DQmFfj5OZNy8Io66N4L0nStkZ3QKQ==
479+
dependencies:
480+
"@eth-optimism/contracts" "^0.5.21"
481+
"@openzeppelin/contracts" "~4.3.3"
482+
"@openzeppelin/contracts-upgradeable" "^4.7.3"
483+
"@openzeppelin/contracts-v0.7" "npm:@openzeppelin/contracts@v3.4.2"
484+
475485
"@chainsafe/as-sha256@^0.3.1":
476486
version "0.3.1"
477487
resolved "https://registry.yarnpkg.com/@chainsafe/as-sha256/-/as-sha256-0.3.1.tgz#3639df0e1435cab03f4d9870cc3ac079e57a6fc9"
@@ -575,6 +585,37 @@
575585
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.40.0.tgz#3ba73359e11f5a7bd3e407f70b3528abfae69cec"
576586
integrity sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==
577587

588+
"@eth-optimism/contracts@^0.5.21":
589+
version "0.5.40"
590+
resolved "https://registry.yarnpkg.com/@eth-optimism/contracts/-/contracts-0.5.40.tgz#d13a04a15ea947a69055e6fc74d87e215d4c936a"
591+
integrity sha512-MrzV0nvsymfO/fursTB7m/KunkPsCndltVgfdHaT1Aj5Vi6R/doKIGGkOofHX+8B6VMZpuZosKCMQ5lQuqjt8w==
592+
dependencies:
593+
"@eth-optimism/core-utils" "0.12.0"
594+
"@ethersproject/abstract-provider" "^5.7.0"
595+
"@ethersproject/abstract-signer" "^5.7.0"
596+
597+
"@eth-optimism/core-utils@0.12.0":
598+
version "0.12.0"
599+
resolved "https://registry.yarnpkg.com/@eth-optimism/core-utils/-/core-utils-0.12.0.tgz#6337e4599a34de23f8eceb20378de2a2de82b0ea"
600+
integrity sha512-qW+7LZYCz7i8dRa7SRlUKIo1VBU8lvN0HeXCxJR+z+xtMzMQpPds20XJNCMclszxYQHkXY00fOT6GvFw9ZL6nw==
601+
dependencies:
602+
"@ethersproject/abi" "^5.7.0"
603+
"@ethersproject/abstract-provider" "^5.7.0"
604+
"@ethersproject/address" "^5.7.0"
605+
"@ethersproject/bignumber" "^5.7.0"
606+
"@ethersproject/bytes" "^5.7.0"
607+
"@ethersproject/constants" "^5.7.0"
608+
"@ethersproject/contracts" "^5.7.0"
609+
"@ethersproject/hash" "^5.7.0"
610+
"@ethersproject/keccak256" "^5.7.0"
611+
"@ethersproject/properties" "^5.7.0"
612+
"@ethersproject/providers" "^5.7.0"
613+
"@ethersproject/rlp" "^5.7.0"
614+
"@ethersproject/transactions" "^5.7.0"
615+
"@ethersproject/web" "^5.7.0"
616+
bufio "^1.0.7"
617+
chai "^4.3.4"
618+
578619
"@ethereumjs/common@^2.4.0":
579620
version "2.6.5"
580621
resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30"
@@ -1887,11 +1928,36 @@
18871928
resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz#b41053e360c31a32c2640c9a45ee981a7e603fe0"
18881929
integrity sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg==
18891930

1931+
"@openzeppelin/contracts-upgradeable@4.7.3":
1932+
version "4.7.3"
1933+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.7.3.tgz#f1d606e2827d409053f3e908ba4eb8adb1dd6995"
1934+
integrity sha512-+wuegAMaLcZnLCJIvrVUDzA9z/Wp93f0Dla/4jJvIhijRrPabjQbZe6fWiECLaJyfn5ci9fqf9vTw3xpQOad2A==
1935+
1936+
"@openzeppelin/contracts-upgradeable@^4.4.2", "@openzeppelin/contracts-upgradeable@^4.7.3":
1937+
version "4.9.3"
1938+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.9.3.tgz#ff17a80fb945f5102571f8efecb5ce5915cc4811"
1939+
integrity sha512-jjaHAVRMrE4UuZNfDwjlLGDxTHWIOwTJS2ldnc278a0gevfXfPr8hxKEVBGFBE96kl2G3VHDZhUimw/+G3TG2A==
1940+
1941+
"@openzeppelin/contracts-v0.7@npm:@openzeppelin/contracts@v3.4.2":
1942+
version "3.4.2"
1943+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.2.tgz#d81f786fda2871d1eb8a8c5a73e455753ba53527"
1944+
integrity sha512-z0zMCjyhhp4y7XKAcDAi3Vgms4T2PstwBdahiO0+9NaGICQKjynK3wduSRplTgk4LXmoO1yfDGO5RbjKYxtuxA==
1945+
1946+
"@openzeppelin/contracts@4.7.3":
1947+
version "4.7.3"
1948+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.7.3.tgz#939534757a81f8d69cc854c7692805684ff3111e"
1949+
integrity sha512-dGRS0agJzu8ybo44pCIf3xBaPQN/65AIXNgK8+4gzKd5kbvlqyxryUYVLJv7fK98Seyd2hDZzVEHSWAh0Bt1Yw==
1950+
18901951
"@openzeppelin/contracts@^4.7.3":
18911952
version "4.9.2"
18921953
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"
18931954
integrity sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==
18941955

1956+
"@openzeppelin/contracts@~4.3.3":
1957+
version "4.3.3"
1958+
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.3.3.tgz#ff6ee919fc2a1abaf72b22814bfb72ed129ec137"
1959+
integrity sha512-tDBopO1c98Yk7Cv/PZlHqrvtVjlgK5R4J6jxLwoO7qxK4xqOiZG+zSkIvGFpPZ0ikc3QOED3plgdqjgNTnBc7g==
1960+
18951961
"@paperxyz/embedded-wallet-service-sdk@^1.1.3":
18961962
version "1.1.3"
18971963
resolved "https://registry.yarnpkg.com/@paperxyz/embedded-wallet-service-sdk/-/embedded-wallet-service-sdk-1.1.3.tgz#f2a65f27843a04dd6ada21f15924b502d296401b"
@@ -2712,24 +2778,52 @@
27122778
resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.46.tgz#d115c0b8efb02e74ee38ef8c1237bdf476e62717"
27132779
integrity sha512-AVDLJZ6ttFY8jPzQTKe3mRMnCAQcUzK6eX5vjs9A5CqUCdq7mBmuMM4x3fRs/80FR4vRdEaEYkdRv6HCjCHxGw==
27142780

2781+
"@thirdweb-dev/chains@0.1.50":
2782+
version "0.1.50"
2783+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.50.tgz#857ce24a30821497974e55d75e721905cb35ca33"
2784+
integrity sha512-0rpBdFVgTE5mjgbafoBkpUnq0izx9NZz0mfFammQXWb08eQZUueuBHOVNhK2pRQT346SpQLtf65Oqag82+zZoA==
2785+
27152786
"@thirdweb-dev/contracts-js@1.3.11":
27162787
version "1.3.11"
27172788
resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.11.tgz#12bffe133228436487d0a1298657242e137f08d5"
27182789
integrity sha512-Qh7vEt7egILk7QHbl9y8Yi78MNP+JGogA/g2+Ybr8mY2vZB2I8zpyyHKC60fwMaoGanvm+mIThFCIDXCnmz2Aw==
27192790
dependencies:
27202791
"@thirdweb-dev/contracts" "3.8.3"
27212792

2793+
"@thirdweb-dev/contracts-js@1.3.12":
2794+
version "1.3.12"
2795+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.12.tgz#57aa2ad364ad78a2816cd045f5a555514fee4891"
2796+
integrity sha512-CBgxCYea7fst4bSS1dXDDOOB2rb9FsgFCAUzQPSQIlpqajOJES1fEPZc/TlFz7u444AYxA/9NoHesQ9RipQUgA==
2797+
dependencies:
2798+
"@thirdweb-dev/contracts" "3.8.5"
2799+
27222800
"@thirdweb-dev/contracts@3.8.3":
27232801
version "3.8.3"
27242802
resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.8.3.tgz#2424e5179e4cab56fe73fb74a529ea5d559287f9"
27252803
integrity sha512-J1CRG8bZ/Y9x7jgd0kmu0LDgV3l+s6wBO/ohCJeOamxuXp9ubYMXr1DFmFHnNphmEHnQfLt459nu8qwGJ9ip6Q==
27262804

2805+
"@thirdweb-dev/contracts@3.8.5":
2806+
version "3.8.5"
2807+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.8.5.tgz#7c9e95808c74a43830408cb1c8a2f477c45cc371"
2808+
integrity sha512-JUAeJJlNLw+Lb/8StER8k74VEi5kXDaQx6Ko3cyJnKTWHpZ28xvGIPphkgOFaLw6cG/q4xB423crcZnQZw9YLQ==
2809+
dependencies:
2810+
"@chainlink/contracts" "^0.6.1"
2811+
"@openzeppelin/contracts" "4.7.3"
2812+
"@openzeppelin/contracts-upgradeable" "4.7.3"
2813+
"@thirdweb-dev/dynamic-contracts" "^1.1.2"
2814+
erc721a-upgradeable "^3.3.0"
2815+
2816+
"@thirdweb-dev/dynamic-contracts@^1.1.2":
2817+
version "1.1.4"
2818+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/dynamic-contracts/-/dynamic-contracts-1.1.4.tgz#f14de117bad647d0f32073325627f4b31963446f"
2819+
integrity sha512-uvZBvcbrJH9IzGkQgaJGsKrRgKh3PcRtrbegk62aGEmv1+vlNakcbaVlOiNC8jHpc/S2pZ29CmuKZntl1cEF8Q==
2820+
27272821
"@thirdweb-dev/generated-abis@0.0.1":
27282822
version "0.0.1"
27292823
resolved "https://registry.yarnpkg.com/@thirdweb-dev/generated-abis/-/generated-abis-0.0.1.tgz#0d788d6aff0ac08f11e9eeb9ae4c8321845272a8"
27302824
integrity sha512-vO9/3lSLO8smyyH1QVeYravSTzFwV1nf1C/Im1NBDPdH8//YvcbhtETGGiNfHWpyCvSi0vRYwvf+/7FKdwpDGQ==
27312825

2732-
"@thirdweb-dev/sdk@3.10.54", "@thirdweb-dev/sdk@^3.10.54":
2826+
"@thirdweb-dev/sdk@3.10.54":
27332827
version "3.10.54"
27342828
resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-3.10.54.tgz#25ba3cbf6853da01e1c0d873ca1616769191ceb3"
27352829
integrity sha512-jgQpRcTEn81PEe81QWz3efNSCktJmLCjXd0ju78v04Z/HIxUUcHx83vCiaSp55mpJndf0tMqR7/MWbovu59i8Q==
@@ -2752,6 +2846,29 @@
27522846
yaml "^2.3.1"
27532847
zod "^3.20.2"
27542848

2849+
"@thirdweb-dev/sdk@3.10.59":
2850+
version "3.10.59"
2851+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-3.10.59.tgz#9f820ee511a5bf20d865958961a125be05b7acb6"
2852+
integrity sha512-uDGc2yavYRiXP1+etUaDNLJdzaTSFRPQNoKNqzbR1HMHMHb/KHHPXHKO50AuKpc5pMw8/f+OmCphF0qTMTZu1Q==
2853+
dependencies:
2854+
"@thirdweb-dev/chains" "0.1.50"
2855+
"@thirdweb-dev/contracts-js" "1.3.12"
2856+
"@thirdweb-dev/generated-abis" "0.0.1"
2857+
"@thirdweb-dev/storage" "1.2.10"
2858+
abitype "^0.2.5"
2859+
bn.js "^5.2.1"
2860+
bs58 "^5.0.0"
2861+
buffer "^6.0.3"
2862+
cross-fetch "^3.1.8"
2863+
eventemitter3 "^5.0.1"
2864+
fast-deep-equal "^3.1.3"
2865+
merkletreejs "^0.2.24"
2866+
tiny-invariant "^1.2.0"
2867+
tweetnacl "^1.0.3"
2868+
uuid "^9.0.0"
2869+
yaml "^2.3.1"
2870+
zod "^3.20.2"
2871+
27552872
"@thirdweb-dev/service-utils@^0.4.2":
27562873
version "0.4.2"
27572874
resolved "https://registry.yarnpkg.com/@thirdweb-dev/service-utils/-/service-utils-0.4.2.tgz#bb22fcb38349bf4c5879cbfc105902d3cc32413a"
@@ -2760,6 +2877,16 @@
27602877
aws4fetch "^1.0.17"
27612878
zod "^3.20.2"
27622879

2880+
"@thirdweb-dev/storage@1.2.10":
2881+
version "1.2.10"
2882+
resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-1.2.10.tgz#04f25211c8a2d23b9a2171aac798211fe49c9de7"
2883+
integrity sha512-tUqUfkCfrZfmYcNVxR7j9CLMrIx0C4w/2QkNNo27AlbKGq4x73UCKRBTPZI2ggTKGfq6pyayOfFuVLoN7W/AqA==
2884+
dependencies:
2885+
cid-tool "^3.0.0"
2886+
cross-fetch "^3.1.8"
2887+
form-data "^4.0.0"
2888+
uuid "^9.0.0"
2889+
27632890
"@thirdweb-dev/storage@1.2.7":
27642891
version "1.2.7"
27652892
resolved "https://registry.yarnpkg.com/@thirdweb-dev/storage/-/storage-1.2.7.tgz#5b986919c59b103d2016b8e5444a5c65b5769980"
@@ -4152,6 +4279,11 @@ bufferutil@^4.0.1:
41524279
dependencies:
41534280
node-gyp-build "^4.3.0"
41544281

4282+
bufio@^1.0.7:
4283+
version "1.2.1"
4284+
resolved "https://registry.yarnpkg.com/bufio/-/bufio-1.2.1.tgz#8d4ab3ddfcd5faa90f996f922f9397d41cbaf2de"
4285+
integrity sha512-9oR3zNdupcg/Ge2sSHQF3GX+kmvL/fTPvD0nd5AGLq8SjUYnTz+SlFjK/GXidndbZtIj+pVKXiWeR9w6e9wKCA==
4286+
41554287
busboy@^1.6.0:
41564288
version "1.6.0"
41574289
resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -4204,6 +4336,19 @@ catharsis@^0.9.0:
42044336
dependencies:
42054337
lodash "^4.17.15"
42064338

4339+
chai@^4.3.4:
4340+
version "4.3.8"
4341+
resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.8.tgz#40c59718ad6928da6629c70496fe990b2bb5b17c"
4342+
integrity sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==
4343+
dependencies:
4344+
assertion-error "^1.1.0"
4345+
check-error "^1.0.2"
4346+
deep-eql "^4.1.2"
4347+
get-func-name "^2.0.0"
4348+
loupe "^2.3.1"
4349+
pathval "^1.1.1"
4350+
type-detect "^4.0.5"
4351+
42074352
chai@^4.3.7:
42084353
version "4.3.7"
42094354
resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
@@ -4773,6 +4918,13 @@ env-paths@^2.2.0:
47734918
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
47744919
integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
47754920

4921+
erc721a-upgradeable@^3.3.0:
4922+
version "3.3.0"
4923+
resolved "https://registry.yarnpkg.com/erc721a-upgradeable/-/erc721a-upgradeable-3.3.0.tgz#c7b481668694756120868261fe98ab3a245a06b4"
4924+
integrity sha512-ILE0SjKuvhx+PABG0A/41QUp0MFiYmzrgo71htQ0Ov6JfDOmgUzGxDW8gZuYfKrdlYjNwSAqMpUFWBbyW3sWBA==
4925+
dependencies:
4926+
"@openzeppelin/contracts-upgradeable" "^4.4.2"
4927+
47764928
es5-ext@^0.10.35, es5-ext@^0.10.50:
47774929
version "0.10.62"
47784930
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"

0 commit comments

Comments
 (0)