Skip to content

Commit c666d22

Browse files
authored
Feature/transaction nonce (#585)
Added nonce support
1 parent 8ce0eac commit c666d22

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

code/go/0chain.net/blobbercore/handler/zcncore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func GetBlobbers() ([]*zcncore.Blobber, error) {
9999
func CallFaucet() error {
100100
wg := &sync.WaitGroup{}
101101
statusBar := &ZCNStatus{wg: wg}
102-
txn, err := zcncore.NewTransaction(statusBar, 0)
102+
txn, err := zcncore.NewTransaction(statusBar, 0, 0)
103103
if err != nil {
104104
return common.NewError("call_faucet_failed", "Failed to create new transaction with err: "+err.Error())
105105
}
@@ -128,7 +128,7 @@ func CallFaucet() error {
128128
func Transfer(token float64, clientID string) error {
129129
wg := &sync.WaitGroup{}
130130
statusBar := &ZCNStatus{wg: wg}
131-
txn, err := zcncore.NewTransaction(statusBar, 0)
131+
txn, err := zcncore.NewTransaction(statusBar, 0, 0)
132132
if err != nil {
133133
return common.NewError("call_transfer_failed", "Failed to create new transaction with err: "+err.Error())
134134
}

code/go/0chain.net/core/transaction/entity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func NewTransactionEntity() (*Transaction, error) {
142142
txn.ChainID = chain.GetServerChain().ID
143143
txn.PublicKey = node.Self.PublicKey
144144
txn.wg = &sync.WaitGroup{}
145-
zcntxn, err := zcncore.NewTransaction(txn, 0)
145+
zcntxn, err := zcncore.NewTransaction(txn, 0, 0)
146146
if err != nil {
147147
return nil, err
148148
}

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.18
44

55
require (
66
github.com/0chain/errors v1.0.3
7-
github.com/0chain/gosdk v1.8.3-0.20220429005652-4d30802b8848
7+
github.com/0chain/gosdk v1.8.3-0.20220505203904-dfd62efd81ff
88
github.com/DATA-DOG/go-sqlmock v1.5.0
99
github.com/didip/tollbooth/v6 v6.1.2
1010
github.com/gorilla/handlers v1.5.1
1111
github.com/gorilla/mux v1.8.0
1212
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
1313
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.0
14-
github.com/herumi/bls-go-binary v1.0.1-0.20210830012634-a8e769d3b872
14+
github.com/herumi/bls-go-binary v1.0.1-0.20220103075647-4e46f4fe2af2
1515
github.com/improbable-eng/grpc-web v0.15.0
1616
github.com/koding/cache v0.0.0-20161222233015-e8a81b0b3f20
1717
github.com/minio/minio-go v6.0.14+incompatible
@@ -37,9 +37,10 @@ require (
3737

3838
require (
3939
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
40-
github.com/btcsuite/btcd v0.22.0-beta // indirect
40+
github.com/btcsuite/btcd v0.22.0-beta.0.20220428234604-a86222c92d7d // indirect
4141
github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
42-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
42+
github.com/btcsuite/btcd/btcutil v1.1.0 // indirect
43+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
4344
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
4445
github.com/davecgh/go-spew v1.1.1 // indirect
4546
github.com/deckarep/golang-set v1.8.0 // indirect

go.sum

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
4242
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4343
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
4444
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
45-
github.com/0chain/gosdk v1.8.3-0.20220429005652-4d30802b8848 h1:35LofGwUeWMRHwMPnLG4GtFwFc4dZhbpN0umaYutAcY=
46-
github.com/0chain/gosdk v1.8.3-0.20220429005652-4d30802b8848/go.mod h1:Ug0PnuaP1E7FmNrRrZ4/UaC6AveGqU/fDleVFRyFGYg=
45+
github.com/0chain/gosdk v1.8.3-0.20220505203904-dfd62efd81ff h1:jirAZBtX/KSh8GsLmGiU26uYTxzUqUXsyDqM98ccsTQ=
46+
github.com/0chain/gosdk v1.8.3-0.20220505203904-dfd62efd81ff/go.mod h1:z7QHQwcdgAi8lhfdYCWkwKiZc1zOFre3x/jxnNgzh/M=
4747
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
4848
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
4949
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
@@ -107,16 +107,21 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
107107
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
108108
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
109109
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
110-
github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo=
111-
github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA=
110+
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
111+
github.com/btcsuite/btcd v0.22.0-beta.0.20220428234604-a86222c92d7d h1:/nB4E+PlcpxrlCdOCp8b6XYr6xB9Q6PnBZSw8kvqeKo=
112+
github.com/btcsuite/btcd v0.22.0-beta.0.20220428234604-a86222c92d7d/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
113+
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
112114
github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
113115
github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJkgl+MTE=
114116
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
117+
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
118+
github.com/btcsuite/btcd/btcutil v1.1.0 h1:MO4klnGY+EWJdoWF12Wkuf4AWDBPMpZNeN/jRLrklUU=
119+
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
115120
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
121+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
122+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
116123
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
117124
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
118-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
119-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
120125
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
121126
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
122127
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
@@ -422,8 +427,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
422427
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
423428
github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
424429
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
425-
github.com/herumi/bls-go-binary v1.0.1-0.20210830012634-a8e769d3b872 h1:TV+x87PxW2BcEzpX6yWK0mBEGc9NFppsihFszD6QmyA=
426-
github.com/herumi/bls-go-binary v1.0.1-0.20210830012634-a8e769d3b872/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y=
430+
github.com/herumi/bls-go-binary v1.0.1-0.20220103075647-4e46f4fe2af2 h1:ddWFFgV7YqNOjXiBPTO4Xj8HIRsmV02FS2XCPiccr5M=
431+
github.com/herumi/bls-go-binary v1.0.1-0.20220103075647-4e46f4fe2af2/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y=
427432
github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
428433
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
429434
github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
@@ -897,8 +902,6 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
897902
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
898903
golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
899904
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
900-
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
901-
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
902905
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
903906
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
904907
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

0 commit comments

Comments
 (0)