Skip to content

Commit

Permalink
Merging develop into main for prelease 2.12.0-prerelease (#2051)
Browse files Browse the repository at this point in the history
### Headlines
- Tagging of Policy Artifacts
- Improving Policy Configurator Blocks using Colors and Shapes
- Scalability of Artifact Size and DB
- Secrets in Pipeline

### Enhancements
- Tagging of Guardian policy artifacts [#1661](#1661)
- Scalability: Artifact (Policy, VC, Schema) size and internal DB [#1155](#1155)
- API contract reviewing [#1629](#1629)
- Develop guardian-cli to manage project [#1636](#1636)
- Dynamic Topic/Message configuration according to the environment [#1696](#1696)
- Monitoring tools - Application events [#1842](#1842)
- Multi configuration of persistance according to the environment [#1888](#1888)
- Develop cypress test suite for contracts [#1816](#1816)
- Secrets in pipelines [#1610](#1610)
- Expose subscribed event or log messages to an external application [#1634](#1634)
- API contract review - Phase one [#1805](#1805)
- Direct service-to-service communication for large payloads [#1998](#1998)
- Verra Reforestation Development [#2023](#2023)
- Use colours and shapes to highlight blocks properties and/or context [#1795](#1795)

### Bugs Fixed
- `policyRolesBlock` web interface allows me to choose role multiple times [#1980](#1980)
- Invalid schema owner [#1972](#1972)
- I cannot exit the code editor without saving the content of the expression [#1981](#1981)
- Persistent data gets dropped between application restarts [#1950](#1950)
- Show transaction id in log file of guardian-service [#1983](#1983)
- Unable to publish policy [#1978](#1978)
- Issue while setup, after new release: unable to Finish Setup [#1971](#1971)
- Potential memory leak in worker service [#1926](#1926)
- Wrong behaviour for minting token process for multipolicies [#2019](#2019)
- Large amount of tokens being minted [#1976](#1976)
- Clogging of queue due to high volume of tokens minted. [#2005](#2005)
- Progress Bar when performing Schema operations are missing [#2046](#2046)
- Unable to configure Guardian services [#1999](#1999)

* fix docker compose

Signed-off-by: simvalery <[email protected]>

* delete folder

Signed-off-by: simvalery <[email protected]>

* update vc in tags

* fixes

Signed-off-by: simvalery <[email protected]>

* share tasks

Signed-off-by: simvalery <[email protected]>

* service scripts

Signed-off-by: simvalery <[email protected]>

* clean code

Signed-off-by: simvalery <[email protected]>

* policy instance container

Signed-off-by: simvalery <[email protected]>

* fix tests

Signed-off-by: simvalery <[email protected]>

* corrected broken links in ReadMe

* added versions to ReadMe

* increase max hedera timeout

Signed-off-by: simvalery <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* bump version

Signed-off-by: simvalery <[email protected]>

* fix workers queue

Signed-off-by: simvalery <[email protected]>

* test fix

Signed-off-by: simvalery <[email protected]>

* wss updates

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* fix

Signed-off-by: simvalery <[email protected]>

* fix block errors

Signed-off-by: simvalery <[email protected]>

* fix messageId

Signed-off-by: simvalery <[email protected]>

* Add documentation for Metered Energy Cooking policy

* Add policy workflow, registry and project proponent's responsibilities

* Complete policy guide

* Add TOC

* Add futureproofing section

* Add futureproofing section

* Add policy comparison

* Add futureproof flow diagram

* Add policy import screenshot

* Add policy file

* update blocks

* fix documents grid updates

Signed-off-by: artembuslaev <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* lint

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix loading for event blocks

Signed-off-by: artembuslaev <[email protected]>

* GITBOOK-308: change request with no subject merged in GitBook

* fix duplicate update block messages

Signed-off-by: artembuslaev <[email protected]>

* added loading to token confirmation ui

Signed-off-by: artembuslaev <[email protected]>

* update swagger

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix loading in event blocks

Signed-off-by: artembuslaev <[email protected]>

* Add relevant demo video links

* moved entities from guardian to common repo

Signed-off-by: artembuslaev <[email protected]>

* remove entities from policy-service

Signed-off-by: artembuslaev <[email protected]>

* chunking db entities

Signed-off-by: artembuslaev <[email protected]>

* fix build

Signed-off-by: artembuslaev <[email protected]>

* fix lint and tests

Signed-off-by: artembuslaev <[email protected]>

* fix duplicate transaction logs

Signed-off-by: artembuslaev <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* update entities

Signed-off-by: artembuslaev <[email protected]>

* added chunking property to send block

Signed-off-by: artembuslaev <[email protected]>

* update common package json

Signed-off-by: artembuslaev <[email protected]>

* fix contract tags

* lint

* Show transaction id in the log

Signed-off-by: Giuseppe Bertone <[email protected]>

* fix update token

Signed-off-by: Stepan Kiryakov <[email protected]>

* remove logs

Signed-off-by: Stepan Kiryakov <[email protected]>

* moved to common

* fix lint

Signed-off-by: artembuslaev <[email protected]>

* - #1888
- #1696

integrate previous changes to Dokerfile
docs and PREUSED
GUARDIAN_ENV in .env
Docs: Docker Compose V2 version
lint

Signed-off-by: otherNet <[email protected]>

* fix transaction logs

Signed-off-by: artembuslaev <[email protected]>

* fix tag schemas

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix delete tag schemas

Signed-off-by: Stepan Kiryakov <[email protected]>

* #1981

Signed-off-by: Stepan Kiryakov <[email protected]>

* automatically document cache

Signed-off-by: artembuslaev <[email protected]>

* fix lint

Signed-off-by: artembuslaev <[email protected]>

* reset send block properties

* moved tests

Signed-off-by: artembuslaev <[email protected]>

* set document cache to aggregate block

Signed-off-by: artembuslaev <[email protected]>

* fix creation of vp document

Signed-off-by: artembuslaev <[email protected]>

* fix publishing schemas

* fix comments and blinking request dialog

* themes

Signed-off-by: Stepan Kiryakov <[email protected]>

* added defs to schemas

Signed-off-by: artembuslaev <[email protected]>

* added document cache fields to external block

Signed-off-by: artembuslaev <[email protected]>

* fix updating files

Signed-off-by: artembuslaev <[email protected]>

* fix updating multi sign block

Signed-off-by: artembuslaev <[email protected]>

* fix lint

Signed-off-by: artembuslaev <[email protected]>

* update

* merge new secrets to dev

Signed-off-by: simvalery <[email protected]>

* merge new secrets to dev

Signed-off-by: simvalery <[email protected]>

* merge new secrets to dev

Signed-off-by: simvalery <[email protected]>

* improve minting tokens

Signed-off-by: artembuslaev <[email protected]>

* fix build

Signed-off-by: simvalery <[email protected]>

* update worker tasks priority

Signed-off-by: artembuslaev <[email protected]>

* fix user keys

Signed-off-by: simvalery <[email protected]>

* added loading tokens on creation retire request

Signed-off-by: artembuslaev <[email protected]>

* fix user keys oldstyle

Signed-off-by: simvalery <[email protected]>

* fix startup values

Signed-off-by: simvalery <[email protected]>

* fix api tests

Signed-off-by: simvalery <[email protected]>

* fix api tests

Signed-off-by: simvalery <[email protected]>

* .env files

Signed-off-by: simvalery <[email protected]>

* fix lint
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* fix common sorting in grids

Signed-off-by: artembuslaev <[email protected]>

* fix publishing policies

Signed-off-by: artembuslaev <[email protected]>

* update

* added readme of modules

* added docs link of modules

* GITBOOK-309: Adding subpage for the Guardian CLI under "Frameworks/Libraries"

* GITBOOK-310: added Guardian CLI

* added BATCH_NFT_MINT_SIZE setting

Signed-off-by: artembuslaev <[email protected]>

* feat: application-events module

Signed-off-by: Felipe Neuhauss <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix updating entities

Signed-off-by: artembuslaev <[email protected]>

* fix exporting modules

Signed-off-by: artembuslaev <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* GITBOOK-311: Added Tymlez Policy demo guide

* feat: api contract review

Signed-off-by: Felipe Neuhauss <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* filter by api

Signed-off-by: Stepan Kiryakov <[email protected]>

* GITBOOK-312: Added env parameters for guardian-service

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* added handing non retryable errors

Signed-off-by: artembuslaev <[email protected]>

* added logs for mint

Signed-off-by: artembuslaev <[email protected]>

* [Cookstove Policy] Publish new policy version and readme with future TODOs

* update

* large payloads
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* docker-run
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* fix .env
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* add themes api

Signed-off-by: Stepan Kiryakov <[email protected]>

* remove quotes
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* fix port expose
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* feature/user-driven-mrv

* GITBOOK-313: adding instructions of changing operator ID and Key in settings

* fix api test
Signed-off-by: simvalery <[email protected]>

Signed-off-by: simvalery <[email protected]>

* fix 404 error

Signed-off-by: simvalery <[email protected]>

* fix timeout

Signed-off-by: simvalery <[email protected]>

* devide test

Signed-off-by: simvalery <[email protected]>

* add auth header

Signed-off-by: simvalery <[email protected]>

* add destructor

Signed-off-by: simvalery <[email protected]>

* remove old test

Signed-off-by: simvalery <[email protected]>

* update theme api

Signed-off-by: Stepan Kiryakov <[email protected]>

* update swagger

Signed-off-by: Stepan Kiryakov <[email protected]>

* feat: application-events additional fixes

Signed-off-by: Felipe Neuhauss <[email protected]>

* change get balances

Signed-off-by: Stepan Kiryakov <[email protected]>

* rest balance

Signed-off-by: simvalery <[email protected]>

* feat: application-events reduced events to avoid annoying notifications

Signed-off-by: Felipe Neuhauss <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* GITBOOK-314: added parameters for services

* GITBOOK-315: Adding Tag UI for Policies and Schemas

* secret manager update

Signed-off-by: simvalery <[email protected]>

* added duplicate transaction handler

Signed-off-by: artembuslaev <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* feat: application-events module.ts updated

Signed-off-by: Felipe Neuhauss <[email protected]>

* Fixed userInfo error

* fix #2019

Signed-off-by: Stepan Kiryakov <[email protected]>

* GITBOOK-317: Tags APIs for Policies

* GITBOOK-318: Schema Tag APIs added

* GITBOOK-319: corrected errors in tags

* Create API Guideline

* Delete API Guideline

* add settings validation

Signed-off-by: simvalery <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix label

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix update settings

Signed-off-by: simvalery <[email protected]>

* update

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix legends

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix application events listener; add service to publish CI

Signed-off-by: simvalery <[email protected]>

* Fixed conflict

* Fixed conflict 2

* added new policies [skip ci]

Signed-off-by: artembuslaev <[email protected]>

* slice users

Signed-off-by: Stepan Kiryakov <[email protected]>

* fix lint

Signed-off-by: Stepan Kiryakov <[email protected]>

* Added iREC 9 in ReadMe

* fix version

Signed-off-by: Stepan Kiryakov <[email protected]>

* Added Verra ARR ReadMe

* update gold standard ar policy

Signed-off-by: artembuslaev <[email protected]>

* fix filters in button block

Signed-off-by: artembuslaev <[email protected]>

* Deleted Branding related code

* Adding Gold Standard AR ReadMe

* GITBOOK-320: Added Themes UI

* GITBOOK-321: Adding Theme APIs

* Add files via upload

* hotfix/progress-bar-schemas

* API Guideline 

This documentation is to underline the different types of validation status code and any error status code, including Naming Conventions for RESTful APIs. This documentation is apart of the API contract review PR #1974 and issue #1629

* fix duplicate schema field label

Signed-off-by: artembuslaev <[email protected]>

* updated policy files [skip ci]

Signed-off-by: artembuslaev <[email protected]>

* fix merge

Signed-off-by: Stepan Kiryakov <[email protected]>

* bump version

Signed-off-by: simvalery <[email protected]>

* GITBOOK-322: Guidance for Open Source Policy

* Updated Verra ARR Timestamp

* Added Schema

* Updated Gold Standard AR Timestamp

---------

Signed-off-by: simvalery <[email protected]>
Signed-off-by: Stepan Kiryakov <[email protected]>
Signed-off-by: artembuslaev <[email protected]>
Signed-off-by: Giuseppe Bertone <[email protected]>
Signed-off-by: otherNet <[email protected]>
Signed-off-by: Felipe Neuhauss <[email protected]>
Signed-off-by: artembuslaev <[email protected]>
Co-authored-by: Stepan Kiryakov <[email protected]>
Co-authored-by: prernaadev01 <[email protected]>
Co-authored-by: Gautam Prajapati <[email protected]>
Co-authored-by: Gautam Prajapati <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: prernaa.agarwal <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: Giuseppe Bertone <[email protected]>
Co-authored-by: Stepan Kirjakov <[email protected]>
Co-authored-by: otherNet <[email protected]>
Co-authored-by: Serg Metelin <[email protected]>
Co-authored-by: Felipe Neuhauss <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: E. Santiago <[email protected]>
Co-authored-by: E. Santiago <[email protected]>
Co-authored-by: Vanessa Lopes <[email protected]>
Co-authored-by: Eduardo Santiago <[email protected]>
  • Loading branch information
18 people authored Apr 25, 2023
1 parent 6ecd859 commit 16a8774
Show file tree
Hide file tree
Showing 1,116 changed files with 37,798 additions and 21,681 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ jobs:
uses: EnricoMi/publish-unit-test-result-action@v1
if: always()
with:
files: test_results/**/*.xml
files: test_results/**/*.xml
8 changes: 7 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ jobs:
CI: true
- name: Test
run: |
pushd common
npm run test
popd
pushd policy-service
npm run test
popd
pushd guardian-service
npm run test
popd
Expand All @@ -103,4 +109,4 @@ jobs:
uses: EnricoMi/publish-unit-test-result-action@v1
if: always()
with:
files: test_results/**/*.xml
files: test_results/**/*.xml
20 changes: 19 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,24 @@ jobs:
username: 'oauth2accesstoken'
password: '${{ steps.auth.outputs.access_token }}'

- name: application-events-latest
if: ${{ steps.latestTag.outputs.value == 'latest'}}
uses: docker/build-push-action@v2
with:
context: .
file: ./application-events/Dockerfile
push: true
tags: 'gcr.io/hedera-registry/application-events:${{ steps.package-version.outputs.current-version}}, gcr.io/hedera-registry/application-events:latest'

- name: application-events
if: ${{ steps.latestTag.outputs.value == 'hotfix'}}
uses: docker/build-push-action@v2
with:
context: .
file: ./application-events/Dockerfile
push: true
tags: 'gcr.io/hedera-registry/application-events:${{ steps.package-version.outputs.current-version}}'

- name: logger-service-latest
if: ${{ steps.latestTag.outputs.value == 'latest'}}
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -242,4 +260,4 @@ jobs:
context: .
file: ./web-proxy/Dockerfile.demo
push: true
tags: 'gcr.io/hedera-registry/frontend-demo:${{ steps.package-version.outputs.current-version}}'
tags: 'gcr.io/hedera-registry/frontend-demo:${{ steps.package-version.outputs.current-version}}'
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ config.keys
www-data/
/test_results/
/guardian-service/config.json
.env
tsconfig.tsbuildinfo
.yarn/*
!.yarn/patches
Expand Down
61 changes: 61 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
vault_keygen:
@./vault/hashicorp/scripts/keygen/keygen_cfssl.sh

cfgen:
@./vault/hashicorp/scripts/consul/consul_config_gen.sh
@./vault/hashicorp/scripts/vault/vault_config_gen.sh

vault_up: vault_keygen distribute_keys cfgen
@docker-compose up -d consul vault
@sleep 10
@./vault/hashicorp/scripts/vault/vault_init.sh

vault_down:
@docker-compose stop vault consul
@docker-compose rm -s -v vault consul

vault_restart: vault_down
@docker-compose up -d consul vault
@sleep 10
@./vault/hashicorp/scripts/vault/vault_init.sh

distribute_keys:
@./vault/hashicorp/scripts/keygen/keystore.sh distribute

clean_keys:
@./vault/hashicorp/scripts/keygen/keystore.sh clean

clean: clean_keys
@rm -rf ./vault/hashicorp/vault ./vault/hashicorp/consul

guardian_build:
cd interfaces && yarn install && yarn build:prod
cd common && yarn install && yarn build:prod

cd logger-service && yarn install && yarn build:prod
cd api-gateway && yarn install && yarn build:prod
cd auth-service && yarn install && yarn build:prod
cd worker-service && yarn install && yarn build:prod
cd guardian-service && yarn install && yarn build:prod
cd policy-service && yarn install && yarn build:prod
cd topic-viewer && yarn install && yarn build:prod
cd mrv-sender && yarn install && yarn build:prod
cd frontend && yarn install && yarn build:prod

guardian_make_env:
cd logger-service && cp .env.example .env && cp .env.docker.example .env.docker
cd api-gateway && cp .env.example .env && cp .env.docker.example .env.docker
cd auth-service && cp .env.example .env && cp .env.docker.example .env.docker
cd guardian-service && cp .env.example .env && cp .env.docker.example .env.docker
cd worker-service && cp .env.example .env && cp .env.docker.example .env.docker
cd policy-service && cp .env.example .env && cp .env.docker.example .env.docker

guardian_up_pm2:
docker-compose -f docker-compose-dev.yml up -d mongo message-broker ipfs-node
pm2 start ecosystem.config.js

guardian_down_pm2:
docker-compose stop mongo
docker-compose rm -s -v mongo
pm2 delete all

Binary file not shown.
Binary file not shown.
23 changes: 23 additions & 0 deletions Methodology Library/GoldStandard/GoldStandard AR/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Gold Standard Afforestation/Reforestation GHG Emissions Reduction & Sequestration Methodology v2.0

**Policy Description**:

The Gold Standard Afforestation and Reforestation (AR) methodology is a set of guidelines and procedures developed by The Gold Standard Foundation for quantifying and verifying greenhouse gas (GHG) emissions reductions resulting from afforestation and reforestation projects. The methodology provides a standardized framework for calculating the carbon sequestration potential of these types of projects, taking into account removals from both aboveground and belowground tree biomass, and also quantifies emissions from biomass burning for site preparation and the use of nitrogen fertilizer.

The AR methodology sets out requirements for project design, implementation, and monitoring. It outlines the steps necessary to establish a baseline for GHG emissions and carbon sequestration potential, and to assess the project's impact on local biodiversity. The methodology also includes provisions for addressing potential leakage and permanence risks, which can impact the long-term effectiveness of the project in sequestering carbon.

The Gold Standard AR methodology promotes sustainable land use practices that contribute to mitigating climate change while supporting the conservation of biodiversity. By providing a standardized framework for evaluating and verifying the carbon sequestration potential of afforestation and reforestation projects, the methodology helps to incentivize the adoption of more sustainable land use practices around the world.



**Workflow**:

<img width="900" alt="image" src="https://user-images.githubusercontent.com/79293833/233697424-458a3277-58d7-4804-893b-bde949093e28.png">



**GoldStandard AR Version and their IPFS timestamp:**

| Version | IPFS Timestamp | Policy File Link | Version Differences |
|---|---|---|---:|
| GoldStandard AR | 1682356854.756427003 | [Link](https://github.com/hashgraph/guardian/blob/main/Methodology%20Library/GoldStandard/GoldStandard%20AR/Gold%20Standard%20AR.policy) | GoldStandard AR |
Binary file not shown.
Loading

0 comments on commit 16a8774

Please sign in to comment.