fix: compass attestation with ERC20 tokens

x/evm/keeper/attest_test.go

@@ -570,7 +570,7 @@ var _ = g.Describe("attest router", func() {
 
 					g.When("target chain has no deployed ERC20 tokens", func() {
 						g.BeforeEach(func() {
-							gk.On("CastAllERC20ToDenoms", mock.Anything).Return(nil, nil)
+							gk.On("CastChainERC20ToDenoms", mock.Anything, mock.Anything).Return(nil, nil)
 						})
 						g.It("removes deployment", func() {
 							setupChainSupport()
@@ -590,10 +590,9 @@ var _ = g.Describe("attest router", func() {
 
 					g.When("target chain has active ERC20 tokens deployed", func() {
 						g.BeforeEach(func() {
-							gk.On("CastAllERC20ToDenoms", mock.Anything).Return([]types.ERC20Record{
+							gk.On("CastChainERC20ToDenoms", mock.Anything, newChain.ChainReferenceID).Return([]types.ERC20Record{
 								record{"denom", "address1", newChain.ChainReferenceID},
 								record{"denom2", "address2", newChain.ChainReferenceID},
-								record{"denom3", "address3", "unknown-chain"},
 							}, nil)
 						})
 						g.It("updates deployment", func() {

x/evm/keeper/attest_upload_smart_contract.go

@@ -101,7 +101,8 @@ func (a *uploadSmartContractAttester) attest(ctx sdk.Context, evidence *types.Tx
 		return err
 	}
 
-	records, err := a.k.Skyway.CastAllERC20ToDenoms(ctx)
+	// Get the ERC20 tokens just for this chain
+	records, err := a.k.Skyway.CastChainERC20ToDenoms(ctx, a.chainReferenceID)
 	if err != nil {
 		a.logger.WithError(err).Error("Failed to extract ERC20 records.")
 		return err
@@ -212,6 +213,13 @@ func (a *uploadSmartContractAttester) startTokenRelink(
 		})
 	}
 
+	// This shouldn't be needed anymore, since we query the ERC20 tokens for
+	// this specific chain. However, just to make double sure, we check the
+	// transfers. If there's none, just set the contract to active.
+	if len(transfers) == 0 {
+		return a.k.SetSmartContractAsActive(ctx, smartContractID, a.chainReferenceID)
+	}
+
 	deployment.Erc20Transfers = transfers
 	if err := a.k.updateSmartContractDeployment(ctx, smartContractID, a.chainReferenceID, deployment); err != nil {
 		a.logger.WithError(err).Error("Failed to update smart contract deployment")

x/evm/types/expected_keepers.go

@@ -61,6 +61,7 @@ type ERC20Record interface {
 type SkywayKeeper interface {
 	GetLastObservedSkywayNonce(ctx context.Context, chainReferenceID string) (uint64, error)
 	CastAllERC20ToDenoms(ctx context.Context) ([]ERC20Record, error)
+	CastChainERC20ToDenoms(ctx context.Context, chainReferenceID string) ([]ERC20Record, error)
 }
 
 //go:generate mockery --name=MetrixKeeper

x/skyway/keeper/cosmos-originated.go

@@ -83,6 +83,25 @@ func (k Keeper) CastAllERC20ToDenoms(ctx context.Context) ([]evmtypes.ERC20Recor
 	return cast, nil
 }
 
+func (k Keeper) CastChainERC20ToDenoms(
+	ctx context.Context,
+	chainReferenceID string,
+) ([]evmtypes.ERC20Record, error) {
+	all, err := k.GetAllERC20ToDenoms(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	cast := make([]evmtypes.ERC20Record, 0, len(all))
+	for _, v := range all {
+		if v.GetChainReferenceId() == chainReferenceID {
+			cast = append(cast, v)
+		}
+	}
+
+	return cast, nil
+}
+
 func (k Keeper) setDenomToERC20(ctx context.Context, chainReferenceId, denom string, tokenContract types.EthAddress) error {
 	store := k.GetStore(ctx, types.StoreModulePrefix)