From 495aaabc4ad7a2f5d41576d8a682760624f14f2c Mon Sep 17 00:00:00 2001 From: Piers Shepperson Date: Wed, 23 Feb 2022 11:13:03 +0000 Subject: [PATCH 1/4] change stake pool fields --- internal/cli/model/model.go | 43 +++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/internal/cli/model/model.go b/internal/cli/model/model.go index cd31e8885d..6e61ad20bd 100644 --- a/internal/cli/model/model.go +++ b/internal/cli/model/model.go @@ -215,34 +215,31 @@ type BlobberAllocation struct { } type StakePoolInfo struct { - ID string `json:"pool_id"` - Balance int64 `json:"balance"` - Unstake int64 `json:"unstake"` - Free int64 `json:"free"` - Capacity int64 `json:"capacity"` - WritePrice int64 `json:"write_price"` - OffersTotal int64 `json:"offers_total"` - UnstakeTotal int64 `json:"unstake_total"` - Delegate []*StakePoolDelegatePoolInfo `json:"delegate"` - Penalty int64 `json:"penalty"` - Rewards StakePoolRewardsInfo `json:"rewards"` - Settings StakePoolSettings `json:"settings"` -} - -// StakePoolRewardsInfo represents stake pool rewards. -type StakePoolRewardsInfo struct { - Charge int64 `json:"charge"` // total for all time - Blobber int64 `json:"blobber"` // total for all time - Validator int64 `json:"validator"` // total for all time + ID string `json:"pool_id"` // pool ID + Balance int64 `json:"balance"` // total balance + Unstake int64 `json:"unstake"` // total unstake amount + Free int64 `json:"free"` // free staked space + Capacity int64 `json:"capacity"` // blobber bid + WritePrice int64 `json:"write_price"` // its write price + OffersTotal int64 `json:"offers_total"` // + UnstakeTotal int64 `json:"unstake_total"` + Delegate []StakePoolDelegatePoolInfo `json:"delegate"` + Penalty int64 `json:"penalty"` // total for all + Rewards int64 `json:"rewards"` + Settings StakePoolSettings `json:"settings"` } type StakePoolDelegatePoolInfo struct { - ID string `json:"id"` // pool ID + ID string `json:"id"` // blobber ID Balance int64 `json:"balance"` // current balance DelegateID string `json:"delegate_id"` // wallet - Rewards int64 `json:"rewards"` // total for all time - Penalty int64 `json:"penalty"` // total for all time - Unstake bool `json:"unstake"` + Rewards int64 `json:"rewards"` // current + UnStake bool `json:"unstake"` // want to unstake + + TotalReward int64 `json:"total_reward"` + TotalPenalty int64 `json:"total_penalty"` + Status string `json:"status"` + RoundCreated int64 `json:"round_created"` } type StakePoolSettings struct { From 4c9abcd4069e674abe6f6bc0a4937dbe3082d42d Mon Sep 17 00:00:00 2001 From: Piers Shepperson Date: Fri, 4 Mar 2022 11:24:23 +0000 Subject: [PATCH 2/4] change stake pool fields --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 680db41849..fb6ab58a8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,7 +109,7 @@ jobs: explorer_image: ${{ env.EXPLORER_TAG }} zproxy_image: staging zsearch_image: staging - blobber_stake_image: latest + blobber_stake_image: one - name: "Run System tests" uses: 0chain/actions/run-system-tests@master From eacb700aa844d0fe40bc7367f814bebfc5e7cebf Mon Sep 17 00:00:00 2001 From: Kishan-Dhakan Date: Fri, 4 Mar 2022 18:39:33 +0530 Subject: [PATCH 3/4] change actions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb6ab58a8a..40213e4ae3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: - name: "Deploy 0Chain" if: github.event_name == 'push' || github.event.inputs.existing_network == '' - uses: 0chain/actions/deploy-0chain@master + uses: 0chain/actions/deploy-0chain@blobber-stake-one with: kube_config: ${{ secrets[format('DEV{0}KC', env.RUNNER_NUMBER)] }} teardown_condition: "TESTS_PASSED" @@ -112,7 +112,7 @@ jobs: blobber_stake_image: one - name: "Run System tests" - uses: 0chain/actions/run-system-tests@master + uses: 0chain/actions/run-system-tests@blobber-stake-one with: network: ${{ env.NETWORK_URL }} zbox_cli_branch: ${{ env.ZBOX_BRANCH }} From 582ff167957ca175973ec53498a7edb8f8eb29d7 Mon Sep 17 00:00:00 2001 From: Kishan-Dhakan Date: Sun, 6 Mar 2022 15:30:05 +0530 Subject: [PATCH 4/4] revert ci.yml changes --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40213e4ae3..680db41849 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: - name: "Deploy 0Chain" if: github.event_name == 'push' || github.event.inputs.existing_network == '' - uses: 0chain/actions/deploy-0chain@blobber-stake-one + uses: 0chain/actions/deploy-0chain@master with: kube_config: ${{ secrets[format('DEV{0}KC', env.RUNNER_NUMBER)] }} teardown_condition: "TESTS_PASSED" @@ -109,10 +109,10 @@ jobs: explorer_image: ${{ env.EXPLORER_TAG }} zproxy_image: staging zsearch_image: staging - blobber_stake_image: one + blobber_stake_image: latest - name: "Run System tests" - uses: 0chain/actions/run-system-tests@blobber-stake-one + uses: 0chain/actions/run-system-tests@master with: network: ${{ env.NETWORK_URL }} zbox_cli_branch: ${{ env.ZBOX_BRANCH }}