From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:48:16 +0000 (+0800)
Subject: fix chain keepers (#279)
X-Git-Tag: v1.0.5~142
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=ee7f4e1c5c376bd3be83beb9cac3aa38c1fdf848

fix chain keepers (#279)

* fix sidechain_keeper initialization

* fix sql schema

* fix(federation): fix readme
---

diff --git a/docs/federation/README-en.md b/docs/federation/README-en.md
index 982a0a7b..392e2a29 100644
--- a/docs/federation/README-en.md
+++ b/docs/federation/README-en.md
@@ -24,13 +24,7 @@ A `fed_cfg.json` would look like this:
         },
         "log_mode" : true
     },
-    "warders" : [
-        {
-            "position" : 1,
-            "xpub" : "50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"
-        }
-    ],
-    "quorum": 1,
+    "federation_prog" : "0020305dc12c0dbec0c1dc1f30e835034c1f19094c06afb0eb953a6d1af42222a721",
     "mainchain" : {
         "name" : "bytom",
         "confirmations" : 10,
diff --git a/docs/federation/federation.sql b/docs/federation/federation.sql
index 38d8107a..0e190429 100644
--- a/docs/federation/federation.sql
+++ b/docs/federation/federation.sql
@@ -105,9 +105,9 @@ UNLOCK TABLES;
 CREATE TABLE `assets` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `asset_id` varchar(64) NOT NULL,
-  `issuance_program` varchar(64) NOT NULL,
+  `issuance_program` varchar(128) NOT NULL,
   `vm_version` int(11) NOT NULL DEFAULT '1',
-  `raw_definition_byte` text,
+  `definition` text,
   `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
@@ -117,9 +117,16 @@ 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`, `issuance_program`, `vm_version`, `definition`, `created_at`, `updated_at`)
 VALUES
-  (1,'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff','',1,'7b0a202022646563696d616c73223a20382c0a2020226465736372697074696f6e223a20224279746f6d204f6666696369616c204973737565222c0a2020226e616d65223a202242544d222c0a20202273796d626f6c223a202242544d220a7d','2018-09-13 05:10:43','2018-11-27 09:43:35');
+  (1,'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff','',1,
+  '{
+    "decimals": 8,
+    "description": "Bytom Official Issue",
+    "name": "BTM",
+    "symbol": "BTM"
+  }',
+  '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/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go
index d7f2acc4..7f2f9d6a 100644
--- a/federation/synchron/sidechain_keeper.go
+++ b/federation/synchron/sidechain_keeper.go
@@ -39,6 +39,7 @@ func NewSidechainKeeper(db *gorm.DB, assetStore *database.AssetStore, cfg *confi
 		db:         db,
 		node:       service.NewNode(cfg.Sidechain.Upstream),
 		assetStore: assetStore,
+		chainID:    chain.ID,
 	}
 }