Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint-1.18 #1101

Open
wants to merge 139 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
f2060d9
go mod tidy
Jayashsatolia403 Mar 10, 2024
da47b3c
Restricted blobber tests
Jayashsatolia403 Mar 20, 2024
a9422df
Changed repo snapshots
Jayashsatolia403 Mar 20, 2024
27ac46f
Merge branch 'master' into sprint-1.14
Jayashsatolia403 Mar 26, 2024
e0994b0
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
d21f717
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
803ba50
Skipped authorizer tests
Jayashsatolia403 Apr 2, 2024
49f095b
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
f1cbede
add owner api calls (#1047)
Sanchit011 Apr 7, 2024
444f542
Added feature blobber auth tests
Jayashsatolia403 Apr 8, 2024
6a6e660
Fix API tests create allocation
Jayashsatolia403 Apr 8, 2024
4a99711
Updated gosdk
Jayashsatolia403 Apr 8, 2024
37d9664
Merge branch 'refs/heads/sprint-1.14' into feature/blobber-auth
Jayashsatolia403 Apr 8, 2024
90f92ec
Updated gosdk
Jayashsatolia403 Apr 8, 2024
3990f94
Fix
Jayashsatolia403 Apr 8, 2024
32f1bc1
Fix
Jayashsatolia403 Apr 8, 2024
eff1e13
Fix blobber config update test =
Jayashsatolia403 Apr 8, 2024
48f7f65
Fix blobber config update cleanup
Jayashsatolia403 Apr 8, 2024
ff1b743
Fix
Jayashsatolia403 Apr 8, 2024
d5cb623
Hotfix/0box (#1049)
Sanchit011 Apr 9, 2024
b114d8e
Updated gosdk
Jayashsatolia403 Apr 11, 2024
c0218cd
fix commit err message (#1052)
Hitenjain14 Apr 11, 2024
274393e
Fix
Jayashsatolia403 Apr 14, 2024
5d494ef
Fix
Jayashsatolia403 Apr 14, 2024
f7d76d8
Fix
Jayashsatolia403 Apr 14, 2024
03b3e24
Fix
Jayashsatolia403 Apr 14, 2024
f557e07
Fix
Jayashsatolia403 Apr 14, 2024
5906a73
Fix
Jayashsatolia403 Apr 14, 2024
c4b29b2
Fix lint
Jayashsatolia403 Apr 14, 2024
67ae7ee
Fix
Jayashsatolia403 Apr 14, 2024
cd10097
Merge pull request #1031 from 0chain/feature/blobber-auth
dabasov Apr 14, 2024
619a423
tests to list stakable providers (#1036)
storybehind Apr 15, 2024
43f0884
Fix 0box tests with create allocation
Jayashsatolia403 Apr 15, 2024
069c96a
fix 0box tests
Sanchit011 Apr 15, 2024
9ba204a
Empty commit
Jayashsatolia403 Apr 16, 2024
1e20724
Fix restricted blobber tests
Jayashsatolia403 Apr 16, 2024
be7287d
Merge pull request #1054 from 0chain/fix/0box-tests
dabasov Apr 16, 2024
6a49c1d
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
11a6f88
Merge branch 'master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
a455567
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
ca51ad2
Update gosdk
Jayashsatolia403 Apr 23, 2024
b57c34f
Fix sharder config update
Jayashsatolia403 Apr 24, 2024
c826906
fix delete wallet (#1057)
Sanchit011 Apr 27, 2024
a64f648
Fixed file format and restricted blobbers test
Jayashsatolia403 Apr 28, 2024
055f288
Fix resume upload
Jayashsatolia403 Apr 28, 2024
6f8e983
Fix restricted blobbers
Jayashsatolia403 Apr 28, 2024
763c02c
fix resume download test (#1058)
Hitenjain14 Apr 28, 2024
22c07a9
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
6581305
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
df4597d
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
15d8c16
added repair allocation with diff file size (#1034)
Zorro30 Apr 30, 2024
2772ccc
added test suite for dropbox
pewssh May 1, 2024
967e5cf
test suite for gdrive
pewssh May 1, 2024
3dba307
updated for workflow
pewssh May 2, 2024
a17b590
lint fix
pewssh May 2, 2024
acc5176
changes for dropbox tests
pewssh May 5, 2024
66cdcd6
Fix: Issue previous test cases
pewssh May 5, 2024
fe1aeb9
Added lib
pewssh Jun 13, 2024
3a32014
Resolve conflicts
pewssh Jun 13, 2024
4a7553e
disable lint
pewssh Jun 13, 2024
27cea92
Test for mc and zs3server
pewssh Jun 21, 2024
f5aa94d
* Test cases for mc commands and warp benchmarking tool
pewssh Jul 4, 2024
b7df8ac
Test Cases Formatted
pewssh Jul 4, 2024
5d2a5b7
updated comment
pewssh Jul 4, 2024
539c50a
Added changes
pewssh Jul 12, 2024
bf4c2d9
pulled changes from 1.17
pewssh Jul 12, 2024
50ed4a5
updated readme
pewssh Jul 12, 2024
e9e6710
Added binary for mc
pewssh Jul 13, 2024
7e6e507
re
pewssh Jul 13, 2024
288ff1f
updated for mc
pewssh Jul 13, 2024
08c66be
Warp
pewssh Jul 14, 2024
061cac1
Added minio
pewssh Jul 14, 2024
479041a
Updated for mc_wrap_test_cases
pewssh Jul 14, 2024
d74313b
updated dir config
pewssh Jul 15, 2024
3285503
lint fix
pewssh Jul 15, 2024
93bf3e7
updated cli
pewssh Jul 15, 2024
1527ce8
Fix failing testcases for PR #1043 (#1077)
yash10019coder Jul 15, 2024
d780dca
main_test.go
pewssh Jul 15, 2024
280bfcc
Reset location for cli
pewssh Jul 16, 2024
437a1a4
Common server
pewssh Jul 16, 2024
0d5d9c2
Merge pull request #1088 from 0chain/mc_warp_test_cases
pewssh Jul 16, 2024
d00d61f
Revert "Mc warp test cases"
pewssh Jul 16, 2024
60b89f5
Merge pull request #1089 from 0chain/revert-1088-mc_warp_test_cases
pewssh Jul 16, 2024
80d9090
Merge branch 'master' into sprint-1.17
Jayashsatolia403 Jul 17, 2024
9420e34
Merge branch 'master' into sprint-1.17
Jayashsatolia403 Jul 17, 2024
3516323
running rollback allocation tests parallel. (#1096)
yash10019coder Jul 25, 2024
fb506c9
Fix system tests
Jayashsatolia403 Aug 25, 2024
3db0333
Revert "Fix system tests"
Jayashsatolia403 Aug 25, 2024
76c8746
Empty commit
Jayashsatolia403 Aug 25, 2024
cabebb9
Merge branch 'sprint-1.17' into fix/refactor-zboxcore
Jayashsatolia403 Aug 25, 2024
2a407e8
Revert "Revert "Fix system tests""
Jayashsatolia403 Aug 25, 2024
f6d1f7d
Empty commit
Jayashsatolia403 Sep 7, 2024
5fed64f
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Sep 7, 2024
f8f9146
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 7, 2024
ab4dfeb
Fix
Jayashsatolia403 Sep 7, 2024
41a8a79
Fix
Jayashsatolia403 Sep 7, 2024
aab9112
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Sep 14, 2024
7a7c4fd
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Sep 14, 2024
e8bceec
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Sep 14, 2024
eec2c4c
Fix
Jayashsatolia403 Sep 14, 2024
d94a839
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 14, 2024
0b8fc50
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Sep 15, 2024
3b9e9af
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 15, 2024
e050fae
Fix
Jayashsatolia403 Sep 15, 2024
2ddc1fb
Remove read marker tests
Jayashsatolia403 Sep 15, 2024
7b7b1b7
Feature: add KMS related tests (#1102)
YarikRevich Sep 16, 2024
25c8be4
Cleanup/readpool refactor zboxcore (#1106)
Jayashsatolia403 Sep 23, 2024
07912ed
Fix
Jayashsatolia403 Sep 23, 2024
41f4cdb
Fix
Jayashsatolia403 Sep 23, 2024
c75f719
Fix
Jayashsatolia403 Sep 23, 2024
896be12
Fix
Jayashsatolia403 Sep 23, 2024
9915b71
Update gosdk
Jayashsatolia403 Sep 23, 2024
7e9d282
Fix
Jayashsatolia403 Sep 28, 2024
a657f97
Merge remote-tracking branch 'origin/fix/refactor-zboxcore' into fix/…
Jayashsatolia403 Sep 28, 2024
df4b11e
Fix
Jayashsatolia403 Sep 28, 2024
c067231
Fix
Jayashsatolia403 Oct 2, 2024
4798c30
Merge branch 'master' into sprint-1.18
Jayashsatolia403 Oct 9, 2024
9ff4387
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 9, 2024
18661ad
Fix: KMS test issues related to updated APIs (#1112)
YarikRevich Oct 11, 2024
4184233
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 11, 2024
1f0cedf
Storage V2 (#1105)
Hitenjain14 Oct 13, 2024
99e5fa7
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 13, 2024
9b31e72
Go mod tidy
Jayashsatolia403 Oct 13, 2024
704c17a
Merge branch 'refs/heads/sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 13, 2024
dbd9c25
Update gosdkk
Jayashsatolia403 Oct 13, 2024
93ca910
Fixed tests for aggregate endpoints
Jayashsatolia403 Oct 17, 2024
a2c280e
Fixed tests for aggregate endpoints
Jayashsatolia403 Oct 17, 2024
a576c46
Merge branch 'refs/heads/sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 17, 2024
4d32c9b
Update gosdk
Jayashsatolia403 Oct 17, 2024
92f563c
fix shareinfo auth ticket (#1119)
Sanchit011 Oct 17, 2024
4d3f790
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 17, 2024
be7484a
Fixed tests for aggregate endpoints
Jayashsatolia403 Oct 17, 2024
a750841
Merge remote-tracking branch 'origin/sprint-1.18' into sprint-1.18
Jayashsatolia403 Oct 17, 2024
f6f3721
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Oct 17, 2024
8313183
Update gosdk
Jayashsatolia403 Oct 19, 2024
d32f687
system test for new transaction endpoint (#1118)
smaulik13 Oct 20, 2024
6ce44d0
Merge pull request #1099 from 0chain/fix/refactor-zboxcore
dabasov Oct 22, 2024
bdf0912
Fix update alloc min lock test s
Jayashsatolia403 Oct 23, 2024
828a59f
Fix challenge protocol
Jayashsatolia403 Oct 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
module github.com/0chain/system_test

go 1.21

toolchain go1.22.1
go 1.22.0

require (
github.com/0chain/errors v1.0.3
github.com/0chain/gosdk v1.17.5
github.com/0chain/gosdk v1.18.0-RC1.0.20241019160820-24aad2c5153e
github.com/go-resty/resty/v2 v2.7.0
github.com/herumi/bls-go-binary v1.31.0
github.com/shopspring/decimal v1.3.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/tyler-smith/go-bip39 v1.1.0
github.com/ybbus/jsonrpc/v3 v3.1.5 // nolint
golang.org/x/crypto v0.24.0
Expand All @@ -23,18 +21,20 @@ require (

require (
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hack-pad/go-webworkers v0.1.0 // indirect
github.com/hack-pad/safejs v0.1.1 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.51.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
Expand All @@ -47,7 +47,7 @@ require (
)

require (
github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565
github.com/0chain/common v1.13.1-0.20240926135437-61b88d39bbbd
github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect
github.com/PuerkitoBio/goquery v1.8.1 // indirect
github.com/andybalholm/cascadia v1.3.1 // indirect
Expand All @@ -68,7 +68,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gocolly/colly v1.2.0
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/h2non/filetype v1.1.4-0.20231228185113-6469358c2bcb // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand All @@ -86,7 +86,6 @@ require (
github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/spf13/afero v1.9.3 // indirect
Expand All @@ -106,7 +105,7 @@ require (
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
)
Expand Down
69 changes: 52 additions & 17 deletions go.sum

Large diffs are not rendered by default.

22 changes: 1 addition & 21 deletions internal/api/model/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,6 @@ func NewCreateWritePoolTransactionData(createWritePoolRequest CreateWritePoolReq
}
}

func NewCreateReadPoolTransactionData() TransactionData {
return TransactionData{
Name: "read_pool_lock",
}
}

func NewUnlockReadPoolTransactionData() TransactionData {
return TransactionData{
Name: "read_pool_unlock",
}
}

func NewCreateStackPoolTransactionData(createStakePoolRequest CreateStakePoolRequest) TransactionData {
return TransactionData{
Name: "stake_pool_lock",
Expand Down Expand Up @@ -372,10 +360,6 @@ type ClientGetBalanceResponse struct {
Nonce int64 `json:"nonce"`
}

type ClientGetReadPoolBalanceRequest struct {
ClientID string
}

type QueryRequest struct {
Query string
}
Expand All @@ -389,11 +373,6 @@ type GetAllChallengesForAllocationRequest struct {
AllocationID string
}

type ClientGetReadPoolBalanceResponse struct {
UserID string `json:"user_id" gorm:"uniqueIndex"`
Balance int64 `json:"balance"`
}

type QueryRewardsResponse struct {
TotalProviderReward float64 `json:"total_provider_reward"`
TotalDelegateReward float64 `json:"total_delegate_reward"`
Expand Down Expand Up @@ -490,6 +469,7 @@ type SCRestGetAllocationBlobbersResponse struct {
Blobbers *[]string `json:"blobbers"`
BlobberAuthTickets []string `json:"blobber_auth_tickets"`
BlobberRequirements
StorageVersion int `json:"storage_version"`
}

type SCRestGetAllocationRequest struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/api/model/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "time"

func DefaultBlobberRequirements(id, publicKey string) BlobberRequirements {
return BlobberRequirements{
Size: 60000,
Size: 64 * 1024 * 4 * 50,
DataShards: 3,
ParityShards: 1,
ExpirationDate: time.Now().Add(721 * time.Hour).Unix(),
Expand Down
30 changes: 30 additions & 0 deletions internal/api/model/zauth.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package model

// SetupWallet represents wallet used to perform set up.
type SetupWallet struct {
UserID string `json:"user_id"`
ClientID string `json:"client_id"`
ClientKey string `json:"client_key"`
PublicKey string `json:"public_key"`
PrivateKey string `json:"private_key"`
PeerPublicKey string `json:"peer_public_key"`
Restrictions []string `json:"restrictions"`
ExpiredAt int64 `json:"expired_at"`
}

// SignMessageRequest represents message requested to be signed.
type SignMessageRequest struct {
Hash string `json:"hash"`
Signature string `json:"signature"`
ClientID string `json:"client_id"`
}

// SignMessageResponse represents message sign operation response.
type SignMessageResponse struct {
Sig string `json:"sig"`
}

// KeyDetailsResponse represents split key details retrieval response.
type KeyDetailsResponse struct {
LastUsed int64 `json:"last_used"`
}
28 changes: 28 additions & 0 deletions internal/api/model/zbox.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ type ZboxNftList struct {
NftCount int64 `json:"total"`
}

type ZboxJwtToken struct {
JwtToken string `json:"jwt_token"`
}

type ReferralCodeOfUser struct {
ReferrerCode string `json:"referral_code"`
ReferrerLink string `json:"referral_link"`
Expand Down Expand Up @@ -225,5 +229,29 @@ type ReferralRankOfUser struct {
ReferrerID int64 `json:"referrer_id"`
}

type ZboxTransactionDetails struct {
Hash string `json:"hash"`
BlockHash string `json:"block_hash"`
Round int64 `json:"round"`
Version string `json:"version"`
ClientId string `json:"client_id"`
ToClientId string `json:"to_client_id"`
TransactionData string `json:"transaction_data"`
Value int64 `json:"value"`
Signature string `json:"signature"`
CreationDate int64 `json:"creation_date"`
Fee int64 `json:"fee"`
Nonce int `json:"nonce"`
TransactionType int `json:"transaction_type"`
TransactionOutput string `json:"transaction_output"`
OutputHash string `json:"output_hash"`
Status int `json:"status"`
}

type ZboxTransactionsDataResponse struct {
PitId string `json:"pit_id"`
Transactions []ZboxTransactionDetails `json:"transactions"`
}

type ZboxGraphEndpoint func(*test.SystemTest, *ZboxGraphRequest) (*ZboxGraphInt64Response, *resty.Response, error)
type ZboxGraphBlobberEndpoint func(*test.SystemTest, string, *ZboxGraphRequest) (*ZboxGraphInt64Response, *resty.Response, error)
56 changes: 56 additions & 0 deletions internal/api/model/zvault.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package model

// SplitWallet represents both split wallet and split key after generation operation.
type SplitWallet struct {
ClientID string `json:"client_id"`
ClientKey string `json:"client_key"`
PeerPublicKey string `json:"peer_public_key"`
Keys []KeyPair `json:"keys"`
Mnemonic string `json:"mnemonics"`
Version string `json:"version"`
DateCreated string `json:"date_created"`
Nonce int64 `json:"nonce"`
IsSplit bool `json:"is_split"`
}

// SplitKey represents retrieved split key.
type SplitKey struct {
UserID string `json:"user_id"`
ClientID string `json:"client_id"`
ClientKey string `json:"client_key"`
PrivateKey string `gorm:"unique" json:"private_key"`
PublicKey string `gorm:"unique" json:"public_key"`
PeerPublicKey string `gorm:"unique" json:"peer_public_key"`
Mnemonic string `json:"mnemonics"`
SharedTo string `json:"shared_to"`
IsRevoked bool `json:"is_revoked"`
CreatedAt int64 `json:"created_at"`
ExpiresAt int64 `json:"expires_at"`
}

// StoreRequest represents store request payload.
type StoreRequest struct {
Mnemonic string `json:"mnemonic"`
PrivateKey string `json:"private_key"`
}

// UpdateRestrictionsRequest represents update restrictions request payload.
type UpdateRestrictionsRequest struct {
Restrictions []string `json:"restrictions"`
}

// ShareWalletRequest represents share wallet request payload.
type ShareWalletRequest struct {
PublicKey string `json:"public_key"`
TargetUserID string `json:"target_user_id"`
}

// GenerateWalletResponse represents generate wallet response payload.
type GenerateWalletResponse struct {
ClientID string `json:"client_id"`
}

// GetKeyResponse represents retrieved set of split keys.
type GetKeyResponse struct {
Keys []*SplitKey `json:"keys"`
}
Loading
Loading