diff --git a/.github/workflows/deploy-staging-subgraph.yaml b/.github/workflows/deploy-staging-subgraph.yaml index acbe1f0f9..ca804e8ff 100644 --- a/.github/workflows/deploy-staging-subgraph.yaml +++ b/.github/workflows/deploy-staging-subgraph.yaml @@ -30,7 +30,7 @@ jobs: run: npm run build -- --cache-dir=".turbo" - name: Authenticate The Graph CLI run: npx graph auth --product hosted-service ${{ secrets.THE_GRAPH_ACCESS_TOKEN_STAGING }} - - name: Deploy subgraph to mumbai - run: cd ./packages/subgraph && npm run deploy:staging + - name: Deploy subgraph to amoy + run: cd ./packages/subgraph && npm run deploy:staging:amoy - name: Deploy subgraph to sepolia run: cd ./packages/subgraph && npm run deploy:staging:sepolia diff --git a/.github/workflows/deploy-testing-subgraph.yaml b/.github/workflows/deploy-testing-subgraph.yaml index 451d5cc5c..7f1d72733 100644 --- a/.github/workflows/deploy-testing-subgraph.yaml +++ b/.github/workflows/deploy-testing-subgraph.yaml @@ -31,7 +31,7 @@ jobs: run: npm run build -- --cache-dir=".turbo" - name: Authenticate The Graph CLI run: npx graph auth --product hosted-service ${{ secrets.THE_GRAPH_ACCESS_TOKEN_TESTING }} - - name: Deploy subgraph to mumbai - run: cd ./packages/subgraph && npm run deploy:testing + - name: Deploy subgraph to amoy + run: cd ./packages/subgraph && npm run deploy:testing:amoy - name: Deploy subgraph to sepolia run: cd ./packages/subgraph && npm run deploy:testing:sepolia diff --git a/.github/workflows/pin-to-pinata.yaml b/.github/workflows/pin-to-pinata.yaml index ed5a83b39..381dd2270 100644 --- a/.github/workflows/pin-to-pinata.yaml +++ b/.github/workflows/pin-to-pinata.yaml @@ -36,10 +36,10 @@ jobs: INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }} INFURA_PROJECT_SECRET: ${{ secrets.INFURA_PROJECT_SECRET }} run: | - echo "Pin for testing/mumbai env..." + echo "Pin for testing/amoy env..." npm run pin-to-pinata -- \ -e testing \ - -c testing-80001-0 \ + -c testing-80002-0 \ -fd ${{ env.FROM_DATE }} \ -p ${{ env.PINATA_JWT }} \ -i ${{ env.INFURA_PROJECT_ID }}/${{ env.INFURA_PROJECT_SECRET }} @@ -52,10 +52,10 @@ jobs: -p ${{ env.PINATA_JWT }} \ -i ${{ env.INFURA_PROJECT_ID }}/${{ env.INFURA_PROJECT_SECRET }} - echo "Pin for staging/mumbai env..." + echo "Pin for staging/amoy env..." npm run pin-to-pinata -- \ -e staging \ - -c staging-80001-0 \ + -c staging-80002-0 \ -fd ${{ env.FROM_DATE }} \ -p ${{ env.PINATA_JWT }} \ -i ${{ env.INFURA_PROJECT_ID }}/${{ env.INFURA_PROJECT_SECRET }} diff --git a/docs/releases.md b/docs/releases.md index 6dc379f50..3e42b9290 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -24,16 +24,19 @@ Subgraphs are deployed also to different environments. Every merge into the `main` branch will trigger a deployment of the subgraph which listens to our `testing` environment. For details have a look at [`.github/workflows/deploy-testing-subgraph.yaml`](../.github/workflows/deploy-testing-subgraph.yaml.). Access this subgraph via: -- https://graph.bsn-development-potassium.bosonportal.io/subgraphs/name/boson/corecomponents +- https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-testing +- https://api.thegraph.com/subgraphs/name/bosonprotocol/sepolia-testing ### Staging If a stable release of the packages are triggered through the GitHub UI, then a deployment of the subgraph connected to the `staging` environment is also initiated. For details have a look at [`.github/workflows/deploy-staging-subgraph.yaml`](../.github/workflows/deploy-staging-subgraph.yaml.). Access this subgraph via: -- https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai +- https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-staging +- https://api.thegraph.com/subgraphs/name/bosonprotocol/sepolia-staging ### Production A `production` subgraph deployment to can be triggered through the GitHub UI by running the workflow `deploy-prod-subgraph.yaml`. For details have a look at [`.github/workflows/deploy-prod-subgraph.yaml`](../.github/workflows/deploy-prod-subgraph.yaml.). Access this subgraph via: -- TODO +- https://api.thegraph.com/subgraphs/name/bosonprotocol/polygon +- https://api.thegraph.com/subgraphs/name/bosonprotocol/ethereum diff --git a/e2e/meta-tx-gateway/package.json b/e2e/meta-tx-gateway/package.json index 8ebd78ed5..9b3e29a09 100644 --- a/e2e/meta-tx-gateway/package.json +++ b/e2e/meta-tx-gateway/package.json @@ -1,6 +1,6 @@ { "name": "meta-tx-gateway", - "version": "1.7.4", + "version": "1.7.5-alpha.0", "description": "", "main": "index.js", "private": true, @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/bosonprotocol/core-components#readme", "dependencies": { - "@bosonprotocol/common": "^1.27.0", + "@bosonprotocol/common": "^1.27.1-alpha.0", "cors": "^2.8.5", "dotenv": "^16.0.2", "ethers": "^5.7.0", diff --git a/package-lock.json b/package-lock.json index 633efe813..cad118d73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,28 +27,28 @@ "@typescript-eslint/parser": "^5.12.1", "assemblyscript": "0.19.23", "commander": "^9.4.0", - "eslint-config-prettier": "^8.4.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-tsdoc": "^0.2.16", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-tsdoc": "^0.2.17", "ethers-v6": "npm:ethers@^6.10.0", "form-data": "^4.0.0", "graphql": "^16.8.1", "ipfs-utils": "^9.0.14", "lerna": "^5.5.1", "opensea-js": "^7.1.2", - "prettier": "^2.6.2", + "prettier": "^3.2.5", "run-script-os": "^1.1.6", "ts-jest": "29.1.1", - "ts-node": "^10.8.1", + "ts-node": "^10.9.2", "turbo": "^1.10.13", "typescript-coverage-report": "^0.8.0" } }, "e2e/meta-tx-gateway": { - "version": "1.7.4", + "version": "1.7.5-alpha.0", "license": "ISC", "dependencies": { - "@bosonprotocol/common": "^1.27.0", + "@bosonprotocol/common": "^1.27.1-alpha.0", "cors": "^2.8.5", "dotenv": "^16.0.2", "ethers": "^5.7.0", @@ -80,6 +80,54 @@ "dev": true, "license": "MIT" }, + "e2e/meta-tx-gateway/node_modules/eslint-config-prettier": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", + "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "e2e/meta-tx-gateway/node_modules/eslint-plugin-prettier": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", + "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, + "e2e/meta-tx-gateway/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "e2e/meta-tx-gateway/node_modules/typescript": { "version": "4.9.5", "dev": true, @@ -3112,21 +3160,6 @@ "version": "0.3.0", "license": "MIT" }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.1", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "dev": true, @@ -8755,10 +8788,9 @@ }, "node_modules/@opensea/seaport-js": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@opensea/seaport-js/-/seaport-js-4.0.0.tgz", - "integrity": "sha512-xL0kv4CDdtuuJd7w2zI+cWR0e33T10Y9Sor+R1e1DfBHfc8w0POcgCqG0LsyAM0ZuopuYw4gwYY1eVyoqLJfVg==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "ethers": "^6.9.0", "merkletreejs": "^0.3.11" @@ -8769,20 +8801,16 @@ }, "node_modules/@opensea/seaport-js/node_modules/@adraffy/ens-normalize": { "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@opensea/seaport-js/node_modules/aes-js": { "version": "4.0.0-beta.5", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", - "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@opensea/seaport-js/node_modules/ethers": { "version": "6.11.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.11.1.tgz", - "integrity": "sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg==", "dev": true, "funding": [ { @@ -8794,6 +8822,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -8809,15 +8838,13 @@ }, "node_modules/@opensea/seaport-js/node_modules/tslib": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@opensea/seaport-js/node_modules/ws": { "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -8889,24 +8916,6 @@ "inBundle": true, "license": "MIT" }, - "node_modules/@parcel/watcher/node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.4.1", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@peculiar/asn1-schema": { "version": "2.3.8", "license": "MIT", @@ -8949,6 +8958,18 @@ "node": ">=14" } }, + "node_modules/@pkgr/core": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", + "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/@pmmmwh/react-refresh-webpack-plugin": { "version": "0.5.7", "dev": true, @@ -10642,20 +10663,6 @@ "node": ">=8" } }, - "node_modules/@storybook/cli/node_modules/prettier": { - "version": "3.2.5", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/@storybook/cli/node_modules/read-pkg": { "version": "5.2.0", "dev": true, @@ -10799,20 +10806,6 @@ "type-fest": "^2.19.0" } }, - "node_modules/@storybook/codemod/node_modules/prettier": { - "version": "3.2.5", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/@storybook/codemod/node_modules/type-fest": { "version": "2.19.0", "dev": true, @@ -12629,21 +12622,6 @@ } } }, - "node_modules/@swc/core-darwin-arm64": { - "version": "1.4.6", - "cpu": [ - "arm64" - ], - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": ">=10" - } - }, "node_modules/@swc/counter": { "version": "0.1.3", "devOptional": true, @@ -13234,8 +13212,7 @@ }, "node_modules/@types/node": { "version": "18.15.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.13.tgz", - "integrity": "sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==" + "license": "MIT" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -16185,9 +16162,8 @@ }, "node_modules/buffer-reverse": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-reverse/-/buffer-reverse-1.0.1.tgz", - "integrity": "sha512-M87YIUBsZ6N924W57vDwT/aOu8hw7ZgdByz6ijksLjmHJELBASmYTTlNHRgjE+pTsT9oJXGaDSgqqwfdHotDUg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/buffer-to-arraybuffer": { "version": "0.0.5", @@ -16613,9 +16589,8 @@ }, "node_modules/chromatic": { "version": "11.0.8", - "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-11.0.8.tgz", - "integrity": "sha512-+zJ5h0/Eu5z26KCNLIw2tknbK69gUO8q3Jsew4oU0Q/i/NPhIwcXhvPP7u75aLJgX1EI61+ndiGJA/yeQZQcgw==", "dev": true, + "license": "MIT", "bin": { "chroma": "dist/bin.js", "chromatic": "dist/bin.js", @@ -16658,9 +16633,7 @@ }, "node_modules/cids": { "version": "1.1.9", - "resolved": "https://registry.npmjs.org/cids/-/cids-1.1.9.tgz", - "integrity": "sha512-l11hWRfugIcbGuTZwAM5PwpjPPjyb6UZOGwlHSnOBV5o07XhQ4gNpBN67FbODvpjyHtd+0Xs6KNvUcGBiDRsdg==", - "deprecated": "This module has been superseded by the multiformats module", + "license": "MIT", "dependencies": { "multibase": "^4.0.1", "multicodec": "^3.0.1", @@ -17845,9 +17818,8 @@ }, "node_modules/crypto-js": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", - "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/crypto-random-string": { "version": "2.0.0", @@ -19751,9 +19723,10 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.5.0", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, - "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -19995,20 +19968,30 @@ "license": "MIT" }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz", + "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==", "dev": true, - "license": "MIT", "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.6" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -20765,8 +20748,6 @@ "node_modules/ethers-v6": { "name": "ethers", "version": "6.11.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.11.1.tgz", - "integrity": "sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg==", "dev": true, "funding": [ { @@ -20778,6 +20759,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -20793,27 +20775,23 @@ }, "node_modules/ethers-v6/node_modules/@adraffy/ens-normalize": { "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ethers-v6/node_modules/aes-js": { "version": "4.0.0-beta.5", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", - "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ethers-v6/node_modules/tslib": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/ethers-v6/node_modules/ws": { "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -21783,17 +21761,6 @@ "version": "1.0.0", "license": "ISC" }, - "node_modules/fsevents": { - "version": "2.3.3", - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "license": "MIT", @@ -23743,8 +23710,7 @@ }, "node_modules/ipfs-utils": { "version": "9.0.14", - "resolved": "https://registry.npmjs.org/ipfs-utils/-/ipfs-utils-9.0.14.tgz", - "integrity": "sha512-zIaiEGX18QATxgaS0/EOQNoo33W0islREABAcxXE8n7y2MGAlB+hdsxXn4J0hGZge8IqVQhW8sWIb+oJz2yEvg==", + "license": "Apache-2.0 OR MIT", "dependencies": { "any-signal": "^3.0.0", "browser-readablestream-to-it": "^1.0.0", @@ -23796,8 +23762,7 @@ }, "node_modules/ipfs-utils/node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -23815,18 +23780,15 @@ }, "node_modules/ipfs-utils/node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, "node_modules/ipfs-utils/node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "license": "BSD-2-Clause" }, "node_modules/ipfs-utils/node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -28128,9 +28090,8 @@ }, "node_modules/matchstick-as": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/matchstick-as/-/matchstick-as-0.6.0.tgz", - "integrity": "sha512-E36fWsC1AbCkBFt05VsDDRoFvGSdcZg6oZJrtIe/YDBbuFh8SKbR5FcoqDhNWqSN+F7bN/iS2u8Md0SM+4pUpw==", "dev": true, + "license": "MIT", "dependencies": { "wabt": "1.0.24" } @@ -28650,9 +28611,8 @@ }, "node_modules/merkletreejs": { "version": "0.3.11", - "resolved": "https://registry.npmjs.org/merkletreejs/-/merkletreejs-0.3.11.tgz", - "integrity": "sha512-LJKTl4iVNTndhL+3Uz/tfkjD0klIWsHlUzgtuNnNrsf7bAlXR30m+xYB7lHr5Z/l6e/yAIsr26Dabx6Buo4VGQ==", "dev": true, + "license": "MIT", "dependencies": { "bignumber.js": "^9.0.1", "buffer-reverse": "^1.0.1", @@ -29607,9 +29567,7 @@ }, "node_modules/multibase": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/multibase/-/multibase-4.0.6.tgz", - "integrity": "sha512-x23pDe5+svdLz/k5JPGCVdfn7Q5mZVMBETiC+ORfO+sor9Sgs0smJzAjfTbM5tckeCqnaUuMYoz+k3RXMmJClQ==", - "deprecated": "This module has been superseded by the multiformats module", + "license": "MIT", "dependencies": { "@multiformats/base-x": "^4.0.1" }, @@ -29632,9 +29590,7 @@ }, "node_modules/multicodec": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-3.2.1.tgz", - "integrity": "sha512-+expTPftro8VAW8kfvcuNNNBgb9gPeNYV9dn+z1kJRWF2vih+/S79f2RVeIwmrJBUJ6NT9IUPWnZDQvegEh5pw==", - "deprecated": "This module has been superseded by the multiformats module", + "license": "MIT", "dependencies": { "uint8arrays": "^3.0.0", "varint": "^6.0.0" @@ -29646,8 +29602,7 @@ }, "node_modules/multihashes": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-4.0.3.tgz", - "integrity": "sha512-0AhMH7Iu95XjDLxIeuCOOE4t9+vQZsACyKZ9Fxw2pcsRmlX4iCn1mby0hS0bb+nQOVpdQYWPpnyusw4da5RPhA==", + "license": "MIT", "dependencies": { "multibase": "^4.0.1", "uint8arrays": "^3.0.0", @@ -29660,8 +29615,7 @@ }, "node_modules/multihashes/node_modules/varint": { "version": "5.0.2", - "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz", - "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==" + "license": "MIT" }, "node_modules/multimatch": { "version": "5.0.0", @@ -31016,10 +30970,9 @@ }, "node_modules/opensea-js": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/opensea-js/-/opensea-js-7.1.3.tgz", - "integrity": "sha512-0JdmrQOsd0t8vP7uyXnlLlM6hRi83F0lFyRr1EnAkVUcPM7suEPxV0XEcwEhohq+l4KYI3FqHFu2RyjmYcQH8g==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@opensea/seaport-js": "^4.0.0", "ethers": "^6.9.0" @@ -31030,20 +30983,16 @@ }, "node_modules/opensea-js/node_modules/@adraffy/ens-normalize": { "version": "1.10.1", - "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", - "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/opensea-js/node_modules/aes-js": { "version": "4.0.0-beta.5", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", - "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/opensea-js/node_modules/ethers": { "version": "6.11.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.11.1.tgz", - "integrity": "sha512-mxTAE6wqJQAbp5QAe/+o+rXOID7Nw91OZXvgpjDa1r4fAbq2Nu314oEZSbjoRLacuCzs7kUC3clEvkCQowffGg==", "dev": true, "funding": [ { @@ -31055,6 +31004,7 @@ "url": "https://www.buymeacoffee.com/ricmoo" } ], + "license": "MIT", "dependencies": { "@adraffy/ens-normalize": "1.10.1", "@noble/curves": "1.2.0", @@ -31070,15 +31020,13 @@ }, "node_modules/opensea-js/node_modules/tslib": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/opensea-js/node_modules/ws": { "version": "8.5.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", - "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -33055,14 +33003,15 @@ } }, "node_modules/prettier": { - "version": "2.7.1", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", "dev": true, - "license": "MIT", "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -34071,8 +34020,7 @@ }, "node_modules/react-native-fetch-api": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/react-native-fetch-api/-/react-native-fetch-api-3.0.0.tgz", - "integrity": "sha512-g2rtqPjdroaboDKTsJCTlcmtw54E25OjyaunUP0anOZn4Fuo2IKs8BVfe02zVggA/UysbmfSnRJIqtNkAgggNA==", + "license": "MIT", "dependencies": { "p-defer": "^3.0.0" } @@ -38486,6 +38434,22 @@ "node": ">=4" } }, + "node_modules/synckit": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/system-architecture": { "version": "0.1.0", "license": "MIT", @@ -39189,9 +39153,8 @@ }, "node_modules/treeify": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", - "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } @@ -39355,8 +39318,9 @@ "license": "MIT" }, "node_modules/ts-node": { - "version": "10.9.1", - "license": "MIT", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -39542,16 +39506,16 @@ "turbo-windows-arm64": "1.10.13" } }, - "node_modules/turbo-darwin-arm64": { + "node_modules/turbo/node_modules/turbo-windows-64": { "version": "1.10.13", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MPL-2.0", "optional": true, "os": [ - "darwin" + "win32" ] }, "node_modules/tween-functions": { @@ -39684,6 +39648,21 @@ "graceful-fs": "^4.1.6" } }, + "node_modules/typechain/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/typechain/node_modules/universalify": { "version": "0.1.2", "dev": true, @@ -39959,7 +39938,7 @@ "@fastify/busboy": "^2.0.0" }, "engines": { - "node": ">=12.18" + "node": ">=14.0" } }, "node_modules/unenv": { @@ -42351,10 +42330,10 @@ }, "packages/common": { "name": "@bosonprotocol/common", - "version": "1.27.0", + "version": "1.27.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/metadata": "^1.16.0", + "@bosonprotocol/metadata": "^1.16.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -42372,10 +42351,10 @@ }, "packages/core-sdk": { "name": "@bosonprotocol/core-sdk", - "version": "1.40.0", + "version": "1.40.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.27.0", + "@bosonprotocol/common": "^1.27.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", @@ -42435,10 +42414,10 @@ }, "packages/eth-connect-sdk": { "name": "@bosonprotocol/eth-connect-sdk", - "version": "1.6.3", + "version": "1.6.4-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.27.0" + "@bosonprotocol/common": "^1.27.1-alpha.0" }, "devDependencies": { "eslint": "^8.10.0", @@ -42454,10 +42433,10 @@ }, "packages/ethers-sdk": { "name": "@bosonprotocol/ethers-sdk", - "version": "1.14.0", + "version": "1.14.1-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/common": "^1.27.0" + "@bosonprotocol/common": "^1.27.1-alpha.0" }, "devDependencies": { "@typechain/ethers-v5": "^9.0.0", @@ -42474,10 +42453,10 @@ }, "packages/ipfs-storage": { "name": "@bosonprotocol/ipfs-storage", - "version": "1.11.2", + "version": "1.11.3-alpha.0", "license": "Apache-2.0", "dependencies": { - "@bosonprotocol/metadata": "^1.16.0", + "@bosonprotocol/metadata": "^1.16.1-alpha.0", "ipfs-http-client": "^56.0.1", "multiformats": "^9.6.4", "uint8arrays": "^3.0.0" @@ -42493,7 +42472,7 @@ }, "packages/metadata": { "name": "@bosonprotocol/metadata", - "version": "1.16.0", + "version": "1.16.1-alpha.0", "license": "Apache-2.0", "dependencies": { "schema-to-yup": "^1.11.11" @@ -42509,13 +42488,13 @@ }, "packages/react-kit": { "name": "@bosonprotocol/react-kit", - "version": "0.29.0", + "version": "0.29.1-alpha.0", "license": "Apache-2.0", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.40.0", - "@bosonprotocol/ethers-sdk": "^1.14.0", - "@bosonprotocol/ipfs-storage": "^1.11.2", + "@bosonprotocol/core-sdk": "^1.40.1-alpha.0", + "@bosonprotocol/ethers-sdk": "^1.14.1-alpha.0", + "@bosonprotocol/ipfs-storage": "^1.11.3-alpha.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", diff --git a/package.json b/package.json index 5cfe3de1a..ea955bca9 100644 --- a/package.json +++ b/package.json @@ -72,19 +72,19 @@ "@typescript-eslint/parser": "^5.12.1", "assemblyscript": "0.19.23", "commander": "^9.4.0", - "eslint-config-prettier": "^8.4.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-tsdoc": "^0.2.16", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-tsdoc": "^0.2.17", "ethers-v6": "npm:ethers@^6.10.0", "form-data": "^4.0.0", "graphql": "^16.8.1", "ipfs-utils": "^9.0.14", "lerna": "^5.5.1", "opensea-js": "^7.1.2", - "prettier": "^2.6.2", + "prettier": "^3.2.5", "run-script-os": "^1.1.6", "ts-jest": "29.1.1", - "ts-node": "^10.8.1", + "ts-node": "^10.9.2", "turbo": "^1.10.13", "typescript-coverage-report": "^0.8.0" }, diff --git a/packages/common/package.json b/packages/common/package.json index c0b1cde77..c6cd952b3 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/common", - "version": "1.27.0", + "version": "1.27.1-alpha.0", "description": "Common configs, types, interfaces and utilities shared by the core components of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -8,6 +8,7 @@ "scripts": { "dev": "tsc --watch --preserveWatchOutput", "lint": "eslint --ignore-path ../../.gitignore --ext .js,.ts .", + "lint:fix": "npm run lint -- --fix", "build": "rimraf dist && tsc && tsc --build tsconfig.cjs.json", "test": "jest", "clean": "rimraf dist coverage .turbo node_modules" @@ -37,7 +38,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@bosonprotocol/metadata": "^1.16.0", + "@bosonprotocol/metadata": "^1.16.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", diff --git a/packages/common/src/chains.ts b/packages/common/src/chains.ts index 0022345c6..8a31ec95e 100644 --- a/packages/common/src/chains.ts +++ b/packages/common/src/chains.ts @@ -1,6 +1,6 @@ export const chains = { 31337: 31337, - 80001: 80001, + 80002: 80002, 137: 137, 1: 1, 11155111: 11155111 diff --git a/packages/common/src/configs.ts b/packages/common/src/configs.ts index c73e2bf4a..f8a7cdfdc 100644 --- a/packages/common/src/configs.ts +++ b/packages/common/src/configs.ts @@ -43,30 +43,30 @@ export const envConfigs: Record = { testing: [ { envName: "testing", - chainId: 80001, - configId: "testing-80001-0", + chainId: 80002, + configId: "testing-80002-0", sellersBlackList: - "https://raw.githubusercontent.com/BAppLimited/curationLists/main/bosonApp.io/testing-80001-0/sellers/blacklist.json", - defaultDisputeResolverId: "13", - defaultTokens: chainIdToDefaultTokens.get(80001), - nativeCoin: chainIdToInfo.get(80001), - getTxExplorerUrl: chainIdToGraphTx.get(80001), + "https://raw.githubusercontent.com/BAppLimited/curationLists/main/bosonApp.io/testing-80002-0/sellers/blacklist.json", + defaultDisputeResolverId: "1", + defaultTokens: chainIdToDefaultTokens.get(80002), + nativeCoin: chainIdToInfo.get(80002), + getTxExplorerUrl: chainIdToGraphTx.get(80002), subgraphUrl: - "https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-testing", + "https://api.studio.thegraph.com/query/71250/llx-amoy-testing/v0.0.1", jsonRpcUrl: - "https://polygon-mumbai.infura.io/v3/b832a48b9bce4aa6bd9da86eb0126300", + "https://polygon-amoy.infura.io/v3/b832a48b9bce4aa6bd9da86eb0126300", theGraphIpfsUrl: "https://api.thegraph.com/ipfs/api/v0", ipfsMetadataUrl: "https://ipfs.infura.io:5001", contracts: { - protocolDiamond: "0x76051FC05Ab42D912a737d59a8711f1446712630", - forwarder: "0x69015912AA33720b842dCD6aC059Ed623F28d9f7" // https://docs-gasless.biconomy.io/misc/contract-addresses + protocolDiamond: "0x7de418a7ce94debd057c34ebac232e7027634ade", + forwarder: "0xd240234dacd7ffdca7e4effcf6c7190885d7e2f0" // https://github.com/bosonprotocol/boson-protocol-contracts/blob/main/scripts/config/client-upgrade.js#L11 }, metaTx: { relayerUrl: "https://api.biconomy.io", forwarderAbi: abis.BiconomyForwarderABI }, lens: { - ...(chainIdToLensInfo.has(80001) && chainIdToLensInfo.get(80001)) + ...(chainIdToLensInfo.has(80002) && chainIdToLensInfo.get(80002)) } }, { @@ -87,8 +87,8 @@ export const envConfigs: Record = { ipfsMetadataUrl: "https://ipfs.infura.io:5001", contracts: { // from https://github.com/bosonprotocol/boson-protocol-contracts/pull/807 - protocolDiamond: "0x7de418a7ce94debd057c34ebac232e7027634ade", - forwarder: "0xffffffffffffffffffffffffffffffffffffffff" // https://docs-gasless.biconomy.io/misc/contract-addresses + protocolDiamond: "0x76051fc05ab42d912a737d59a8711f1446712630", + forwarder: "0xbdeA59c8801658561a16fF58D68FC2b198DE4E93" // https://github.com/bosonprotocol/boson-protocol-contracts/blob/main/scripts/config/client-upgrade.js#L10 }, metaTx: undefined, lens: undefined @@ -97,30 +97,30 @@ export const envConfigs: Record = { staging: [ { envName: "staging", - chainId: 80001, - configId: "staging-80001-0", + chainId: 80002, + configId: "staging-80002-0", sellersBlackList: - "https://raw.githubusercontent.com/BAppLimited/curationLists/main/bosonApp.io/staging-80001-0/sellers/blacklist.json", - defaultDisputeResolverId: "2", - defaultTokens: chainIdToDefaultTokens.get(80001), - nativeCoin: chainIdToInfo.get(80001), - getTxExplorerUrl: chainIdToGraphTx.get(80001), + "https://raw.githubusercontent.com/BAppLimited/curationLists/main/bosonApp.io/staging-80002-0/sellers/blacklist.json", + defaultDisputeResolverId: "1", + defaultTokens: chainIdToDefaultTokens.get(80002), + nativeCoin: chainIdToInfo.get(80002), + getTxExplorerUrl: chainIdToGraphTx.get(80002), subgraphUrl: - "https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-staging", + "https://api.studio.thegraph.com/query/71250/llx-amoy-staging/v0.0.1", jsonRpcUrl: - "https://polygon-mumbai.infura.io/v3/b832a48b9bce4aa6bd9da86eb0126300", + "https://polygon-amoy.infura.io/v3/b832a48b9bce4aa6bd9da86eb0126300", theGraphIpfsUrl: "https://api.thegraph.com/ipfs/api/v0", ipfsMetadataUrl: "https://ipfs.infura.io:5001", contracts: { - protocolDiamond: "0xf9719c7e641964D83cC50ea2d4d0D4e6C300d50E", - forwarder: "0x69015912AA33720b842dCD6aC059Ed623F28d9f7" + protocolDiamond: "0x26f643746cbc918b46c2d47edca68c4a6c98ebe6", + forwarder: "0xd240234dacd7ffdca7e4effcf6c7190885d7e2f0" // https://github.com/bosonprotocol/boson-protocol-contracts/blob/main/scripts/config/client-upgrade.js#L11 }, metaTx: { relayerUrl: "https://api.biconomy.io", forwarderAbi: abis.BiconomyForwarderABI }, lens: { - ...(chainIdToLensInfo.has(80001) && chainIdToLensInfo.get(80001)) + ...(chainIdToLensInfo.has(80002) && chainIdToLensInfo.get(80002)) } }, { @@ -142,7 +142,7 @@ export const envConfigs: Record = { contracts: { // from https://github.com/bosonprotocol/boson-protocol-contracts/pull/807 protocolDiamond: "0x26f643746cbc918b46c2d47edca68c4a6c98ebe6", - forwarder: "0xffffffffffffffffffffffffffffffffffffffff" // https://docs-gasless.biconomy.io/misc/contract-addresses + forwarder: "0xbdeA59c8801658561a16fF58D68FC2b198DE4E93" // https://github.com/bosonprotocol/boson-protocol-contracts/blob/main/scripts/config/client-upgrade.js#L10 }, metaTx: undefined, lens: undefined diff --git a/packages/common/src/mappings.ts b/packages/common/src/mappings.ts index 5ed02c6e6..b603b6e80 100644 --- a/packages/common/src/mappings.ts +++ b/packages/common/src/mappings.ts @@ -1,7 +1,7 @@ import { ChainId, Lens, ProtocolConfig, Token } from "./types"; export const chainIdToInfo = new Map([ - [80001, { decimals: "18", name: "Matic", symbol: "MATIC" }], + [80002, { decimals: "18", name: "Matic", symbol: "MATIC" }], [137, { decimals: "18", name: "Matic", symbol: "MATIC" }], [1, { decimals: "18", name: "Ether", symbol: "ETH" }], [11155111, { decimals: "18", name: "sETH", symbol: "sETH" }], @@ -13,12 +13,12 @@ export const chainIdToGraphTx = new Map< (txHash?: string, isAddress?: boolean) => string >([ [ - 80001, + 80002, (txHash = "", isAddress = false) => { if (isAddress) { - return `https://mumbai.polygonscan.com/address/${txHash}`; + return `https://www.oklink.com/amoy/address/${txHash}`; } - return `https://mumbai.polygonscan.com/tx/${txHash}`; + return `https://www.oklink.com/amoy/tx/${txHash}`; } ], [ @@ -53,18 +53,6 @@ export const chainIdToGraphTx = new Map< // https://docs.lens.xyz/docs/deployed-contract-addresses export const chainIdToLensInfo = new Map([ - [ - 80001, - { - LENS_HUB_CONTRACT: "0x60Ae865ee4C725cd04353b5AAb364553f56ceF82", - LENS_PERIPHERY_CONTRACT: "0xD5037d72877808cdE7F669563e9389930AF404E8", - LENS_PROFILES_CONTRACT_ADDRESS: - "0x60ae865ee4c725cd04353b5aab364553f56cef82", - LENS_PROFILES_CONTRACT_PARTIAL_ABI: - '[{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":true,"name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event","signature":"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"}]', - apiLink: "https://api-mumbai.lens.dev/" - } - ], [ 137, { @@ -98,7 +86,7 @@ export const chainIdToDefaultTokens = new Map([ ] ], [ - 80001, + 80002, [ { symbol: "MATIC", @@ -106,36 +94,36 @@ export const chainIdToDefaultTokens = new Map([ address: "0x0000000000000000000000000000000000000000", decimals: "18" }, - { - symbol: "WETH", - name: "Wrapped Ether", - address: "0xA6FA4fB5f76172d178d61B04b0ecd319C5d1C0aa", - decimals: "18" - }, + // { + // symbol: "WETH", + // name: "Wrapped Ether", + // address: "0x????????????????????????????????????????", // TODO: to be defined + // decimals: "18" + // }, { symbol: "BOSON", name: "Boson Token (PoS)", - address: "0x1f5431E8679630790E8EbA3a9b41d1BB4d41aeD0", + address: "0x94e32c4bfcA1D3fe08B6F8252ABB47A5B14AC2bD", decimals: "18" - }, - { - symbol: "USDC", - name: "Mumbai USD Coin", - address: "0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747", - decimals: "6" - }, - { - symbol: "DAI", - name: "DAI", - address: "0x001b3b4d0f3714ca98ba10f6042daebf0b1b7b6f", - decimals: "18" - }, - { - symbol: "USDT", - name: "Tether USD", - address: "0xA02f6adc7926efeBBd59Fd43A84f4E0c0c91e832", - decimals: "6" } + // { + // symbol: "USDC", + // name: "Amoy USD Coin", + // address: "0x????????????????????????????????????????", // TODO: to be defined + // decimals: "6" + // }, + // { + // symbol: "DAI", + // name: "DAI", + // address: "0x????????????????????????????????????????", // TODO: to be defined + // decimals: "18" + // }, + // { + // symbol: "USDT", + // name: "Tether USD", + // address: "0x????????????????????????????????????????", // TODO: to be defined + // decimals: "6" + // } ] ], [ diff --git a/packages/common/src/types/configs.ts b/packages/common/src/types/configs.ts index 7a975490a..5d42ecba0 100644 --- a/packages/common/src/types/configs.ts +++ b/packages/common/src/types/configs.ts @@ -30,13 +30,13 @@ export type Lens = LensContracts & { apiLink?: string; }; -export type ChainId = typeof chains[keyof typeof chains]; +export type ChainId = (typeof chains)[keyof typeof chains]; export type ConfigId = | "local-31337-0" - | "testing-80001-0" + | "testing-80002-0" | "testing-11155111-0" - | "staging-80001-0" + | "staging-80002-0" | "staging-11155111-0" | "production-137-0" | "production-1-0"; diff --git a/packages/common/tests/index.test.ts b/packages/common/tests/index.test.ts index 8aa3797c2..a97b3ce4b 100644 --- a/packages/common/tests/index.test.ts +++ b/packages/common/tests/index.test.ts @@ -85,7 +85,7 @@ describe("index entrypoint", () => { } ); - test.each([1, 137, 80001, 11155111])( + test.each([1, 137, 80002, 11155111])( `Chain Id %p is available`, (chainId) => { expect(chains[chainId]).toBeTruthy(); diff --git a/packages/core-sdk/package.json b/packages/core-sdk/package.json index 7c9f7deef..993a9fa00 100644 --- a/packages/core-sdk/package.json +++ b/packages/core-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/core-sdk", - "version": "1.40.0", + "version": "1.40.1-alpha.0", "description": "Facilitates interaction with the contracts and subgraphs of the Boson Protocol", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -35,7 +35,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.27.0", + "@bosonprotocol/common": "^1.27.1-alpha.0", "@ethersproject/abi": "^5.5.0", "@ethersproject/address": "^5.5.0", "@ethersproject/bignumber": "^5.5.0", diff --git a/packages/core-sdk/src/accounts/subgraph.ts b/packages/core-sdk/src/accounts/subgraph.ts index af1fc5026..b4196f891 100644 --- a/packages/core-sdk/src/accounts/subgraph.ts +++ b/packages/core-sdk/src/accounts/subgraph.ts @@ -168,9 +168,8 @@ export async function getDisputeResolvers( queryVars: GetDisputeResolversQueryQueryVariables = {} ): Promise { const sdk = getSubgraphSdk(subgraphUrl); - const { disputeResolvers = [] } = await sdk.getDisputeResolversQuery( - queryVars - ); + const { disputeResolvers = [] } = + await sdk.getDisputeResolversQuery(queryVars); return disputeResolvers; } @@ -179,9 +178,8 @@ export async function getOfferCollections( queryVars: GetOfferCollectionsQueryQueryVariables = {} ): Promise { const sdk = getSubgraphSdk(subgraphUrl); - const { offerCollections = [] } = await sdk.getOfferCollectionsQuery( - queryVars - ); + const { offerCollections = [] } = + await sdk.getOfferCollectionsQuery(queryVars); return offerCollections; } diff --git a/packages/core-sdk/src/meta-tx/mixin.ts b/packages/core-sdk/src/meta-tx/mixin.ts index 1831b9a5a..d4113cef0 100644 --- a/packages/core-sdk/src/meta-tx/mixin.ts +++ b/packages/core-sdk/src/meta-tx/mixin.ts @@ -406,13 +406,13 @@ export class MetaTxMixin extends BaseCoreSDK { contractAddress: string, metaTxParams: { request: Parameters< - typeof handler["relayBiconomyMetaTransaction"] + (typeof handler)["relayBiconomyMetaTransaction"] >[0]["metaTx"]["params"]["request"]; domainSeparator: Parameters< - typeof handler["relayBiconomyMetaTransaction"] + (typeof handler)["relayBiconomyMetaTransaction"] >[0]["metaTx"]["params"]["domainSeparator"]; signature: Parameters< - typeof handler["relayBiconomyMetaTransaction"] + (typeof handler)["relayBiconomyMetaTransaction"] >[0]["metaTx"]["params"]["signature"]; }, overrides: Partial<{ diff --git a/packages/core-sdk/src/mixins/base-core-sdk.ts b/packages/core-sdk/src/mixins/base-core-sdk.ts index 66f9642cc..646d87358 100644 --- a/packages/core-sdk/src/mixins/base-core-sdk.ts +++ b/packages/core-sdk/src/mixins/base-core-sdk.ts @@ -96,7 +96,7 @@ export class BaseCoreSDK { // Doc: https://www.typescriptlang.org/docs/handbook/mixins.html#alternative-pattern export function applyMixins( derivedCtor: typeof BaseCoreSDK, - constructors: typeof BaseCoreSDK[] + constructors: (typeof BaseCoreSDK)[] ) { constructors.forEach((baseCtor) => { Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => { diff --git a/packages/core-sdk/src/native-meta-tx/tokenSpecifics.ts b/packages/core-sdk/src/native-meta-tx/tokenSpecifics.ts index aa915a95e..eda1baf6a 100644 --- a/packages/core-sdk/src/native-meta-tx/tokenSpecifics.ts +++ b/packages/core-sdk/src/native-meta-tx/tokenSpecifics.ts @@ -12,6 +12,7 @@ const _tokenSpecifics: Record> = { ERC712_VERSION: "2" // On MUMBAI, ERC712_VERSION is different than on Polygon } } + // TODO: check on Amoy }; /** Returns the configuration items that are specific to some tokens on some chain */ diff --git a/packages/core-sdk/src/subgraph/mixin.ts b/packages/core-sdk/src/subgraph/mixin.ts index 4238bce1a..7ee6f2469 100644 --- a/packages/core-sdk/src/subgraph/mixin.ts +++ b/packages/core-sdk/src/subgraph/mixin.ts @@ -22,12 +22,6 @@ const DELAYS_PER_CHAINID: { MAX_SAME_BLOCK_DELAY: 5000, DEFAULT_TIMEOUT: 30000 }, - 80001: { - BLOCK_DELAY: 1000, - MAX_SAME_BLOCK: 20, - MAX_SAME_BLOCK_DELAY: 5000, - DEFAULT_TIMEOUT: 30000 - }, 80002: { BLOCK_DELAY: 1000, MAX_SAME_BLOCK: 20, diff --git a/packages/core-sdk/src/utils/errors.ts b/packages/core-sdk/src/utils/errors.ts index 1a026bf30..ab5dbf572 100644 --- a/packages/core-sdk/src/utils/errors.ts +++ b/packages/core-sdk/src/utils/errors.ts @@ -1,5 +1,8 @@ export class ApiError extends Error { - constructor(public status: number, message: string) { + constructor( + public status: number, + message: string + ) { super(message); } } diff --git a/packages/core-sdk/src/utils/tokenInfoManager.ts b/packages/core-sdk/src/utils/tokenInfoManager.ts index b7d5eeff9..af2a0a227 100644 --- a/packages/core-sdk/src/utils/tokenInfoManager.ts +++ b/packages/core-sdk/src/utils/tokenInfoManager.ts @@ -32,8 +32,8 @@ export const NATIVE_TOKENS: { [key: number]: ITokenInfo } = { decimals: 18, symbol: "MATIC" }, - 80001: { - // Polygon Mumbai + 80002: { + // Polygon Amoy name: "MATIC", decimals: 18, symbol: "MATIC" diff --git a/packages/core-sdk/tests/core-sdk.test.ts b/packages/core-sdk/tests/core-sdk.test.ts index 1d6fbf5d3..4bcb6d731 100644 --- a/packages/core-sdk/tests/core-sdk.test.ts +++ b/packages/core-sdk/tests/core-sdk.test.ts @@ -17,7 +17,7 @@ describe("#fromDefaultConfig()", () => { const coreSDK = CoreSDK.fromDefaultConfig({ web3Lib: new MockWeb3LibAdapter(), envName: "testing", - configId: "testing-80001-0" + configId: "testing-80002-0" }); expect(coreSDK).toBeInstanceOf(CoreSDK); }); @@ -27,7 +27,7 @@ describe("#fromDefaultConfig()", () => { CoreSDK.fromDefaultConfig({ web3Lib: new MockWeb3LibAdapter(), envName: "unknown" as EnvironmentType, - configId: "testing-80001-0" + configId: "testing-80002-0" }) ).toThrow(); }); @@ -36,7 +36,11 @@ describe("#fromDefaultConfig()", () => { expect(() => CoreSDK.fromDefaultConfig({ web3Lib: new MockWeb3LibAdapter() - } as unknown as { envName: EnvironmentType; web3Lib: Web3LibAdapter; configId: ConfigId }) + } as unknown as { + envName: EnvironmentType; + web3Lib: Web3LibAdapter; + configId: ConfigId; + }) ).toThrow(); }); }); diff --git a/packages/core-sdk/tests/errors/decodeErrors.test.ts b/packages/core-sdk/tests/errors/decodeErrors.test.ts index 917e83be5..eaf2b80ee 100644 --- a/packages/core-sdk/tests/errors/decodeErrors.test.ts +++ b/packages/core-sdk/tests/errors/decodeErrors.test.ts @@ -27,7 +27,7 @@ beforeEach(() => { coreSDK = CoreSDK.fromDefaultConfig({ web3Lib: new MockWeb3LibAdapter(), envName: "testing", - configId: "testing-80001-0" + configId: "testing-80002-0" }); expect(coreSDK).toBeInstanceOf(CoreSDK); }); diff --git a/packages/eth-connect-sdk/package.json b/packages/eth-connect-sdk/package.json index 69938c612..979a602cc 100644 --- a/packages/eth-connect-sdk/package.json +++ b/packages/eth-connect-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/eth-connect-sdk", - "version": "1.6.3", + "version": "1.6.4-alpha.0", "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting eth-connect for the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -8,6 +8,7 @@ "scripts": { "dev": "tsc --build tsconfig.cjs.json --watch --preserveWatchOutput ", "lint": "eslint --ignore-path ../../.gitignore --ext .js,.ts .", + "lint:fix": "npm run lint -- --fix", "build": "rimraf dist && tsc && tsc --build tsconfig.cjs.json", "test": "jest", "clean": "rimraf dist coverage .turbo node_modules" @@ -30,7 +31,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.27.0" + "@bosonprotocol/common": "^1.27.1-alpha.0" }, "devDependencies": { "eslint": "^8.10.0", diff --git a/packages/eth-connect-sdk/src/eth-connect-adapter.ts b/packages/eth-connect-sdk/src/eth-connect-adapter.ts index fe7789c48..971bba213 100644 --- a/packages/eth-connect-sdk/src/eth-connect-adapter.ts +++ b/packages/eth-connect-sdk/src/eth-connect-adapter.ts @@ -160,9 +160,8 @@ export class EthConnectAdapter implements Web3LibAdapter { // Note: usage of requestManager.eth_getTransactionByHash is prohibited by DCL kernel // Use standard requestManager to fetch blockchain information - const txReceipt = await this._requestManager.eth_getTransactionReceipt( - txHash - ); + const txReceipt = + await this._requestManager.eth_getTransactionReceipt(txHash); return { from: txObject?.from, to: txObject?.to, diff --git a/packages/ethers-sdk/package.json b/packages/ethers-sdk/package.json index 848d52422..3638b390c 100644 --- a/packages/ethers-sdk/package.json +++ b/packages/ethers-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/ethers-sdk", - "version": "1.14.0", + "version": "1.14.1-alpha.0", "description": "Implementation of the Web3LibAdapter interface and contract abstractions targeting ethers for the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -8,6 +8,7 @@ "scripts": { "dev": "tsc --build tsconfig.cjs.json --watch --preserveWatchOutput ", "lint": "eslint --ignore-path ../../.gitignore --ext .js,.ts .", + "lint:fix": "npm run lint -- --fix", "build": "rimraf dist && tsc && tsc --build tsconfig.cjs.json", "test": "jest", "clean": "rimraf dist coverage .turbo node_modules", @@ -31,7 +32,7 @@ "access": "public" }, "dependencies": { - "@bosonprotocol/common": "^1.27.0" + "@bosonprotocol/common": "^1.27.1-alpha.0" }, "devDependencies": { "@typechain/ethers-v5": "^9.0.0", diff --git a/packages/ipfs-storage/package.json b/packages/ipfs-storage/package.json index 78f77d898..8633fb694 100644 --- a/packages/ipfs-storage/package.json +++ b/packages/ipfs-storage/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/ipfs-storage", - "version": "1.11.2", + "version": "1.11.3-alpha.0", "description": "IPFS metadata storage implementation for building on top of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -8,6 +8,7 @@ "scripts": { "dev": "tsc --watch --preserveWatchOutput", "lint": "eslint --ignore-path ../../.gitignore --ext .js,.ts .", + "lint:fix": "npm run lint -- --fix", "build": "rimraf dist && tsc && tsc --build tsconfig.cjs.json", "test": "jest", "clean": "rimraf dist coverage .turbo node_modules" @@ -38,7 +39,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@bosonprotocol/metadata": "^1.16.0", + "@bosonprotocol/metadata": "^1.16.1-alpha.0", "ipfs-http-client": "^56.0.1", "multiformats": "^9.6.4", "uint8arrays": "^3.0.0" diff --git a/packages/metadata/package.json b/packages/metadata/package.json index 20b311cb8..213b6665b 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@bosonprotocol/metadata", - "version": "1.16.0", + "version": "1.16.1-alpha.0", "description": "Offer metadata schemas, types and tools of the Boson Protocol.", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", @@ -8,6 +8,7 @@ "scripts": { "dev": "tsc --watch --preserveWatchOutput", "lint": "eslint --ignore-path ../../.gitignore --ext .js,.ts .", + "lint:fix": "npm run lint -- --fix", "build": "rimraf dist && tsc && tsc --build tsconfig.cjs.json", "test": "jest", "clean": "rimraf dist coverage .turbo node_modules" diff --git a/packages/metadata/tests/index.test.ts b/packages/metadata/tests/index.test.ts index 4680c3fe5..cbdcc7d76 100644 --- a/packages/metadata/tests/index.test.ts +++ b/packages/metadata/tests/index.test.ts @@ -120,18 +120,18 @@ describe("#validateMetadata()", () => { } } : (data as any).exchangePolicy - ? { - ...productV1ValidFullOffer, - ...data, - exchangePolicy: { - ...productV1ValidFullOffer.exchangePolicy, - ...(data as any).exchangePolicy + ? { + ...productV1ValidFullOffer, + ...data, + exchangePolicy: { + ...productV1ValidFullOffer.exchangePolicy, + ...(data as any).exchangePolicy + } } - } - : { - ...productV1ValidFullOffer, - ...data - }; + : { + ...productV1ValidFullOffer, + ...data + }; const result = expect(() => validateMetadata(product as any as AnyMetadata) ); @@ -222,18 +222,18 @@ describe("#validateMetadata()", () => { } } : (data as any).exchangePolicy - ? { - ...productV1ValidFullOffer, - ...data, - exchangePolicy: { - ...productV1ValidFullOffer.exchangePolicy, - ...(data as any).exchangePolicy + ? { + ...productV1ValidFullOffer, + ...data, + exchangePolicy: { + ...productV1ValidFullOffer.exchangePolicy, + ...(data as any).exchangePolicy + } } - } - : { - ...productV1ValidFullOffer, - ...data - }; + : { + ...productV1ValidFullOffer, + ...data + }; const result = expect(() => validateMetadata(product as any as AnyMetadata) ); diff --git a/packages/react-kit/package.json b/packages/react-kit/package.json index 83ad7640f..4ec2652a1 100644 --- a/packages/react-kit/package.json +++ b/packages/react-kit/package.json @@ -1,7 +1,7 @@ { "name": "@bosonprotocol/react-kit", "description": "React toolkit with smart components and hooks for building on top of the Boson Protocol.", - "version": "0.29.0", + "version": "0.29.1-alpha.0", "main": "./dist/cjs/index.js", "module": "./dist/esm/index.js", "types": "./dist/cjs/index.d.ts", @@ -15,9 +15,9 @@ "license": "Apache-2.0", "dependencies": { "@bosonprotocol/chat-sdk": "^1.3.1-alpha.9", - "@bosonprotocol/core-sdk": "^1.40.0", - "@bosonprotocol/ethers-sdk": "^1.14.0", - "@bosonprotocol/ipfs-storage": "^1.11.2", + "@bosonprotocol/core-sdk": "^1.40.1-alpha.0", + "@bosonprotocol/ethers-sdk": "^1.14.1-alpha.0", + "@bosonprotocol/ipfs-storage": "^1.11.3-alpha.0", "@davatar/react": "1.11.1", "@ethersproject/units": "5.6.0", "@glidejs/glide": "3.6.0", @@ -74,6 +74,7 @@ }, "scripts": { "lint": "eslint --ignore-path ../../.gitignore --ext .jsx,.tsx .", + "lint:fix": "npm run lint -- --fix", "eject": "react-scripts eject", "clean": "rimraf build coverage .turbo node_modules", "storybook": "storybook dev -p 6006", diff --git a/packages/react-kit/src/components/cta/offer/CommitButton.tsx b/packages/react-kit/src/components/cta/offer/CommitButton.tsx index 5488b9ab7..2b804aa5d 100644 --- a/packages/react-kit/src/components/cta/offer/CommitButton.tsx +++ b/packages/react-kit/src/components/cta/offer/CommitButton.tsx @@ -68,9 +68,8 @@ export const CommitButton = withQueryClientProvider( if (exchangeToken === AddressZero) { return false; } - const currentAllowance = await coreSdk.getProtocolAllowance( - exchangeToken - ); + const currentAllowance = + await coreSdk.getProtocolAllowance(exchangeToken); return BigNumber.from(currentAllowance).lt(price); } }, diff --git a/packages/react-kit/src/components/currencyDisplay/CurrencyDisplay.tsx b/packages/react-kit/src/components/currencyDisplay/CurrencyDisplay.tsx index 4e804450f..49e837a25 100644 --- a/packages/react-kit/src/components/currencyDisplay/CurrencyDisplay.tsx +++ b/packages/react-kit/src/components/currencyDisplay/CurrencyDisplay.tsx @@ -58,11 +58,10 @@ const CurrencyDisplayValueWrapper = styled.div` `; const CurrencyDisplayValue = styled.span<{ $height: number }>` - ${({ $height }) => - css` - line-height: ${$height}px; - font-size: ${($height - 5) / 16}rem; - `} + ${({ $height }) => css` + line-height: ${$height}px; + font-size: ${($height - 5) / 16}rem; + `} color: #09182c; display: flex; diff --git a/packages/react-kit/src/components/datepicker/SelectTime.tsx b/packages/react-kit/src/components/datepicker/SelectTime.tsx index 7b4510ed6..e915012a3 100644 --- a/packages/react-kit/src/components/datepicker/SelectTime.tsx +++ b/packages/react-kit/src/components/datepicker/SelectTime.tsx @@ -46,8 +46,8 @@ export default function SelectTime({ period ? [date?.isToday() ? dayjs().format("HH") : "00", "23"] : date?.isToday() - ? dayjs().format("HH") - : "00", + ? dayjs().format("HH") + : "00", [period, date] ); const DEFAULT_MINUTE = useMemo( @@ -55,8 +55,8 @@ export default function SelectTime({ period ? [date?.isToday() ? dayjs().add(5, "minute").format("mm") : "00", "59"] : date?.isToday() - ? dayjs().add(5, "minute").format("mm") - : "00", + ? dayjs().add(5, "minute").format("mm") + : "00", [period, date] ); const DEFAULT_TIME = useMemo(() => (period ? ["00", "00"] : "00"), [period]); diff --git a/packages/react-kit/src/components/form/BaseSelect.tsx b/packages/react-kit/src/components/form/BaseSelect.tsx index 1312d419c..fcf0534af 100644 --- a/packages/react-kit/src/components/form/BaseSelect.tsx +++ b/packages/react-kit/src/components/form/BaseSelect.tsx @@ -23,8 +23,8 @@ const customStyles = (error: any) => ({ border: state.isFocused ? `1px solid ${colors.secondary}` : !checkIfValueIsEmpty(error) - ? `1px solid ${colors.orange}` - : `1px solid ${colors.border}` + ? `1px solid ${colors.orange}` + : `1px solid ${colors.border}` }), container: (provided: any, state: any) => ({ ...provided, diff --git a/packages/react-kit/src/components/form/Select.tsx b/packages/react-kit/src/components/form/Select.tsx index cde283c12..5212ca01b 100644 --- a/packages/react-kit/src/components/form/Select.tsx +++ b/packages/react-kit/src/components/form/Select.tsx @@ -42,8 +42,8 @@ const customStyles = (error: any) => ({ border: state.isFocused ? `1px solid ${colors.secondary}` : !checkIfValueIsEmpty(error) - ? `1px solid ${colors.orange}` - : `1px solid ${colors.border}`, + ? `1px solid ${colors.orange}` + : `1px solid ${colors.border}`, ...before }; }, @@ -87,8 +87,8 @@ export default function SelectComponent({ meta.error && meta.touched && !errorMessage ? meta.error : meta.error && meta.touched && errorMessage - ? errorMessage - : ""; + ? errorMessage + : ""; const displayError = typeof displayErrorMessage === typeof "string" && diff --git a/packages/react-kit/src/components/modal/ModalContext.tsx b/packages/react-kit/src/components/modal/ModalContext.tsx index e961a74cb..b784af261 100644 --- a/packages/react-kit/src/components/modal/ModalContext.tsx +++ b/packages/react-kit/src/components/modal/ModalContext.tsx @@ -24,11 +24,10 @@ export type Store = { > | null; theme?: "light" | "dark"; }; -export type GenericModalProps = Parameters< - typeof MODAL_COMPONENTS[T] ->[0] extends Record - ? ModalProps & Record - : ModalProps & Parameters[0]; +export type GenericModalProps = + Parameters<(typeof MODAL_COMPONENTS)[T]>[0] extends Record + ? ModalProps & Record + : ModalProps & Parameters<(typeof MODAL_COMPONENTS)[T]>[0]; export interface ModalContextType { showModal: ( diff --git a/packages/react-kit/src/components/modal/components/Commit/CommitSuccess/CommitSuccess.tsx b/packages/react-kit/src/components/modal/components/Commit/CommitSuccess/CommitSuccess.tsx index 44a889a1a..9e4c1aefe 100644 --- a/packages/react-kit/src/components/modal/components/Commit/CommitSuccess/CommitSuccess.tsx +++ b/packages/react-kit/src/components/modal/components/Commit/CommitSuccess/CommitSuccess.tsx @@ -113,7 +113,7 @@ export function CommitSuccess({ onHouseClick, exchangeId, commitHash }: Props) { }} > View on{" "} - {[80001, 137].includes(config.chainId) + {[80002, 137].includes(config.chainId) ? "Polygonscan" : "Etherscan"}{" "} { - const canceledExchange = await coreSDK.getExchangeById( - exchangeId - ); + const canceledExchange = + await coreSDK.getExchangeById(exchangeId); return canceledExchange.cancelledDate; }, (cancelledDate) => { diff --git a/packages/react-kit/src/components/modal/components/Redeem/ExchangeView/expireVoucher/ExpireVoucher.tsx b/packages/react-kit/src/components/modal/components/Redeem/ExchangeView/expireVoucher/ExpireVoucher.tsx index 003da8008..ce20c8cdd 100644 --- a/packages/react-kit/src/components/modal/components/Redeem/ExchangeView/expireVoucher/ExpireVoucher.tsx +++ b/packages/react-kit/src/components/modal/components/Redeem/ExchangeView/expireVoucher/ExpireVoucher.tsx @@ -236,9 +236,8 @@ export default function ExpireVoucher({ const [, { exchangeId }] = args; await poll( async () => { - const expiredExchange = await coreSDK.getExchangeById( - exchangeId - ); + const expiredExchange = + await coreSDK.getExchangeById(exchangeId); return expiredExchange.expired; }, (expired) => { diff --git a/packages/react-kit/src/components/modal/components/Redeem/MyItems/WithExchangesData.tsx b/packages/react-kit/src/components/modal/components/Redeem/MyItems/WithExchangesData.tsx index 3d4d10395..84f342580 100644 --- a/packages/react-kit/src/components/modal/components/Redeem/MyItems/WithExchangesData.tsx +++ b/packages/react-kit/src/components/modal/components/Redeem/MyItems/WithExchangesData.tsx @@ -52,8 +52,8 @@ export function WithExchangesData( ? sellerIds.filter((s) => sellerCurationList?.includes(s)) : sellerIds : enableCurationLists - ? sellerCurationList - : undefined; + ? sellerCurationList + : undefined; const committedExchanges = useExchanges( { ...orderProps, diff --git a/packages/react-kit/src/components/modal/components/Redeem/RedeemNonModal.tsx b/packages/react-kit/src/components/modal/components/Redeem/RedeemNonModal.tsx index 2e4bf8664..56496112d 100644 --- a/packages/react-kit/src/components/modal/components/Redeem/RedeemNonModal.tsx +++ b/packages/react-kit/src/components/modal/components/Redeem/RedeemNonModal.tsx @@ -257,14 +257,14 @@ const getInitialStep = ( return showRedemptionOverview ? ActiveStep.STEPS_OVERVIEW : widgetAction === RedemptionWidgetAction.SELECT_EXCHANGE - ? ActiveStep.MY_ITEMS - : widgetAction === RedemptionWidgetAction.REDEEM_FORM - ? ActiveStep.REDEEM_FORM - : widgetAction === RedemptionWidgetAction.CANCEL_FORM - ? ActiveStep.CANCELLATION_VIEW - : widgetAction === RedemptionWidgetAction.EXCHANGE_DETAILS - ? ActiveStep.EXCHANGE_VIEW - : ActiveStep.REDEEM_FORM_CONFIRMATION; + ? ActiveStep.MY_ITEMS + : widgetAction === RedemptionWidgetAction.REDEEM_FORM + ? ActiveStep.REDEEM_FORM + : widgetAction === RedemptionWidgetAction.CANCEL_FORM + ? ActiveStep.CANCELLATION_VIEW + : widgetAction === RedemptionWidgetAction.EXCHANGE_DETAILS + ? ActiveStep.EXCHANGE_VIEW + : ActiveStep.REDEEM_FORM_CONFIRMATION; }; const getPreviousSteps = ( widgetAction: RedemptionWidgetAction, diff --git a/packages/react-kit/src/components/modal/components/common/OfferFullDescription/DigitalProductData.tsx b/packages/react-kit/src/components/modal/components/common/OfferFullDescription/DigitalProductData.tsx index d0e2c8949..c7f868483 100644 --- a/packages/react-kit/src/components/modal/components/common/OfferFullDescription/DigitalProductData.tsx +++ b/packages/react-kit/src/components/modal/components/common/OfferFullDescription/DigitalProductData.tsx @@ -102,12 +102,12 @@ export const DigitalProductData: React.FC = ({ attribute.value as keyof typeof digitalTypeMappingDisplay ] : digitalNftTypeMapping[ - attribute.value as keyof typeof digitalNftTypeMapping - ] - ? digitalNftTypeMapping[ - attribute.value as keyof typeof digitalNftTypeMapping - ] - : attribute.value} + attribute.value as keyof typeof digitalNftTypeMapping + ] + ? digitalNftTypeMapping[ + attribute.value as keyof typeof digitalNftTypeMapping + ] + : attribute.value} ) })), diff --git a/packages/react-kit/src/components/modal/components/common/OfferFullDescription/OfferFullDescription.tsx b/packages/react-kit/src/components/modal/components/common/OfferFullDescription/OfferFullDescription.tsx index 934874235..6f74f85a9 100644 --- a/packages/react-kit/src/components/modal/components/common/OfferFullDescription/OfferFullDescription.tsx +++ b/packages/react-kit/src/components/modal/components/common/OfferFullDescription/OfferFullDescription.tsx @@ -31,7 +31,7 @@ export type OfferFullDescriptionProps = OnClickBuyOrSwapHandler & { includeGeneralProductDataTab: boolean; exchange: Exchange | null; className?: string; - defaultSelectedTabId?: typeof ids[number]; + defaultSelectedTabId?: (typeof ids)[number]; } & Pick & Pick; diff --git a/packages/react-kit/src/components/modal/components/common/detail/Detail.style.tsx b/packages/react-kit/src/components/modal/components/common/detail/Detail.style.tsx index 6339c92b9..4c275943f 100644 --- a/packages/react-kit/src/components/modal/components/common/detail/Detail.style.tsx +++ b/packages/react-kit/src/components/modal/components/common/detail/Detail.style.tsx @@ -506,8 +506,11 @@ export const BaseWidget = styled.div` } box-shadow: 0px 4.318px 107.946px rgba(21, 30, 52, 0.1); - box-shadow: 0px 0px 0px rgba(0, 0, 0, 0.05), 0px 0px 16px rgba(0, 0, 0, 0.05), - 0px 0px 32px rgba(0, 0, 0, 0.05), 0px 0px 64px rgba(0, 0, 0, 0.05), + box-shadow: + 0px 0px 0px rgba(0, 0, 0, 0.05), + 0px 0px 16px rgba(0, 0, 0, 0.05), + 0px 0px 32px rgba(0, 0, 0, 0.05), + 0px 0px 64px rgba(0, 0, 0, 0.05), 0px 0px 128px rgba(0, 0, 0, 0.05); > div { diff --git a/packages/react-kit/src/components/modal/components/common/detail/DetailSlider.tsx b/packages/react-kit/src/components/modal/components/common/detail/DetailSlider.tsx index 080b69508..9acd236e1 100644 --- a/packages/react-kit/src/components/modal/components/common/detail/DetailSlider.tsx +++ b/packages/react-kit/src/components/modal/components/common/detail/DetailSlider.tsx @@ -125,8 +125,8 @@ export default function DetailSlider({ outerShowArrows === false ? false : sumMediaFiles !== 1 && (sliderOptions.perView ?? 1) === 1 - ? true - : sumMediaFiles > (sliderOptions.perView ?? 1); + ? true + : sumMediaFiles > (sliderOptions.perView ?? 1); const draggable = showArrows; useEffect(() => { if (mediaFiles.length !== 0 && ref.current !== null) { diff --git a/packages/react-kit/src/components/modal/components/common/detail/DetailViewWithProvider.tsx b/packages/react-kit/src/components/modal/components/common/detail/DetailViewWithProvider.tsx index f50e0cafd..d7d77c0a3 100644 --- a/packages/react-kit/src/components/modal/components/common/detail/DetailViewWithProvider.tsx +++ b/packages/react-kit/src/components/modal/components/common/detail/DetailViewWithProvider.tsx @@ -111,7 +111,7 @@ export const DetailViewWithProvider: React.FC< ) : "", [swapQueryParameters.exactField]: Field.OUTPUT.toLowerCase() - } as const), + }) as const, [ minNeededBalance, offer.exchangeToken.address, diff --git a/packages/react-kit/src/components/modal/components/common/detail/TokenGatedItem.tsx b/packages/react-kit/src/components/modal/components/common/detail/TokenGatedItem.tsx index 75e7cb07e..bd3f8e355 100644 --- a/packages/react-kit/src/components/modal/components/common/detail/TokenGatedItem.tsx +++ b/packages/react-kit/src/components/modal/components/common/detail/TokenGatedItem.tsx @@ -216,16 +216,16 @@ export const TokenGatedItem = ({ !chainId || !condition ? null : condition.tokenAddress === ethers.constants.AddressZero - ? nativeOnChain(chainId) - : erc20TokenInfo - ? new Token( - chainId, - condition.tokenAddress, - Number(erc20TokenInfo.decimals), - erc20TokenInfo.symbol, - erc20TokenInfo.name - ) - : null, + ? nativeOnChain(chainId) + : erc20TokenInfo + ? new Token( + chainId, + condition.tokenAddress, + Number(erc20TokenInfo.decimals), + erc20TokenInfo.symbol, + erc20TokenInfo.name + ) + : null, [chainId, condition, erc20TokenInfo] ); diff --git a/packages/react-kit/src/components/wallet/wallet-connection.ts b/packages/react-kit/src/components/wallet/wallet-connection.ts index 65fd46f9d..998d2349e 100644 --- a/packages/react-kit/src/components/wallet/wallet-connection.ts +++ b/packages/react-kit/src/components/wallet/wallet-connection.ts @@ -12,11 +12,33 @@ import { useConfigContext } from "../config/ConfigContext"; function getChain( chainId: number -): [typeof wagmiChains[keyof typeof wagmiChains]] { +): [(typeof wagmiChains)[keyof typeof wagmiChains]] { const chain = Object.values(wagmiChains).find( (chain) => chain.id === chainId ); if (!chain) { + if (chainId === 80002) { + // Amoy config, from https://github.com/wevm/viem/pull/1787 + return [ + { + id: 80_002, + name: "Polygon Amoy", + nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 }, + rpcUrls: { + default: { + http: ["https://rpc-amoy.polygon.technology"] + } + }, + blockExplorers: { + default: { + name: "OK LINK", + url: "https://www.oklink.com/amoy" + } + }, + testnet: true + } as unknown as (typeof wagmiChains)[keyof typeof wagmiChains] // Force casting + ]; + } throw new Error(`Cannot find a chain with id ${chainId} in wagmiChains`); } return [chain]; diff --git a/packages/react-kit/src/components/widgets/commit/CommitModalWithOffer.tsx b/packages/react-kit/src/components/widgets/commit/CommitModalWithOffer.tsx index 44532da2c..89e394b53 100644 --- a/packages/react-kit/src/components/widgets/commit/CommitModalWithOffer.tsx +++ b/packages/react-kit/src/components/widgets/commit/CommitModalWithOffer.tsx @@ -82,7 +82,7 @@ function WithProductOrOffer( ({ variations: productV1Item.variations, offer: bundle.offer - } as VariantV1) + }) as VariantV1 ); }) .filter(isTruthy); diff --git a/packages/react-kit/src/lib/chains/getNativeLogoURI.ts b/packages/react-kit/src/lib/chains/getNativeLogoURI.ts index 034774c9a..03f89cb6b 100644 --- a/packages/react-kit/src/lib/chains/getNativeLogoURI.ts +++ b/packages/react-kit/src/lib/chains/getNativeLogoURI.ts @@ -2,10 +2,13 @@ import { ChainId } from "@uniswap/sdk-core"; import EthereumLogo from "../../assets/svg/ethereum_square_logo.svg"; import MaticLogo from "../../assets/svg/matic-token-icon.svg"; -export function getNativeLogoURI(chainId: ChainId = ChainId.MAINNET): string { +export function getNativeLogoURI( + chainId: ChainId | number = ChainId.MAINNET +): string { switch (chainId) { case ChainId.POLYGON: case ChainId.POLYGON_MUMBAI: + case 80002: return MaticLogo; default: return EthereumLogo; diff --git a/packages/react-kit/src/lib/const/chainInfo.ts b/packages/react-kit/src/lib/const/chainInfo.ts index b2cfa6677..431c40773 100644 --- a/packages/react-kit/src/lib/const/chainInfo.ts +++ b/packages/react-kit/src/lib/const/chainInfo.ts @@ -98,6 +98,21 @@ const CHAIN_INFO: ChainInfoMap = { symbol: "mMATIC", decimals: 18 } + }, + 80002: { + networkType: NetworkType.L1, + blockWaitMsBeforeWarning: ms(`10m`), + bridge: "https://wallet.polygon.technology/polygon/bridge/deposit", + docs: "https://polygon.io/", + explorer: "https://www.oklink.com/amoy/", + infoLink: "https://info.uniswap.org/#/polygon/", + label: "Polygon Amoy", + logoUrl: polygonMaticLogo, + nativeCurrency: { + name: "Polygon Amoy Matic", + symbol: "aMATIC", + decimals: 18 + } } } as const; diff --git a/packages/react-kit/src/lib/const/chains.ts b/packages/react-kit/src/lib/const/chains.ts index 864b89d99..67dbccb89 100644 --- a/packages/react-kit/src/lib/const/chains.ts +++ b/packages/react-kit/src/lib/const/chains.ts @@ -5,6 +5,7 @@ export const CHAIN_IDS_TO_NAMES = { [ChainId.SEPOLIA]: "sepolia", [ChainId.POLYGON]: "polygon", [ChainId.POLYGON_MUMBAI]: "polygon_mumbai", + 80002: "polygon_amoy", [ChainId.CELO]: "celo", [ChainId.CELO_ALFAJORES]: "celo_alfajores", [ChainId.ARBITRUM_ONE]: "arbitrum", @@ -25,7 +26,8 @@ export const L1_CHAIN_IDS = [ // ChainId.GOERLI, ChainId.SEPOLIA, ChainId.POLYGON, - ChainId.POLYGON_MUMBAI + ChainId.POLYGON_MUMBAI, + 80002 // LocalChainId // ChainId.CELO, // ChainId.CELO_ALFAJORES diff --git a/packages/react-kit/src/lib/const/networks.ts b/packages/react-kit/src/lib/const/networks.ts index bcdd13f29..24b8922ad 100644 --- a/packages/react-kit/src/lib/const/networks.ts +++ b/packages/react-kit/src/lib/const/networks.ts @@ -71,6 +71,10 @@ export const FALLBACK_URLS = { "https://rpc-mumbai.maticvigil.com", "https://matic-testnet-archive-rpc.bwarelabs.com" ], + 80002: [ + // "Safe" URLs + "https://rpc-amoy.polygon.technology" + ], [ChainId.ARBITRUM_ONE]: [ // "Safe" URLs "https://arb1.arbitrum.io/rpc", @@ -175,6 +179,10 @@ export const getRpcUrls = (infuraKey: string) => ({ `https://polygon-mumbai.infura.io/v3/${infuraKey}`, ...FALLBACK_URLS[ChainId.POLYGON_MUMBAI] ], + 80002: [ // AMOY + `https://polygon-amoy.infura.io/v3/${infuraKey}`, + ...FALLBACK_URLS[80002] + ], [ChainId.CELO]: FALLBACK_URLS[ChainId.CELO], [ChainId.CELO_ALFAJORES]: FALLBACK_URLS[ChainId.CELO_ALFAJORES], [ChainId.BNB]: [ diff --git a/packages/react-kit/src/lib/const/tokens.ts b/packages/react-kit/src/lib/const/tokens.ts index 5a44ad313..0183cdeed 100644 --- a/packages/react-kit/src/lib/const/tokens.ts +++ b/packages/react-kit/src/lib/const/tokens.ts @@ -411,6 +411,13 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } = "WMATIC", "Wrapped MATIC" ), + 80002: new Token( + 80002, + "0x52eF3d68BaB452a294342DC3e5f464d7f610f72E", + 18, + "WMATIC", + "Wrapped MATIC" + ), [ChainId.CELO]: new Token( ChainId.CELO, "0x471ece3750da237f93b8e339c536989b8978a438", @@ -458,10 +465,16 @@ function getCeloNativeCurrency(chainId: number) { } } +type NewType = 80002; + export function isMatic( chainId: number -): chainId is ChainId.POLYGON | ChainId.POLYGON_MUMBAI { - return chainId === ChainId.POLYGON_MUMBAI || chainId === ChainId.POLYGON; +): chainId is ChainId.POLYGON | ChainId.POLYGON_MUMBAI | NewType { + return ( + chainId === ChainId.POLYGON_MUMBAI || + chainId === ChainId.POLYGON || + chainId === 80002 + ); } class MaticNativeCurrency extends NativeCurrency { diff --git a/packages/react-kit/src/lib/opensea/getOpenSeaUrl.ts b/packages/react-kit/src/lib/opensea/getOpenSeaUrl.ts index 368548a64..86e028071 100644 --- a/packages/react-kit/src/lib/opensea/getOpenSeaUrl.ts +++ b/packages/react-kit/src/lib/opensea/getOpenSeaUrl.ts @@ -4,12 +4,12 @@ import { getExchangeTokenId } from "../utils/exchange"; const openSeaUrlMap = new Map([ [ - "testing", // Mumbai + "testing", // testnets new Map([ [ - "testing-80001-0", + "testing-80002-0", (tokenId: string, contractAddress: string) => - `https://testnets.opensea.io/assets/mumbai/${contractAddress}/${tokenId}` + `https://testnets.opensea.io/assets/amoy/${contractAddress}/${tokenId}` // TO BE CONFIRMED ], [ "testing-11155111-0", @@ -19,12 +19,12 @@ const openSeaUrlMap = new Map([ ]) ], [ - "staging", // Mumbai + "staging", // testnets new Map([ [ - "staging-80001-0", + "staging-80002-0", (tokenId: string, contractAddress: string) => - `https://testnets.opensea.io/assets/mumbai/${contractAddress}/${tokenId}` + `https://testnets.opensea.io/assets/amoy/${contractAddress}/${tokenId}` // TO BE CONFIRMED ], [ "staging-11155111-0", diff --git a/packages/react-kit/src/stories/cta/dispute/AddFeesDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/AddFeesDisputeResolverButton.stories.tsx index 792fb6561..338c938dc 100644 --- a/packages/react-kit/src/stories/cta/dispute/AddFeesDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/AddFeesDisputeResolverButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory< Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -74,7 +74,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/dispute/AddSellerToDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/AddSellerToDisputeResolverButton.stories.tsx index 54bebfb12..fa6f00a42 100644 --- a/packages/react-kit/src/stories/cta/dispute/AddSellerToDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/AddSellerToDisputeResolverButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/dispute/CreateDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/CreateDisputeResolverButton.stories.tsx index 400bee48f..0e5025bbe 100644 --- a/packages/react-kit/src/stories/cta/dispute/CreateDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/CreateDisputeResolverButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -75,7 +75,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/dispute/DecideDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/DecideDisputeButton.stories.tsx index a9abe75fd..a9775d963 100644 --- a/packages/react-kit/src/stories/cta/dispute/DecideDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/DecideDisputeButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -68,7 +68,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/EscalateDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/EscalateDisputeButton.stories.tsx index 206046ab7..170f23ba8 100644 --- a/packages/react-kit/src/stories/cta/dispute/EscalateDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/EscalateDisputeButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/ExpireDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/ExpireDisputeButton.stories.tsx index 0ce92c590..4248d3448 100644 --- a/packages/react-kit/src/stories/cta/dispute/ExpireDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/ExpireDisputeButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -67,7 +67,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/ExpireEscalationDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/ExpireEscalationDisputeButton.stories.tsx index d05ef9b21..9af0a3eac 100644 --- a/packages/react-kit/src/stories/cta/dispute/ExpireEscalationDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/ExpireEscalationDisputeButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory< Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId" @@ -67,7 +67,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/ExtendDisputeTimeoutButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/ExtendDisputeTimeoutButton.stories.tsx index 824d07a0b..327c2b848 100644 --- a/packages/react-kit/src/stories/cta/dispute/ExtendDisputeTimeoutButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/ExtendDisputeTimeoutButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -67,7 +67,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/RaiseDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/RaiseDisputeButton.stories.tsx index 4d666b5bd..217903afc 100644 --- a/packages/react-kit/src/stories/cta/dispute/RaiseDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/RaiseDisputeButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -67,7 +67,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/RefuseDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/RefuseDisputeButton.stories.tsx index 85b8d7048..65ac07f5b 100644 --- a/packages/react-kit/src/stories/cta/dispute/RefuseDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/RefuseDisputeButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -67,7 +67,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/RemoveFeesDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/RemoveFeesDisputeResolverButton.stories.tsx index ddf45db80..022124242 100644 --- a/packages/react-kit/src/stories/cta/dispute/RemoveFeesDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/RemoveFeesDisputeResolverButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/dispute/RemoveSellerFromDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/RemoveSellerFromDisputeResolverButton.stories.tsx index a6fd27478..212176558 100644 --- a/packages/react-kit/src/stories/cta/dispute/RemoveSellerFromDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/RemoveSellerFromDisputeResolverButton.stories.tsx @@ -42,7 +42,7 @@ export const WithExtraInfo: ComponentStory< Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -68,7 +68,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/dispute/ResolveDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/ResolveDisputeButton.stories.tsx index ba267c4df..29bf4d6f2 100644 --- a/packages/react-kit/src/stories/cta/dispute/ResolveDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/ResolveDisputeButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -72,7 +72,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/RetractDisputeButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/RetractDisputeButton.stories.tsx index ec6dde5b0..70cfb5a13 100644 --- a/packages/react-kit/src/stories/cta/dispute/RetractDisputeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/RetractDisputeButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, // metaTransactionsApiId: "dummyApiId", @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" // metaTransactionsApiKey: undefined, }, diff --git a/packages/react-kit/src/stories/cta/dispute/UpdateDisputeResolverButton.stories.tsx b/packages/react-kit/src/stories/cta/dispute/UpdateDisputeResolverButton.stories.tsx index 903f6ff5e..fef759547 100644 --- a/packages/react-kit/src/stories/cta/dispute/UpdateDisputeResolverButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/dispute/UpdateDisputeResolverButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -73,7 +73,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/exchange/BatchCompleteButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/BatchCompleteButton.stories.tsx index a4c6ba19f..e5ee46869 100644 --- a/packages/react-kit/src/stories/cta/exchange/BatchCompleteButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/BatchCompleteButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeIds: ["1", "2"], @@ -65,7 +65,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeIds: ["1", "2"], diff --git a/packages/react-kit/src/stories/cta/exchange/CancelButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/CancelButton.stories.tsx index 9455360e4..d59b8a0f3 100644 --- a/packages/react-kit/src/stories/cta/exchange/CancelButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/CancelButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", @@ -64,7 +64,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", diff --git a/packages/react-kit/src/stories/cta/exchange/CompleteButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/CompleteButton.stories.tsx index dba287594..bad03218e 100644 --- a/packages/react-kit/src/stories/cta/exchange/CompleteButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/CompleteButton.stories.tsx @@ -39,7 +39,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", @@ -63,7 +63,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", diff --git a/packages/react-kit/src/stories/cta/exchange/ExpireButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/ExpireButton.stories.tsx index d1659cd48..290074230 100644 --- a/packages/react-kit/src/stories/cta/exchange/ExpireButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/ExpireButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", @@ -64,7 +64,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", diff --git a/packages/react-kit/src/stories/cta/exchange/RedeemButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/RedeemButton.stories.tsx index c42dbbd71..02dbbdf95 100644 --- a/packages/react-kit/src/stories/cta/exchange/RedeemButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/RedeemButton.stories.tsx @@ -30,7 +30,7 @@ export const WithExtraInfo: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "92", @@ -56,7 +56,7 @@ Simple.args = { WithBiconomy.args = { ...Simple.args, coreSdkConfig: { - configId: "staging-80001-0", + configId: "staging-80002-0", envName: "staging", metaTx: { apiKey: "vYoPWofBr.e4f3e2f9-69e5-4076-8ce1-3b8e0916e02c" @@ -67,7 +67,7 @@ WithBiconomy.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/exchange/RevokeButton.stories.tsx b/packages/react-kit/src/stories/cta/exchange/RevokeButton.stories.tsx index 3e5ddaf23..e19423b8a 100644 --- a/packages/react-kit/src/stories/cta/exchange/RevokeButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/exchange/RevokeButton.stories.tsx @@ -38,7 +38,7 @@ export const WithStep: ComponentStory = Template.bind({}); Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", @@ -63,7 +63,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeId: "28", diff --git a/packages/react-kit/src/stories/cta/funds/DepositFundsButton.stories.tsx b/packages/react-kit/src/stories/cta/funds/DepositFundsButton.stories.tsx index f72eea588..75488a8d5 100644 --- a/packages/react-kit/src/stories/cta/funds/DepositFundsButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/funds/DepositFundsButton.stories.tsx @@ -45,7 +45,7 @@ export const WithMetaTx: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, accountId: "", @@ -93,7 +93,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, exchangeToken: "0x" + "0".repeat(40), @@ -119,7 +119,7 @@ WithStep.args = { WithMetaTx.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", metaTx: { relayerUrl: "https://api.biconomy.io", diff --git a/packages/react-kit/src/stories/cta/funds/WithdrawAllFunds.stories.tsx b/packages/react-kit/src/stories/cta/funds/WithdrawAllFunds.stories.tsx index 3676c3018..3cd7b522e 100644 --- a/packages/react-kit/src/stories/cta/funds/WithdrawAllFunds.stories.tsx +++ b/packages/react-kit/src/stories/cta/funds/WithdrawAllFunds.stories.tsx @@ -45,7 +45,7 @@ export const WithMetaTx: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, accountId: "42", @@ -78,7 +78,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, extraInfo: "Step 1", @@ -103,7 +103,7 @@ WithStep.args = { WithMetaTx.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", metaTx: { relayerUrl: "https://api.biconomy.io", diff --git a/packages/react-kit/src/stories/cta/funds/WithdrawFundsButton.stories.tsx b/packages/react-kit/src/stories/cta/funds/WithdrawFundsButton.stories.tsx index 5d8a6654c..4253a7fe5 100644 --- a/packages/react-kit/src/stories/cta/funds/WithdrawFundsButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/funds/WithdrawFundsButton.stories.tsx @@ -47,7 +47,7 @@ export const WithMetaTx: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, accountId: "42", @@ -86,7 +86,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, tokensToWithdraw: [ @@ -117,7 +117,7 @@ WithStep.args = { WithMetaTx.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", metaTx: { relayerUrl: "https://api.biconomy.io", diff --git a/packages/react-kit/src/stories/cta/offer/BatchVoidButton.stories.tsx b/packages/react-kit/src/stories/cta/offer/BatchVoidButton.stories.tsx index ab6ce063b..044f1c21f 100644 --- a/packages/react-kit/src/stories/cta/offer/BatchVoidButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/offer/BatchVoidButton.stories.tsx @@ -40,7 +40,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/offer/CommitButton.stories.tsx b/packages/react-kit/src/stories/cta/offer/CommitButton.stories.tsx index f8fac53e9..023beb4f8 100644 --- a/packages/react-kit/src/stories/cta/offer/CommitButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/offer/CommitButton.stories.tsx @@ -44,7 +44,7 @@ export const WithMetaTx: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, offerId: "28", @@ -80,7 +80,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, offerId: "52", @@ -108,7 +108,7 @@ WithStep.args = { WithMetaTx.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", metaTx: { relayerUrl: "https://api.biconomy.io", diff --git a/packages/react-kit/src/stories/cta/offer/CreateOfferButton.stories.tsx b/packages/react-kit/src/stories/cta/offer/CreateOfferButton.stories.tsx index d22bbdfe2..12bb67019 100644 --- a/packages/react-kit/src/stories/cta/offer/CreateOfferButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/offer/CreateOfferButton.stories.tsx @@ -43,7 +43,7 @@ export const WithStep: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined, ipfsMetadataStorageHeaders: { @@ -123,7 +123,7 @@ Simple.args = { WithStep.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined, ipfsMetadataStorageHeaders: { diff --git a/packages/react-kit/src/stories/cta/offer/VoidButton.stories.tsx b/packages/react-kit/src/stories/cta/offer/VoidButton.stories.tsx index 86903c214..f9a014c00 100644 --- a/packages/react-kit/src/stories/cta/offer/VoidButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/offer/VoidButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Template.bind( Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -66,7 +66,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing" }, offerId: "28", diff --git a/packages/react-kit/src/stories/cta/seller/CreateSellerButton.stories.tsx b/packages/react-kit/src/stories/cta/seller/CreateSellerButton.stories.tsx index 24d43dab4..4482ca9c6 100644 --- a/packages/react-kit/src/stories/cta/seller/CreateSellerButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/seller/CreateSellerButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -77,7 +77,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/cta/seller/UpdateSellerButton.stories.tsx b/packages/react-kit/src/stories/cta/seller/UpdateSellerButton.stories.tsx index 5884ba330..1784a8ca7 100644 --- a/packages/react-kit/src/stories/cta/seller/UpdateSellerButton.stories.tsx +++ b/packages/react-kit/src/stories/cta/seller/UpdateSellerButton.stories.tsx @@ -41,7 +41,7 @@ export const WithExtraInfo: ComponentStory = Simple.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, @@ -76,7 +76,7 @@ Simple.args = { WithExtraInfo.args = { coreSdkConfig: { - configId: "testing-80001-0", + configId: "testing-80002-0", envName: "testing", web3Provider: undefined }, diff --git a/packages/react-kit/src/stories/helpers/CtaButtonWrapper.tsx b/packages/react-kit/src/stories/helpers/CtaButtonWrapper.tsx index 8bb66d67c..f9d07f787 100644 --- a/packages/react-kit/src/stories/helpers/CtaButtonWrapper.tsx +++ b/packages/react-kit/src/stories/helpers/CtaButtonWrapper.tsx @@ -43,7 +43,7 @@ export const CtaButtonWrapper = ({ children: ReactNode; configId: ConfigId; }) => { - const chainId = configId?.split("-")[1] || "80001"; + const chainId = configId?.split("-")[1] || "80002"; return ( {children} diff --git a/packages/subgraph/README.md b/packages/subgraph/README.md index c64760a49..8cd88789f 100644 --- a/packages/subgraph/README.md +++ b/packages/subgraph/README.md @@ -5,8 +5,8 @@ Official [subgraph](https://api.thegraph.com/subgraphs/name/bosonprotocol/polygo | Env | Network | Endpoint | | ------------ | --------- | -------------------------------------------------------------------------------------------- | | `production` | `polygon` | [`https://api.thegraph.com/subgraphs/name/bosonprotocol/polygon`](https://api.thegraph.com/subgraphs/name/bosonprotocol/polygon) | -| `testing`* | `mumbai` | [`https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-testing`](https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-testing) | -| `staging`* | `mumbai` | [`https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-staging`](https://api.thegraph.com/subgraphs/name/bosonprotocol/mumbai-staging) | +| `testing`* | `amoy` | [`https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-testing`](https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-testing) | +| `staging`* | `amoy` | [`https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-staging`](https://api.thegraph.com/subgraphs/name/bosonprotocol/amoy-staging) | \* The `testing` and `staging` subgraphs are used for development purposes. diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json index 6ea7431c8..8d22dc36d 100644 --- a/packages/subgraph/package.json +++ b/packages/subgraph/package.json @@ -18,9 +18,9 @@ "scripts": { "manifest": "ts-node -P ../../tsconfig.base.json ./scripts/render-manifest.ts", "manifest:local": "npm run manifest -- local local-31337-0 && npm run codegen", - "manifest:testing": "npm run manifest -- testing testing-80001-0 && npm run codegen", + "manifest:testing:amoy": "npm run manifest -- testing testing-80002-0 && npm run codegen", "manifest:testing:sepolia": "npm run manifest -- testing testing-11155111-0 && npm run codegen", - "manifest:staging": "npm run manifest -- staging staging-80001-0 && npm run codegen", + "manifest:staging:amoy": "npm run manifest -- staging staging-80002-0 && npm run codegen", "manifest:staging:sepolia": "npm run manifest -- staging staging-11155111-0 && npm run codegen", "manifest:production": "npm run manifest -- production production-137-0 && npm run codegen", "manifest:production:ethereum": "npm run manifest -- production production-1-0 && npm run codegen", @@ -28,9 +28,9 @@ "create:local": "graph create --node http://localhost:8020/ boson/corecomponents", "remove:local": "graph remove --node http://localhost:8020/ boson/corecomponents", "deploy:local": "npm run manifest:local && npm run create:local && graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 boson/corecomponents -l 0.0.1", - "deploy:testing": "npm run manifest:testing && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/mumbai-testing", + "deploy:testing:amoy": "npm run manifest:testing:amoy && graph deploy --studio --ipfs https://api.thegraph.com/ipfs/ -l v0.0.1 llx-amoy-testing", "deploy:testing:sepolia": "npm run manifest:testing:sepolia && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/sepolia-testing", - "deploy:staging": "npm run manifest:staging && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/mumbai-staging", + "deploy:staging:amoy": "npm run manifest:staging:amoy && graph deploy --studio --ipfs https://api.thegraph.com/ipfs/ -l v0.0.1 llx-amoy-staging", "deploy:staging:sepolia": "npm run manifest:staging:sepolia && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/sepolia-staging", "deploy:production": "npm run manifest:production && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/polygon", "deploy:production:ethereum": "npm run manifest:production:ethereum && graph deploy --node https://api.thegraph.com/deploy/ --product hosted-service --ipfs https://api.thegraph.com/ipfs/ bosonprotocol/ethereum", diff --git a/packages/subgraph/scripts/render-manifest.ts b/packages/subgraph/scripts/render-manifest.ts index 34b3a2f9a..dab2aa25e 100644 --- a/packages/subgraph/scripts/render-manifest.ts +++ b/packages/subgraph/scripts/render-manifest.ts @@ -32,9 +32,9 @@ const envNameToConfig: Record< } }, testing: { - "testing-80001-0": { - network: "mumbai", - startBlock: 35370695 // mumbai, this is NOT the block number when the protocol was deployed (manual override as there was an error in the subgraph) + "testing-80002-0": { + network: "polygon-amoy", + startBlock: 5608358 // amoy, block number when protocol was deployed https://www.oklink.com/amoy/tx/0x4c5fa4ecdaef460d53e14302b4acc99a51379f13c1c435e4d7faca6e09bf6ab0 }, "testing-11155111-0": { network: "sepolia", @@ -42,9 +42,9 @@ const envNameToConfig: Record< } }, staging: { - "staging-80001-0": { - network: "mumbai", - startBlock: 28566747 // mumbai, block number when protocol was deployed + "staging-80002-0": { + network: "polygon-amoy", + startBlock: 5646249 // amoy, block number when protocol was deployed https://www.oklink.com/amoy/tx/0xecce702cd69df29088b3a69e24feb62787bda7d9fcf7f0694ccd22d29e98c326 }, "staging-11155111-0": { network: "sepolia", diff --git a/packages/subgraph/src/entities/token.ts b/packages/subgraph/src/entities/token.ts index b9559a706..d754c7fff 100644 --- a/packages/subgraph/src/entities/token.ts +++ b/packages/subgraph/src/entities/token.ts @@ -17,7 +17,9 @@ export function saveExchangeToken(exchangeTokenAddress: Address): void { const networkName = dataSource.network(); exchangeToken.decimals = BigInt.fromI32(18); - if (["mumbai", "maticmum", "polygon", "matic"].includes(networkName)) { + if ( + ["mumbai", "maticmum", "polygon", "matic", "amoy"].includes(networkName) + ) { exchangeToken.name = "Matic"; exchangeToken.symbol = "MATIC"; } else { diff --git a/scripts/change-contract-uri.ts b/scripts/change-contract-uri.ts index 4d1a8a960..845afa256 100644 --- a/scripts/change-contract-uri.ts +++ b/scripts/change-contract-uri.ts @@ -13,7 +13,7 @@ program ) .argument("", "Contract URI to set in the seller's voucher") .option("-e, --env ", "Target environment", "testing") - .option("-c, --configId ", "Config id", "testing-80001-0") + .option("-c, --configId ", "Config id", "testing-80002-0") .parse(process.argv); async function main() { @@ -21,7 +21,7 @@ async function main() { const opts = program.opts(); const envName = opts.env || "testing"; - const configId = opts.configId || "testing-80001-0"; + const configId = opts.configId || "testing-80002-0"; const defaultConfig = getEnvConfigById(envName as EnvironmentType, configId); const chainId = defaultConfig.chainId; const sellerWallet = new Wallet(sellerPrivateKey); diff --git a/scripts/checkOfferExchangePolicy.ts b/scripts/checkOfferExchangePolicy.ts index ce3cce67d..d37df069b 100644 --- a/scripts/checkOfferExchangePolicy.ts +++ b/scripts/checkOfferExchangePolicy.ts @@ -18,7 +18,7 @@ program .description("Check Exchange policy of an Offer.") .argument("", "Id of the offer to check") .option("-e, --env ", "Target environment", "testing") - .option("-c, --configId ", "Config id", "testing-80001-0") + .option("-c, --configId ", "Config id", "testing-80002-0") .parse(process.argv); async function main() { @@ -26,7 +26,7 @@ async function main() { const opts = program.opts(); const envName = opts.env || "testing"; - const configId = opts.configId || "testing-80001-0"; + const configId = opts.configId || "testing-80002-0"; const defaultConfig = getEnvConfigById(envName as EnvironmentType, configId); const coreSDK = CoreSDK.fromDefaultConfig({ diff --git a/scripts/complete-exchange.ts b/scripts/complete-exchange.ts index 92efc8672..f5ae703e6 100644 --- a/scripts/complete-exchange.ts +++ b/scripts/complete-exchange.ts @@ -23,7 +23,7 @@ program "Private key of the account issuing the transaction." ) .option("-e, --env ", "Target environment", "testing") - .option("-c, --configId ", "Config id", "testing-80001-0") + .option("-c, --configId ", "Config id", "testing-80002-0") .option( "-m, --metaTx ", "JSON file with the meta tx parameters" @@ -44,7 +44,7 @@ async function main() { const opts = program.opts(); const envName = (opts.env as EnvironmentType) || "testing"; - const configId = opts.configId || "testing-80001-0"; + const configId = opts.configId || "testing-80002-0"; const defaultConfig = getEnvConfigById(envName, configId); const wallet = new Wallet(privateKey); let metaTx: Partial | undefined = undefined; diff --git a/scripts/create-dispute-resolver.ts b/scripts/create-dispute-resolver.ts index d5c82768f..55a37cf72 100644 --- a/scripts/create-dispute-resolver.ts +++ b/scripts/create-dispute-resolver.ts @@ -16,7 +16,7 @@ program "Private key of Admin address of dispute resolver. Same address will be used for clerk, treasury and assistant." ) .option("-e, --env ", "Target environment", "testing") - .option("-c, --configId ", "Config id", "testing-80001-0") + .option("-c, --configId ", "Config id", "testing-80002-0") .option( "-esc, --escalation-period ", "Escalation response period in milliseconds." @@ -54,7 +54,7 @@ async function main() { const assistant = disputeResolverAdminWallet.address; const treasury = disputeResolverAdminWallet.address; const envName = (opts.env as EnvironmentType) || "testing"; - const configId = opts.configId || "testing-80001-0"; + const configId = opts.configId || "testing-80002-0"; const defaultConfig = getEnvConfigById(envName, configId); const chainId = defaultConfig.chainId; const metadataUri = opts.metadata; diff --git a/scripts/create-offer-batch.ts b/scripts/create-offer-batch.ts index 3b3f688d1..50f18e1df 100644 --- a/scripts/create-offer-batch.ts +++ b/scripts/create-offer-batch.ts @@ -16,7 +16,7 @@ program ) .argument("", "JSON file with the Offers specific parameters") .option("-e, --env ", "Target environment", "testing") - .option("-c, --configId ", "Config id", "testing-80001-0") + .option("-c, --configId ", "Config id", "testing-80002-0") .option( "--template