return nil neither both op_ret nor inscription found

zeta-chain · Aug 21, 2024 · b341832 · b341832
1 parent 152b0d7
commit b341832
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/e2e/e2etests/test_extract_bitcoin_inscription_memo.go b/e2e/e2etests/test_extract_bitcoin_inscription_memo.go
@@ -25,6 +25,7 @@ func TestExtractBitcoinInscriptionMemo(r *runner.E2ERunner, args []string) {
 	require.NoError(r, err)
 
 	amount := parseFloat(r, args[0])
+	// this is just some random test memo for inscription
 	memo, err := hex.DecodeString(
 		"72f080c854647755d0d9e6f6821f6931f855b9acffd53d87433395672756d58822fd143360762109ab898626556b1c3b8d3096d2361f1297df4a41c1b429471a9aa2fc9be5f27c13b3863d6ac269e4b587d8389f8fd9649859935b0d48dea88cdb40f20c",
 	)

diff --git a/e2e/runner/bitcoin.go b/e2e/runner/bitcoin.go
@@ -303,7 +303,7 @@ func (r *E2ERunner) InscribeToTSSFromDeployerWithMemo(
 ) (*chainhash.Hash, error) {
 	// TODO: replace builder with Go function to enable instructions
 	// https://github.com/zeta-chain/node/issues/2759
-	builder := InscriptionBuilder{sidecarUrl: "http://bitcoin-node-sidecar:8000", client: http.Client{}}
+	builder := InscriptionBuilder{sidecarURL: "http://bitcoin-node-sidecar:8000", client: http.Client{}}
 
 	address, err := builder.GenerateCommitAddress(memo)
 	if err != nil {

diff --git a/e2e/runner/inscription.go b/e2e/runner/inscription.go
@@ -28,7 +28,7 @@ type revealRequest struct {
 
 // InscriptionBuilder is a util struct that help create inscription commit and reveal transactions
 type InscriptionBuilder struct {
-	sidecarUrl string
+	sidecarURL string
 	client     http.Client
 }
 
@@ -44,7 +44,7 @@ func (r *InscriptionBuilder) GenerateCommitAddress(memo []byte) (string, error)
 		return "", err
 	}
 
-	postUrl := r.sidecarUrl + "/commit"
+	postUrl := r.sidecarURL + "/commit"
 	req, err := http.NewRequest("POST", postUrl, bytes.NewBuffer(jsonData))
 	if err != nil {
 		return "", errors.Wrap(err, "cannot create commit request")
@@ -85,7 +85,7 @@ func (r *InscriptionBuilder) GenerateRevealTxn(to string, txnHash string, idx in
 		return "", err
 	}
 
-	postUrl := r.sidecarUrl + "/reveal"
+	postUrl := r.sidecarURL + "/reveal"
 	req, err := http.NewRequest("POST", postUrl, bytes.NewBuffer(jsonData))
 	if err != nil {
 		return "", errors.Wrap(err, "cannot create reveal request")

diff --git a/zetaclient/chains/bitcoin/observer/witness.go b/zetaclient/chains/bitcoin/observer/witness.go
@@ -58,7 +58,7 @@ func GetBtcEventWithWitness(
 		memo = candidate
 		logger.Debug().Msgf("GetBtcEventWithWitness: found inscription memo %s in tx %s", hex.EncodeToString(memo), tx.Txid)
 	} else {
-		return nil, errors.Errorf("error getting memo for inbound: %s", tx.Txid)
+		return nil, nil
 	}
 
 	// event found, get sender address