Merge pull request #1 from yilunzhang/master

Upgrade to new tuna version due to incompatibility change
nknorg · Jul 16, 2020 · 882065d · 882065d
2 parents bd754fb + fdfc717
commit 882065d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 78 deletions.
diff --git a/bin/main.go b/bin/main.go
@@ -20,6 +20,7 @@ func main() {
 	to := flag.String("to", "", "to address (nkn address or ip:port)")
 	useTuna := flag.Bool("tuna", false, "use tuna instead of nkn client for nkn session")
 	tunaCountry := flag.String("country", "", `tuna service node allowed country code, separated by comma, e.g. "US" or "US,CN"`)
+	tunaMaxPrice := flag.String("tuna-max-price", "0.01", "tuna max price in unit of NKN/MB")
 	mtu := flag.Int("mtu", 0, "ncp session mtu")
 	verbose := flag.Bool("v", false, "show logs on dialing/accepting connection")
 
@@ -48,6 +49,7 @@ func main() {
 
 		tsConfig = &ts.Config{
 			TunaIPFilter: &tuna.IPFilter{Allow: locations},
+			TunaMaxPrice: *tunaMaxPrice,
 		}
 	}
 

diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/nknorg/nkn-tunnel
 go 1.13
 
 require (
-	github.com/nknorg/ncp-go v0.0.0-20200406215949-844c0615f43e
-	github.com/nknorg/nkn-sdk-go v1.2.6
-	github.com/nknorg/nkn-tuna-session v0.0.0-20200509012218-ccd40afe003e
-	github.com/nknorg/tuna v0.0.0-20200509010839-b8e4fdb699e6
+	github.com/nknorg/ncp-go v1.0.1
+	github.com/nknorg/nkn-sdk-go v1.3.0
+	github.com/nknorg/nkn-tuna-session v0.0.0-20200716030938-96a9604ca2d3
+	github.com/nknorg/tuna v0.0.0-20200714222241-1d03b8a3603c
 )