diff --git a/.env.example b/.env.example index 05dca4c0f..a5f56c8cc 100644 --- a/.env.example +++ b/.env.example @@ -13,11 +13,11 @@ REACT_APP_INFURA_IPFS_PROJECT_ID= REACT_APP_INFURA_IPFS_PROJECT_SECRET= # A Biconomy API key can be set here, to allow meta transactions in the widgets -REACT_APP_META_TX_API_KEY_MAP={"testing-80001-0":"xxxxxx", "testing-5-0":"xxxxxx"} +REACT_APP_META_TX_API_KEY_MAP={"testing-80002-0":"xxxxxx", "testing-5-0":"xxxxxx"} # Biconomy API ids can be set here, to allow meta transactions to the protocol contracts # As each contracts needs its own AipId, we need to consider protocol, and all supported ERC20 tokens -REACT_APP_META_TX_API_IDS_MAP={"testing-80001-0":{"protocol": "xxxxxx", "BOSON": "yyyyyy", "WETH": "zzzzzz"}, "testing-5-0":{"protocol": "xxxxxx", "BOSON": "yyyyyy", "WETH": "zzzzzz"}} +REACT_APP_META_TX_API_IDS_MAP={"testing-80002-0":{"protocol": "xxxxxx", "BOSON": "yyyyyy", "WETH": "zzzzzz", "forwarder": "tttttt"}, "testing-5-0":{"protocol": "xxxxxx", "BOSON": "yyyyyy", "WETH": "zzzzzz", "forwarder": "tttttt"}} # Meta-transactions Gateway URL (ex: "https://api.biconomy.io") REACT_APP_META_TX_RELAYER_URL= diff --git a/package-lock.json b/package-lock.json index 17fc41b22..53e9a0458 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "dependencies": { "@apollo/client": "^3.8.1", "@bosonprotocol/chat-sdk": "^1.4.5", - "@bosonprotocol/common": "^1.32.0-alpha.6", - "@bosonprotocol/react-kit": "^0.42.0-alpha.0", + "@bosonprotocol/common": "^1.32.1-alpha.1", + "@bosonprotocol/react-kit": "^0.42.0-alpha.2", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.7.0", @@ -3579,9 +3579,9 @@ } }, "node_modules/@bosonprotocol/common": { - "version": "1.32.0-alpha.6", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.32.0-alpha.6.tgz", - "integrity": "sha512-fAJxG1XfmBIXPUFb5h7BP8QRkcyDVOqZpW5DwzKGltiWx0HCVgK66gUQosm+SYq30CVMhC34EJN/SwWpuwtLag==", + "version": "1.32.1-alpha.1", + "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.32.1-alpha.1.tgz", + "integrity": "sha512-RnqKjJ8/kXJG5y04Ieeq/NWC/MfTE+GhK6x2l2SQf19xa5yR1kepMRpqJq2EjufC721jypI12UZo41uGdj0TtQ==", "dependencies": { "@bosonprotocol/metadata": "^1.16.3", "@ethersproject/abi": "^5.5.0", @@ -3592,11 +3592,11 @@ } }, "node_modules/@bosonprotocol/core-sdk": { - "version": "1.46.0-alpha.0", - "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.46.0-alpha.0.tgz", - "integrity": "sha512-8mE6qjDoxqnks7CwxcK2Di2BdyOHvCGJVjexJvG0pmDjSUWQ0YXJxbJjQnSiGSy4TemsIc/zIyq5cX+iXaeyZg==", + "version": "1.46.0-alpha.2", + "resolved": "https://registry.npmjs.org/@bosonprotocol/core-sdk/-/core-sdk-1.46.0-alpha.2.tgz", + "integrity": "sha512-98gWq23fcniukuTsLGQ9QEtmQFScKjnKZeirjXexLKeRCLkFj9IN2mvJ3leAPBbs4eYg9SWP5+YZXWhNPaxiCQ==", "dependencies": { - "@bosonprotocol/common": "^1.32.0", + "@bosonprotocol/common": "^1.32.1-alpha.1", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -3611,43 +3611,17 @@ "schema-to-yup": "^1.11.11" } }, - "node_modules/@bosonprotocol/core-sdk/node_modules/@bosonprotocol/common": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.32.0.tgz", - "integrity": "sha512-YSMpjqPyBXw5WRYlpFKdwCQwyXgSWxNDF1OqTRwFU9wdO+8R/VdG4QV0YTi+uEuy/9rFLyQZvrbxwLNVO4ZdBg==", - "dependencies": { - "@bosonprotocol/metadata": "^1.16.3", - "@ethersproject/abi": "^5.5.0", - "@ethersproject/address": "^5.5.0", - "@ethersproject/bignumber": "^5.5.0", - "@ethersproject/constants": "^5.5.0", - "@ethersproject/units": "^5.5.0" - } - }, "node_modules/@bosonprotocol/ethers-sdk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.17.0.tgz", - "integrity": "sha512-rH7t6thEEdijUlFS8NJVCuzum7OF/XoFATB2NLj65+AJDrxNUCGdoECjpXOmi6/i8hn8fT7C7t+2eEblPvhR+w==", + "version": "1.17.1-alpha.1", + "resolved": "https://registry.npmjs.org/@bosonprotocol/ethers-sdk/-/ethers-sdk-1.17.1-alpha.1.tgz", + "integrity": "sha512-TTJ8ZNiRO/QDez0iw4WtnQc5ceUhgYGlhv42fd3NBCDuusKRTpKHI64rXn2YOo2uZStPepFOgYZQLNoAn/yu5A==", "dependencies": { - "@bosonprotocol/common": "^1.32.0" + "@bosonprotocol/common": "^1.32.1-alpha.1" }, "peerDependencies": { "ethers": "^5.5.0" } }, - "node_modules/@bosonprotocol/ethers-sdk/node_modules/@bosonprotocol/common": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/@bosonprotocol/common/-/common-1.32.0.tgz", - "integrity": "sha512-YSMpjqPyBXw5WRYlpFKdwCQwyXgSWxNDF1OqTRwFU9wdO+8R/VdG4QV0YTi+uEuy/9rFLyQZvrbxwLNVO4ZdBg==", - "dependencies": { - "@bosonprotocol/metadata": "^1.16.3", - "@ethersproject/abi": "^5.5.0", - "@ethersproject/address": "^5.5.0", - "@ethersproject/bignumber": "^5.5.0", - "@ethersproject/constants": "^5.5.0", - "@ethersproject/units": "^5.5.0" - } - }, "node_modules/@bosonprotocol/ipfs-storage": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/@bosonprotocol/ipfs-storage/-/ipfs-storage-1.13.0.tgz", @@ -3678,13 +3652,13 @@ "license": "Apache-2.0" }, "node_modules/@bosonprotocol/react-kit": { - "version": "0.42.0-alpha.0", - "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.42.0-alpha.0.tgz", - "integrity": "sha512-hqiq0SpiJpioc7IOVtHnsAIOkvBqQ9l0pSt85dZISZl8FGU+OEC5a+bAVj8fWT8qNYapWCHdMbiD+2RIhsOW8w==", + "version": "0.42.0-alpha.2", + "resolved": "https://registry.npmjs.org/@bosonprotocol/react-kit/-/react-kit-0.42.0-alpha.2.tgz", + "integrity": "sha512-OHecO8Si2of6Ir4sl07BuV8dWfWGQefS3MjcbqzliXcqmjuitZw9LZjL+LeSzk2cwiLs3CW+iJvpdR4wyJ+9PA==", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.20", - "@bosonprotocol/core-sdk": "^1.46.0-alpha.0", - "@bosonprotocol/ethers-sdk": "^1.17.0", + "@bosonprotocol/core-sdk": "^1.46.0-alpha.2", + "@bosonprotocol/ethers-sdk": "^1.17.1-alpha.1", "@bosonprotocol/ipfs-storage": "^1.13.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", diff --git a/package.json b/package.json index 04fa77539..b026b39a0 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "dependencies": { "@apollo/client": "^3.8.1", "@bosonprotocol/chat-sdk": "^1.4.5", - "@bosonprotocol/common": "^1.32.0-alpha.6", - "@bosonprotocol/react-kit": "^0.42.0-alpha.0", + "@bosonprotocol/common": "^1.32.1-alpha.1", + "@bosonprotocol/react-kit": "^0.42.0-alpha.2", "@davatar/react": "^1.10.4", "@ethersproject/address": "^5.6.1", "@ethersproject/units": "^5.7.0", diff --git a/src/components/modal/components/PremintVouchersModal/PremintVouchersModal.tsx b/src/components/modal/components/PremintVouchersModal/PremintVouchersModal.tsx index b1c929ecb..311592619 100644 --- a/src/components/modal/components/PremintVouchersModal/PremintVouchersModal.tsx +++ b/src/components/modal/components/PremintVouchersModal/PremintVouchersModal.tsx @@ -172,6 +172,11 @@ export const PremintVouchersModal: React.FC = ({ }} offerId={offerId || ""} amount={values?.premintQuantity || 0} + metaTxApiId={ + config.metaTx + ? config.metaTx.apiIds?.["FORWARDER"]?.["FORWARD"] + : undefined + } onPendingSignature={() => { setLoading(true); }} diff --git a/src/lib/config.ts b/src/lib/config.ts index 6fddaf7ea..0d73f3019 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -47,6 +47,9 @@ function getMetaTxApiIds(envConfig: ProtocolConfig) { if (key.toLowerCase() === "protocol") { apiIds[protocolAddress.toLowerCase()] = {}; apiIds[protocolAddress.toLowerCase()][method] = apiIdsInput[key]; + } else if (key.toLowerCase() === "forwarder") { + apiIds["FORWARDER"] = {}; + apiIds["FORWARDER"]["FORWARD"] = apiIdsInput[key]; } else { const token = tokens.find( (t: Token) => t.symbol.toLowerCase() === key.toLowerCase()