fix

diff --git a/docs/federation/federation.sql b/docs/federation/federation.sql
index b2613c5..aab74dd 100644 (file)
--- a/docs/federation/federation.sql
+++ b/docs/federation/federation.sql
@@ -17,7 +17,7 @@ USE `federation`;
 
 CREATE TABLE `warders` (
   `id` tinyint(1) NOT NULL AUTO_INCREMENT,
-  `pubkey` varchar(64) NOT NULL,
+  `pubkey` varchar(128) NOT NULL,
   `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
   `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),

diff --git a/federation/warder.go b/federation/warder.go
index 8d4b312..0ace037 100644 (file)
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -210,7 +210,8 @@ func (w *warder) buildSidechainTx(ormTx *orm.CrossTransaction) (*vaporTypes.Tx,
        destTx := vaporTypes.NewTx(*destTxData)
        w.addInputWitness(destTx)
 
-       if err := w.db.Model(&orm.CrossTransaction{}).Where(&orm.CrossTransaction{ID: ormTx.ID}).
+       if err := w.db.Model(&orm.CrossTransaction{}).
+               Where(&orm.CrossTransaction{ID: ormTx.ID}).
                UpdateColumn(&orm.CrossTransaction{
                        DestTxHash: sql.NullString{destTx.ID.String(), true},
                }).Error; err != nil {
@@ -288,15 +289,17 @@ func (w *warder) submitTx(destTx interface{}) (string, error) {
        }
 }
 
-func (w *warder) updateSubmission(tx *orm.CrossTransaction) error {
-       if err := w.db.Where(tx).UpdateColumn(&orm.CrossTransaction{
-               Status: common.CrossTxSubmittedStatus,
-       }).Error; err != nil {
+func (w *warder) updateSubmission(ormTx *orm.CrossTransaction) error {
+       if err := w.db.Model(&orm.CrossTransaction{}).
+               Where(&orm.CrossTransaction{ID: ormTx.ID}).
+               UpdateColumn(&orm.CrossTransaction{
+                       Status: common.CrossTxSubmittedStatus,
+               }).Error; err != nil {
                return err
        }
 
        for _, remote := range w.remotes {
-               remote.NotifySubmission(tx)
+               remote.NotifySubmission(ormTx)
        }
        return nil
 }