Merge commit '8e59bb0c6a92e708c798818c4a5bddfd2e383588' into developm…

…ent_bscmultisig
threefoldfoundation · Jul 28, 2023 · 14e6522 · 14e6522
2 parents 894a9a4 + 8e59bb0
commit 14e6522
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/publish_binaries.yml b/.github/workflows/publish_binaries.yml
@@ -22,13 +22,19 @@ jobs:
       - name: compress accountactivation
         run: cd dist && tar -czf accountactivation_linux_amd64.tar.gz accountactivation
 
+      - name: build stellar-evm bridge
+        run: cd bridges/stellar-evm && GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.Version=${{ github.ref }}'" -o ../../dist/
+
+      - name: compress stellar-evm bridge
+        run: cd dist && tar -czf stellarevmbridge_linux_amd64.tar.gz stellar-evm
+
       - name: Get release
         id: get_release
         uses: bruceadams/[email protected]
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Upload accountactivation release binary
+      - name: Upload accountactivation binary
         uses: actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -37,3 +43,14 @@ jobs:
           asset_path: ./dist/accountactivation_linux_amd64.tar.gz
           asset_name: accountactivation_linux_amd64.tar.gz
           asset_content_type: application/gzip
+
+
+      - name: Upload stellar-evm bridge binary
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./dist/stellarevmbridge_linux_amd64.tar.gz
+          asset_name: stellarevmbridge_linux_amd64.tar.gz
+          asset_content_type: application/gzip
diff --git a/bridges/stellar-evm/api/bridge/signer_server.go b/bridges/stellar-evm/api/bridge/signer_server.go
@@ -354,10 +354,10 @@ func (s *SignerService) validateRefundTransaction(request multisig.StellarSignRe
 				}
 			}
 		}
+	}
 
-		if stellar.DecimalToStroops(depositedAmount) != (refundAmountWithoutPenalty + WithdrawFee) {
-			return errors.Wrap(ErrInvalidTransaction, "The refunded amount does not match the deposit")
-		}
+	if stellar.DecimalToStroops(depositedAmount) != (refundAmountWithoutPenalty + WithdrawFee) {
+		return errors.Wrapf(ErrInvalidTransaction, "The refunded amount %s does not match the deposit %s minus the penalty", stellar.StroopsToDecimal(refundAmountWithoutPenalty), depositedAmount)
 	}
 
 	return nil

diff --git a/bridges/stellar-evm/main.go b/bridges/stellar-evm/main.go
@@ -16,8 +16,14 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
+var Version = "development"
+
 func main() {
 
+	if len(os.Args) > 1 && os.Args[1] == "version" {
+		fmt.Println(Version)
+		return
+	}
 	var bridgeCfg bridge.BridgeConfig
 	var stellarCfg stellar.StellarConfig
 	var ethCfg bridge.EthConfig

diff --git a/bridges/stellar-evm/stellar/wallet.go b/bridges/stellar-evm/stellar/wallet.go
@@ -313,12 +313,12 @@ func (w *Wallet) refundDeposit(ctx context.Context, totalAmount uint64, sender s
 
 	err := w.CreateAndSubmitRefund(ctx, sender, amount, tx.Hash, true)
 	for err != nil {
-		log.Error("error while refunding", "err", err.Error(), "amount", StroopsToDecimal(int64(totalAmount)))
+		log.Error("error while refunding", "err", err.Error(), "amount", StroopsToDecimal(int64(totalAmount)), "tx", tx.Hash)
 		select {
 		case <-ctx.Done():
 			return
 		case <-time.After(10 * time.Second):
-			err = w.CreateAndSubmitRefund(ctx, tx.Account, amount, tx.Hash, true)
+			err = w.CreateAndSubmitRefund(ctx, sender, amount, tx.Hash, true)
 		}
 	}
 

diff --git a/ethereum/helmchart/tftethbridge/Chart.yaml b/ethereum/helmchart/tftethbridge/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: tftethbridge
 description: TFT stellar-ethereum bridge
 type: application
-version: 0.3.6
-appVersion: "1.3.3"
+version: 0.3.7
+appVersion: "1.4.1"