Fix sdk bugs, remove tx_overrides, merge main (#131)

adam-maj · web-flow · commit 9a7a4bcaafb3 · 2023-09-14T10:23:34.000-07:00
* updated roles/permission doc (#115) * swagger UI on Production gives a 404 (#116) * fixed nodemon & retry to not update mined status, let the other process handle it (#117) * Retry Fixes (#123) * updated retry to not retry if gas value is lower than previously sent. Dynamic Wallet Add doesn't work. Will be fixed in Adam/Furqans branch * updated log to warn & updated message * Testjam error fixes (#124) * fixed Jorge worker error * readme update for swagger UI for Docker Image * added examples for end-points * enabled swagger UI on production (#127) * fix for adding wallets dynamically for a new chain (#128) * Updated sdk to 3.10.60 & used retry var (#129) * Fix prebuilt merge conflicts * Remove dbOperations
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -21,6 +21,7 @@
 
 1. Create a `.env` file based off `.env.example` with all the variables filled in.
 2. Update the `THIRDWEB_API_SECRET_KEY` value on the `.env` file
+3. Update the `POSTGRES_CONNECTION_URL` value on the `.env` file
 
 ### PostgreSQL DB
 
@@ -79,9 +80,18 @@ For updates on your requests, you can either poll using the `get` (`/tranasction
 3. Run the below command
    <br />
    ```
-   docker run -e .env -p 3005:3005 thirdweb/web3-api:latest
+   docker run -e .env -p 3005:3005 thirdweb/web3-api:nightly
+   # check other images at https://hub.docker.com/r/thirdweb/web3-api/tags
    ```
 
+### Note:
+
+To access the Swagger UI locally on `http://localhost:3005/` when using the docker image, you need to update add the following to the `.env` file:
+
+```
+NODE_ENV=development
+```
+
 <details>
  <summary>Run on a Server (EC2 Instance/Google Compute/VM) </summary>
 
@@ -134,9 +144,8 @@ We use `docker-compose-infra.yml` to spin up the supporting infra services, a po
 
 1. Clone the Repo
 2. Check [Setup Instruction section](#setup-instructions) to update the `.env` file
-3. Check [Advance Setup : PostgreSQL DB](#advance-setup--postgresql-db) section to update the `.env` file
-4. Run: `yarn install`
-5. Run: `yarn dev:server & yarn dev:worker`
+3. Run: `yarn install`
+4. Run: `yarn dev:server & yarn dev:worker`
 
 The API defaults to `http://localhost:3005`
 
@@ -161,4 +170,14 @@ We use `docker-compose.yml` to spin up the API Server & Worker along with suppor
 
 The API defaults to `http://localhost:3005`
 
+To access the Swagger UI locally on `http://localhost:3005/` when using the docker image, you need to update add the following to the `.env` file:
+
+### Note:
+
+To access the Swagger UI locally on `http://localhost:3005/` when using the docker image, you need to update add the following to the `.env` file:
+
+```
+NODE_ENV=development
+```
+
 </details>
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@sinclair/typebox": "^0.28",
     "@t3-oss/env-core": "^0.6.0",
     "@thirdweb-dev/chains": "^0.1.46",
-    "@thirdweb-dev/sdk": "3.10.59",
+    "@thirdweb-dev/sdk": "^3.10.60",
     "@thirdweb-dev/service-utils": "^0.4.2",
     "@thirdweb-dev/wallets": "^1.1.23",
     "body-parser": "^1.20.2",
diff --git a/server/api/contract/extensions/erc1155/write/airdrop.ts b/server/api/contract/extensions/erc1155/write/airdrop.ts
@@ -70,7 +70,7 @@ export async function erc1155airdrop(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { token_id, addresses, tx_overrides } = request.body;
+      const { token_id, addresses } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/burn.ts b/server/api/contract/extensions/erc1155/write/burn.ts
@@ -53,7 +53,7 @@ export async function erc1155burn(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { token_id, amount, tx_overrides } = request.body;
+      const { token_id, amount } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/burnBatch.ts b/server/api/contract/extensions/erc1155/write/burnBatch.ts
@@ -59,7 +59,7 @@ export async function erc1155burnBatch(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { token_ids, amounts, tx_overrides } = request.body;
+      const { token_ids, amounts } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/claimTo.ts b/server/api/contract/extensions/erc1155/write/claimTo.ts
@@ -57,7 +57,7 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, token_id, quantity, tx_overrides } = request.body;
+      const { receiver, token_id, quantity } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/lazyMint.ts b/server/api/contract/extensions/erc1155/write/lazyMint.ts
@@ -60,7 +60,7 @@ export async function erc1155lazyMint(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { metadatas, tx_overrides } = request.body;
+      const { metadatas } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/mintAdditionalSupplyTo.ts b/server/api/contract/extensions/erc1155/write/mintAdditionalSupplyTo.ts
@@ -57,8 +57,7 @@ export async function erc1155mintAdditionalSupplyTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, additional_supply, token_id, tx_overrides } =
-        request.body;
+      const { receiver, additional_supply, token_id } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/mintBatchTo.ts b/server/api/contract/extensions/erc1155/write/mintBatchTo.ts
@@ -73,7 +73,7 @@ export async function erc1155mintBatchTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, metadataWithSupply, tx_overrides } = request.body;
+      const { receiver, metadataWithSupply } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/mintTo.ts b/server/api/contract/extensions/erc1155/write/mintTo.ts
@@ -61,7 +61,7 @@ export async function erc1155mintTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, metadataWithSupply, tx_overrides } = request.body;
+      const { receiver, metadataWithSupply } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc1155/write/setApprovalForAll.ts b/server/api/contract/extensions/erc1155/write/setApprovalForAll.ts
@@ -56,7 +56,7 @@ export async function erc1155SetApprovalForAll(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { operator, approved, tx_overrides } = request.body;
+      const { operator, approved } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc1155/write/signatureMint.ts b/server/api/contract/extensions/erc1155/write/signatureMint.ts
@@ -52,7 +52,7 @@ export async function erc1155SignatureMint(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { payload, signature, tx_overrides } = request.body;
+      const { payload, signature } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
 
       const contract = await getContractInstance(
diff --git a/server/api/contract/extensions/erc1155/write/transfer.ts b/server/api/contract/extensions/erc1155/write/transfer.ts
@@ -56,7 +56,7 @@ export async function erc1155transfer(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { to, token_id, amount, tx_overrides } = request.body;
+      const { to, token_id, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc1155/write/transferFrom.ts b/server/api/contract/extensions/erc1155/write/transferFrom.ts
@@ -63,7 +63,7 @@ export async function erc1155transferFrom(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { from, to, token_id, amount, tx_overrides } = request.body;
+      const { from, to, token_id, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc20/write/burn.ts b/server/api/contract/extensions/erc20/write/burn.ts
@@ -50,7 +50,7 @@ export async function erc20burn(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { amount, tx_overrides } = request.body;
+      const { amount } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc20/write/burnFrom.ts b/server/api/contract/extensions/erc20/write/burnFrom.ts
@@ -55,7 +55,7 @@ export async function erc20burnFrom(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { holder_address, amount, tx_overrides } = request.body;
+      const { holder_address, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc20/write/claimTo.ts b/server/api/contract/extensions/erc20/write/claimTo.ts
@@ -54,7 +54,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { recipient, amount, tx_overrides } = request.body;
+      const { recipient, amount } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc20/write/mintBatchTo.ts b/server/api/contract/extensions/erc20/write/mintBatchTo.ts
@@ -65,7 +65,7 @@ export async function erc20mintBatchTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { data, tx_overrides } = request.body;
+      const { data } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc20/write/mintTo.ts b/server/api/contract/extensions/erc20/write/mintTo.ts
@@ -54,7 +54,7 @@ export async function erc20mintTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { to_address, amount, tx_overrides } = request.body;
+      const { to_address, amount } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc20/write/setAllowance.ts b/server/api/contract/extensions/erc20/write/setAllowance.ts
@@ -54,7 +54,7 @@ export async function erc20SetAlowance(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { spender_address, amount, tx_overrides } = request.body;
+      const { spender_address, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc20/write/signatureMint.ts b/server/api/contract/extensions/erc20/write/signatureMint.ts
@@ -52,7 +52,7 @@ export async function erc20SignatureMint(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { payload, signature, tx_overrides } = request.body;
+      const { payload, signature } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
 
       const contract = await getContractInstance(
diff --git a/server/api/contract/extensions/erc20/write/transfer.ts b/server/api/contract/extensions/erc20/write/transfer.ts
@@ -56,7 +56,7 @@ export async function erc20Transfer(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { to_address, amount, tx_overrides } = request.body;
+      const { to_address, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc20/write/transferFrom.ts b/server/api/contract/extensions/erc20/write/transferFrom.ts
@@ -61,7 +61,7 @@ export async function erc20TransferFrom(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { from_address, to_address, amount, tx_overrides } = request.body;
+      const { from_address, to_address, amount } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc721/write/burn.ts b/server/api/contract/extensions/erc721/write/burn.ts
@@ -49,7 +49,7 @@ export async function erc721burn(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { token_id, tx_overrides } = request.body;
+      const { token_id } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc721/write/claimTo.ts b/server/api/contract/extensions/erc721/write/claimTo.ts
@@ -53,7 +53,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, quantity, tx_overrides } = request.body;
+      const { receiver, quantity } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc721/write/lazyMint.ts b/server/api/contract/extensions/erc721/write/lazyMint.ts
@@ -60,7 +60,7 @@ export async function erc721lazyMint(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { metadatas, tx_overrides } = request.body;
+      const { metadatas } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc721/write/mintBatchTo.ts b/server/api/contract/extensions/erc721/write/mintBatchTo.ts
@@ -63,7 +63,7 @@ export async function erc721mintBatchTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, metadatas, tx_overrides } = request.body;
+      const { receiver, metadatas } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc721/write/mintTo.ts b/server/api/contract/extensions/erc721/write/mintTo.ts
@@ -56,7 +56,7 @@ export async function erc721mintTo(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { receiver, metadata, tx_overrides } = request.body;
+      const { receiver, metadata } = request.body;
       const walletAddress = request.headers["x-wallet-address"] as string;
       const chainId = getChainIdFromChain(network);
 
diff --git a/server/api/contract/extensions/erc721/write/setApprovalForAll.ts b/server/api/contract/extensions/erc721/write/setApprovalForAll.ts
@@ -54,7 +54,7 @@ export async function erc721SetApprovalForAll(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { operator, approved, tx_overrides } = request.body;
+      const { operator, approved } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc721/write/setApprovalForToken.ts b/server/api/contract/extensions/erc721/write/setApprovalForToken.ts
@@ -54,7 +54,7 @@ export async function erc721SetApprovalForToken(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { operator, token_id, tx_overrides } = request.body;
+      const { operator, token_id } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc721/write/signatureMint.ts b/server/api/contract/extensions/erc721/write/signatureMint.ts
@@ -69,7 +69,7 @@ export async function erc721SignatureMint(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { payload, signature, tx_overrides } = request.body;
+      const { payload, signature } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc721/write/transfer.ts b/server/api/contract/extensions/erc721/write/transfer.ts
@@ -54,7 +54,7 @@ export async function erc721transfer(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { to, token_id, tx_overrides } = request.body;
+      const { to, token_id } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/extensions/erc721/write/transferFrom.ts b/server/api/contract/extensions/erc721/write/transferFrom.ts
@@ -57,7 +57,7 @@ export async function erc721transferFrom(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_address } = request.params;
-      const { from, to, token_id, tx_overrides } = request.body;
+      const { from, to, token_id } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/contract/write/write.ts b/server/api/contract/write/write.ts
@@ -73,10 +73,7 @@ export async function writeToContract(fastify: FastifyInstance) {
         contract_address,
         walletAddress,
       );
-      const tx = await contract.prepare(function_name, args, {
-        value: tx_overrides?.value,
-        from: walletAddress,
-      });
+      const tx = await contract.prepare(function_name, args, tx_overrides);
 
       const queuedId = await queueTx({ tx, chainId, extension: "none" });
 
diff --git a/server/api/deployer/prebuilt.ts b/server/api/deployer/prebuilt.ts
@@ -70,7 +70,7 @@ export async function deployPrebuilt(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network, contract_type } = request.params;
-      const { contractMetadata, version, tx_overrides } = request.body;
+      const { contractMetadata, version } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/deployer/prebuilts/edition.ts b/server/api/deployer/prebuilts/edition.ts
@@ -64,7 +64,7 @@ export async function deployPrebuiltEdition(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network } = request.params;
-      const { contractMetadata, version, tx_overrides } = request.body;
+      const { contractMetadata, version } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/deployer/prebuilts/editionDrop.ts b/server/api/deployer/prebuilts/editionDrop.ts
@@ -66,7 +66,7 @@ export async function deployPrebuiltEditionDrop(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network } = request.params;
-      const { contractMetadata, version, tx_overrides } = request.body;
+      const { contractMetadata, version } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/deployer/prebuilts/marketplaceV3.ts b/server/api/deployer/prebuilts/marketplaceV3.ts
@@ -58,7 +58,7 @@ export async function deployPrebuiltMarketplaceV3(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { network } = request.params;
-      const { contractMetadata, version, tx_overrides } = request.body;
+      const { contractMetadata, version } = request.body;
       const chainId = getChainIdFromChain(network);
       const walletAddress = request.headers["x-wallet-address"] as string;
 
diff --git a/server/api/deployer/prebuilts/multiwrap.ts b/server/api/deployer/prebuilts/multiwrap.ts
diff --git a/server/api/deployer/prebuilts/nftCollection.ts b/server/api/deployer/prebuilts/nftCollection.ts
diff --git a/server/api/deployer/prebuilts/pack.ts b/server/api/deployer/prebuilts/pack.ts
diff --git a/server/api/deployer/prebuilts/signatureDrop.ts b/server/api/deployer/prebuilts/signatureDrop.ts
diff --git a/server/api/deployer/prebuilts/tokenDrop.ts b/server/api/deployer/prebuilts/tokenDrop.ts
diff --git a/server/api/deployer/prebuilts/vote.ts b/server/api/deployer/prebuilts/vote.ts
diff --git a/server/api/deployer/published.ts b/server/api/deployer/published.ts
diff --git a/server/api/wallet/addWallet.ts b/server/api/wallet/addWallet.ts
diff --git a/server/api/wallet/createEOAWallet.ts b/server/api/wallet/createEOAWallet.ts
diff --git a/server/helpers/server.ts b/server/helpers/server.ts
diff --git a/server/schemas/wallet/index.ts b/server/schemas/wallet/index.ts
diff --git a/worker/controller/retryTransaction.ts b/worker/controller/retryTransaction.ts
diff --git a/yarn.lock b/yarn.lock
