Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ocp/common/mint.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ var (
bogeyMintAccount, _ = NewAccountFromPublicKeyString(config.BogeyMintPublicKey)
floatMintAccount, _ = NewAccountFromPublicKeyString(config.FloatMintPublicKey)
jeffyMintAccount, _ = NewAccountFromPublicKeyString(config.JeffyMintPublicKey)
lightspeedMintAccount, _ = NewAccountFromPublicKeyString(config.LightspeedMintPublicKey)
linksMintAccount, _ = NewAccountFromPublicKeyString(config.LinksMintPublicKey)
marketCoinMintAccount, _ = NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey)
moonyMintAccount, _ = NewAccountFromPublicKeyString(config.MoonyMintPublicKey)
testMintAccount, _ = NewAccountFromPublicKeyString(config.TestMintPublicKey)
toshiMintAccount, _ = NewAccountFromPublicKeyString(config.ToshiMintPublicKey)
xpMintAccount, _ = NewAccountFromPublicKeyString(config.XpMintPublicKey)
)

Expand Down
46 changes: 46 additions & 0 deletions ocp/common/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ var (
jeffyVmAccount, _ = NewAccountFromPublicKeyString(config.JeffyVmAccountPublicKey)
jeffyVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.JeffyVmOmnibusPublicKey)

lightspeedAuthority, _ = NewAccountFromPublicKeyString(config.LightspeedAuthorityPublicKey)
lightspeedVmAccount, _ = NewAccountFromPublicKeyString(config.LightspeedVmAccountPublicKey)
lightspeedVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.LightspeedVmOmnibusPublicKey)

linksAuthority, _ = NewAccountFromPublicKeyString(config.LinksAuthorityPublicKey)
linksVmAccount, _ = NewAccountFromPublicKeyString(config.LinksVmAccountPublicKey)
linksVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.LinksVmOmnibusPublicKey)
Expand All @@ -53,6 +57,10 @@ var (
testVmAccount, _ = NewAccountFromPublicKeyString(config.TestVmAccountPublicKey)
testVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.TestVmOmnibusPublicKey)

toshiAuthority, _ = NewAccountFromPublicKeyString(config.ToshiAuthorityPublicKey)
toshiVmAccount, _ = NewAccountFromPublicKeyString(config.ToshiVmAccountPublicKey)
toshiVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.ToshiVmOmnibusPublicKey)

xpAuthority, _ = NewAccountFromPublicKeyString(config.XpAuthorityPublicKey)
xpVmAccount, _ = NewAccountFromPublicKeyString(config.XpVmAccountPublicKey)
xpVmOmnibusAccount, _ = NewAccountFromPublicKeyString(config.XpVmOmnibusPublicKey)
Expand Down Expand Up @@ -192,6 +200,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount
Omnibus: jeffyVmOmnibusAccount,
Mint: mintAccount,
}, nil
case lightspeedMintAccount.PublicKey().ToBase58():
if lightspeedAuthority.PrivateKey() == nil {
vaultRecord, err := data.GetKey(ctx, lightspeedAuthority.PublicKey().ToBase58())
if err != nil {
return nil, err
}

lightspeedAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey)
if err != nil {
return nil, err
}
}

return &VmConfig{
Authority: lightspeedAuthority,
Vm: lightspeedVmAccount,
Omnibus: lightspeedVmOmnibusAccount,
Mint: mintAccount,
}, nil
case linksMintAccount.PublicKey().ToBase58():
if linksAuthority.PrivateKey() == nil {
vaultRecord, err := data.GetKey(ctx, linksAuthority.PublicKey().ToBase58())
Expand Down Expand Up @@ -268,6 +295,25 @@ func GetVmConfigForMint(ctx context.Context, data ocp_data.Provider, mintAccount
Omnibus: testVmOmnibusAccount,
Mint: mintAccount,
}, nil
case toshiMintAccount.PublicKey().ToBase58():
if toshiAuthority.PrivateKey() == nil {
vaultRecord, err := data.GetKey(ctx, toshiAuthority.PublicKey().ToBase58())
if err != nil {
return nil, err
}

toshiAuthority, err = NewAccountFromPrivateKeyString(vaultRecord.PrivateKey)
if err != nil {
return nil, err
}
}

return &VmConfig{
Authority: toshiAuthority,
Vm: toshiVmAccount,
Omnibus: toshiVmOmnibusAccount,
Mint: mintAccount,
}, nil
case xpMintAccount.PublicKey().ToBase58():
if xpAuthority.PrivateKey() == nil {
vaultRecord, err := data.GetKey(ctx, xpAuthority.PublicKey().ToBase58())
Expand Down
10 changes: 10 additions & 0 deletions ocp/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ const (
JeffyVmAccountPublicKey = "8rwgUXsLSq1Pn51UJs4NGVA1cTkemwBgKyWPfFYgnm3B"
JeffyVmOmnibusPublicKey = "9XiqBPYSG2cBwpb8MqJeuFmLaQaAAr6gwikyBrPZDQ8R"

LightspeedMintPublicKey = "D4Srn1tRU69JWvPeNGre1AiF2swFhw6bpUNyH18Dfag6"
LightspeedAuthorityPublicKey = "1spdvA8EGbo56cnGUDzt2FjWCwEWF5hY3jw6yz8BcWw"
LightspeedVmAccountPublicKey = "GkYnW2md9TdWV7ZmSnShaFGg3S1e62UmJMDtnYXG4gpe"
LightspeedVmOmnibusPublicKey = "5sBqTvFrfu6hCJPrxEcQ2PXvzLTfy4UCJjYxDoJcaP19"

LinksMintPublicKey = "CPBcprSXXYerwh6LE6o3yc6NJqeZvm87GRSySgjTicE5"
LinksAuthorityPublicKey = "1nkSmZ9VCLBiQqSuMdmv9SXQ2y5wTJVnBW5ZsESjvzd"
LinksVmAccountPublicKey = "2s18j1EyBjRTcie48Hn6wyiZVCD9NrmkqH1JAKchoKT2"
Expand All @@ -75,6 +80,11 @@ const (
TestVmAccountPublicKey = "CYtzE732LQ7YP9sngSPUQhCCTQ8GY14dmjWX2hXP16Np"
TestVmOmnibusPublicKey = "65Ghp2FFPmdB3FLkC2NCKkBQ3RuXgmjZ56DDGZLVAZZa"

ToshiMintPublicKey = "EfBCnuhon2uWSRB3WFqmWRQumiHvhZXYbUZXUcHDHNyz"
ToshiAuthorityPublicKey = "tshUiGXuyb4ujawe2fByjissauSdgDjuysSeGoV9Aga"
ToshiVmAccountPublicKey = "9VpRW29UXcyAZkXJpk4Pqcdz2HyprKPft6pyBKH6LGC1"
ToshiVmOmnibusPublicKey = "AmYSBrPT5ozvxjYT7Gq3B3imRHGoEoNpZ7ZDzcxJ1xKp"

XpMintPublicKey = "6oZnhB1FPrUaDfhRCVZnbVWNKVx9wgj84vKGH7eMpzXL"
XpAuthorityPublicKey = "xpTXV7BNXwsdvCaFKfeT4h6rSnKck2Bv5iBAFFS5Uwk"
XpVmAccountPublicKey = "4qnCaQkGxCnr66cmPfpNfM2rxaaTMFSSfbY9gXZgCYdS"
Expand Down
4 changes: 4 additions & 0 deletions ocp/rpc/currency/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ var (
bogeyMintAccount, _ = common.NewAccountFromPublicKeyString(config.BogeyMintPublicKey)
floatMintAccount, _ = common.NewAccountFromPublicKeyString(config.FloatMintPublicKey)
jeffyMintAccount, _ = common.NewAccountFromPublicKeyString(config.JeffyMintPublicKey)
lightspeedMintAccount, _ = common.NewAccountFromPublicKeyString(config.LightspeedMintPublicKey)
linksMintAccount, _ = common.NewAccountFromPublicKeyString(config.LinksMintPublicKey)
marketCoinMintAccount, _ = common.NewAccountFromPublicKeyString(config.MarketCoinMintPublicKey)
moonyMintAccount, _ = common.NewAccountFromPublicKeyString(config.MoonyMintPublicKey)
testMintAccount, _ = common.NewAccountFromPublicKeyString(config.TestMintPublicKey)
toshiMintAccount, _ = common.NewAccountFromPublicKeyString(config.ToshiMintPublicKey)
xpMintAccount, _ = common.NewAccountFromPublicKeyString(config.XpMintPublicKey)
)

Expand All @@ -45,10 +47,12 @@ var trackedLaunchpadMints = []*common.Account{
bogeyMintAccount,
floatMintAccount,
jeffyMintAccount,
lightspeedMintAccount,
linksMintAccount,
marketCoinMintAccount,
moonyMintAccount,
testMintAccount,
toshiMintAccount,
xpMintAccount,
}

Expand Down
36 changes: 36 additions & 0 deletions ocp/worker/currency/reserve.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,36 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context)
})
}()

err12 := func() error {
lightspeedMintAccount, _ := common.NewAccountFromPublicKeyString(config.LightspeedMintPublicKey)

ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, lightspeedMintAccount)
if err != nil {
return err
}

return p.data.PutCurrencyReserve(ctx, &currency.ReserveRecord{
Mint: lightspeedMintAccount.PublicKey().ToBase58(),
SupplyFromBonding: ciculatingSupply,
Time: ts,
})
}()

err13 := func() error {
toshiMintAccount, _ := common.NewAccountFromPublicKeyString(config.ToshiMintPublicKey)

ciculatingSupply, ts, err := currency_util.GetLaunchpadCurrencyCirculatingSupply(ctx, p.data, toshiMintAccount)
if err != nil {
return err
}

return p.data.PutCurrencyReserve(ctx, &currency.ReserveRecord{
Mint: toshiMintAccount.PublicKey().ToBase58(),
SupplyFromBonding: ciculatingSupply,
Time: ts,
})
}()

if err1 != nil {
return err1
}
Expand Down Expand Up @@ -268,6 +298,12 @@ func (p *reserveRuntime) UpdateAllLaunchpadCurrencyReserves(ctx context.Context)
if err11 != nil {
return err11
}
if err12 != nil {
return err12
}
if err13 != nil {
return err13
}

return nil
}
2 changes: 2 additions & 0 deletions ocp/worker/geyser/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,12 @@ func (h *TokenProgramAccountHandler) Handle(ctx context.Context, update *geyserp
config.BogeyMintPublicKey,
config.FloatMintPublicKey,
config.JeffyMintPublicKey,
config.LightspeedMintPublicKey,
config.LinksMintPublicKey,
config.MarketCoinMintPublicKey,
config.MoonyMintPublicKey,
config.TestMintPublicKey,
config.ToshiMintPublicKey,
config.XpMintPublicKey:
// Not an ATA, so filter it out. It cannot be a VM deposit ATA
if bytes.Equal(tokenAccount.PublicKey().ToBytes(), ownerAccount.PublicKey().ToBytes()) {
Expand Down
2 changes: 2 additions & 0 deletions ocp/worker/nonce/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ func (p *runtime) Start(ctx context.Context, interval time.Duration) error {
config.BogeyVmAccountPublicKey,
config.FloatVmAccountPublicKey,
config.JeffyVmAccountPublicKey,
config.LightspeedVmAccountPublicKey,
config.LinksVmAccountPublicKey,
config.MarketCoinVmAccountPublicKey,
config.MoonyVmAccountPublicKey,
config.TestVmAccountPublicKey,
config.ToshiVmAccountPublicKey,
config.XpVmAccountPublicKey,
} {
for _, state := range []nonce.State{
Expand Down
Loading