fix: position token address

taikoxyz · Feb 5, 2025 · 66a6c46 · 66a6c46
1 parent f14306c
commit 66a6c46
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/adapters/adapters.go b/adapters/adapters.go
@@ -59,7 +59,8 @@ type Lock struct {
 	TxHash        common.Hash
 }
 
-// Position is used for logx trading campaign
+// Position is used for airdrop or trading campaign.
+// For examples, see Avalon.
 type Position struct {
 	User          common.Address
 	TokenAmount   *big.Int

diff --git a/adapters/projects/avalon/claim.go b/adapters/projects/avalon/claim.go
@@ -16,9 +16,9 @@ import (
 
 const (
 	// TODO: update
-	AvalonAirdropContractAddress string = "0x46f0a2e45bee8e9ebfdb278ce06caa6af294c349"
-	AvalonTokenAddress           string = "0x46f0a2e45bee8e9ebfdb278ce06caa6af294c349"
-	AvalonTokenDecimal                  = 18
+	AvalonAirdropAddress string = "0x46f0a2e45bee8e9ebfdb278ce06caa6af294c349"
+	AvalonTokenAddress   string = "0x46f0a2e45bee8e9ebfdb278ce06caa6af294c349"
+	AvalonTokenDecimal          = 18
 
 	logTransferSignature string = "Transfer(address,address,uint256)"
 )
@@ -44,19 +44,19 @@ func (indexer *ClaimIndexer) Addresses() []common.Address {
 }
 
 func (indexer *ClaimIndexer) Index(ctx context.Context, logs ...types.Log) ([]adapters.Position, error) {
+	var transferEvent struct {
+		Value *big.Int
+	}
+
 	var claims []adapters.Position
 
 	for _, l := range logs {
 		if !indexer.isTransfer(l) {
 			continue
 		}
 
-		var transferEvent struct {
-			Value *big.Int
-		}
-
-		to := common.BytesToAddress(l.Topics[2].Bytes()[12:])
 		from := common.BytesToAddress(l.Topics[1].Bytes()[12:])
+		to := common.BytesToAddress(l.Topics[2].Bytes()[12:])
 
 		if from.Hex() != indexer.contract.Hex() {
 			continue
@@ -81,7 +81,7 @@ func (indexer *ClaimIndexer) Index(ctx context.Context, logs ...types.Log) ([]ad
 			User:          to,
 			TokenAmount:   transferEvent.Value,
 			TokenDecimals: AvalonTokenDecimal,
-			Token:         common.HexToAddress(adapters.TaikoTokenAddress),
+			Token:         common.HexToAddress(AvalonTokenAddress),
 			BlockTime:     block.Time(),
 			BlockNumber:   block.NumberU64(),
 			TxHash:        l.TxHash,

diff --git a/adapters/projects/avalon/claim_test.go b/adapters/projects/avalon/claim_test.go
@@ -22,7 +22,7 @@ func TestClaimIndexer(t *testing.T) {
 	client, err := ethclient.Dial(taikoRPC)
 	require.NoError(t, err)
 
-	indexer := avalon.NewClaimIndexer(client, common.HexToAddress(avalon.AvalonAirdropContractAddress), []common.Address{common.HexToAddress(avalon.AvalonTokenAddress)})
+	indexer := avalon.NewClaimIndexer(client, common.HexToAddress(avalon.AvalonAirdropAddress), []common.Address{common.HexToAddress(avalon.AvalonTokenAddress)})
 
 	logs, err := adapters.GetLogs(ctx, client, indexer.Addresses(), blocknumber)
 	require.NoError(t, err)

diff --git a/cmd/adapter.go b/cmd/adapter.go
@@ -23,6 +23,8 @@ const (
 	RobinosPrediction        adapter = "RobinosPrediction"
 	LoopringLock             adapter = "LoopringLock"
 	PolarisLP                adapter = "PolarisLP"
+	DoraHacksVoting          adapter = "DoraHacksVoting"
+	AvalonClaim              adapter = "AvalonClaim"
 )
 
 func adapterz() []adapter {
@@ -43,5 +45,7 @@ func adapterz() []adapter {
 		RobinosPrediction,
 		LoopringLock,
 		PolarisLP,
+		DoraHacksVoting,
+		AvalonClaim,
 	}
 }
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -13,8 +13,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/taikoxyz/trailblazer-adapters/adapters"
 	nftdeployed "github.com/taikoxyz/trailblazer-adapters/adapters/nft_deployed"
+	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/avalon"
 	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/conft"
 	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/domains"
+	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/dorahacks"
 	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/drips"
 	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/gaming"
 	"github.com/taikoxyz/trailblazer-adapters/adapters/projects/izumi"
@@ -201,6 +203,19 @@ func executeCommand(p prompt) error {
 			[]common.Address{common.HexToAddress(polaris.VaultAddress)},
 		)
 		return processLog(ctx, client, indexer, p.Blocknumber)
+	case DoraHacksVoting:
+		indexer := dorahacks.NewVotingIndexer(
+			client,
+			[]common.Address{common.HexToAddress(dorahacks.VotingAddress)},
+		)
+		return processLog(ctx, client, indexer, p.Blocknumber)
+	case AvalonClaim:
+		indexer := avalon.NewClaimIndexer(
+			client,
+			common.HexToAddress(avalon.AvalonAirdropAddress),
+			[]common.Address{common.HexToAddress(avalon.AvalonTokenAddress)},
+		)
+		return processLog(ctx, client, indexer, p.Blocknumber)
 
 	default:
 		return fmt.Errorf("adapter %s is not supported", p.Adapter)