From 55f6189b7dc620261b2cdcdf8f461f7de614fd92 Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 31 Jan 2024 02:15:50 -0300 Subject: [PATCH 1/4] chore: Delete indexer package.json --- packages/indexer/package.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 packages/indexer/package.json diff --git a/packages/indexer/package.json b/packages/indexer/package.json deleted file mode 100644 index ce4e43ffe..000000000 --- a/packages/indexer/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "@fuel-explorer/indexer", - "private": true, - "author": "Fuel Labs (https://fuel.network/)", - "license": "Apache-2.0", - "scripts": { - "dev": "sh ./scripts/dev.sh", - "deploy": "sh ./scripts/deploy.sh", - "clean": "sh ./scripts/clean.sh" - }, - "devDependencies": { - "nodemon": "^3.0.2" - } -} From 987d85d6fac01c1dcd37197fef848acc9278afa8 Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Wed, 31 Jan 2024 18:39:55 -0300 Subject: [PATCH 2/4] fix: index --- packages/app-portal/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-portal/index.html b/packages/app-portal/index.html index e03da6f75..baa60fcd1 100644 --- a/packages/app-portal/index.html +++ b/packages/app-portal/index.html @@ -1,8 +1,8 @@ - + - + Fuel Portal From 1f7b66938a6124726a6a14bcc65e4576a2d0a795 Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Thu, 1 Feb 2024 15:58:49 -0300 Subject: [PATCH 3/4] fix: docker versions --- docker/erc20-deployer/Dockerfile | 9 +---- docker/l1-chain/Dockerfile | 7 ++-- pnpm-lock.yaml | 60 -------------------------------- 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/docker/erc20-deployer/Dockerfile b/docker/erc20-deployer/Dockerfile index 5fedab457..16bb8d1a5 100644 --- a/docker/erc20-deployer/Dockerfile +++ b/docker/erc20-deployer/Dockerfile @@ -26,11 +26,4 @@ ENV PK_ETH_WALLET="${PK_ETH_WALLET}" EXPOSE ${PORT} # copy over script and run -CMD ["pnpm", "start"] - - - # L1_CHAIN_HTTP=http://localhost:8545 \ - # FUEL_GRAPHQL_ENDPOINT=http://localhost:4000/graphql \ - # DEPLOYMENTS_HTTP=http://localhost:8080 \ - # PK_ETH_WALLET=59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d \ - # pnpm start \ No newline at end of file +CMD ["pnpm", "start"] \ No newline at end of file diff --git a/docker/l1-chain/Dockerfile b/docker/l1-chain/Dockerfile index f122ad3ad..09a917b40 100644 --- a/docker/l1-chain/Dockerfile +++ b/docker/l1-chain/Dockerfile @@ -1,11 +1,10 @@ # ====== Build Image ====== -FROM node:20-alpine AS BUILD_IMAGE +FROM node:18-alpine AS BUILD_IMAGE # dependencies RUN apk --no-cache add git RUN npm i -g pnpm - # set workdir WORKDIR /l1chain @@ -18,7 +17,7 @@ ADD ./.fuelChainConsts.env /l1chain/portal-contracts/.fuelChainConsts.env WORKDIR /l1chain/portal-contracts # build the ethereum contracts and environment -RUN pnpm install --force +RUN pnpm install # replace the fuel chain consts values and change contract code RUN pnpm ts-node scripts/replaceFuelChainConsts.ts # run contract compile with the new consts @@ -29,7 +28,7 @@ RUN pnpm compile COPY ./hardhat/hardhat.config.ts . # ====== Final Image ====== -FROM node:20-alpine +FROM node:18-alpine ARG L1_IP=0.0.0.0 ARG L1_PORT=8545 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e1663bad..133a545c2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -741,12 +741,6 @@ importers: specifier: 4.7.0 version: 4.7.0 - packages/indexer: - devDependencies: - nodemon: - specifier: ^3.0.2 - version: 3.0.3 - packages/notification-service: dependencies: '@fuel-bridge/solidity-contracts': @@ -14171,10 +14165,6 @@ packages: resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} deprecated: Use your platform's native atob() and btoa() methods instead - /abbrev@1.1.1: - resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - dev: true - /abitype@0.8.7(typescript@4.9.5): resolution: {integrity: sha512-wQ7hV8Yg/yKmGyFpqrNZufCxbszDe5es4AZGYPBitocfSqXtjrTG9JMWFcc4N30ukl2ve48aBTwt7NJxVQdU3w==} peerDependencies: @@ -20363,10 +20353,6 @@ packages: /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - /ignore-by-default@1.0.1: - resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==} - dev: true - /ignore@5.3.0: resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} engines: {node: '>= 4'} @@ -23125,34 +23111,10 @@ packages: engines: {node: '>=6.0.0'} dev: false - /nodemon@3.0.3: - resolution: {integrity: sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==} - engines: {node: '>=10'} - hasBin: true - dependencies: - chokidar: 3.5.3 - debug: 4.3.4(supports-color@5.5.0) - ignore-by-default: 1.0.1 - minimatch: 3.1.2 - pstree.remy: 1.1.8 - semver: 7.5.4 - simple-update-notifier: 2.0.0 - supports-color: 5.5.0 - touch: 3.1.0 - undefsafe: 2.0.5 - dev: true - /nofilter@3.1.0: resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==} engines: {node: '>=12.19'} - /nopt@1.0.10: - resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} - hasBin: true - dependencies: - abbrev: 1.1.1 - dev: true - /normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: @@ -24384,10 +24346,6 @@ packages: /psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} - /pstree.remy@1.1.8: - resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==} - dev: true - /public-encrypt@4.0.3: resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==} dependencies: @@ -26004,13 +25962,6 @@ packages: dependencies: is-arrayish: 0.3.2 - /simple-update-notifier@2.0.0: - resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} - engines: {node: '>=10'} - dependencies: - semver: 7.5.4 - dev: true - /sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -27214,13 +27165,6 @@ packages: /toposort@2.0.2: resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==} - /touch@3.1.0: - resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==} - hasBin: true - dependencies: - nopt: 1.0.10 - dev: true - /tough-cookie@2.4.3: resolution: {integrity: sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==} engines: {node: '>=0.8'} @@ -27815,10 +27759,6 @@ packages: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} dev: false - /undefsafe@2.0.5: - resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} - dev: true - /underscore@1.13.6: resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==} dev: true From 8e0e5494f5b4bffa25a226cd4b86ba69563237db Mon Sep 17 00:00:00 2001 From: LuizAsFight Date: Thu, 1 Feb 2024 16:00:22 -0300 Subject: [PATCH 4/4] chore --- packages/app-portal/.env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-portal/.env.production b/packages/app-portal/.env.production index dcac7c68b..f79f24005 100644 --- a/packages/app-portal/.env.production +++ b/packages/app-portal/.env.production @@ -1,6 +1,6 @@ VITE_ETH_CHAIN=sepolia VITE_FUEL_CHAIN=fuelBeta5 -VITE_FUEL_VERSION=0.20.7 +VITE_FUEL_VERSION=0.22.0 VITE_IS_PUBLIC_PREVIEW=true VITE_WALLET_INSTALL=https://chrome.google.com/webstore/detail/fuel-wallet/dldjpboieedgcmpkchcjcbijingjcgok VITE_WALLET_INSTALL_NEXT=https://next-wallet.fuel.network/docs/install/#install-from-source-code