@@ -39,12 +39,12 @@
-
+
-
-
-
+
+
+ <
diff --git a/app/scripts/controllers/transactionInfosController.js b/app/scripts/controllers/transactionInfosController.js
index 468ceae..6747825 100644
--- a/app/scripts/controllers/transactionInfosController.js
+++ b/app/scripts/controllers/transactionInfosController.js
@@ -1,87 +1,105 @@
-angular.module('ethExplorer')
- .controller('transactionInfosCtrl', function ($rootScope, $scope, $location, $routeParams,$q) {
-
- var web3 = $rootScope.web3;
-
- $scope.init=function()
- {
- $scope.txId=$routeParams.transactionId;
-
- if($scope.txId!==undefined) { // add a test to check if it match tx paterns to avoid useless API call, clients are not obliged to come from the search form...
-
- getTransactionInfos()
- .then(function(result){
- //TODO Refactor this logic, asynchron calls + services....
- var number = web3.eth.blockNumber;
-
- $scope.result = result;
-
- if(result.blockHash!==undefined){
- $scope.blockHash = result.blockHash;
- }
- else{
- $scope.blockHash ='pending';
- }
- if(result.blockNumber!==undefined){
- $scope.blockNumber = result.blockNumber;
- }
- else{
- $scope.blockNumber ='pending';
- }
- $scope.from = result.from;
- $scope.gas = result.gas;
- $scope.gasPrice = result.gasPrice.c[0] + " WEI";
- $scope.hash = result.hash;
- $scope.input = result.input; // that's a string
- $scope.nonce = result.nonce;
- $scope.to = result.to;
- $scope.transactionIndex = result.transactionIndex;
- $scope.ethValue = result.value.c[0] / 10000;
- $scope.txprice = (result.gas * result.gasPrice)/1000000000000000000 + " ETH";
- if($scope.blockNumber!==undefined){
- $scope.conf = number - $scope.blockNumber;
- if($scope.conf===0){
- $scope.conf='unconfirmed'; //TODO change color button when unconfirmed... ng-if or ng-class
- }
- }
- //TODO Refactor this logic, asynchron calls + services....
- if($scope.blockNumber!==undefined){
- var info = web3.eth.getBlock($scope.blockNumber);
- if(info!==undefined){
- $scope.time = info.timestamp;
- }
- }
-
- });
-
- }
-
-
-
- else{
- $location.path("/"); // add a trigger to display an error message so user knows he messed up with the TX number
- }
-
-
- function getTransactionInfos(){
- var deferred = $q.defer();
-
- web3.eth.getTransaction($scope.txId,function(error, result) {
- if(!error){
- deferred.resolve(result);
- }
- else{
- deferred.reject(error);
- }
- });
- return deferred.promise;
-
- }
-
-
-
- };
- $scope.init();
- console.log($scope.result);
-
- });
+angular.module('ethExplorer')
+ .controller('transactionInfosCtrl', function($rootScope, $scope, $location, $routeParams, $q) {
+
+ var web3 = $rootScope.web3;
+
+ $scope.init = function() {
+ $scope.txId = $routeParams.transactionId;
+
+ if ($scope.txId !== undefined) { // add a test to check if it match tx paterns to avoid useless API call, clients are not obliged to come from the search form...
+
+ getTransactionInfos()
+ .then(function(result) {
+ //TODO Refactor this logic, asynchron calls + services....
+ var number = web3.eth.blockNumber;
+
+ $scope.result = result;
+
+ if (result.blockHash !== undefined) {
+ $scope.blockHash = result.blockHash;
+ } else {
+ $scope.blockHash = 'pending';
+ }
+ if (result.blockNumber !== undefined) {
+ $scope.blockNumber = result.blockNumber;
+ } else {
+ $scope.blockNumber = 'pending';
+ }
+ $scope.from = result.from;
+ $scope.gas = result.gas;
+ $scope.gasPrice = result.gasPrice.c[0] + " WEI";
+ $scope.hash = result.hash;
+ $scope.input = result.input; // that's a string
+ $scope.nonce = result.nonce;
+ $scope.to = result.to;
+ $scope.transactionIndex = result.transactionIndex;
+ $scope.ethValue = result.value.c[0] / 10000;
+ $scope.txprice = (result.gas * result.gasPrice) / 1000000000000000000 + " ETH";
+ if ($scope.blockNumber !== undefined) {
+ $scope.conf = number - $scope.blockNumber;
+ if ($scope.conf === 0) {
+ $scope.conf = 'unconfirmed'; //TODO change color button when unconfirmed... ng-if or ng-class
+ }
+ }
+ //TODO Refactor this logic, asynchron calls + services....
+ if ($scope.blockNumber !== undefined) {
+ var info = web3.eth.getBlock($scope.blockNumber);
+ if (info !== undefined) {
+ $scope.time = info.timestamp;
+ }
+ }
+
+ // Display the converter button only if we have data
+ var inputData = result.input.trim();
+ if ((inputData.length == 0) || (inputData == '0x')) {
+ $scope.showButton = false;
+ } else {
+ $scope.showButton = true;
+ }
+
+ // Convert the input data from Hex to Ascii
+ $scope.$watch('toggle', function() {
+ $scope.toggleText = $scope.toggle ? 'Back to Raw' : 'Convert to Ascii';
+ if ($scope.toggleText == 'Back to Raw') {
+ $scope.input = convertToAscii(result.input);
+ } else {
+ $scope.input = result.input;
+ }
+ })
+
+ });
+
+ } else {
+ $location.path("/"); // add a trigger to display an error message so user knows he messed up with the TX number
+ }
+
+
+ function getTransactionInfos() {
+ var deferred = $q.defer();
+
+ web3.eth.getTransaction($scope.txId, function(error, result) {
+ if (!error) {
+ deferred.resolve(result);
+ } else {
+ deferred.reject(error);
+ }
+ });
+ return deferred.promise;
+
+ }
+
+ function convertToAscii(rawString) {
+ var hex = rawString.toString();
+ var convertedString = '';
+ for (var i = 0; i < rawString.length; i += 2) {
+ convertedString += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
+ }
+ return convertedString;
+ }
+
+
+ };
+ $scope.init();
+ console.log($scope.result);
+
+ });
diff --git a/app/styles/main.css b/app/styles/main.css
index c925240..72c875a 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -28,3 +28,12 @@
content: "";
padding: 0;
}
+
+#inputdata {
+ width: 100%;
+ resize: vertical;
+ font-size: small;
+ font-family: Monospace;
+ padding: 8px;
+ background-color: #EEEEEE;
+}
diff --git a/app/views/blockInfos.html b/app/views/blockInfos.html
index 03f8339..b6cebcd 100644
--- a/app/views/blockInfos.html
+++ b/app/views/blockInfos.html
@@ -8,7 +8,7 @@
Block
@@ -22,7 +22,7 @@
Block
| Block Number |
- {{number}} |
+ {{number}} |
| Received Time |
@@ -46,7 +46,7 @@ Block
| Miner |
- {{miner}} |
+ {{miner}} |
| Gas Limit |
@@ -79,15 +79,15 @@
| Hash # |
- {{tx.hash}} |
+ {{tx.hash}} |
| From |
- {{tx.from}} |
+ {{tx.from}} |
| To |
- {{tx.to}} |
+ {{tx.to}} |
| Gas |
diff --git a/app/views/main.html b/app/views/main.html
index b2f74af..30bda2c 100644
--- a/app/views/main.html
+++ b/app/views/main.html
@@ -3,7 +3,7 @@
Welcome to the Etherparty Block Explorer!
@@ -15,7 +15,7 @@
| Timestamp |
- | {{i.number}} |
+ {{i.number}} |
{{i.transactions.length}} |
{{i.size}} |
{{i.timestamp}} |
diff --git a/app/views/transactionInfos.html b/app/views/transactionInfos.html
index 40e59e9..d51293b 100644
--- a/app/views/transactionInfos.html
+++ b/app/views/transactionInfos.html
@@ -1,81 +1,88 @@
-
-
-
Transaction
- View information about an Ethereum transaction
-
-
-
-
-
-
-
-
-
-
- | Summary |
-
-
- | Block Hash |
- {{blockHash}} |
-
-
- | Received Time |
-
- {{time}}
- |
-
-
- | Included In Block |
-
- {{blockNumber}}
- |
-
-
- | Gas Used |
- {{gas}} |
-
-
- | Gas Price |
- {{gasPrice}} |
-
-
- | Number of transactions made by the sender prior to this one |
- {{nonce}} |
-
-
- | Transaction price |
- {{txprice}} |
-
-
- | Data |
- {{input}} |
-
-
-
-
-
-
-
-
+
+
Transaction
+ View information about an Ethereum transaction
+
+
+
+
+
+
+
+
+
+
+
+
+ | Summary |
+
+
+ | Block Hash |
+ {{blockHash}} |
+
+
+ | Received Time |
+
+ {{time}}
+ |
+
+
+ | Included In Block |
+
+ {{blockNumber}}
+ |
+
+
+ | Gas Used |
+ {{gas}} |
+
+
+ | Gas Price |
+ {{gasPrice}} |
+
+
+ | Number of transactions made by the sender prior to this one |
+ {{nonce}} |
+
+
+ | Transaction price |
+ {{txprice}} |
+
+
+ | Data |
+
+
+
+
+
+
+ |
+
+
+
+
+
+