Merge remote-tracking branch 'origin' into feat_upgrade_polkadot_1.2.0

activation-service/helm/tfchainactivationservice/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: tfchainactivationservice
 description: TFchain account activation funding service
 type: application
-version: 2.9.0
-appVersion: '2.9.0'
+version: 2.9.2
+appVersion: '2.9.2'

activation-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "substrate-funding-service",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "description": "Substrate funding service",
   "main": "index.js",
   "scripts": {

bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: tfchainbridge
 description: Bridge for TFT between Tfchain Stellar
 type: application
-version: 2.9.0
-appVersion: '2.9.0'
+version: 2.9.2
+appVersion: '2.9.2'

bridge/tfchain_bridge/go.mod

@@ -1,6 +1,6 @@
 module github.com/threefoldtech/tfchain/bridge/tfchain_bridge
 
-go 1.17
+go 1.21
 
 require (
 	github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12
@@ -9,7 +9,7 @@ require (
 )
 
 require (
-	github.com/ethereum/go-ethereum v1.10.17 // indirect
+	github.com/ethereum/go-ethereum v1.10.20 // indirect
 	github.com/klauspost/compress v1.9.5 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/rs/zerolog v1.26.0
@@ -19,15 +19,18 @@ require (
 	github.com/vedhavyas/go-subkey v1.0.3
 )
 
-require github.com/cenkalti/backoff/v4 v4.1.3
+require (
+	github.com/cenkalti/backoff/v4 v4.1.3
+	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230607082553-5605bca61c79
+)
 
 require (
 	github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
-	github.com/decred/base58 v1.0.3 // indirect
+	github.com/decred/base58 v1.0.4 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
 	github.com/go-chi/chi v4.0.3+incompatible // indirect
 	github.com/go-errors/errors v0.0.0-20150906023321-a41850380601 // indirect
@@ -38,18 +41,18 @@ require (
 	github.com/gtank/ristretto255 v0.1.2 // indirect
 	github.com/jbenet/go-base58 v0.0.0-20150317085156-6237cf65f3a6 // indirect
 	github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 // indirect
-	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
+	github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
 	github.com/pierrec/xxHash v0.1.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/segmentio/go-loggly v0.5.1-0.20171222203950-eb91657e62b2 // indirect
 	github.com/stellar/go-xdr v0.0.0-20201028102745-f80a23dac78a // indirect
-	github.com/stretchr/testify v1.7.0 // indirect
-	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20230607082553-5605bca61c79 // indirect
-	golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 // indirect
-	golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
+	github.com/stretchr/testify v1.7.2 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/threefoldtech/tfchain/clients/tfchain-client-go => ../../clients/tfchain-client-go

clients/tfchain-client-go/account.go

@@ -39,7 +39,7 @@ type AccountID types.AccountID
 // Balance
 type Balance struct {
 	Free       types.U128 `json:"free"`
-	Reserved   types.U128 `json:"reserverd"`
+	Reserved   types.U128 `json:"reserved"`
 	MiscFrozen types.U128 `json:"misc_frozen"`
 	FreeFrozen types.U128 `json:"free_frozen"`
 }
@@ -54,7 +54,7 @@ type AccountInfo struct {
 
 // TODO: Add service response status code if avialble
 type ActivationServiceError struct {
-	StatusCode int // 0 or a valid HTTP status code. 0 indicates that a response was not recived due to an error such host unreachable.
+	StatusCode int // 0 or a valid HTTP status code. 0 indicates that a response was not received due to an error such host unreachable.
 	Err        error
 }
 

clients/tfchain-client-go/go.mod

@@ -1,16 +1,16 @@
 module github.com/threefoldtech/tfchain/clients/tfchain-client-go
 
-go 1.17
+go 1.21
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12
 	github.com/jbenet/go-base58 v0.0.0-20150317085156-6237cf65f3a6
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.26.0
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.2
 	github.com/vedhavyas/go-subkey v1.0.3
-	golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
+	golang.org/x/crypto v0.7.0
 )
 
 require (
@@ -19,20 +19,24 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
-	github.com/decred/base58 v1.0.3 // indirect
+	github.com/decred/base58 v1.0.4 // indirect
 	github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
-	github.com/ethereum/go-ethereum v1.10.17 // indirect
+	github.com/ethereum/go-ethereum v1.10.20 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gtank/merlin v0.1.1 // indirect
 	github.com/gtank/ristretto255 v0.1.2 // indirect
-	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
 	github.com/pierrec/xxHash v0.1.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/tklauser/go-sysconf v0.3.9 // indirect
-	golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
+	github.com/vedhavyas/go-subkey/v2 v2.0.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/threefoldtech/go-substrate-rpc-client/v4 v4.0.0-20240916115924-b6e9bfa88b8a