From 41ed8f62e2557cdca0f579744a6e594cdf551692 Mon Sep 17 00:00:00 2001 From: mmc Date: Fri, 31 May 2024 18:19:07 +0800 Subject: [PATCH] mainnet-beta8 --- go.mod | 1 - go.sum | 1 - internal/logic/miner.go | 31 +++++++++++++++---------------- solxen-tx.yaml | 3 ++- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 62e7766..5d08167 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/gagliardetto/solana-go v1.10.0 github.com/gagliardetto/treeout v0.1.4 github.com/logrusorgru/aurora v2.0.3+incompatible - github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe github.com/mr-tron/base58 v1.2.0 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 36c06c9..27486cf 100644 --- a/go.sum +++ b/go.sum @@ -82,7 +82,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 h1:mPMvm6X6tf4w8y7j9YIt6V9jfWhL6QlbEc7CCmeQlWk= github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1/go.mod h1:ye2e/VUEtE2BHE+G/QcKkcLQVAEJoYRFj5VUOQatCRE= diff --git a/internal/logic/miner.go b/internal/logic/miner.go index 7e62e4c..161e364 100644 --- a/internal/logic/miner.go +++ b/internal/logic/miner.go @@ -12,7 +12,6 @@ import ( "github.com/gagliardetto/solana-go" computebudget "github.com/gagliardetto/solana-go/programs/compute-budget" "github.com/gagliardetto/solana-go/rpc" - "github.com/montanaflynn/stats" "github.com/zeromicro/go-zero/core/errorx" "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/mr" @@ -31,21 +30,21 @@ func (l *Producer) Miner() error { eth.Address = uint8Array eth.AddressStr = ethAccount.String() - out := make([]rpc.PriorizationFeeResult, 0) - feeAccount := []solana.PublicKey{ - solana.MustPublicKeyFromBase58(l.svcCtx.Config.Sol.ProgramId), - } + // out := make([]rpc.PriorizationFeeResult, 0) + // feeAccount := []solana.PublicKey{ + // solana.MustPublicKeyFromBase58(l.svcCtx.Config.Sol.ProgramId), + // } - fee := l.svcCtx.Config.Sol.Fee - if fee == 0 { - out, _ = l.svcCtx.SolCli.GetRecentPrioritizationFees(l.ctx, feeAccount) - var feeFata []float64 - for _, item := range out { - feeFata = append(feeFata, float64(item.PrioritizationFee)) - } - _fee, _ := stats.Mean(feeFata) - fee = uint64(_fee) * 1_000_000 - } + // fee := l.svcCtx.Config.Sol.Fee + // if fee == 0 { + // out, _ = l.svcCtx.SolCli.GetRecentPrioritizationFees(l.ctx, feeAccount) + // var feeFata []float64 + // for _, item := range out { + // feeFata = append(feeFata, float64(item.PrioritizationFee)) + // } + // _fee, _ := stats.Mean(feeFata) + // fee = uint64(_fee) * 1_000_000 + // } feesInit := computebudget.NewSetComputeUnitPriceInstructionBuilder().SetMicroLamports(l.svcCtx.Config.Sol.Fee).Build() for _index, _account := range l.svcCtx.AddrList { @@ -216,7 +215,7 @@ func (l *Producer) Miner() error { logx.Infof("account:%v fee:%v slot:%v kind:%v hashs:%v superhashes:%v Points:%v t:%v", account.PublicKey(), - fee, + l.svcCtx.Config.Sol.Fee, recent.Context.Slot, kind, // common.Bytes2Hex(maybe_user_account_data_raw.Nonce[:]), diff --git a/solxen-tx.yaml b/solxen-tx.yaml index 921c7a5..90d4de2 100644 --- a/solxen-tx.yaml +++ b/solxen-tx.yaml @@ -7,7 +7,8 @@ Sol: Url: "https://api.mainnet-beta.solana.com" # rpc地址 [rpc address] Mnemonic: "" # 助记词 [mnemonic phrase] Num: 1 # 并发数 [concurrency] - Fee: 0 # 优先级费用 [priority fee] + Fee: 3000 # 优先级费用 [priority fee] + Kind: -1 ToAddr: "0x405113f4376A7769E61e82c5cdA16c80Cc9c0bd8" # eth空投地址 [eth address for receiving xn airdrop] ProgramID: "5tungisGgk1fmGXxacNT1NkPtZgRwJnJPVMK5kfHqx2m" # solxen合约地址 [solxen contract address] Time: 1000 # 间隔时间(单位毫秒) [interval time (milliseconds)]