contracts: prefix contracts to indicate chain fixes #2

OpenST · Nov 24, 2017 · dbbd840 · dbbd840
1 parent d7b8b67
commit dbbd840
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 593 deletions.
diff --git a/contracts/OpenSTInterface.sol b/contracts/OpenSTInterface.sol
diff --git a/contracts/utilityChain/BrandedToken.sol → contracts/UcBrandedToken.sol b/contracts/utilityChain/BrandedToken.sol → contracts/UcBrandedToken.sol
diff --git a/contracts/utilityChain/EIP20Token.sol → contracts/UcEIP20Token.sol b/contracts/utilityChain/EIP20Token.sol → contracts/UcEIP20Token.sol
diff --git a/contracts/utilityChain/OpenSTUtility.sol → contracts/UcOpenSTUtility.sol b/contracts/utilityChain/OpenSTUtility.sol → contracts/UcOpenSTUtility.sol
@@ -73,6 +73,7 @@ contract OpenSTUtility is Hasher, OpsManaged {
 	 */
 	string public constant STPRIME_SYMBOL = "STP";
     string public constant STPRIME_NAME = "SimpleTokenPrime";
+    uint256 public constant STPRIME_CONVERSION_RATE = 1;
     uint8 public constant TOKEN_DECIMALS = 18;
     uint256 public constant DECIMALSFACTOR = 10**uint256(TOKEN_DECIMALS);
 	// ~2 weeks, assuming ~15s per block
@@ -141,7 +142,7 @@ contract OpenSTUtility is Hasher, OpsManaged {
 			_chainIdValue,
 			_chainIdUtility,
 			address(this),
-			1);
+			STPRIME_CONVERSION_RATE);
 		simpleTokenPrime = new STPrime(
 			address(this),
 			uuidSTPrime);
@@ -343,7 +344,7 @@ contract OpenSTUtility is Hasher, OpsManaged {
 			unlockHeight: unlockHeight
 		});
 
-    	StakingIntentConfirmed(_uuid, _stakingIntentHash, _staker, _beneficiary, _amountST,
+    	StakingIntentConfirmed(_uuid, stakingIntentHash, _staker, _beneficiary, _amountST,
     		_amountUT, unlockHeight);
 
     	return unlockHeight;

diff --git a/...s/utilityChain/OpenSTUtilityInterface.sol → contracts/UcOpenSTUtilityInterface.sol b/...s/utilityChain/OpenSTUtilityInterface.sol → contracts/UcOpenSTUtilityInterface.sol
diff --git a/contracts/utilityChain/STPrime.sol → contracts/UcSTPrime.sol b/contracts/utilityChain/STPrime.sol → contracts/UcSTPrime.sol
diff --git a/contracts/utilityChain/STPrimeConfig.sol → contracts/UcSTPrimeConfig.sol b/contracts/utilityChain/STPrimeConfig.sol → contracts/UcSTPrimeConfig.sol
diff --git a/...cts/utilityChain/UtilityTokenAbstract.sol → contracts/UcUtilityTokenAbstract.sol b/...cts/utilityChain/UtilityTokenAbstract.sol → contracts/UcUtilityTokenAbstract.sol
diff --git a/...ts/utilityChain/UtilityTokenInterface.sol → contracts/UcUtilityTokenInterface.sol b/...ts/utilityChain/UtilityTokenInterface.sol → contracts/UcUtilityTokenInterface.sol
diff --git a/contracts/valueChain/OpenSTValue.sol → contracts/VcOpenSTValue.sol b/contracts/valueChain/OpenSTValue.sol → contracts/VcOpenSTValue.sol
diff --git a/...racts/valueChain/OpenSTValueInterface.sol → contracts/VcOpenSTValueInterface.sol b/...racts/valueChain/OpenSTValueInterface.sol → contracts/VcOpenSTValueInterface.sol
diff --git a/contracts/valueChain/SimpleStake.sol → contracts/VcSimpleStake.sol b/contracts/valueChain/SimpleStake.sol → contracts/VcSimpleStake.sol
diff --git a/contracts/v0.9.0_Staking.so_ b/contracts/v0.9.0_Staking.so_
diff --git a/contracts/v0.9.0_StakingData.so_ b/contracts/v0.9.0_StakingData.so_