Skip to content

Fix/txn processing #1516

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.

Sign up for GitHub

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

Merged
dabasov merged 7 commits into from
Dec 19, 2024
Merged

Fix/txn processing #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1db5e16
Fix txn processing
Dec 11, 2024
9d8d5d5
Remove verifyOptimistic
Dec 12, 2024
9d9f219
Debug
Dec 12, 2024
5e20e5b
Debug
Dec 12, 2024
7d216ea
Debug
Dec 12, 2024
47b5ef7
Fix
Dec 12, 2024
75a57a6
Merge branch 'staging' into fix/txn-processing
dabasov Dec 19, 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
14 changes: 10 additions & 4 deletions code/go/0chain.net/blobber/zcn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ func setupServerChain() error {
serverChain := chain.NewChainFromConfig()
chain.SetServerChain(serverChain)

//options := []int{
// 0,
// 10, // MinConfirmation
// 20, // MinSubmit
// 3, // ConfirmationChainLength
// 3, // SharderConsensous
// 1, // QuerySleepTime
// 0, // VerifyOptimistic
//}

err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false)
if err != nil {
return err
Expand All @@ -93,10 +103,6 @@ func setupServerChain() error {
return err
}

if client.GetClient().IsSplit {
zcncore.RegisterZauthServer(serverChain.ZauthServer)
}

fmt.Print(" [OK]\n")
return nil
}
1 change: 0 additions & 1 deletion code/go/0chain.net/core/chain/entity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ func NewChainFromConfig() *Chain {
chain.ID = common.ToKey(config.Configuration.ChainID)
chain.OwnerID = viper.GetString("server_chain.owner")
chain.BlockWorker = viper.GetString("block_worker")
chain.ZauthServer = viper.GetString("zauth_server")
return chain
}

Expand Down
4 changes: 0 additions & 4 deletions code/go/0chain.net/validator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,6 @@ func SetupValidatorOnBC(logDir string) error {
return err
}

if client.GetClient().IsSplit {
zcncore.RegisterZauthServer(serverChain.ZauthServer)
}

go RegisterValidator()

return nil
Expand Down
Loading