Skip to content

Commit 94f7042

Browse files
renauterrenauter
committed
Merge remote-tracking branch 'origin' into fix_upgrade_polkadot_1.2.0
2 parents 20f5ccc + 1c787e1 commit 94f7042

File tree

18 files changed

+320
-894
lines changed

18 files changed

+320
-894
lines changed

‎activation-service/helm/tfchainactivationservice/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: tfchainactivationservice
33
description: TFchain account activation funding service
44
type: application
5-
version: 2.9.0
6-
appVersion: '2.9.0'
5+
version: 2.9.1
6+
appVersion: '2.9.1'

‎activation-service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "substrate-funding-service",
3-
"version": "2.9.0",
3+
"version": "2.9.1",
44
"description": "Substrate funding service",
55
"main": "index.js",
66
"scripts": {

‎bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: tfchainbridge
33
description: Bridge for TFT between Tfchain Stellar
44
type: application
5-
version: 2.9.0
6-
appVersion: '2.9.0'
5+
version: 2.9.1
6+
appVersion: '2.9.1'

‎bridge/tfchain_bridge/go.mod

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/threefoldtech/tfchain/bridge/tfchain_bridge
22

3-
go 1.17
3+
go 1.21
44

55
require (
66
github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12
@@ -9,7 +9,7 @@ require (
99
)
1010

1111
require (
12-
github.com/ethereum/go-ethereum v1.10.17 // indirect
12+
github.com/ethereum/go-ethereum v1.10.20 // indirect
1313
github.com/klauspost/compress v1.9.5 // indirect
1414
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
1515
github.com/rs/zerolog v1.26.0
@@ -19,15 +19,18 @@ require (
1919
github.com/vedhavyas/go-subkey v1.0.3
2020
)
2121

22-
require github.com/cenkalti/backoff/v4 v4.1.3
22+
require (
23+
github.com/cenkalti/backoff/v4 v4.1.3
24+
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230607082553-5605bca61c79
25+
)
2326

2427
require (
2528
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
2629
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
2730
github.com/cosmos/go-bip39 v1.0.0 // indirect
2831
github.com/davecgh/go-spew v1.1.1 // indirect
2932
github.com/deckarep/golang-set v1.8.0 // indirect
30-
github.com/decred/base58 v1.0.3 // indirect
33+
github.com/decred/base58 v1.0.4 // indirect
3134
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
3235
github.com/go-chi/chi v4.0.3+incompatible // indirect
3336
github.com/go-errors/errors v0.0.0-20150906023321-a41850380601 // indirect
@@ -38,18 +41,18 @@ require (
3841
github.com/gtank/ristretto255 v0.1.2 // indirect
3942
github.com/jbenet/go-base58 v0.0.0-20150317085156-6237cf65f3a6 // indirect
4043
github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 // indirect
41-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
44+
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
4245
github.com/pierrec/xxHash v0.1.5 // indirect
4346
github.com/pmezard/go-difflib v1.0.0 // indirect
47+
github.com/rogpeppe/go-internal v1.12.0 // indirect
4448
github.com/rs/cors v1.8.2 // indirect
4549
github.com/segmentio/go-loggly v0.5.1-0.20171222203950-eb91657e62b2 // indirect
4650
github.com/stellar/go-xdr v0.0.0-20201028102745-f80a23dac78a // indirect
47-
github.com/stretchr/testify v1.7.0 // indirect
48-
github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230607082553-5605bca61c79 // indirect
49-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
50-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
51+
github.com/stretchr/testify v1.7.2 // indirect
52+
golang.org/x/crypto v0.7.0 // indirect
53+
golang.org/x/sys v0.6.0 // indirect
5154
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
52-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
55+
gopkg.in/yaml.v3 v3.0.1 // indirect
5356
)
5457

5558
replace github.com/threefoldtech/tfchain/clients/tfchain-client-go => ../../clients/tfchain-client-go

‎bridge/tfchain_bridge/go.sum

Lines changed: 34 additions & 274 deletions
Large diffs are not rendered by default.

‎clients/tfchain-client-go/account.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type AccountID types.AccountID
3939
// Balance
4040
type Balance struct {
4141
Free types.U128 `json:"free"`
42-
Reserved types.U128 `json:"reserverd"`
42+
Reserved types.U128 `json:"reserved"`
4343
MiscFrozen types.U128 `json:"misc_frozen"`
4444
FreeFrozen types.U128 `json:"free_frozen"`
4545
}
@@ -54,7 +54,7 @@ type AccountInfo struct {
5454

5555
// TODO: Add service response status code if avialble
5656
type ActivationServiceError struct {
57-
StatusCode int // 0 or a valid HTTP status code. 0 indicates that a response was not recived due to an error such host unreachable.
57+
StatusCode int // 0 or a valid HTTP status code. 0 indicates that a response was not received due to an error such host unreachable.
5858
Err error
5959
}
6060

‎clients/tfchain-client-go/go.mod

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/threefoldtech/tfchain/clients/tfchain-client-go
22

3-
go 1.17
3+
go 1.21
44

55
require (
66
github.com/cenkalti/backoff v2.2.1+incompatible
77
github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12
88
github.com/jbenet/go-base58 v0.0.0-20150317085156-6237cf65f3a6
99
github.com/pkg/errors v0.9.1
1010
github.com/rs/zerolog v1.26.0
11-
github.com/stretchr/testify v1.7.0
11+
github.com/stretchr/testify v1.7.2
1212
github.com/vedhavyas/go-subkey v1.0.3
13-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
13+
golang.org/x/crypto v0.7.0
1414
)
1515

1616
require (
@@ -19,20 +19,24 @@ require (
1919
github.com/cosmos/go-bip39 v1.0.0 // indirect
2020
github.com/davecgh/go-spew v1.1.1 // indirect
2121
github.com/deckarep/golang-set v1.8.0 // indirect
22-
github.com/decred/base58 v1.0.3 // indirect
22+
github.com/decred/base58 v1.0.4 // indirect
2323
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
24-
github.com/ethereum/go-ethereum v1.10.17 // indirect
24+
github.com/ethereum/go-ethereum v1.10.20 // indirect
2525
github.com/go-ole/go-ole v1.2.6 // indirect
2626
github.com/go-stack/stack v1.8.1 // indirect
2727
github.com/gorilla/websocket v1.5.0 // indirect
2828
github.com/gtank/merlin v0.1.1 // indirect
2929
github.com/gtank/ristretto255 v0.1.2 // indirect
30-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
30+
github.com/kr/pretty v0.3.1 // indirect
31+
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
3132
github.com/pierrec/xxHash v0.1.5 // indirect
3233
github.com/pmezard/go-difflib v1.0.0 // indirect
3334
github.com/rs/cors v1.8.2 // indirect
3435
github.com/tklauser/go-sysconf v0.3.9 // indirect
35-
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
36+
github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect
37+
golang.org/x/sys v0.6.0 // indirect
3638
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
37-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
39+
gopkg.in/yaml.v3 v3.0.1 // indirect
3840
)
41+
42+
replace github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/threefoldtech/go-substrate-rpc-client/v4 v4.0.0-20240916115924-b6e9bfa88b8a

0 commit comments

Comments
 (0)