Merge pull request #248 from tomochain/v2.2.0

tomox version
BuildOnViction · Apr 28, 2020 · 6cc95fd · 6cc95fd
2 parents 93fde6c + 07cb454
commit 6cc95fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/common/constants.go b/common/constants.go
@@ -31,7 +31,7 @@ var TIP2019Block = big.NewInt(1050000)
 var TIPSigning = big.NewInt(3000000)
 var TIPRandomize = big.NewInt(3464000)
 var BlackListHFNumber = uint64(9349100)
-var TIPTomoX = big.NewInt(0)
+var TIPTomoX = big.NewInt(20581700)
 var TIPTomoXTestnet = big.NewInt(11303000)
 var IsTestnet bool = false
 var StoreRewardFolder string
@@ -47,13 +47,13 @@ var RelayerLendingCancelFee = big.NewInt(1000000000000000)              // 0.001
 var BaseLendingInterest = big.NewInt(100000000)                         // 1e8
 
 var MinGasPrice = big.NewInt(DefaultMinGasPrice)
-var RelayerRegistrationSMC = "0x0342d186212b04E69eA682b3bed8e232b6b3361a"
+var RelayerRegistrationSMC = "0xFF0266957CC194960E7a691971A4260BAbB873E0"
 var RelayerRegistrationSMCTestnet = "0xe7c16037992bEcAFaeeE779Dacaf8991637953F3"
-var LendingRegistrationSMC = "0x4d7eA2cE949216D6b120f3AA10164173615A2b6C"
+var LendingRegistrationSMC = "0xC6034363026dC9fd321D7E2c05De201728D5C9aF"
 var LendingRegistrationSMCTestnet = "0x4d7eA2cE949216D6b120f3AA10164173615A2b6C"
 var TRC21IssuerSMCTestNet = HexToAddress("0x7081C72c9DC44686C7B7EAB1d338EA137Fa9f0D3")
 var TRC21IssuerSMC = HexToAddress("0x8c0faeb5C6bEd2129b8674F262Fd45c4e9468bee")
-var TomoXListingSMC = HexToAddress("0x80430A33EaB86890a346bCf64F86CFeAC73287f3")
+var TomoXListingSMC = HexToAddress("0xDE34dD0f536170993E8CFF639DdFfCF1A85D3E53")
 var TomoXListingSMCTestNet = HexToAddress("0x80430A33EaB86890a346bCf64F86CFeAC73287f3")
 var TRC21GasPriceBefore = big.NewInt(2500)
 var TRC21GasPrice = big.NewInt(250000000)

diff --git a/consensus/posv/posv.go b/consensus/posv/posv.go
@@ -1097,7 +1097,7 @@ func (c *Posv) APIs(chain consensus.ChainReader) []rpc.API {
 		Namespace: "posv",
 		Version:   "1.0",
 		Service:   &API{chain: chain, posv: c},
-		Public:    false,
+		Public:    true,
 	}}
 }
 

diff --git a/docker/tomochain/entrypoint.sh b/docker/tomochain/entrypoint.sh
@@ -56,7 +56,7 @@ if [[ ! -z $NETWORK_ID ]]; then
       ;;
     89 )
       genesisPath="testnet.json"
-      params="$params --tomo-testnet --gcmode archive --rpcapi db,eth,net,web3,debug"
+      params="$params --tomo-testnet --gcmode archive --rpcapi db,eth,net,web3,debug,posv"
       ;;
     90 )
       genesisPath="devnet.json"
@@ -158,7 +158,7 @@ fi
 
 # debug mode
 if [[ ! -z $DEBUG_MODE ]]; then
-  params="$params --gcmode archive --rpcapi db,eth,net,web3,debug"
+  params="$params --gcmode archive --rpcapi db,eth,net,web3,debug,posv"
 fi
 
 # maxpeers

diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 2      // Major version component of the current release
-	VersionMinor = 0      // Minor version component of the current release
-	VersionPatch = 2      // Patch version component of the current release
-	VersionMeta  = "beta" // Version metadata to append to the version string
+	VersionMajor = 2        // Major version component of the current release
+	VersionMinor = 2        // Minor version component of the current release
+	VersionPatch = 0        // Patch version component of the current release
+	VersionMeta  = "stable" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.