Skip to content

Conversation

iexec-renovate-app[bot]
Copy link
Contributor

@iexec-renovate-app iexec-renovate-app bot commented Apr 9, 2025

This PR contains the following updates:

Package Type Update Change
lint-staged devDependencies patch 15.5.1 -> 15.5.2

Release Notes

lint-staged/lint-staged (lint-staged)

v15.5.2

Compare Source

Patch Changes

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

Le-Caignec and others added 28 commits February 20, 2025 16:15
…d-correct

Clean and correct with Jenkins Lib part 1
…d-correct-part2

Clean and correct with Jenkins Lib part 2
* Add Docker support and environment setup for poco-subgraph

- Introduced .dockerignore and Dockerfile for containerization.
- Updated networks.json with new addresses and start blocks.
- Enhanced package.json with new scripts for cleaning and managing the build process.
- Created .gitignore for test-stack to exclude .env files.
- Added docker-compose.yml to define services for the test environment.
- Implemented prepare-test-env.js for dynamic environment variable generation.
- Removed tsconfig.json as it is no longer needed.

* Update CHANGELOG and README with Docker subgraph deployer details

* Fix Docker run command to use correct image name for poco-subgraph-deployer

* Add PR number in changelog

* Remove unused 'fork-test' network configuration and update Docker Compose to use dynamic NETWORK_NAME for Ethereum service

* feat: add typechain generation script and update dependencies

- Added a new script to generate TypeChain types for ethers-v6 in package.json.
- Updated the start-test-stack script to ensure proper environment setup.
- Modified the itest script to include NETWORK_NAME in the environment.
- Removed unused callHandlers from subgraph.yaml.
- Enhanced docker-compose.yml to include a stack-ready service for better orchestration.
- Updated prepare-test-env.js to conditionally update networks.json based on NETWORK_NAME.
- Introduced tsconfig.json for TypeScript configuration with strict settings.

* docs: update CHANGELOG to include README section for Docker-based subgraph deployer

* chore: update .gitignore to include test-stack/.env and remove redundant .gitignore file

* test: update integration test description to reflect app indexing functionality

* refactor: restructure prepare-test-env.js to improve block number fetching and environment file creation

* fix: simplify itest script by removing DEBUG flag

* fix: update start-test-stack script to use export for NETWORK_NAME

* Update test-stack/prepare-test-env.js

Co-authored-by: gfournieriExec <[email protected]>

* refactor: streamline package.json scripts by removing redundant clean and codegen commands

* refactor: update build and test scripts for consistency and clarity

* fix: simplify remove drone logic

* fix: ensure typechain generation runs before starting test stack

* refactor: simplify README instructions for local development and testing

* fix: reorder unit test execution in CI workflow and update README for build instructions

* Remove unused files (#42)

* Remove obsolete Docker configurations, environment files, and subgraph definitions for bellecour, test, and viviani. Refactor unit tests for IexecCategoryManager and IexecPoco, consolidating mock utilities and event parameter builders into a unified structure.

* refactor:github-action-ci (#43)

* chore: update GitHub workflows for coverage, deployment, and testing

* refactor: add formatting scripts and .prettierignore for code consistency

* chore: update dependencies in package.json

* fix: correct paths in .gitignore for test artifacts

* feature/migrate-integration-tests (#44)

* Feature/remove dead handler (#45)

* fix: Fix Subgraph deployment (#47)

* refactor: update CI workflow to include health checks and integration tests, remove obsolete Jenkinsfile

* fix: update fork URL and block number retrieval in CI workflow

* fix: update command options and environment variable retrieval in CI workflow

* fix: correct health check options and update fork URL retrieval in CI workflow

* fix: update IPFS image and health check commands in CI workflow

* fix: update CI workflow to include genesis block retrieval and health checks for Graph Node

* fix: update IPFS image to use kubo version in docker-compose

* fix: retrieve fork URL and block number

* fix: remove blockchain-fork service configuration from CI workflow

* fix: update fetch block number to use static values and add IPFS readiness check

* fix: remove code generation step from README

* fix: remove unused services and streamline CI workflow

* fix: update FORK_URL to use the correct endpoint for integration tests

* fix: uncomment steps for installing dependencies, checking format, building, and running unit tests in CI workflow

* fix: uncomment steps for preparing local stack environment and update FORK_BLOCK in test environment setup

* fix: update fetch block step to source environment variables and use dynamic values for FORK_URL and FORK_BLOCK

* fix: add NETWORK_NAME environment variable to prepare local stack environment step

* fix: update fetch block step to source the correct environment file

* fix: remove .idea directory from .gitignore

* fix: reorder build step to occur before running unit tests

* fix: reorder steps to run unit tests after build in CI workflow

* fix: move NETWORK_NAME environment variable to the job level in CI workflow

* Update test-stack/prepare-test-env.ts

Co-authored-by: Zied Guesmi <[email protected]>

* fix: update changelog for integration tests migration to GitHub Actions

* fix: streamline test stack preparation in CI workflow (#46)

* fix: remove NETWORK_NAME environment variable from job level in CI workflow

* fix: update .env generation message in prepare-test-env script

* fix: update integration test structure and add .env.template file

* fix: add missing network configurations for avalancheFuji and arbitrumSepolia

* fix: add Arbitrum & Avalanche network to changelog

* fix: add dotenv and zod to package.json and package-lock.json; create env.ts for environment variable validation

* fix: update test:unit script to include 'unit' argument for clarity

* fix: update startBlock values and rename avalancheFuji to fuji in networks.json

* feat: add Protocol entity to Core data source in subgraph.yaml

* fix: update test:e2e script to specify test file pattern

* fix: downgrade @graphprotocol/graph-ts to version 0.35.1 in package.json and package-lock.json

* feat: add dotenv-cli dependency and update build scripts to use dotenv

---------

Co-authored-by: Ugo Mignon <[email protected]>
Co-authored-by: Zied Guesmi <[email protected]>

---------

Co-authored-by: gfournieriExec <[email protected]>
Co-authored-by: Ugo Mignon <[email protected]>
Co-authored-by: Zied Guesmi <[email protected]>
@iexec-renovate-app iexec-renovate-app bot force-pushed the renovate/patch-updates branch from c83f738 to f05a8db Compare May 3, 2025 00:38
@iexec-renovate-app iexec-renovate-app bot changed the title Update patch updates 🩹 chore(deps): update patch updates 🩹 May 3, 2025
Copy link

github-actions bot commented May 3, 2025

🔒 Trivy Security Scan Results

Click to expand detailed results

For OSS Maintainers: VEX Notice
--------------------------------
If you're an OSS maintainer and Trivy has detected vulnerabilities in your project that you believe are not actually exploitable, consider issuing a VEX (Vulnerability Exploitability eXchange) statement.
VEX allows you to communicate the actual status of vulnerabilities in your project, improving security transparency and reducing false positives for your users.
Learn more and start using VEX: https://aquasecurity.github.io/trivy/v0.57/docs/supply-chain/vex/repo#publishing-vex-documents

To disable this notice, set the TRIVY_DISABLE_VEX_NOTICE environment variable.


vuln-image.tar (debian 12.10)
=============================
Total: 0 (HIGH: 0, CRITICAL: 0)


Node.js (node-pkg)
==================
Total: 7 (HIGH: 6, CRITICAL: 1)

┌────────────────────────────────────────┬────────────────┬──────────┬────────┬───────────────────┬─────────────────────┬──────────────────────────────────────────────────────────────┐
│                Library                 │ Vulnerability  │ Severity │ Status │ Installed Version │    Fixed Version    │                            Title                             │
├────────────────────────────────────────┼────────────────┼──────────┼────────┼───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ @openzeppelin/contracts (package.json) │ CVE-2021-46320 │ HIGH     │ fixed  │ 3.2.0             │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
│                                        ├────────────────┼──────────┤        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-39167 │ CRITICAL │        │ 3.3.0             │ 4.3.1, 3.4.2        │ TimelockController vulnerability in OpenZeppelin Contracts   │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-39167                   │
│                                        ├────────────────┼──────────┤        │                   ├─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-46320 │ HIGH     │        │                   │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ axios (package.json)                   │ CVE-2025-27152 │          │        │ 0.21.4            │ 1.8.2, 0.30.0       │ axios: Possible SSRF and Credential Leakage via Absolute URL │
│                                        │                │          │        │                   │                     │ in axios Requests...                                         │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2025-27152                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ cross-spawn (package.json)             │ CVE-2024-21538 │          │        │ 7.0.3             │ 7.0.5, 6.0.6        │ cross-spawn: regular expression denial of service            │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2024-21538                   │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ semver (package.json)                  │ CVE-2022-25883 │          │        │ 7.3.5             │ 7.5.2, 6.3.1, 5.7.2 │ nodejs-semver: Regular expression denial of service          │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2022-25883                   │
└────────────────────────────────────────┴────────────────┴──────────┴────────┴───────────────────┴─────────────────────┴──────────────────────────────────────────────────────────────┘

@iexec-renovate-app iexec-renovate-app bot force-pushed the renovate/patch-updates branch from f05a8db to 68c49d6 Compare May 10, 2025 00:33
Copy link

🔒 Trivy Security Scan Results

Click to expand detailed results

For OSS Maintainers: VEX Notice
--------------------------------
If you're an OSS maintainer and Trivy has detected vulnerabilities in your project that you believe are not actually exploitable, consider issuing a VEX (Vulnerability Exploitability eXchange) statement.
VEX allows you to communicate the actual status of vulnerabilities in your project, improving security transparency and reducing false positives for your users.
Learn more and start using VEX: https://aquasecurity.github.io/trivy/v0.57/docs/supply-chain/vex/repo#publishing-vex-documents

To disable this notice, set the TRIVY_DISABLE_VEX_NOTICE environment variable.


vuln-image.tar (debian 12.10)
=============================
Total: 0 (HIGH: 0, CRITICAL: 0)


Node.js (node-pkg)
==================
Total: 7 (HIGH: 6, CRITICAL: 1)

┌────────────────────────────────────────┬────────────────┬──────────┬────────┬───────────────────┬─────────────────────┬──────────────────────────────────────────────────────────────┐
│                Library                 │ Vulnerability  │ Severity │ Status │ Installed Version │    Fixed Version    │                            Title                             │
├────────────────────────────────────────┼────────────────┼──────────┼────────┼───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ @openzeppelin/contracts (package.json) │ CVE-2021-46320 │ HIGH     │ fixed  │ 3.2.0             │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
│                                        ├────────────────┼──────────┤        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-39167 │ CRITICAL │        │ 3.3.0             │ 4.3.1, 3.4.2        │ TimelockController vulnerability in OpenZeppelin Contracts   │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-39167                   │
│                                        ├────────────────┼──────────┤        │                   ├─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-46320 │ HIGH     │        │                   │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ axios (package.json)                   │ CVE-2025-27152 │          │        │ 0.21.4            │ 1.8.2, 0.30.0       │ axios: Possible SSRF and Credential Leakage via Absolute URL │
│                                        │                │          │        │                   │                     │ in axios Requests...                                         │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2025-27152                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ cross-spawn (package.json)             │ CVE-2024-21538 │          │        │ 7.0.3             │ 7.0.5, 6.0.6        │ cross-spawn: regular expression denial of service            │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2024-21538                   │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ semver (package.json)                  │ CVE-2022-25883 │          │        │ 7.3.5             │ 7.5.2, 6.3.1, 5.7.2 │ nodejs-semver: Regular expression denial of service          │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2022-25883                   │
└────────────────────────────────────────┴────────────────┴──────────┴────────┴───────────────────┴─────────────────────┴──────────────────────────────────────────────────────────────┘

@iexec-renovate-app iexec-renovate-app bot force-pushed the renovate/patch-updates branch from 68c49d6 to acf27ce Compare May 24, 2025 00:34
Copy link

🔒 Trivy Security Scan Results

Click to expand detailed results

For OSS Maintainers: VEX Notice
--------------------------------
If you're an OSS maintainer and Trivy has detected vulnerabilities in your project that you believe are not actually exploitable, consider issuing a VEX (Vulnerability Exploitability eXchange) statement.
VEX allows you to communicate the actual status of vulnerabilities in your project, improving security transparency and reducing false positives for your users.
Learn more and start using VEX: https://aquasecurity.github.io/trivy/v0.57/docs/supply-chain/vex/repo#publishing-vex-documents

To disable this notice, set the TRIVY_DISABLE_VEX_NOTICE environment variable.


vuln-image.tar (debian 12.11)
=============================
Total: 0 (HIGH: 0, CRITICAL: 0)


Node.js (node-pkg)
==================
Total: 7 (HIGH: 6, CRITICAL: 1)

┌────────────────────────────────────────┬────────────────┬──────────┬────────┬───────────────────┬─────────────────────┬──────────────────────────────────────────────────────────────┐
│                Library                 │ Vulnerability  │ Severity │ Status │ Installed Version │    Fixed Version    │                            Title                             │
├────────────────────────────────────────┼────────────────┼──────────┼────────┼───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ @openzeppelin/contracts (package.json) │ CVE-2021-46320 │ HIGH     │ fixed  │ 3.2.0             │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
│                                        ├────────────────┼──────────┤        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-39167 │ CRITICAL │        │ 3.3.0             │ 4.3.1, 3.4.2        │ TimelockController vulnerability in OpenZeppelin Contracts   │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-39167                   │
│                                        ├────────────────┼──────────┤        │                   ├─────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-46320 │ HIGH     │        │                   │ 4.4.1               │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ axios (package.json)                   │ CVE-2025-27152 │          │        │ 0.21.4            │ 1.8.2, 0.30.0       │ axios: Possible SSRF and Credential Leakage via Absolute URL │
│                                        │                │          │        │                   │                     │ in axios Requests...                                         │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2025-27152                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ cross-spawn (package.json)             │ CVE-2024-21538 │          │        │ 7.0.3             │ 7.0.5, 6.0.6        │ cross-spawn: regular expression denial of service            │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2024-21538                   │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
│                                        │                │          │        │                   │                     │                                                              │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼─────────────────────┼──────────────────────────────────────────────────────────────┤
│ semver (package.json)                  │ CVE-2022-25883 │          │        │ 7.3.5             │ 7.5.2, 6.3.1, 5.7.2 │ nodejs-semver: Regular expression denial of service          │
│                                        │                │          │        │                   │                     │ https://avd.aquasec.com/nvd/cve-2022-25883                   │
└────────────────────────────────────────┴────────────────┴──────────┴────────┴───────────────────┴─────────────────────┴──────────────────────────────────────────────────────────────┘

@iexec-renovate-app iexec-renovate-app bot force-pushed the renovate/patch-updates branch from acf27ce to 42ec4cc Compare June 14, 2025 00:35
@iexec-renovate-app iexec-renovate-app bot changed the title chore(deps): update patch updates 🩹 chore(deps): update dependency lint-staged to v15.5.2 Jun 14, 2025
Copy link

🔒 Trivy Security Scan Results

Click to expand detailed results

For OSS Maintainers: VEX Notice
--------------------------------
If you're an OSS maintainer and Trivy has detected vulnerabilities in your project that you believe are not actually exploitable, consider issuing a VEX (Vulnerability Exploitability eXchange) statement.
VEX allows you to communicate the actual status of vulnerabilities in your project, improving security transparency and reducing false positives for your users.
Learn more and start using VEX: https://aquasecurity.github.io/trivy/v0.57/docs/supply-chain/vex/repo#publishing-vex-documents

To disable this notice, set the TRIVY_DISABLE_VEX_NOTICE environment variable.


vuln-image.tar (debian 12.11)
=============================
Total: 0 (HIGH: 0, CRITICAL: 0)


Node.js (node-pkg)
==================
Total: 9 (HIGH: 8, CRITICAL: 1)

┌────────────────────────────────────────┬────────────────┬──────────┬────────┬───────────────────┬──────────────────────┬──────────────────────────────────────────────────────────────┐
│                Library                 │ Vulnerability  │ Severity │ Status │ Installed Version │    Fixed Version     │                            Title                             │
├────────────────────────────────────────┼────────────────┼──────────┼────────┼───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│ @openzeppelin/contracts (package.json) │ CVE-2021-46320 │ HIGH     │ fixed  │ 3.2.0             │ 4.4.1                │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
│                                        ├────────────────┼──────────┤        ├───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-39167 │ CRITICAL │        │ 3.3.0             │ 4.3.1, 3.4.2         │ TimelockController vulnerability in OpenZeppelin Contracts   │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2021-39167                   │
│                                        ├────────────────┼──────────┤        │                   ├──────────────────────┼──────────────────────────────────────────────────────────────┤
│                                        │ CVE-2021-46320 │ HIGH     │        │                   │ 4.4.1                │ Improper Initialization in OpenZeppelin                      │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2021-46320                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│ axios (package.json)                   │ CVE-2025-27152 │          │        │ 0.21.4            │ 1.8.2, 0.30.0        │ axios: Possible SSRF and Credential Leakage via Absolute URL │
│                                        │                │          │        │                   │                      │ in axios Requests...                                         │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2025-27152                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│ cross-spawn (package.json)             │ CVE-2024-21538 │          │        │ 7.0.3             │ 7.0.5, 6.0.6         │ cross-spawn: regular expression denial of service            │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2024-21538                   │
│                                        │                │          │        │                   │                      │                                                              │
│                                        │                │          │        │                   │                      │                                                              │
│                                        │                │          │        │                   │                      │                                                              │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│ semver (package.json)                  │ CVE-2022-25883 │          │        │ 7.3.5             │ 7.5.2, 6.3.1, 5.7.2  │ nodejs-semver: Regular expression denial of service          │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2022-25883                   │
├────────────────────────────────────────┼────────────────┤          │        ├───────────────────┼──────────────────────┼──────────────────────────────────────────────────────────────┤
│ tar-fs (package.json)                  │ CVE-2025-48387 │          │        │ 2.1.2             │ 1.16.5, 2.1.3, 3.0.9 │ tar-fs: tar-fs has issue where extract can write outside the │
│                                        │                │          │        │                   │                      │ specified dir...                                             │
│                                        │                │          │        │                   │                      │ https://avd.aquasec.com/nvd/cve-2025-48387                   │
│                                        │                │          │        ├───────────────────┤                      │                                                              │
│                                        │                │          │        │ 3.0.8             │                      │                                                              │
│                                        │                │          │        │                   │                      │                                                              │
│                                        │                │          │        │                   │                      │                                                              │
└────────────────────────────────────────┴────────────────┴──────────┴────────┴───────────────────┴──────────────────────┴──────────────────────────────────────────────────────────────┘

Base automatically changed from develop to main July 25, 2025 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants