ported
/
egaz-pool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
yuriy0803 3 years ago
parent
42a801574a
commit
35061687dd
7 changed files with 14 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      main.go
  2. 2
      payouts/payer.go
  3. 12
      payouts/unlocker.go
  4. 2
      proxy/blocks.go
  5. 2
      proxy/miner.go
  6. 2
      rpc/rpc.go
  7. 6
      util/util.go

1
main.go
Unescape View File

@ -1,3 +1,4 @@
//go:build go1.9
// +build go1.9 // +build go1.9
package main package main

2
payouts/payer.go
Unescape View File

@ -10,7 +10,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/etclabscore/core-geth/common/hexutil"
"github.com/yuriy0803/open-etc-pool-friends/rpc" "github.com/yuriy0803/open-etc-pool-friends/rpc"
"github.com/yuriy0803/open-etc-pool-friends/storage" "github.com/yuriy0803/open-etc-pool-friends/storage"

12
payouts/unlocker.go
Unescape View File

@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/common/math" "github.com/etclabscore/core-geth/common/math"
"github.com/yuriy0803/open-etc-pool-friends/rpc" "github.com/yuriy0803/open-etc-pool-friends/rpc"
"github.com/yuriy0803/open-etc-pool-friends/storage" "github.com/yuriy0803/open-etc-pool-friends/storage"
@ -626,7 +626,7 @@ func getConstReward(era *big.Int) *big.Int {
return wr return wr
} }
//etchash // etchash
func getRewardForUncle(blockReward *big.Int) *big.Int { func getRewardForUncle(blockReward *big.Int) *big.Int {
return new(big.Int).Div(blockReward, big32) //return new(big.Int).Div(reward, new(big.Int).SetInt64(32)) return new(big.Int).Div(blockReward, big32) //return new(big.Int).Div(reward, new(big.Int).SetInt64(32))
} }
@ -669,10 +669,10 @@ func getConstRewardUbiq(height int64) *big.Int {
reward = big.NewInt(4e+18) reward = big.NewInt(4e+18)
// Year 4 // Year 4
} }
// If Orion use new MP // If Orion use new MP
if headerNumber.Cmp(big.NewInt(1791793)) >= 0 { if headerNumber.Cmp(big.NewInt(1791793)) >= 0 {
reward = big.NewInt(15e+17) reward = big.NewInt(15e+17)
} }
return reward return reward
} }

2
proxy/blocks.go
Unescape View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/ethereum/go-ethereum/common" "github.com/etclabscore/core-geth/common"
"github.com/yuriy0803/open-etc-pool-friends/rpc" "github.com/yuriy0803/open-etc-pool-friends/rpc"
"github.com/yuriy0803/open-etc-pool-friends/util" "github.com/yuriy0803/open-etc-pool-friends/util"
) )

2
proxy/miner.go
Unescape View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/etclabscore/core-geth/common"
"github.com/yuriy0803/etchash" "github.com/yuriy0803/etchash"
) )

2
rpc/rpc.go
Unescape View File

@ -12,7 +12,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/etclabscore/core-geth/common/hexutil"
"github.com/yuriy0803/open-etc-pool-friends/util" "github.com/yuriy0803/open-etc-pool-friends/util"
) )

6
util/util.go
Unescape View File

@ -6,9 +6,9 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/etclabscore/core-geth/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/etclabscore/core-geth/common/hexutil"
"github.com/ethereum/go-ethereum/common/math" "github.com/etclabscore/core-geth/common/math"
) )
var Ether = math.BigPow(10, 18) var Ether = math.BigPow(10, 18)

Write Preview
Loading…
Cancel
Save