modify listener

b2network · Oct 21, 2024 · 68eaad4 · 68eaad4
1 parent 0566042
commit 68eaad4
Show file tree

Hide file tree

Showing 98 changed files with 44,129 additions and 1,876 deletions.
diff --git a/README.md b/README.md
diff --git a/applications/cmd/builder/main.go b/applications/cmd/builder/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/initiates"
-	"bsquared.network/b2-message-sharing-applications/internal/serves/builder"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/initiates"
+	"bsquared.network/message-sharing-applications/internal/serves/builder"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
 	"encoding/json"
 	"flag"
 	"fmt"

diff --git a/applications/cmd/listener/main.go b/applications/cmd/listener/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/initiates"
-	"bsquared.network/b2-message-sharing-applications/internal/serves/listener/bitcoin"
-	"bsquared.network/b2-message-sharing-applications/internal/serves/listener/ethereum"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/initiates"
+	"bsquared.network/message-sharing-applications/internal/serves/listener/bitcoin"
+	"bsquared.network/message-sharing-applications/internal/serves/listener/ethereum"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
 	"encoding/json"
 	"flag"
 	"fmt"

diff --git a/applications/cmd/proposer/main.go b/applications/cmd/proposer/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/initiates"
-	"bsquared.network/b2-message-sharing-applications/internal/serves/proposer"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
-	"bsquared.network/b2-message-sharing-applications/internal/vo"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/initiates"
+	"bsquared.network/message-sharing-applications/internal/serves/proposer"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/vo"
 	"encoding/json"
 	"flag"
 	"fmt"

diff --git a/applications/cmd/validator/main.go b/applications/cmd/validator/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/initiates"
-	"bsquared.network/b2-message-sharing-applications/internal/serves/validator"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
-	"bsquared.network/b2-message-sharing-applications/internal/vo"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/initiates"
+	"bsquared.network/message-sharing-applications/internal/serves/validator"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/vo"
 	"encoding/json"
 	"flag"
 	"fmt"

diff --git a/applications/go.mod b/applications/go.mod
@@ -1,4 +1,4 @@
-module bsquared.network/b2-message-sharing-applications
+module bsquared.network/message-sharing-applications
 
 go 1.22
 

diff --git a/applications/internal/config/config.go b/applications/internal/config/config.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/enums"
 	"fmt"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"

diff --git a/applications/internal/initiates/db.go b/applications/internal/initiates/db.go
@@ -1,7 +1,7 @@
 package initiates
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/config"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"

diff --git a/applications/internal/models/deposit.go b/applications/internal/models/deposit.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/enums"
 	"time"
 )
 

diff --git a/applications/internal/models/messages.go b/applications/internal/models/messages.go
@@ -1,6 +1,6 @@
 package models
 
-import "bsquared.network/b2-message-sharing-applications/internal/enums"
+import "bsquared.network/message-sharing-applications/internal/enums"
 
 type Message struct {
 	Base

diff --git a/applications/internal/models/signatures.go b/applications/internal/models/signatures.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/enums"
 	"github.com/shopspring/decimal"
 )
 

diff --git a/applications/internal/models/sync_tasks.go b/applications/internal/models/sync_tasks.go
@@ -1,6 +1,6 @@
 package models
 
-import "bsquared.network/b2-message-sharing-applications/internal/enums"
+import "bsquared.network/message-sharing-applications/internal/enums"
 
 type SyncTask struct {
 	Base

diff --git a/applications/internal/serves/builder/builder.go b/applications/internal/serves/builder/builder.go
@@ -1,11 +1,11 @@
 package builder
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
-	"bsquared.network/b2-message-sharing-applications/internal/models"
-	msg "bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/message"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/models"
+	msg "bsquared.network/message-sharing-applications/internal/utils/ethereum/message"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
 	"bytes"
 	"context"
 	"crypto/ecdsa"

diff --git a/applications/internal/serves/listener/bitcoin/bitcoin.go b/applications/internal/serves/listener/bitcoin/bitcoin.go
@@ -1,13 +1,13 @@
 package bitcoin
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
-	"bsquared.network/b2-message-sharing-applications/internal/models"
-	"bsquared.network/b2-message-sharing-applications/internal/types"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/aa"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/message"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/models"
+	"bsquared.network/message-sharing-applications/internal/types"
+	"bsquared.network/message-sharing-applications/internal/utils/aa"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/message"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
 	"bytes"
 	"context"
 	"encoding/hex"

diff --git a/applications/internal/serves/listener/ethereum/ethereum.go b/applications/internal/serves/listener/ethereum/ethereum.go
@@ -1,12 +1,12 @@
 package ethereum
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
-	"bsquared.network/b2-message-sharing-applications/internal/models"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/event"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/event/message"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/models"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/event"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/event/message"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
 	"context"
 	"fmt"
 	"github.com/ethereum/go-ethereum"
@@ -235,6 +235,7 @@ func (l *EthereumListener) handEvent() {
 		handles := make(map[string]bool)
 
 		var Type enums.MessageType
+		var FromMessageBridge string
 		var FromChainId int64
 		var FromSender string
 		var FromId string
@@ -259,6 +260,7 @@ func (l *EthereumListener) handEvent() {
 					time.Sleep(duration)
 					continue
 				}
+				FromMessageBridge = event.ContractAddress
 				FromChainId = messageCall.FromChainId
 				FromSender = messageCall.FromSender
 				FromId = common.BytesToHash(messageCall.FromId.BigInt().Bytes()).Hex()
@@ -279,17 +281,30 @@ func (l *EthereumListener) handEvent() {
 				FromId = common.BytesToHash(messageSend.FromId.BigInt().Bytes()).Hex()
 				ToChainId = messageSend.ToChainId
 				ToContractAddress = messageSend.ContractAddress
+				ToMessageBridge = event.ContractAddress
 				ToBytes = messageSend.Bytes
 				Type = enums.MessageTypeSend
 				status = enums.MessageStatusPending
 			}
 
-			messageBridge, ok := l.bridges[ToChainId]
-			if ok {
-				ToMessageBridge = messageBridge
-			} else {
-				invalids = append(invalids, event.Id)
-				continue
+			if FromMessageBridge == "" {
+				messageBridge, ok := l.bridges[FromChainId]
+				if ok {
+					FromMessageBridge = messageBridge
+				} else {
+					invalids = append(invalids, event.Id)
+					continue
+				}
+			}
+
+			if ToMessageBridge == "" {
+				messageBridge, ok := l.bridges[ToChainId]
+				if ok {
+					ToMessageBridge = messageBridge
+				} else {
+					invalids = append(invalids, event.Id)
+					continue
+				}
 			}
 
 			var message models.Message
@@ -305,7 +320,7 @@ func (l *EthereumListener) handEvent() {
 					Type:              Type,
 					FromChainId:       FromChainId,
 					FromSender:        FromSender,
-					FromMessageBridge: event.ContractAddress,
+					FromMessageBridge: FromMessageBridge,
 					FromId:            FromId,
 					ToChainId:         ToChainId,
 					ToMessageBridge:   ToMessageBridge,

diff --git a/applications/internal/serves/proposer/proposer.go b/applications/internal/serves/proposer/proposer.go
@@ -1,13 +1,13 @@
 package proposer
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
-	"bsquared.network/b2-message-sharing-applications/internal/models"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/message"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/tx"
-	"bsquared.network/b2-message-sharing-applications/internal/vo"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/models"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/message"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/utils/tx"
+	"bsquared.network/message-sharing-applications/internal/vo"
 	"bufio"
 	"context"
 	"crypto/ecdsa"

diff --git a/applications/internal/serves/validator/validator.go b/applications/internal/serves/validator/validator.go
@@ -1,12 +1,12 @@
 package validator
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/message"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/log"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/tx"
-	"bsquared.network/b2-message-sharing-applications/internal/vo"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/message"
+	"bsquared.network/message-sharing-applications/internal/utils/log"
+	"bsquared.network/message-sharing-applications/internal/utils/tx"
+	"bsquared.network/message-sharing-applications/internal/vo"
 	"bufio"
 	"context"
 	"crypto/ecdsa"

diff --git a/applications/internal/utils/aa/aa.go b/applications/internal/utils/aa/aa.go
@@ -1,7 +1,7 @@
 package aa
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/utils/particle"
+	"bsquared.network/message-sharing-applications/internal/utils/particle"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"

diff --git a/applications/internal/utils/ethereum/event/message/call.go b/applications/internal/utils/ethereum/event/message/call.go
@@ -1,7 +1,7 @@
 package message
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/event"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/event"
 	"encoding/json"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"

diff --git a/applications/internal/utils/ethereum/event/message/send.go b/applications/internal/utils/ethereum/event/message/send.go
@@ -1,7 +1,7 @@
 package message
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/event"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/event"
 	"encoding/json"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"

diff --git a/applications/internal/utils/tx/tx.go b/applications/internal/utils/tx/tx.go
@@ -1,11 +1,11 @@
 package tx
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/config"
-	"bsquared.network/b2-message-sharing-applications/internal/types"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/aa"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/event"
-	"bsquared.network/b2-message-sharing-applications/internal/utils/ethereum/message"
+	"bsquared.network/message-sharing-applications/internal/config"
+	"bsquared.network/message-sharing-applications/internal/types"
+	"bsquared.network/message-sharing-applications/internal/utils/aa"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/event"
+	"bsquared.network/message-sharing-applications/internal/utils/ethereum/message"
 	"bytes"
 	"context"
 	"encoding/hex"

diff --git a/applications/internal/vo/vo.go b/applications/internal/vo/vo.go
@@ -1,7 +1,7 @@
 package vo
 
 import (
-	"bsquared.network/b2-message-sharing-applications/internal/enums"
+	"bsquared.network/message-sharing-applications/internal/enums"
 	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/ethereum/go-ethereum/ethclient"
 )