Merge pull request #18 from nervosnetwork/rc/v0.3.5

nervosnetwork · Oct 13, 2020 · 7879eac · 7879eac
2 parents fa7c0a4 + 357312b
commit 7879eac
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# [v0.3.5](https://github.com/nervosnetwork/ckb-rosetta-sdk/compare/v0.3.4...v0.3.5) (2020-10-13)
+
+
+### Bug Fixes
+
+* wrong prefix ([2b83d55](https://github.com/nervosnetwork/ckb-rosetta-sdk/commit/2b83d55))
+
+
+
 # [v0.3.4](https://github.com/nervosnetwork/ckb-rosetta-sdk/compare/v0.3.3...v0.3.4) (2020-10-12)
 
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,8 +1,7 @@
-# [v0.3.4](https://github.com/nervosnetwork/ckb-rosetta-sdk/compare/v0.3.3...v0.3.4) (2020-10-12)
+# [v0.3.5](https://github.com/nervosnetwork/ckb-rosetta-sdk/compare/v0.3.4...v0.3.5) (2020-10-13)
 
 
-### Features
-
-* use config Network replace string var ([d486aea](https://github.com/nervosnetwork/ckb-rosetta-sdk/commit/d486aea))
+### Bug Fixes
 
+* wrong prefix ([2b83d55](https://github.com/nervosnetwork/ckb-rosetta-sdk/commit/2b83d55))
 
diff --git a/server/services/construction_service.go b/server/services/construction_service.go
@@ -266,8 +266,11 @@ func (s *ConstructionAPIService) ConstructionDerive(
 		return nil, wrapErr(ServerError, err)
 	}
 
+	if _, ok := SupportedNetworks[s.network.Network]; !ok {
+		return nil, wrapErr(UnsupportedNetworkError, fmt.Errorf("network %s not supported", s.network.Network))
+	}
 	prefix := address.Mainnet
-	if s.network.Network != s.cfg.Network {
+	if s.network.Network != "mainnet" {
 		prefix = address.Testnet
 	}
 

diff --git a/server/services/misc.go b/server/services/misc.go
@@ -222,6 +222,12 @@ var (
 		Retriable: false,
 	}
 
+	UnsupportedNetworkError = &types.Error{
+		Code:      37,
+		Message:   "unsupported network error.",
+		Retriable: false,
+	}
+
 	CkbCurrency = &types.Currency{
 		Symbol:   "CKB",
 		Decimals: 8,
@@ -233,6 +239,12 @@ var (
 		ckb.RewardOpType,
 	}
 
+	SupportedNetworks = map[string]bool{
+		"mainnet": true,
+		"testnet": true,
+		"dev":     true,
+	}
+
 	SupportedConstructionTypes = map[string]bool{
 		ckb.TransferCKB: true,
 	}
@@ -272,6 +284,7 @@ var (
 		TransactionParseError,
 		InvalidAccountIdentifierMetadataError,
 		AddressGenerationError,
+		UnsupportedNetworkError,
 	}
 )