Merge branch 'main' into vuln-checks

Signed-off-by: Samim Mirhosseini <ssmirr@users.noreply.github.com>

.env

@@ -1,5 +1,5 @@
 PORT=3000
 ETHCONNECT_URL=http://127.0.0.1:5102
+ETHCONNECT_INSTANCE=/contracts/erc1155
 ETHCONNECT_TOPIC=token
 CONTRACT_ADDRESS=
-AUTO_INIT=true

.github/workflows/docker_main.yml

@@ -9,7 +9,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set build tag
         id: build_tag_generator
@@ -25,16 +25,16 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
-      
+
       - name: Tag release
         run: docker tag ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-tokens-erc1155:head
-      
+
       - name: Push docker image
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
           docker push ghcr.io/hyperledger/firefly-tokens-erc1155:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
-      
+
       - name: Push head tag
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-tokens-erc1155:head
+          docker push ghcr.io/hyperledger/firefly-tokens-erc1155:head

.github/workflows/docker_release.yml

@@ -8,7 +8,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
           docker push ghcr.io/hyperledger/firefly-tokens-erc1155:${GITHUB_REF##*/}
-      
+
       - name: Push head tag
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin

.github/workflows/test.yml

@@ -10,12 +10,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.9.0'
       - run: npm ci
       - run: npm run test
 
@@ -25,12 +25,12 @@ jobs:
       run:
         working-directory: ./samples/solidity
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.9.0'
       - run: npm ci
       - run: npm run compile
       - run: npm run test

.vscode/launch.json

@@ -0,0 +1,33 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run Tests",
+      "runtimeExecutable": "npm",
+      "args": ["run", "test"],
+      "request": "launch",
+      "type": "node",
+      "outputCapture": "std"
+    },
+    {
+      "name": "Run E2E Tests",
+      "runtimeExecutable": "npm",
+      "args": ["run", "test:e2e"],
+      "request": "launch",
+      "type": "node",
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Program",
+      "skipFiles": ["<node_internals>/**"],
+      "program": "${file}",
+      "preLaunchTask": "tsc: build - tsconfig.json",
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"]
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "solidity.compileUsingRemoteVersion": "v0.6.12+commit.27d51765",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "eslint.validate": ["javascript"],
+  "solidity.defaultCompiler": "remote",
+  "cSpell.words": ["eventstream", "fftm"]
+}

Dockerfile

@@ -1,13 +1,13 @@
-FROM node:16-alpine3.15 as solidity-builder
-RUN apk add python3 alpine-sdk
+FROM node:20-alpine3.17 as solidity-build
+RUN apk add python3=3.10.13-r0 alpine-sdk=1.0-r1
 USER node
 WORKDIR /home/node
 ADD --chown=node:node ./samples/solidity/package*.json ./
 RUN npm install
 ADD --chown=node:node ./samples/solidity .
 RUN npx hardhat compile
 
-FROM node:16-alpine3.15 as builder
+FROM node:20-alpine3.17 as build
 WORKDIR /root
 ADD package*.json ./
 RUN npm install
@@ -22,15 +22,17 @@ RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/
 RUN trivy fs --format spdx-json --output /sbom.spdx.json /SBOM
 RUN trivy sbom /sbom.spdx.json --severity UNKNOWN,HIGH,CRITICAL --exit-code 1
 
-FROM node:16-alpine3.15 
-RUN apk add curl
+FROM node:20-alpine3.17
+RUN apk add curl=8.5.0-r0
+# We also need to keep copying it to the old location to maintain compatibility with the FireFly CLI
+COPY --from=solidity-build --chown=1001:0 /home/node/artifacts/contracts/ERC1155MixedFungible.sol/ERC1155MixedFungible.json /root/contracts/
 WORKDIR /app
 ADD package*.json ./
 RUN npm install --production
-COPY --from=solidity-builder /home/node/contracts contracts/source
-COPY --from=solidity-builder /home/node/artifacts/contracts/ERC1155MixedFungible.sol contracts
-COPY --from=builder /root/dist dist
-COPY --from=builder /root/.env /app/.env
+COPY --from=solidity-build /home/node/contracts contracts/source
+COPY --from=solidity-build /home/node/artifacts/contracts/ERC1155MixedFungible.sol contracts
+COPY --from=build /root/dist dist
+COPY --from=build /root/.env /app/.env
 RUN chgrp -R 0 /app/ \
     && chmod -R g+rwX /app/
 COPY --from=SBOM /sbom.spdx.json /sbom.spdx.json