diff --git a/ocp/common/mint.go b/ocp/common/mint.go index c71cf7a..ecb7dfb 100644 --- a/ocp/common/mint.go +++ b/ocp/common/mint.go @@ -28,6 +28,7 @@ var ( floatMintAccount, _ = NewAccountFromPublicKeyString(config.FloatMintPublicKey) jeffyMintAccount, _ = NewAccountFromPublicKeyString(config.JeffyMintPublicKey) marketCoinMintAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) + moonyMintAccount, _ = NewAccountFromPublicKeyString(config.MoonyMintPublicKey) testMintAccount, _ = NewAccountFromPublicKeyString(config.TestMintPublicKey) xpMintAccount, _ = NewAccountFromPublicKeyString(config.XpMintPublicKey) ) diff --git a/ocp/common/vm.go b/ocp/common/vm.go index c97a352..a3546af 100644 --- a/ocp/common/vm.go +++ b/ocp/common/vm.go @@ -37,6 +37,10 @@ var ( marketCoinVmAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinVmAccountPublicKey) marketCoinVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinVmOmnibusPublicKey) + moonyAuthority, _ = NewAccountFromPublicKeyString(config.MoonyAuthorityPublicKey) + moonyVmAccount, _ = NewAccountFromPublicKeyString(config.MoonyVmAccountPublicKey) + moonyVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.MoonyVmOmnibusPublicKey) + testAuthority, _ = NewAccountFromPublicKeyString(config.TestAuthorityPublicKey) testVmAccount, _ = NewAccountFromPublicKeyString(config.TestVmAccountPublicKey) testVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.TestVmOmnibusPublicKey) @@ -180,6 +184,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount Omnibus: marketCoinVmOmnibusAccount, Mint: mintAccount, }, nil + case moonyMintAccount.PublicKey().ToBase58(): + if moonyAuthority.PrivateKey() == nil { + vaultRecord, err := data.GetKey(ctx, moonyAuthority.PublicKey().ToBase58()) + if err != nil { + return nil, err + } + + moonyAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey) + if err != nil { + return nil, err + } + } + + return &VmConfig{ + Authority: moonyAuthority, + Vm: moonyVmAccount, + Omnibus: moonyVmOmnibusAccount, + 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 26a497f..e1133e8 100644 --- a/ocp/config/config.go +++ b/ocp/config/config.go @@ -55,6 +55,11 @@ const ( MarketCoinVmAccountPublicKey = "AeJ6x6mtwdjUM2AqppQ7zG6m89sx5c8qegfFPzjmD2x6" MarketCoinVmOmnibusPublicKey = "CQMdG8AKtLP9JCU4GAzKunKnsfpXVFdMcSwQd3Hd5oZg" + MoonyMintPublicKey = "4muAfB6m1P7C3Znad1VUsoqYFwvGQRkWGpJ3A4vupxz6" + MoonyAuthorityPublicKey = "mnyXRKy3pz8WXG4XQC6inaKNbzrqq2xRJfGv5Lq9qgR" + MoonyVmAccountPublicKey = "FCZitKZWuMfrZ3Krcp67egUwPzFoWM9Xo913S17qdjWV" + MoonyVmOmnibusPublicKey = "FvhtPHhARVkRJKfkM96Wvo2WEwjtiweyLAdpAroqT646" + TestMintPublicKey = "2psDP3LAvbNzfvBYNMs9ieMpsD8PVzyQsKNfZrjEKoDN" TestAuthorityPublicKey = "tstBCPtzNDycsM7rAd2CxzdgKh1gWrMULzrDHuGVXAW" TestVmAccountPublicKey = "CYtzE732LQ7YP9sngSPUQhCCTQ8GY14dmjWX2hXP16Np" diff --git a/ocp/rpc/currency/worker.go b/ocp/rpc/currency/worker.go index 02d17ce..e98cee6 100644 --- a/ocp/rpc/currency/worker.go +++ b/ocp/rpc/currency/worker.go @@ -29,6 +29,7 @@ var ( floatMintAccount, _ = common.NewAccountFromPublicKeyString(config.FloatMintPublicKey) jeffyMintAccount, _ = common.NewAccountFromPublicKeyString(config.JeffyMintPublicKey) marketCoinMintAccount, _ = common.NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey) + moonyMintAccount, _ = common.NewAccountFromPublicKeyString(config.MoonyMintPublicKey) testMintAccount, _ = common.NewAccountFromPublicKeyString(config.TestMintPublicKey) xpMintAccount, _ = common.NewAccountFromPublicKeyString(config.XpMintPublicKey) ) @@ -42,6 +43,7 @@ var trackedLaunchpadMints = []*common.Account{ floatMintAccount, jeffyMintAccount, marketCoinMintAccount, + moonyMintAccount, testMintAccount, xpMintAccount, } diff --git a/ocp/worker/currency/reserve.go b/ocp/worker/currency/reserve.go index 187bce3..eeb961a 100644 --- a/ocp/worker/currency/reserve.go +++ b/ocp/worker/currency/reserve.go @@ -190,6 +190,21 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) }) }() + err9 := func() error { + moonyMintAccount, _ := common.NewAccountFromPublicKeyString(config.MoonyMintPublicKey) + + ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, moonyMintAccount) + if err != nil { + return err + } + + return p.data.PutCurrencyReserve(ctx, ¤cy.ReserveRecord{ + Mint: moonyMintAccount.PublicKey().ToBase58(), + SupplyFromBonding: ciculatingSupply, + Time: ts, + }) + }() + if err1 != nil { return err1 } @@ -214,6 +229,9 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context) if err8 != nil { return err8 } + if err9 != nil { + return err9 + } return nil } diff --git a/ocp/worker/geyser/handler.go b/ocp/worker/geyser/handler.go index 3d25b00..0c3a000 100644 --- a/ocp/worker/geyser/handler.go +++ b/ocp/worker/geyser/handler.go @@ -91,6 +91,7 @@ func (h *TokenProgramAccountHandler) Handle(ctx context.Context, update *geyserp config.FloatMintPublicKey, config.JeffyMintPublicKey, config.MarketCoinMintPublicKey, + config.MoonyMintPublicKey, config.TestMintPublicKey, config.XpMintPublicKey: // Not an ATA, so filter it out. It cannot be a VM deposit ATA diff --git a/ocp/worker/nonce/runtime.go b/ocp/worker/nonce/runtime.go index 4114658..cfecac9 100644 --- a/ocp/worker/nonce/runtime.go +++ b/ocp/worker/nonce/runtime.go @@ -76,6 +76,7 @@ func (p *runtime) Start(ctx context.Context, interval time.Duration) error { config.FloatVmAccountPublicKey, config.JeffyVmAccountPublicKey, config.MarketCoinVmAccountPublicKey, + config.MoonyVmAccountPublicKey, config.TestVmAccountPublicKey, config.XpVmAccountPublicKey, } {