fix airdorp detail, use csv

atomone-hub · Sep 3, 2024 · ce8c144 · ce8c144
1 parent 0043f98
commit ce8c144
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/distribution.go b/distribution.go
@@ -239,14 +239,14 @@ func distribution(accounts []Account, params distriParams, prefix string) (airdr
 					Multiplier: params.noVotesMultiplier,
 					BonusMalus: params.bonus,
 					Factor:     params.supplyFactor,
-					AtoneAmt:   noWithVetoAtomAmt,
+					AtoneAmt:   noWithVetoAirdropAmt,
 				},
 				AbsDetail: amtDetail{
 					AtomAmt:    abstainAtomAmt,
 					Multiplier: airdrop.nonVotersMultiplier,
 					BonusMalus: sdk.OneDec(),
 					Factor:     params.supplyFactor,
-					AtoneAmt:   abstainAtomAmt,
+					AtoneAmt:   abstainAirdropAmt,
 				},
 				DnvDetail: amtDetail{
 					AtomAmt:    noVoteAtomAmt,
@@ -264,6 +264,10 @@ func distribution(accounts []Account, params distriParams, prefix string) (airdr
 				},
 				Total: airdropAmt,
 			}
+			amt := yesAirdropAmt.Add(noAirdropAmt).Add(noWithVetoAirdropAmt).Add(abstainAirdropAmt).Add(noVoteAirdropAmt).Add(liquidAirdropAmt)
+			if !amt.Equal(airdropAmt) {
+				panic(fmt.Sprintf("WRONG %+v\n", airdrop.addressesDetail[addr]))
+			}
 		}
 	}
 	// Compute minted part

diff --git a/main.go b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/csv"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -193,7 +194,7 @@ func distributionCmd() *ffcli.Command {
 				datapath          = fs.Arg(0)
 				accountsFile      = filepath.Join(datapath, "accounts.json")
 				airdropFile       = filepath.Join(datapath, "airdrop.json")
-				airdropDetailFile = filepath.Join(datapath, "airdrop_detail.json")
+				airdropDetailFile = filepath.Join(datapath, "airdrop_detail.csv")
 				airdrops          []airdrop
 			)
 			accounts, err := parseAccounts(accountsFile)
@@ -221,14 +222,46 @@ func distributionCmd() *ffcli.Command {
 				}
 				fmt.Printf("⚠ '%s' has been created/updated, don't forget to update S3 ⚠\n", airdropFile)
 
+				f, err := os.Create(airdropDetailFile)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				w := csv.NewWriter(f)
+				w.Write([]string{
+					"address", "factor",
+					"yesAtomAmt", "yesMultiplier", "yesBonusMalus", "yesAtoneAmt",
+					"noAtomAmt", "noMultiplier", "noBonusMalus", "noAtoneAmt",
+					"nwvAtomAmt", "nwvMultiplier", "nwvBonusMalus", "nwvAtoneAmt",
+					"absAtomAmt", "absMultiplier", "absBonusMalus", "absAtoneAmt",
+					"dnvAtomAmt", "dnvMultiplier", "dnvBonusMalus", "dnvAtoneAmt",
+					"liquidAtomAmt", "liquidMultiplier", "liquidBonusMalus", "liquidAtoneAmt",
+					"totalAtoneAmt",
+				})
+				for k, v := range airdrops[0].addressesDetail {
+					w.Write([]string{
+						k, v.YesDetail.Factor.String(),
+						v.YesDetail.AtomAmt.String(), v.YesDetail.Multiplier.String(), v.YesDetail.BonusMalus.String(), v.YesDetail.AtoneAmt.String(),
+						v.NoDetail.AtomAmt.String(), v.NoDetail.Multiplier.String(), v.NoDetail.BonusMalus.String(), v.NoDetail.AtoneAmt.String(),
+						v.NWVDetail.AtomAmt.String(), v.NWVDetail.Multiplier.String(), v.NWVDetail.BonusMalus.String(), v.NWVDetail.AtoneAmt.String(),
+						v.AbsDetail.AtomAmt.String(), v.AbsDetail.Multiplier.String(), v.AbsDetail.BonusMalus.String(), v.AbsDetail.AtoneAmt.String(),
+						v.DnvDetail.AtomAmt.String(), v.DnvDetail.Multiplier.String(), v.DnvDetail.BonusMalus.String(), v.DnvDetail.AtoneAmt.String(),
+						v.LiquidDetail.AtomAmt.String(), v.LiquidDetail.Multiplier.String(), v.LiquidDetail.BonusMalus.String(), v.LiquidDetail.AtoneAmt.String(),
+						v.Total.String(),
+					})
+				}
+				w.Flush()
+				fmt.Printf("⚠ '%s' has been created/updated, don't forget to update S3 ⚠\n", airdropDetailFile)
+
 				bz, err = json.MarshalIndent(airdrops[0].addressesDetail, "", "  ")
 				if err != nil {
 					return err
 				}
-				if err := os.WriteFile(airdropDetailFile, bz, 0o666); err != nil {
+				filename := filepath.Join(datapath, "airdrop_detail.json")
+				if err := os.WriteFile(filename, bz, 0o666); err != nil {
 					return err
 				}
-				fmt.Printf("⚠ '%s' has been created/updated, don't forget to update S3 ⚠\n", airdropDetailFile)
+				fmt.Printf("⚠ '%s' has been created/updated, don't forget to update S3 ⚠\n", filename)
 			}
 			return nil
 		},