diff --git a/ocp/common/mint.go b/ocp/common/mint.go index ec2fff3..964d1ab 100644 --- a/ocp/common/mint.go +++ b/ocp/common/mint.go @@ -32,6 +32,7 @@ var ( linksMintAccount, _ = NewAccountFromPublicKeyString(config.LinksMintPublicKey) marketCoinMintAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) moonyMintAccount, _ = NewAccountFromPublicKeyString(config.MoonyMintPublicKey) + teddiesMintAccount, _ = NewAccountFromPublicKeyString(config.TeddiesMintPublicKey) testMintAccount, _ = NewAccountFromPublicKeyString(config.TestMintPublicKey) toshiMintAccount, _ = NewAccountFromPublicKeyString(config.ToshiMintPublicKey) xpMintAccount, _ = NewAccountFromPublicKeyString(config.XpMintPublicKey) diff --git a/ocp/common/vm.go b/ocp/common/vm.go index e908f22..05b23bf 100644 --- a/ocp/common/vm.go +++ b/ocp/common/vm.go @@ -53,6 +53,10 @@ var ( moonyVmAccount, _ = NewAccountFromPublicKeyString(config.MoonyVmAccountPublicKey) moonyVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.MoonyVmOmnibusPublicKey) + teddiesAuthority, _ = NewAccountFromPublicKeyString(config.TeddiesAuthorityPublicKey) + teddiesVmAccount, _ = NewAccountFromPublicKeyString(config.TeddiesVmAccountPublicKey) + teddiesVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.TeddiesVmOmnibusPublicKey) + testAuthority, _ = NewAccountFromPublicKeyString(config.TestAuthorityPublicKey) testVmAccount, _ = NewAccountFromPublicKeyString(config.TestVmAccountPublicKey) testVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.TestVmOmnibusPublicKey) @@ -276,6 +280,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount Omnibus: moonyVmOmnibusAccount, Mint: mintAccount, }, nil + case teddiesMintAccount.PublicKey().ToBase58(): + if teddiesAuthority.PrivateKey() == nil { + vaultRecord, err := data.GetKey(ctx, teddiesAuthority.PublicKey().ToBase58()) + if err != nil { + return nil, err + } + + teddiesAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey) + if err != nil { + return nil, err + } + } + + return &VmConfig{ + Authority: teddiesAuthority, + Vm: teddiesVmAccount, + Omnibus: teddiesVmOmnibusAccount, + Mint: mintAccount, + }, nil case testMintAccount.PublicKey().ToBase58(): if testAuthority.PrivateKey() == nil { vaultRecord, err := data.GetKey(ctx, testAuthority.PublicKey().ToBase58()) diff --git a/ocp/config/config.go b/ocp/config/config.go index 5230503..f7ed72c 100644 --- a/ocp/config/config.go +++ b/ocp/config/config.go @@ -75,6 +75,11 @@ const ( MoonyVmAccountPublicKey = "FCZitKZWuMfrZ3Krcp67egUwPzFoWM9Xo913S17qdjWV" MoonyVmOmnibusPublicKey = "FvhtPHhARVkRJKfkM96Wvo2WEwjtiweyLAdpAroqT646" + TeddiesMintPublicKey = "55TKRUaaxXoSNFMzchMYUwC5CQmbMko5ZQECpH5Uqajm" + TeddiesAuthorityPublicKey = "tedA5B3L5b6tL88ZyWdpxSbJV6PMxTg6ArtaKJcQ14J" + TeddiesVmAccountPublicKey = "2y5sWz6GfqqnvpRLJNbchg7hLmzC8khvjw1SvUBsuYKP" + TeddiesVmOmnibusPublicKey = "E1R3TWPqFFWHMxMURprpAXSeVzF93tJn6Pn8x165pcVe" + TestMintPublicKey = "2psDP3LAvbNzfvBYNMs9ieMpsD8PVzyQsKNfZrjEKoDN" TestAuthorityPublicKey = "tstBCPtzNDycsM7rAd2CxzdgKh1gWrMULzrDHuGVXAW" TestVmAccountPublicKey = "CYtzE732LQ7YP9sngSPUQhCCTQ8GY14dmjWX2hXP16Np" diff --git a/ocp/rpc/currency/worker.go b/ocp/rpc/currency/worker.go index 05458e1..470963f 100644 --- a/ocp/rpc/currency/worker.go +++ b/ocp/rpc/currency/worker.go @@ -33,6 +33,7 @@ var ( linksMintAccount, _ = common.NewAccountFromPublicKeyString(config.LinksMintPublicKey) marketCoinMintAccount, _ = common.NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) moonyMintAccount, _ = common.NewAccountFromPublicKeyString(config.MoonyMintPublicKey) + teddiesMintAccount, _ = common.NewAccountFromPublicKeyString(config.TeddiesMintPublicKey) testMintAccount, _ = common.NewAccountFromPublicKeyString(config.TestMintPublicKey) toshiMintAccount, _ = common.NewAccountFromPublicKeyString(config.ToshiMintPublicKey) xpMintAccount, _ = common.NewAccountFromPublicKeyString(config.XpMintPublicKey) @@ -51,6 +52,7 @@ var trackedLaunchpadMints = []*common.Account{ linksMintAccount, marketCoinMintAccount, moonyMintAccount, + teddiesMintAccount, testMintAccount, toshiMintAccount, xpMintAccount, diff --git a/ocp/worker/currency/reserve.go b/ocp/worker/currency/reserve.go index c63ad17..1a7c8b2 100644 --- a/ocp/worker/currency/reserve.go +++ b/ocp/worker/currency/reserve.go @@ -265,6 +265,21 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) }) }() + err14 := func() error { + teddiesMintAccount, _ := common.NewAccountFromPublicKeyString(config.TeddiesMintPublicKey) + + ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, teddiesMintAccount) + if err != nil { + return err + } + + return p.data.PutCurrencyReserve(ctx, ¤cy.ReserveRecord{ + Mint: teddiesMintAccount.PublicKey().ToBase58(), + SupplyFromBonding: ciculatingSupply, + Time: ts, + }) + }() + if err1 != nil { return err1 } @@ -304,6 +319,9 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) if err13 != nil { return err13 } + if err14 != nil { + return err14 + } return nil } diff --git a/ocp/worker/geyser/handler.go b/ocp/worker/geyser/handler.go index 774bc21..6fb7cd0 100644 --- a/ocp/worker/geyser/handler.go +++ b/ocp/worker/geyser/handler.go @@ -95,6 +95,7 @@ func (h *TokenProgramAccountHandler) Handle(ctx context.Context, update *geyserp config.LinksMintPublicKey, config.MarketCoinMintPublicKey, config.MoonyMintPublicKey, + config.TeddiesMintPublicKey, config.TestMintPublicKey, config.ToshiMintPublicKey, config.XpMintPublicKey: diff --git a/ocp/worker/nonce/runtime.go b/ocp/worker/nonce/runtime.go index cd4ba53..79bd6a8 100644 --- a/ocp/worker/nonce/runtime.go +++ b/ocp/worker/nonce/runtime.go @@ -80,6 +80,7 @@ func (p *runtime) Start(ctx context.Context, interval time.Duration) error { config.LinksVmAccountPublicKey, config.MarketCoinVmAccountPublicKey, config.MoonyVmAccountPublicKey, + config.TeddiesVmAccountPublicKey, config.TestVmAccountPublicKey, config.ToshiVmAccountPublicKey, config.XpVmAccountPublicKey,