fixed a bug with filtering out fungibleToken deposit/transfer events …

…and fixed fee receipient on previewnet
bjartek · Feb 28, 2024 · debbac8 · debbac8
1 parent 1211fec
commit debbac8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/event.go b/event.go
@@ -222,7 +222,7 @@ func (overflowEvents OverflowEvents) FilterTempWithdrawDeposit() OverflowEvents
 	return filteredEvents
 }
 
-var feeReceipients = []string{"0xf919ee77447b7497", "0x912d5440f7e3769e", "0xe5a8b7f23e8b548f"}
+var feeReceipients = []string{"0xf919ee77447b7497", "0x912d5440f7e3769e", "0xe5a8b7f23e8b548f", "0xab086ce9cc29fc80"}
 
 // Filtter out fee events
 func (overflowEvents OverflowEvents) FilterFees(fee float64, payer string) OverflowEvents {
@@ -245,6 +245,8 @@ func (overflowEvents OverflowEvents) FilterFees(fee float64, payer string) Overf
 				if ok && amount == fee && from == payer {
 					continue
 				}
+
+				withDrawnEvents = append(withDrawnEvents, value)
 			}
 			if len(withDrawnEvents) != 0 {
 				filteredEvents[name] = withDrawnEvents
@@ -254,7 +256,7 @@ func (overflowEvents OverflowEvents) FilterFees(fee float64, payer string) Overf
 		}
 
 		if strings.HasSuffix(name, ".FungibleToken.Deposited") {
-			withDrawnEvents := []OverflowEvent{}
+			depositEvents := []OverflowEvent{}
 			for _, value := range events {
 				ftType := value.Fields["type"].(string)
 				if !strings.HasSuffix(ftType, "FlowToken.Vault") {
@@ -266,13 +268,15 @@ func (overflowEvents OverflowEvents) FilterFees(fee float64, payer string) Overf
 				if ok && amount == fee && slices.Contains(feeReceipients, to) {
 					continue
 				}
+				depositEvents = append(depositEvents, value)
 			}
-			if len(withDrawnEvents) != 0 {
-				filteredEvents[name] = withDrawnEvents
+			if len(depositEvents) != 0 {
+				filteredEvents[name] = depositEvents
 			} else {
 				delete(filteredEvents, name)
 			}
 		}
+
 		if strings.HasSuffix(name, "FlowToken.TokensWithdrawn") {
 
 			withDrawnEvents := []OverflowEvent{}

diff --git a/event_integration_test.go b/event_integration_test.go
@@ -20,7 +20,7 @@ func TestIntegrationEvents(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 
 		_, err = g.FetchEvents(
 			WithEndIndex(2),
@@ -39,7 +39,7 @@ func TestIntegrationEvents(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 		ev, err := g.FetchEvents(WithLastBlocks(2), WithEvent("A.0ae53cb6e3f42a79.FlowToken.TokensMinted"))
 		assert.NoError(t, err)
 		assert.Equal(t, 2, len(ev))
@@ -53,14 +53,14 @@ func TestIntegrationEvents(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 
 		g.Tx("mint_tokens",
 			WithSignerServiceAccount(),
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 
 		ev, err := g.FetchEvents(WithLastBlocks(2), WithEvent("A.0ae53cb6e3f42a79.FlowToken.TokensMinted"))
 		assert.NoError(t, err)
@@ -76,7 +76,7 @@ func TestIntegrationEvents(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 
 		ev, err := g.FetchEvents(WithEvent("A.0ae53cb6e3f42a79.FlowToken.TokensMinted"), WithTrackProgressIn("progress"))
 		defer os.Remove("progress")
@@ -108,7 +108,7 @@ func TestIntegrationEvents(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.0),
 		).AssertSuccess(t).
-			AssertEventCount(t, 3)
+			AssertEventCount(t, 4)
 
 		ev, err := g.FetchEvents(WithEvent("A.0ae53cb6e3f42a79.FlowToken.TokensMinted"), WithTrackProgressIn("progress"))
 		defer os.Remove("progress")

diff --git a/interaction_builder.go b/interaction_builder.go
@@ -619,7 +619,6 @@ func (oib OverflowInteractionBuilder) Send() *OverflowResult {
 		if oib.Overflow.FilterOutFeeEvents && fee != nil {
 			overflowEvents = overflowEvents.FilterFees(fee.(float64), fmt.Sprintf("0x%s", result.Transaction.Payer.Hex()))
 		}
-
 		if oib.Overflow.FilterOutEmptyWithDrawDepositEvents {
 			overflowEvents = overflowEvents.FilterTempWithdrawDeposit()
 		}

diff --git a/transaction_integration_test.go b/transaction_integration_test.go
@@ -28,12 +28,13 @@ func TestTransactionIntegration(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.1)).
 			AssertSuccess(t).
-			AssertEventCount(t, 3).
-			AssertEmitEventName(t, "FlowToken.TokensDeposited").
+			AssertEventCount(t, 4).
 			AssertEvent(t, "FlowToken.TokensDeposited", map[string]interface{}{
 				"amount": 100.1,
-			},
-			)
+			}).
+			AssertEvent(t, "FungibleToken.Deposited", map[string]interface{}{
+				"amount": 100.1,
+			})
 		require.NoError(t, result.Err)
 
 		oTx, err := o.GetOverflowTransactionById(context.Background(), result.Transaction.ID())
@@ -69,13 +70,13 @@ func TestTransactionIntegration(t *testing.T) {
 			WithArg("recipient", "first"),
 			WithArg("amount", 100.1)).
 			AssertSuccess(t).
-			AssertEventCount(t, 3).
+			AssertEventCount(t, 4).
 			AssertEmitEventName(t, "FlowToken.TokensDeposited").
 			AssertEvent(t, "FlowToken.TokensDeposited", map[string]interface{}{
 				"amount": 100.1,
 			},
 			)
-		assert.Equal(t, 1, len(result.GetEventsWithName("TokensDeposited")))
+		assert.Equal(t, 1, len(result.GetEventsWithName("FungibleToken.Deposited")))
 
 		report := o.GetCoverageReport()
 		assert.Equal(t, "18.5%", report.Summary().Coverage)