Conversation
* debug wallet client error * Support raw text/html for NFT animation on the token instance page Resolves blockscout#2609 * fix writing to a contract with dynamic provider * change default interval for hot contracts * wait for load event of NFT embed frame * update screenshots * add network validation mode to dynamic provider * add rootstock mainnet preset * update preset for rootsrock mainnet * [skip ci] disable essential dapps for rootstock mainnet * pass required flag to FormFieldSelect controller * bump dynamic version * fix rabby wallet tx write
Replaces text/plain with application/json for proper ingestion on the backend
JOY (JOY)
force-pushed
the
sync-upstream-v2.7.3
branch
from
cb73a95 to
7be5320
Compare
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request adds support for the Rootstock network, updates the project license to the Blockscout Software Licence, and implements a secure iframe-based embedding system for interactive NFTs. Several critical issues need to be addressed, including unresolved merge conflict markers in package.json and CSP files, a missing import in the CSP logic, and a bug in the wallet client where setting the gas limit to zero will cause transaction failures.
| <<<<<<< HEAD | ||
| "private": true, | ||
| "type": "module", | ||
| "main": "dist/index.js", | ||
| "license": "MIT", | ||
| ======= | ||
| "main": "index.js", | ||
| >>>>>>> v2.7.3 |
There was a problem hiding this comment.
Unresolved merge conflict markers found in package.json. Please resolve the conflicts and remove the markers before merging.
| <<<<<<< HEAD | ||
| ======= | ||
| const marketplaceFeature = appConfig.features.marketplace; | ||
|
|
||
| const NFT_HTML_EMBED_PATH = '/nft-html-embed.html'; | ||
|
|
||
| >>>>>>> v2.7.3 |
There was a problem hiding this comment.
Unresolved merge conflict markers detected. Additionally, appConfig is referenced on line 8 but is not imported in this file, which will cause a ReferenceError at runtime. The variable marketplaceFeature also appears to be unused.
| <<<<<<< HEAD | ||
| "@dynamic-labs/ethereum": "4.67.2", | ||
| "@dynamic-labs/sdk-react-core": "4.67.2", | ||
| "@dynamic-labs/wagmi-connector": "4.67.2", | ||
| ======= | ||
| "@dynamic-labs/ethereum": "4.74.1", | ||
| "@dynamic-labs/sdk-react-core": "4.74.1", | ||
| "@dynamic-labs/wagmi-connector": "4.74.1", | ||
| >>>>>>> v2.7.3 |
There was a problem hiding this comment.
Unresolved merge conflict markers found in the dependencies section. Please resolve the version mismatch for @dynamic-labs packages.
| const estimatedGas = feature.isEnabled && feature.connectorType === 'dynamic' && walletType === 'dynamicwaas' ? | ||
| BigInt(0) : undefined; |
There was a problem hiding this comment.
Setting gas to BigInt(0) is incorrect as it sets the gas limit to zero, which will cause the transaction to fail. If gas estimation is not supported or desired for this wallet type, it is better to set this to undefined to allow the wallet or network to handle it, or provide a sufficient manual limit.
const estimatedGas = undefined;| const estimatedGas = feature.isEnabled && feature.connectorType === 'dynamic' && walletType === 'dynamicwaas' ? | ||
| BigInt(0) : undefined; |
There was a problem hiding this comment.
Setting gas to BigInt(0) will cause the transaction to fail. Please use undefined or a valid gas limit instead.
const estimatedGas = undefined;
JOY (JOY)
force-pushed
the
sync-upstream-v2.7.3
branch
7 times, most recently
from
d9f1619 to
3068660
Compare
JOY (JOY)
force-pushed
the
sync-upstream-v2.7.3
branch
from
3068660 to
4d5cc52
Compare
3 participants
Upstream Sync - v2.7.3
Auto-merge with upstream
v2.7.3failed due to conflicts.To resolve:
v2.7.3to trigger Docker buildUpstream release notes