fixing silly types

JackalLabs · Sep 16, 2024 · 04bb5f1 · 04bb5f1
1 parent 7f5b3e1
commit 04bb5f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/config/config.go b/config/config.go
@@ -21,8 +21,8 @@ type NetworkConfig struct {
 	Name     string `yaml:"name" mapstructure:"name"`
 	RPC      string `yaml:"rpc" mapstructure:"rpc"`
 	Contract string `yaml:"contract" mapstructure:"contract"`
-	ChainID  int64  `yaml:"chain_id" mapstructure:"chain_id"`
-	Finality int64  `yaml:"finality" mapstructure:"finality"`
+	ChainID  uint64 `yaml:"chain_id" mapstructure:"chain_id"`
+	Finality uint64 `yaml:"finality" mapstructure:"finality"`
 }
 
 func DefaultConfig() Config {

diff --git a/relay/abi.go b/relay/abi.go
@@ -75,7 +75,7 @@ func init() {
 	}
 }
 
-func handleLog(vLog *types.Log, w *wallet.Wallet, q *uploader.Queue, chainID int64, jackalContract string) {
+func handleLog(vLog *types.Log, w *wallet.Wallet, q *uploader.Queue, chainID uint64, jackalContract string) {
 	event := struct {
 		Sender common.Address
 		Merkle string
@@ -172,7 +172,7 @@ func handleLog(vLog *types.Log, w *wallet.Wallet, q *uploader.Queue, chainID int
 	log.Println(res.TxHash)
 }
 
-func chainRep(id int64) string {
+func chainRep(id uint64) string {
 	s := ChainIDS[id]
 	if len(s) == 0 {
 		return fmt.Sprintf("%d", id)

diff --git a/relay/app.go b/relay/app.go
@@ -243,7 +243,7 @@ func subscribeLogs(client *ethclient.Client, query ethereum.FilterQuery) (ethere
 }
 
 // waitForReceipt polls for the transaction receipt until it's available
-func waitForReceipt(client *ethclient.Client, txHash common.Hash, chainId, finality int64, callBack func(receipt *types.Receipt)) error {
+func waitForReceipt(client *ethclient.Client, txHash common.Hash, chainId, finality uint64, callBack func(receipt *types.Receipt)) error {
 	var errCount int64
 	for {
 		if errCount > 30 {
@@ -259,17 +259,16 @@ func waitForReceipt(client *ethclient.Client, txHash common.Hash, chainId, final
 			continue
 		}
 
-		latestBlock, err := client.BlockByNumber(context.Background(), nil)
+		latestBlock, err := client.BlockNumber(context.Background())
 		if err != nil {
 			log.Printf("cannot get current height | %s", err.Error())
 			errCount++
 			continue
 		}
 
-		latest := latestBlock.Number().Int64()
-		txBlock := receipt.BlockNumber.Int64()
+		txBlock := receipt.BlockNumber.Uint64()
 
-		blockDiff := latest - txBlock
+		blockDiff := latestBlock - txBlock
 		if blockDiff >= finality {
 			callBack(receipt)
 			return nil

diff --git a/relay/types.go b/relay/types.go
@@ -12,7 +12,7 @@ type App struct {
 	cfg config.Config
 }
 
-var ChainIDS = map[int64]string{
+var ChainIDS = map[uint64]string{
 	1:     "Ethereum",
 	8453:  "Base",
 	137:   "Polygon",