add asset symbol

diff --git a/docs/federation/federation.sql b/docs/federation/federation.sql
index 38d8107..23dc205 100644 (file)
--- a/docs/federation/federation.sql
+++ b/docs/federation/federation.sql
@@ -105,6 +105,7 @@ UNLOCK TABLES;
 CREATE TABLE `assets` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `asset_id` varchar(64) NOT NULL,
+  `symbol` varchar(64) NOT NULL,
   `issuance_program` varchar(64) NOT NULL,
   `vm_version` int(11) NOT NULL DEFAULT '1',
   `raw_definition_byte` text,
@@ -117,9 +118,9 @@ CREATE TABLE `assets` (
 LOCK TABLES `assets` WRITE;
 /*!40000 ALTER TABLE `assets` DISABLE KEYS */;
 
-INSERT INTO `assets` (`id`, `asset_id`, `issuance_program`, `vm_version`, `raw_definition_byte`, `created_at`, `updated_at`)
+INSERT INTO `assets` (`id`, `asset_id`, `symbol`, `issuance_program`, `vm_version`, `raw_definition_byte`, `created_at`, `updated_at`)
 VALUES
-  (1,'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff','',1,'7b0a202022646563696d616c73223a20382c0a2020226465736372697074696f6e223a20224279746f6d204f6666696369616c204973737565222c0a2020226e616d65223a202242544d222c0a20202273796d626f6c223a202242544d220a7d','2018-09-13 05:10:43','2018-11-27 09:43:35');
+  (1,'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff','btm',1,'7b0a202022646563696d616c73223a20382c0a2020226465736372697074696f6e223a20224279746f6d204f6666696369616c204973737565222c0a2020226e616d65223a202242544d222c0a20202273796d626f6c223a202242544d220a7d','2018-09-13 05:10:43','2018-11-27 09:43:35');
 
 /*!40000 ALTER TABLE `assets` ENABLE KEYS */;
 UNLOCK TABLES;
\ No newline at end of file

diff --git a/federation/database/orm/asset.go b/federation/database/orm/asset.go
index 1672ce9..e51ea66 100644 (file)
--- a/federation/database/orm/asset.go
+++ b/federation/database/orm/asset.go
@@ -7,6 +7,7 @@ import (
 type Asset struct {
        ID              uint64          `gorm:"primary_key;foreignkey:ID" json:"-"`
        AssetID         string          `json:"asset_id"`
+       Symbol          string          `json:"symbol"`
        IssuanceProgram string          `json:"-"`
        VMVersion       uint64          `json:"-"`
        Definition      string          `json:"-"`

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 0875fe3..853e9ce 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -313,8 +313,13 @@ func (m *mainchainKeeper) processIssuing(txs []*types.Tx) error {
                                        continue
                                }
 
+                               var def struct {
+                                       Symbol string `json:"symbol"`
+                               }
+                               json.Unmarshal(inp.AssetDefinition, &def)
                                m.assetStore.Add(&orm.Asset{
                                        AssetID:         assetID.String(),
+                                       Symbol:          strings.ToUpper(def.Symbol),
                                        IssuanceProgram: hex.EncodeToString(inp.IssuanceProgram),
                                        VMVersion:       inp.VMVersion,
                                        Definition:      string(inp.AssetDefinition),