diff --git a/ocp/common/mint.go b/ocp/common/mint.go index ecb7dfb..f4f1397 100644 --- a/ocp/common/mint.go +++ b/ocp/common/mint.go @@ -23,10 +23,12 @@ var ( ErrUnsupportedMint = errors.New("unsupported mint") badBoysMintAccount, _ = NewAccountFromPublicKeyString(config.BadBoysMintPublicKey) + bluebucksMintAccount, _ = NewAccountFromPublicKeyString(config.BluebucksMintPublicKey) bitsMintAccount, _ = NewAccountFromPublicKeyString(config.BitsMintPublicKey) bogeyMintAccount, _ = NewAccountFromPublicKeyString(config.BogeyMintPublicKey) floatMintAccount, _ = NewAccountFromPublicKeyString(config.FloatMintPublicKey) jeffyMintAccount, _ = NewAccountFromPublicKeyString(config.JeffyMintPublicKey) + linksMintAccount, _ = NewAccountFromPublicKeyString(config.LinksMintPublicKey) marketCoinMintAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) moonyMintAccount, _ = NewAccountFromPublicKeyString(config.MoonyMintPublicKey) testMintAccount, _ = NewAccountFromPublicKeyString(config.TestMintPublicKey) diff --git a/ocp/common/vm.go b/ocp/common/vm.go index a3546af..4245a90 100644 --- a/ocp/common/vm.go +++ b/ocp/common/vm.go @@ -17,6 +17,10 @@ var ( badBoysVmAccount, _ = NewAccountFromPublicKeyString(config.BadBoysVmAccountPublicKey) badBoysVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.BadBoysVmOmnibusPublicKey) + bluebucksAuthority, _ = NewAccountFromPublicKeyString(config.BluebucksAuthorityPublicKey) + bluebucksVmAccount, _ = NewAccountFromPublicKeyString(config.BluebucksVmAccountPublicKey) + bluebucksVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.BluebucksVmOmnibusPublicKey) + bitsAuthority, _ = NewAccountFromPublicKeyString(config.BitsAuthorityPublicKey) bitsVmAccount, _ = NewAccountFromPublicKeyString(config.BitsVmAccountPublicKey) bitsVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.BitsVmOmnibusPublicKey) @@ -33,6 +37,10 @@ var ( jeffyVmAccount, _ = NewAccountFromPublicKeyString(config.JeffyVmAccountPublicKey) jeffyVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.JeffyVmOmnibusPublicKey) + linksAuthority, _ = NewAccountFromPublicKeyString(config.LinksAuthorityPublicKey) + linksVmAccount, _ = NewAccountFromPublicKeyString(config.LinksVmAccountPublicKey) + linksVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.LinksVmOmnibusPublicKey) + marketCoinAuthority, _ = NewAccountFromPublicKeyString(config.MarketCoinAuthorityPublicKey) marketCoinVmAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinVmAccountPublicKey) marketCoinVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinVmOmnibusPublicKey) @@ -89,6 +97,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount Omnibus: badBoysVmOmnibusAccount, Mint: mintAccount, }, nil + case bluebucksMintAccount.PublicKey().ToBase58(): + if bluebucksAuthority.PrivateKey() == nil { + vaultRecord, err := data.GetKey(ctx, bluebucksAuthority.PublicKey().ToBase58()) + if err != nil { + return nil, err + } + + bluebucksAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey) + if err != nil { + return nil, err + } + } + + return &VmConfig{ + Authority: bluebucksAuthority, + Vm: bluebucksVmAccount, + Omnibus: bluebucksVmOmnibusAccount, + Mint: mintAccount, + }, nil case bitsMintAccount.PublicKey().ToBase58(): if bitsAuthority.PrivateKey() == nil { vaultRecord, err := data.GetKey(ctx, bitsAuthority.PublicKey().ToBase58()) @@ -165,6 +192,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount Omnibus: jeffyVmOmnibusAccount, Mint: mintAccount, }, nil + case linksMintAccount.PublicKey().ToBase58(): + if linksAuthority.PrivateKey() == nil { + vaultRecord, err := data.GetKey(ctx, linksAuthority.PublicKey().ToBase58()) + if err != nil { + return nil, err + } + + linksAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey) + if err != nil { + return nil, err + } + } + + return &VmConfig{ + Authority: linksAuthority, + Vm: linksVmAccount, + Omnibus: linksVmOmnibusAccount, + Mint: mintAccount, + }, nil case marketCoinMintAccount.PublicKey().ToBase58(): if marketCoinAuthority.PrivateKey() == nil { vaultRecord, err := data.GetKey(ctx, marketCoinAuthority.PublicKey().ToBase58()) diff --git a/ocp/config/config.go b/ocp/config/config.go index e1133e8..7fb7038 100644 --- a/ocp/config/config.go +++ b/ocp/config/config.go @@ -30,6 +30,11 @@ const ( BadBoysVmAccountPublicKey = "9EpU4RGoe7zfJdLjLyXWLpza6RZHqN6QV73z1gfNKCJa" BadBoysVmOmnibusPublicKey = "7pQkiRaXdMW3bLJK6D1huP175AF5wD6gXNPBsvQ8bJZ3" + BluebucksMintPublicKey = "4MrV36dgdC9kjkC3ibbe1LMUijXde27iJAjJByB7naSN" + BluebucksAuthorityPublicKey = "b1ue4ZAdQeQXw6fi8Gkn9vtmFsGmgFgARiAEwprrkBY" + BluebucksVmAccountPublicKey = "ED1AYFh6bfYCynvfYCiRHKrPSWvw4PfzprM7o3R954Bu" + BluebucksVmOmnibusPublicKey = "7EPGFrgYPNbVtHg5ovnhThSjiUST39R8jRegriadgehk" + BitsMintPublicKey = "A3e8dzb1y4gqGP2cnCS3UU8dm5YNrFpZBpjjdoZdtfnB" BitsAuthorityPublicKey = "bit8rCyAcstm1ZiwLq22FHdz8wAigKU46hmtrigrGub" BitsVmAccountPublicKey = "5zDzL3CHb3wFxs7xnkxmWMGMR1gjNtYgV46PTBgSHmsJ" @@ -50,6 +55,11 @@ const ( JeffyVmAccountPublicKey = "8rwgUXsLSq1Pn51UJs4NGVA1cTkemwBgKyWPfFYgnm3B" JeffyVmOmnibusPublicKey = "9XiqBPYSG2cBwpb8MqJeuFmLaQaAAr6gwikyBrPZDQ8R" + LinksMintPublicKey = "CPBcprSXXYerwh6LE6o3yc6NJqeZvm87GRSySgjTicE5" + LinksAuthorityPublicKey = "1nkSmZ9VCLBiQqSuMdmv9SXQ2y5wTJVnBW5ZsESjvzd" + LinksVmAccountPublicKey = "2s18j1EyBjRTcie48Hn6wyiZVCD9NrmkqH1JAKchoKT2" + LinksVmOmnibusPublicKey = "uWfyTHepnjF5KeJSTSWG7nUYsYrcFxV2URUh7Hh8htb" + MarketCoinMintPublicKey = "311m6Sb1814PfAxkEcqq6MNdBiVZLr8VWuAWDSC72euW" MarketCoinAuthorityPublicKey = "mrkthxqn4rKCZw1pDxhJTpCrvUBtK9m6aLvCeY3PyWR" MarketCoinVmAccountPublicKey = "AeJ6x6mtwdjUM2AqppQ7zG6m89sx5c8qegfFPzjmD2x6" diff --git a/ocp/rpc/currency/worker.go b/ocp/rpc/currency/worker.go index e98cee6..a9032a6 100644 --- a/ocp/rpc/currency/worker.go +++ b/ocp/rpc/currency/worker.go @@ -24,10 +24,12 @@ import ( var ( badBoysMintAccount, _ = common.NewAccountFromPublicKeyString(config.BadBoysMintPublicKey) + bluebucksMintAccount, _ = common.NewAccountFromPublicKeyString(config.BluebucksMintPublicKey) bitsMintAccount, _ = common.NewAccountFromPublicKeyString(config.BitsMintPublicKey) bogeyMintAccount, _ = common.NewAccountFromPublicKeyString(config.BogeyMintPublicKey) floatMintAccount, _ = common.NewAccountFromPublicKeyString(config.FloatMintPublicKey) jeffyMintAccount, _ = common.NewAccountFromPublicKeyString(config.JeffyMintPublicKey) + linksMintAccount, _ = common.NewAccountFromPublicKeyString(config.LinksMintPublicKey) marketCoinMintAccount, _ = common.NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) moonyMintAccount, _ = common.NewAccountFromPublicKeyString(config.MoonyMintPublicKey) testMintAccount, _ = common.NewAccountFromPublicKeyString(config.TestMintPublicKey) @@ -38,10 +40,12 @@ var ( // (excludes core mint as it only has exchange rate data) var trackedLaunchpadMints = []*common.Account{ badBoysMintAccount, + bluebucksMintAccount, bitsMintAccount, bogeyMintAccount, floatMintAccount, jeffyMintAccount, + linksMintAccount, marketCoinMintAccount, moonyMintAccount, testMintAccount, diff --git a/ocp/worker/currency/reserve.go b/ocp/worker/currency/reserve.go index eeb961a..eae3fed 100644 --- a/ocp/worker/currency/reserve.go +++ b/ocp/worker/currency/reserve.go @@ -205,6 +205,36 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) }) }() + err10 := func() error { + bluebucksMintAccount, _ := common.NewAccountFromPublicKeyString(config.BluebucksMintPublicKey) + + ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, bluebucksMintAccount) + if err != nil { + return err + } + + return p.data.PutCurrencyReserve(ctx, ¤cy.ReserveRecord{ + Mint: bluebucksMintAccount.PublicKey().ToBase58(), + SupplyFromBonding: ciculatingSupply, + Time: ts, + }) + }() + + err11 := func() error { + linksMintAccount, _ := common.NewAccountFromPublicKeyString(config.LinksMintPublicKey) + + ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, linksMintAccount) + if err != nil { + return err + } + + return p.data.PutCurrencyReserve(ctx, ¤cy.ReserveRecord{ + Mint: linksMintAccount.PublicKey().ToBase58(), + SupplyFromBonding: ciculatingSupply, + Time: ts, + }) + }() + if err1 != nil { return err1 } @@ -232,6 +262,12 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) if err9 != nil { return err9 } + if err10 != nil { + return err10 + } + if err11 != nil { + return err11 + } return nil } diff --git a/ocp/worker/geyser/handler.go b/ocp/worker/geyser/handler.go index 0c3a000..8e2040b 100644 --- a/ocp/worker/geyser/handler.go +++ b/ocp/worker/geyser/handler.go @@ -86,10 +86,12 @@ func (h *TokenProgramAccountHandler) Handle(ctx context.Context, update *geyserp // todo: Don't hardcode Jeffy and other Flipcash currencies case common.CoreMintAccount.PublicKey().ToBase58(), config.BadBoysMintPublicKey, + config.BluebucksMintPublicKey, config.BitsMintPublicKey, config.BogeyMintPublicKey, config.FloatMintPublicKey, config.JeffyMintPublicKey, + config.LinksMintPublicKey, config.MarketCoinMintPublicKey, config.MoonyMintPublicKey, config.TestMintPublicKey, diff --git a/ocp/worker/nonce/runtime.go b/ocp/worker/nonce/runtime.go index cfecac9..4fe92ce 100644 --- a/ocp/worker/nonce/runtime.go +++ b/ocp/worker/nonce/runtime.go @@ -71,10 +71,12 @@ func (p *runtime) Start(ctx context.Context, interval time.Duration) error { for _, vm := range []string{ common.CoreMintVmAccount.PublicKey().ToBase58(), config.BadBoysVmAccountPublicKey, + config.BluebucksVmAccountPublicKey, config.BitsVmAccountPublicKey, config.BogeyVmAccountPublicKey, config.FloatVmAccountPublicKey, config.JeffyVmAccountPublicKey, + config.LinksVmAccountPublicKey, config.MarketCoinVmAccountPublicKey, config.MoonyVmAccountPublicKey, config.TestVmAccountPublicKey,