Skip to content

Commit

Permalink
Updating main branch from develop for 2.7.0 pre-release (#1546)
Browse files Browse the repository at this point in the history
* #1424

* add new block

* fixed copy block action

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

* update split documents

* update split documents

* update demo

* update name

* restore data from hedera

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

* fix grid fields

* fix lint

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

* fix lint

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

* bump version

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

* fix

* fix

* force unseal hashicorp vault

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

* fix unseal

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

* fix mistype

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

* GitBook: [#199] Restore Data functionality added

* database default vault provider

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

* #1326

* Create README.md

* Create README.md

* added tymlez guardian-policies

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

* fix import tokens without key

* Delete README.md

* Updating git ignore to remove IDE and OSX nonsense files

Signed-off-by: Matt Smithies <[email protected]>

* Adding Carbon Space MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Geotree MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Grain Data Solution MRV

Signed-off-by: Matt Smithies <[email protected]>

* Adding Soil Carbon Coalition MRV

Signed-off-by: Matt Smithies <[email protected]>

* Update README.md

Signed-off-by: Matt Smithies <[email protected]>

* Update readme.md

Signed-off-by: Matt Smithies <[email protected]>

* Updated Tymlez in ReadMe

* Delete Demo Artifacts/Dovu/policies/Grain Data Solution MRV  directory

* fixed condition required fields

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

* restore

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

* fix image build

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

* fix mint ft tokens

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

* fix user id in dry run

* fix update step block

* Create README.md

* Add files via upload

* Delete readme.md

* Delete README.md

* Create README.md

* GitBook: [#200] split Block add and diagram updated

* set version 2.6.0

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

* Update README.md

* Updated ReadMe of Improved Cookstove

* Updated Tolam Earth ReadMe

* Create README.md

* Delete README.md

* Create README.md

* Update readme.md

* restore readme.md

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

* #1465

* added create token block

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

* fixed tokens visible

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

* added validation for token template in token action/confirmation blocks

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

* #995

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

* fix

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

* fixes in create token block and validation

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

* update doc

* update filters

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

* fix

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

* fix

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

* remove console.log

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

* moved keys from topic and token to vault

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

* Create readme.md

Policy for cynk.io

* fix

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

* update topic keys

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

* Added Agricultural soils of Western Australia MRV

Signed-off-by: Matt Smithies <[email protected]>

* Update artifacts readme

Signed-off-by: Matt Smithies <[email protected]>

* Add Rothc MRV

Signed-off-by: Matt Smithies <[email protected]>

* Update DOVU readme

Signed-off-by: Matt Smithies <[email protected]>

* Add MIMICS MRV

Signed-off-by: Matt Smithies <[email protected]>

* Add GHG MRV

Signed-off-by: Matt Smithies <[email protected]>

* Updated number of MRVs from DOVU

Signed-off-by: Matt Smithies <[email protected]>

* using custom context url in vcs

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

* Updated Demo Artifacts ReadMe

* Create README.md

* added policy + process overview

Signed-off-by: Gerhard Seuchter <[email protected]>

* changed cynk io folder

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

* GitBook: [#201] Policy created token

* GitBook: [#202] create token using UI

* fixing moving block issues in policy configuration

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

* Create README.md

* Tolam Earth Policy

* Delete README.md

* added readme, small fixed in policy

Signed-off-by: Gerhard Seuchter <[email protected]>

* add events

* added get file from ipfs endpoint

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

* exclude ipfs-client from required services

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

* fixed editing for ipfs key setting

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

* added spinner for loading remote enum values in schema form

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

* fix error handling

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

* update settings in worker

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

* Create README.md

* Delete Demo Artifacts/GHG Methodology/GHG Scope II directory

* Updated ReadMe

* fix after merge

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

* fix typo

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

* #1476

* fix

* fix freeze token

* update api

* update error message

* fix migrations

* fix migrations

* fix error message

* fix

* disabled  external event

* fix

* update test

* fix save keys

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

* added move actions to policy configuration

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

* #1506 fixed work with strings

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

* update draw events

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

* fix move action displaying in dryrun/publish status

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

* fix dry run

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

* fix import keys from DB

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

* fix import keys from DB

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

* #1505

* add doc

* Updated iREC ReadMe

* Updated iREC ReadMe

* always use mongodb version 6

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

* replace ipfs url

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

* fix migrations, code version in schema message

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

* fix dry run

* fix duration type validation

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

* fix schema migrations

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

* fix restored vcs validation

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

* update external events

* fix

* add event

* disabled chance policyId in schemas

* update env docker files

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

* #1508

* fix

* GitBook: [#204] Restoring from DB and Hashicorp vault

* GitBook: [#205] updated ipfs url in schema type

* GitBook: [#206] added iREC 5 demo

* GitBook: [#208] iREC 7 UI Demo

* update block actions visibility

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

* updating package versions

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

* #228

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

* GitBook: [#209] Updated high res image of splitting logic

* update topic tonfig

* preset readonly fields validation

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

* publishing utility services

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

* added api-docs service

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

* add message

* Bump engine.io and socket.io in /frontend

Bumps [engine.io](https://github.com/socketio/engine.io) and [socket.io](https://github.com/socketio/socket.io). These dependencies needed to be updated together.

Updates `engine.io` from 6.1.3 to 6.2.1
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md)
- [Commits](socketio/engine.io@6.1.3...6.2.1)

Updates `socket.io` from 4.4.1 to 4.5.3
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](socketio/socket.io@4.4.1...4.5.3)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

* add messages

* fix unexciting did

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

* remove console.log

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

* fix unexisting vc

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

* fixed displaying demo account in development

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

* fix user topic restore

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

* fix lint

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

* add job

* restore topic keys

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

* restore tokens

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

* GitBook: [#210] rearranging the pages

* GitBook: [#211] creating token using UI

* Updated Timestamp of Remote Workflow Policy

* add user topic select

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

* fix lint

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

* fix validation

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

* fix lint

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

* fix validation

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

* update messages

* update

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

* fix typo

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

* tmp

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

* implement local ipfs node
remove ipfs client

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

* update moment.js version

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

* update message format

* fix readonly fields in request block

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

* fix

* fix

* update log

* fix readonly fields
fix save topic keys

* fix lint

* GitBook: [#212] added description to token parameters

* fix save key

* fix

* update swagger

* bump version

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

* aggregate documents by custom fields

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

Signed-off-by: artembuslaev <[email protected]>
Signed-off-by: simvalery <[email protected]>
Signed-off-by: Matt Smithies <[email protected]>
Signed-off-by: Stepan Kiryakov <[email protected]>
Signed-off-by: Gerhard Seuchter <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Stepan Kiryakov <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: Stepan Kirjakov <[email protected]>
Co-authored-by: prernaa.agarwal <[email protected]>
Co-authored-by: prernaadev01 <[email protected]>
Co-authored-by: Matt Smithies <[email protected]>
Co-authored-by: artembuslaev <[email protected]>
Co-authored-by: jacopostrada-tamu <[email protected]>
Co-authored-by: Atma Dev <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
11 people authored Nov 28, 2022
1 parent afb3b93 commit ac642b6
Show file tree
Hide file tree
Showing 436 changed files with 39,751 additions and 40,799 deletions.
6 changes: 0 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ updates:
interval: weekly
open-pull-requests-limit: 5
target-branch: "develop"
- package-ecosystem: npm
directory: "/ipfs-client"
schedule:
interval: weekly
open-pull-requests-limit: 5
target-branch: "develop"
- package-ecosystem: npm
directory: "/common"
schedule:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ jobs:
npm install
npm run build
popd
pushd ipfs-client
npm install
npm run build
popd
pushd api-gateway
npm install
npm run build
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ jobs:
npm install
npm run build
popd
pushd ipfs-client
npm install
npm run build
popd
pushd api-gateway
npm install
npm run build
Expand All @@ -72,9 +68,6 @@ jobs:
pushd worker-service
npm run lint
popd
pushd ipfs-client
npm run lint
popd
pushd api-gateway
npm run lint
popd
Expand Down
54 changes: 36 additions & 18 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,6 @@ jobs:
push: true
tags: 'gcr.io/hedera-registry/guardian-service:${{ steps.package-version.outputs.current-version}}'

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

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

- name: worker-service-latest
if: ${{ steps.latestTag.outputs.value == 'latest'}}
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -170,6 +152,24 @@ jobs:
push: true
tags: 'gcr.io/hedera-registry/topic-viewer:${{ steps.package-version.outputs.current-version}}'

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

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

- name: api-docs-latest
if: ${{ steps.latestTag.outputs.value == 'latest'}}
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -205,3 +205,21 @@ jobs:
file: ./web-proxy/Dockerfile.ci
push: true
tags: 'gcr.io/hedera-registry/frontend:${{ steps.package-version.outputs.current-version}}'

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

- name: web-proxy-demo
if: ${{ steps.latestTag.outputs.value == 'hotfix'}}
uses: docker/build-push-action@v2
with:
context: .
file: ./web-proxy/Dockerfile.demo
push: true
tags: 'gcr.io/hedera-registry/frontend-demo:${{ steps.package-version.outputs.current-version}}'
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"field0": "String",
"field1": "String",
"field2": "String",
"field3": "String",
"field4": "String",
"field5": "String",
"field6": "String",
"field7": 1000
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Agricultural soils of Western Australia MRV

This MRV is based upon the work in the following article/paper from the Department of primary industries and regional development of west Australia.

https://www.agric.wa.gov.au/soil-carbon/measuring-and-reporting-soil-organic-carbon

> For an accurate carbon measurements the document should be used in tandem with a scientific verifier has access to a methodology to convert the above data into a number.
It uses these fields below:

- Soil Depth
- Container Radius
- Soil Volume
- Dry Soil Weight
- Bulk Density
- Carbon value
- SOC per Ha
- Carbon Estimate Total

Further accurate measurements can also be taken by referencing gravel bulk density in the following link

https://www.soilquality.org.au/calculators/gravel_bulk_density

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"field0": "String",
"field1": 1000,
"field2": "String",
"field3": "String",
"field4": "String",
"field5": "String",
"field6": "String",
"field7": "String",
"field8": "String",
"field9": "String",
"field10": "String"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
## GHG Assessment Guideline Soil MRV

This MRV is based upon the work by GHG protocol

https://ghgprotocol.org/sites/default/files/standards_supporting/GHG%20Assessment%20Guideline%20Volume%20I%20Soil.pdf

> For an accurate carbon measurements the document should be used in tandem with a scientific verifier has access to a methodology to verify the submitted data
The measurements uses these fields below:

- Annual change in carbon stocks
- SOC0 = soilorganic carbon stock in the last year
- SOC (0-T) = soil organic carbon stock at the beginning of the inventory time period, tonnes C ha-1
- Number of years over a single inventory time period, yr.
- Time dependence of stock change factors which is the default time period for transition between equilibrium SOC values, yr. Commonly 20 years, but depends on assumptions made in computing the factors FLU, FMG and FI. If T exceeds D, use the value for T to obtain an annual rate of change over the inventory time period (0-T years).
- Represents the climate zones, sthe soil types, and ithe set of management systems that are present in a country.
- The reference carbon stock, tonnes C ha-1
- Stock change factor for land-use systems or sub-system for a particular land-use, dimensionless
- Stock change factor for management regime, dimensionless
- Stock change factor for input of organic matter, dimensionless
- Land area of the stratum being estimated, ha.

Furthermore, it is based on multiple soil measurements for a given plot of land.

An example of soil sample measurements.

- Name of Area
- Name of Strata
- Plot number
- GPS location
- Date of extraction
- Sample depth (layer)
- Name of the person in charge
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"field0": "String",
"field1": 1000,
"field2": "String",
"field3": "String",
"field4": "String",
"field5": "String",
"field6": "String",
"field7": "String",
"field8": "String",
"field9": "String",
"field10": "String
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Microbial-Mineral Carbon Stabilization (MIMICS) MRV

This MRV is based upon the work in the following article/paper from nature

https://www.nature.com/articles/s41598-022-14224-8

> For an accurate carbon measurements the document should be used in tandem with a scientific verifier has access to a methodology to verify the submitted data
It uses these fields below:

Which can be found in this [link](https://www.frontiersin.org/files/Articles/819162/fenvs-10-819162-HTML/image_m/fenvs-10-819162-t001.jpg
).

- Location (country, province, city)
- Pedoclimatic regions
- Latitude/Longitude
- Elevation (m)
- Duration of experiment (year)
- Experiment area (ha)
- Soil Type
- Clay (%)
- pH
- Bulk Density (g cm)
- Initial SOC (carbon) (kg/ha)
- Cropping Systems
- Irrigation
- SWW
- SWF

Binary file not shown.
4 changes: 4 additions & 0 deletions Demo Artifacts/Dovu/policies/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Here we have all the policies we are currently building out, the two main focus
- Geotree (beta)
- Grain Data Solution (beta)
- Soil Carbon Coalition (beta)
- GHG Assessment Guideline Soil (beta)
- RothC (beta)
- Microbial-Mineral Carbon Stabilization (MIMICS) (beta)
- Agricultural soils of Western Australia (beta)

Inside of each policy folder we have these items:

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"field0": "String",
"field1": "String",
"field2": "String",
"field3": "String",
"field4": "String",
"field5": "String",
"field6": "String",
"field7": "String",
"field8": "String",
"field9": 1000
}
22 changes: 22 additions & 0 deletions Demo Artifacts/Dovu/policies/RothC MRV/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## RothC MRV

This MRV is based upon the work by Omdena

https://omdena.com/blog/measuring-soil-organic-carbon-changes-using-rothc/

> For an accurate carbon measurements the document should be used in tandem with a scientific verifier has access to a methodology to verify the submitted data
It uses these fields below:

- Monthly Rainfall
- Monthly Open pan evaporation
- Average Monthly mean air temperature
- Clay content of the soil
- Estimate of decomposability
- Soil Cover (0 or 1)
- Monthly input of plant residues
- Monthly input of farmyard manure (FYM)
- Depth of soild layer sampled
- Soil organic carbon (SOC)


Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@ The workflow begins with each employee completing a survey to help refine their

<img width="772" alt="image" src="https://user-images.githubusercontent.com/79293833/193054429-cf3260d6-7535-47b4-ac33-ae756061c64e.png">

**Following are the timestamps of the policy versions:**


| Version | IPFS Timestamp |
|---|---:|
| Remote Workflow Policy 1 | 1666365267.042969003 |
File renamed without changes.
Loading

0 comments on commit ac642b6

Please sign in to comment.