Merge branch 'main' into marketplace-operators

.github/workflows/chain_release.yml

@@ -1,9 +1,11 @@
 name: Create EmpowerChain release
 
-on:
-  push:
-    tags:
-      - "v*" # Push events to matching v*
+on: 
+  workflow_dispatch:
+    inputs:
+      upgradeDir:
+        description: 'Upgrade directory name (e.g. v2)'   
+        required: true
 
 jobs:
   release:
@@ -26,4 +28,4 @@ jobs:
       - uses: "ncipollo/release-action@v1"
         with:
           artifacts: ./chain/build/*
-          bodyFile: "./chain/app/upgrades/$GITHUB_REF_NAME/RELEASE_NOTES.md"
+          bodyFile: "./chain/app/upgrades/${{ inputs.upgradeDir }}/RELEASE_NOTES.md"

.github/workflows/devnet-deploy.yml

@@ -1,9 +1,7 @@
 name: "Devnet depoly"
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/frontend-marketplace-build.yml

@@ -15,6 +15,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.10.0'
       - uses: earthly/actions-setup@v1
         with:
           version: 0.6.30

.github/workflows/frontend-marketplace-deploy-mainnet.yml

@@ -17,20 +17,7 @@ jobs:
       - run: npm ci && npm run build
         working-directory: ./frontend/marketplace
         env:
-          VITE_API_ENDPOINT: ${{ env.VITE_API_ENDPOINT }}
-          VITE_HTTPS_FILE_URL: ${{ env.VITE_HTTPS_FILE_URL }}
-          VITE_MARKETPLACE_CONTRACT: ${{ env.VITE_MARKETPLACE_CONTRACT }}
-          VITE_CHAIN_ID: ${{ env.VITE_CHAIN_ID }}
-          VITE_CHAIN_NAME: ${{ env.VITE_CHAIN_NAME }}
-          VITE_RPC_ENDPOINT: ${{ env.VITE_RPC_ENDPOINT }}
-          VITE_REST_ENDPOINT: ${{ env.VITE_REST_ENDPOINT }}
-          VITE_DEFAULT_CREDIT_TYPE: ${{ env.VITE_DEFAULT_CREDIT_TYPE }}
-          VITE_ENVIRONMENT: ${{ env.VITE_ENVIRONMENT }}
-          VITE_GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           VITE_REVISION_ID: ${{ github.sha }}
-          VITE_ROLLBAR_ACCESS_TOKEN: ${{ secrets.MARKETPLACE_ROLLBAR_ACCESS_TOKEN }}
-
-
       - uses: amondnet/vercel-action@v25
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }}

.github/workflows/frontend-marketplace-deploy-testnet.yml

@@ -19,23 +19,10 @@ jobs:
         with:
           path: ./frontend/marketplace
           mode: test
-      - run: npm ci && npm run build
+      - run: npm ci && npm run build:test
         working-directory: ./frontend/marketplace
         env:
-          VITE_API_ENDPOINT: ${{ env.VITE_API_ENDPOINT }}
-          VITE_HTTPS_FILE_URL: ${{ env.VITE_HTTPS_FILE_URL }}
-          VITE_MARKETPLACE_CONTRACT: ${{ env.VITE_MARKETPLACE_CONTRACT }}
-          VITE_CHAIN_ID: ${{ env.VITE_CHAIN_ID }}
-          VITE_CHAIN_NAME: ${{ env.VITE_CHAIN_NAME }}
-          VITE_RPC_ENDPOINT: ${{ env.VITE_RPC_ENDPOINT }}
-          VITE_REST_ENDPOINT: ${{ env.VITE_REST_ENDPOINT }}
-          VITE_DEFAULT_CREDIT_TYPE: ${{ env.VITE_DEFAULT_CREDIT_TYPE }}
-          VITE_ENVIRONMENT: ${{ env.VITE_ENVIRONMENT }}
-          VITE_GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           VITE_REVISION_ID: ${{ github.sha }}
-          VITE_ROLLBAR_ACCESS_TOKEN: ${{ secrets.MARKETPLACE_ROLLBAR_ACCESS_TOKEN }}
-
-
       - uses: amondnet/vercel-action@v25
         with:
           vercel-token: ${{ secrets.VERCEL_TOKEN }}

chain/app/upgrades/v2/RELEASE_NOTES.md

@@ -0,0 +1,5 @@
+## [2.0.0] - 2023-11-21
+
+- CosmWasm version upgrade to v0.45.0
+- Cosmos SDK version upgrade to v0.47.6
+- IBC Go upgrade to v7.3.1

docs/introduction/roadmap.md

@@ -38,6 +38,6 @@ In this phase we are focused on the following:
 After the release of the initial modules, the current plan is to focus on traceability and adding value to 
 collection incentives and plastic credits through access to products, services, and liquidity.
 
-This phase is right now the most uncertain one. It's contents might change, depending on market and user feedback.
+This phase is right now the most uncertain one. Its contents might change, depending on market and user feedback.
 It is also dependent on technological (privacy in particular) developments in the space.
 

docs/tokenomics/emission-distribution.md

@@ -40,9 +40,9 @@ Any spending will also be required to be done and documented on-chain as far as
 Similar to the 25% from initial genesis distribution, 15% of the block rewards will go to usage incentives for waste
 collectors and recycler infrastructure as basis for both the physical and digital network- and infrastructure effects of the Empowerchain.
 
-1% of the total block rewards (take from these 15%) will be set aside for the Global Waste Lottery staking. Details TBA.
+1% of the total block rewards (taken from these 15%) will be set aside for the Global Waste Lottery staking. Details TBA.
 
-The exact details of how this distribution will happen, and under which conditions, will be documented and announced later (before it start, naturally).
+The exact details of how this distribution will happen, and under which conditions, will be documented and announced later (before it starts, naturally).
 
 ## 3% to impact and physical waste infrastructure grants
 3% of the block rewards will go to grants and support for physical network of waste collectors and recyclers.
@@ -60,4 +60,4 @@ known to avoid sybil attacks. This might require some sort of identity solution,
 Governance will decide in the end how this shall be done.
 
 It has not been decided how the BAVI tokens accumulating in the community pool will be distributed/used.
-This will be decided by governance in any case.
+This will be decided by governance in any case.

docs/tokenomics/initial-token-distribution.md

@@ -39,7 +39,7 @@ Each section is explained in more detail below.
 The main goal is to incentivise and include global network of waste collection and recycling infrastructure as
 basis for both the physical and digital network- and infrastructure effects of the Empowerchain.
 
-The exact details of how this distribution will happen, and under which conditions, will be documented and announced later (before it start, naturally).
+The exact details of how this distribution will happen, and under which conditions, will be documented and announced later (before it starts, naturally).
 
 These usage incentives tokens are held by the Usage Incentives group (controlled by members of the team at launch).
 
@@ -73,13 +73,13 @@ Within these 20% there are also sub-initiatives for:
 - Testnet rewards (a total of 1% of the total supply, 0.5% of which for the first testnet and the rest for future testnets)
 - Bug and security bounty program (1% of the total supply)
 
-These two initatives are held by the Usage incentives group. The other 18% are held by the Impact group.
+These two initiatives are held by the Usage incentives group. The other 18% are held by the Impact group.
 
 ## 7.5% for Team Members
 7.5% of the total supply will be allocated to team members, with a minimum of 1 year lockup and 5 year vesting.
 
 To ensure members of the team are not being incentivized after they stop working on the project, we have placed all
-the tokens in the Empower group. From there they tokens will be distributed to team members as they vest.
+the tokens in the Empower group. From there the tokens will be distributed to team members as they vest.
 This also allows us to move any incentives over to new team members in the scenario of exchange of personnel.
 A smart contract to handle this will be developed and deployed after launch.
 

docs/validators/delegation-program.md

@@ -25,12 +25,12 @@ Any validator that might want to apply for the delegation program need to meet t
 - Keep secure infrastructure and decent up-time (minimum 95%)
 - Must vote on all proposals
 
-If a validator at any time fail to meet any of these criteria, they will be removed from the delegation program with
+If a validator at any time fails to meet any of these criteria, they will be removed from the delegation program with
 immediate effect.
 
 ## Delegation distribution
 
-The weight are very preliminary, and will be adjusted before mainnet launch.
+The weights are very preliminary, and will be adjusted before mainnet launch.
 
 | Activity                                                           | Notes                                                                                                             | Weight |
 |--------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|--------|

docs/validators/full-node-setup.md

@@ -204,7 +204,7 @@ There are three main ways to sync a node on Empowerchain: from scratch, state sy
 
 | Method            	| Benefits                                          	| Drawbacks                                                                                           	| Restrictions                              	|
 |-------------------	|---------------------------------------------------	|-----------------------------------------------------------------------------------------------------	|-------------------------------------------	|
-| Sync from genesis 	| - Full network history is processed during the sync 	| - Slow<br>- Requires the most disk space<br>- Upgrades must be handled at their apprioriate block heights 	| - Required for Archive nodes                	|
+| Sync from genesis 	| - Full network history is processed during the sync 	| - Slow<br>- Requires the most disk space<br>- Upgrades must be handled at their appropriate block heights 	| - Required for Archive nodes                	|
 | State Sync        	| - Very Fast<br>- Low Disk Usage                       	| - May be reliable than snapshots                                                                        	| - Must be using the latest empowerd version 	|
 | Snapshot          	| - Reliable<br>- Moderately Fast                       	| - Slower than state sync<br>- May require more disk space than state sync                               	|                                           	|
 

docs/validators/intro.md

@@ -15,7 +15,7 @@ Another activity that involves validators is active participation in the governa
 Governance proposals are necessary for different key tasks in the network such as protocol updates, allocation of funds, and ultimately the development of the blockchain community.
 
 ## Staking and rewards
-Participation in the network as a validator is conditional on the staking of a certain number of native tokens. Through the prof of stake, validators demonstrate their commitment to the security of the network and in return receive incentives.
+Participation in the network as a validator is conditional on the staking of a certain number of native tokens. Through the proof of stake, validators demonstrate their commitment to the security of the network and in return receive incentives.
 
 ## Reputation and trust
 Interchain ecosystem validators gain trust within the community by building a reputation. It is essential to build a solid reputation to increase your chances of being selected by delegators and attract greater participation. To do so, they must maintain a proven track record of reliability, security, good intentions, and a commitment to the blockchain project.

frontend/marketplace/.env.dev → frontend/marketplace/.env.development

@@ -1,3 +1,4 @@
+VITE_WEB_ENDPOINT="http://localhost:5173"
 VITE_API_ENDPOINT="https://testnet.empowerchain.io:3000/"
 VITE_HTTPS_FILE_URL="https://testnet.empowerchain.io:8080/ipfs/"
 VITE_MARKETPLACE_CONTRACT="empower14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sfg4umu"
@@ -9,4 +10,9 @@ VITE_DEFAULT_CREDIT_TYPE="PCRD"
 VITE_GOOGLE_MAPS_API_KEY=""
 VITE_REVISION_ID="local"
 VITE_ENVIRONMENT="local"
-VITE_ROLLBAR_ACCESS_TOKEN=""
+VITE_ROLLBAR_ACCESS_TOKEN="0791c0b34f844b61aba669c0ad4469d5"
+VITE_GOOGLE_MAPS_API_KEY="AIzaSyBezM4SJJO5t2bS5j2CPOdWJm_kHsdN4n0"
+VITE_LOGTO_ENDPOINT="https://h3cwf8.logto.app/"
+VITE_LOGTO_APP_ID="ilv0vuqy1u4zi05nyesgc"
+VITE_PC_BACKEND_ENDPOINT="https://pc-backend-public-qa-xv5zwi25ya-ew.a.run.app"
+

frontend/marketplace/.env.prod

@@ -1,9 +1,16 @@
-VITE_API_ENDPOINT=https://indexer.empowerchain.io:3000/
-VITE_HTTPS_FILE_URL=https://ipfs.empowerchain.io:8080/ipfs/
-VITE_MARKETPLACE_CONTRACT=empower14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sfg4umu
-VITE_CHAIN_ID=empowerchain-1
-VITE_CHAIN_NAME=Empowerchain
-VITE_RPC_ENDPOINT=https://rpc.empowerchain.io:26657
-VITE_REST_ENDPOINT=https://api.empowerchain.io:1317
-VITE_DEFAULT_CREDIT_TYPE=PCRD
-VITE_ENVIRONMENT=mainnet
+VITE_WEB_ENDPOINT="https://empower.market"
+VITE_API_ENDPOINT="https://indexer.empowerchain.io:3000/"
+VITE_HTTPS_FILE_URL="https://ipfs.empowerchain.io:8080/ipfs/"
+VITE_MARKETPLACE_CONTRACT="empower14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sfg4umu"
+VITE_CHAIN_ID="empowerchain-1"
+VITE_CHAIN_NAME="Empowerchain"
+VITE_RPC_ENDPOINT="https://rpc.empowerchain.io:26657"
+VITE_REST_ENDPOINT="https://api.empowerchain.io:1317"
+VITE_DEFAULT_CREDIT_TYPE="PCRD"
+VITE_REVISION_ID="local"
+VITE_ENVIRONMENT="mainnet"
+VITE_ROLLBAR_ACCESS_TOKEN="0791c0b34f844b61aba669c0ad4469d5"
+VITE_GOOGLE_MAPS_API_KEY="AIzaSyBezM4SJJO5t2bS5j2CPOdWJm_kHsdN4n0"
+VITE_LOGTO_ENDPOINT="https://h3cwf8.logto.app/"
+VITE_LOGTO_APP_ID="ilv0vuqy1u4zi05nyesgc"
+VITE_PC_BACKEND_ENDPOINT="https://pc-backend-public-qa-xv5zwi25ya-ew.a.run.app"

frontend/marketplace/.env.test

@@ -1,9 +1,16 @@
-VITE_API_ENDPOINT=https://testnet.empowerchain.io:3000/
-VITE_HTTPS_FILE_URL=https://testnet.empowerchain.io:8080/ipfs/
-VITE_MARKETPLACE_CONTRACT=empower14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sfg4umu
-VITE_CHAIN_ID=circulus-1
-VITE_CHAIN_NAME=Empowerchain Testnet
-VITE_RPC_ENDPOINT=https://testnet.empowerchain.io:26659
-VITE_REST_ENDPOINT=https://testnet.empowerchain.io:1319
-VITE_DEFAULT_CREDIT_TYPE=PCRD
-VITE_ENVIRONMENT=testnet
+VITE_WEB_ENDPOINT="https://testnet.empower.market"
+VITE_API_ENDPOINT="https://testnet.empowerchain.io:3000/"
+VITE_HTTPS_FILE_URL="https://testnet.empowerchain.io:8080/ipfs/"
+VITE_MARKETPLACE_CONTRACT="empower14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sfg4umu"
+VITE_CHAIN_ID="circulus-1"
+VITE_CHAIN_NAME="Empowerchain Testnet"
+VITE_RPC_ENDPOINT="https://testnet.empowerchain.io:26659"
+VITE_REST_ENDPOINT="https://testnet.empowerchain.io:1319"
+VITE_DEFAULT_CREDIT_TYPE="PCRD"
+VITE_REVISION_ID="local"
+VITE_ENVIRONMENT="testnet"
+VITE_ROLLBAR_ACCESS_TOKEN="0791c0b34f844b61aba669c0ad4469d5"
+VITE_GOOGLE_MAPS_API_KEY="AIzaSyBezM4SJJO5t2bS5j2CPOdWJm_kHsdN4n0"
+VITE_LOGTO_ENDPOINT="https://h3cwf8.logto.app/"
+VITE_LOGTO_APP_ID="ilv0vuqy1u4zi05nyesgc"
+VITE_PC_BACKEND_ENDPOINT="https://pc-backend-public-qa-xv5zwi25ya-ew.a.run.app"

frontend/marketplace/README.md

@@ -21,6 +21,10 @@ If the standalone TypeScript plugin doesn't feel fast enough to you, Volar has a
 
 See [Vite Configuration Reference](https://vitejs.dev/config/).
 
+## Project requirements
+
+Nodejs 20.10, npm 10.2.3
+
 ## Project Setup
 
 ```sh