Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
af0cbc7
sprouts+: initial structure
Dec 5, 2017
33057cf
sprouts+: header verification and signature
Dec 6, 2017
556c65d
sprouts+: coin age calculation
Dec 7, 2017
aac8c0d
sprouts+: no genesis block in coin age calculations
Dec 7, 2017
a771fb5
sprouts+: complete wireframe for main computations
Dec 8, 2017
4d6166e
sprouts+: finish kernel computations
Dec 11, 2017
56d87b9
sprouts+: finish rewards, store coin age in db
Dec 12, 2017
66fb2ac
sprouts+: precise coin age calculations
Dec 12, 2017
5bf33db
sprouts+: kernel computation test and fix
Dec 14, 2017
7e98008
puppeth: option to create sprouts+ network
Dec 14, 2017
7796cb3
sprouts+: test and debug blockchain generation
Dec 17, 2017
7958715
sprouts+: complete chain autogeneration; calc of difficulty as an int
Dec 19, 2017
cf387b5
puppeth: seal genesis with rewards account
Dec 19, 2017
ae2c5c4
sprouts+: check for duplicate stakes
Dec 21, 2017
d68c2ea
sprouts+: cleanup params, add coin age test
Dec 25, 2017
fdb8fc6
sprouts+: update Dockerfile
Dec 26, 2017
2f9e705
sprouts+: cleanup config
Dec 26, 2017
4d05136
sprouts+: transfers from distribution account contribute to coin age …
Dec 28, 2017
d246a39
sprouts+: minor improvements
Dec 28, 2017
7d3082b
sprouts+: refine kernel computation
Dec 28, 2017
46cfece
sprouts+: recalculate coin age on each call
Jan 3, 2018
520ffbb
sprouts+: change import paths to github.com/applicature
Jan 4, 2018
fb20f89
sprouts+: critical fixes
Jan 8, 2018
450ddc6
sprouts+: change import paths to github.com/applicature/sprouts-plus
Jan 8, 2018
0d38150
sprouts+: adjust build scripts to new import paths
Jan 8, 2018
cf30171
sprouts+: add make option to build binaries for sprouts+
Jan 10, 2018
9a36bac
sprouts+: keep 2 separate addresses for charity and R&D; keep reward …
Jan 10, 2018
6e64812
sprouts+: calculate md5 for binaries
Jan 12, 2018
bad655b
sprouts+: use md5sum instead of md5 in Makefile
Jan 12, 2018
246fd7f
sprouts+: add geth cmd line options for sprouts network
Jan 12, 2018
94e164d
sprouts+: make archives and config for Mist as step in Makefile
Jan 15, 2018
d8b645b
sprouts+: fix Mist config formatting
Jan 16, 2018
9c55791
sprouts+: fix hash in Mist config
Jan 16, 2018
b140b5c
sprouts+: fix hash in Mist config
Jan 16, 2018
e52c3d3
sprouts+: make unique sprouts directories;update coin age params
Jan 17, 2018
9a0fb77
sprouts+: update bootnode enode
Jan 17, 2018
019d74e
sprouts+: switch to coin-unit equal to 1 ETH; store coin age as big.Int
Jan 22, 2018
4e3a64e
sprouts+: ancestor is knownn if there is import of multiple blocks
Jan 22, 2018
9e58521
sprouts+: update bootnode
Jan 24, 2018
1c85040
sprouts+: add safety error check in coinAge
Jan 24, 2018
fa67e1c
sprouts+: update bootnode
Jan 25, 2018
f70ddc3
sprouts+: remove all unnecessary bootnodes; change default listening …
Jan 26, 2018
263d8cc
sprouts+: set full syncmode as default for sprouts+ networks
Jan 26, 2018
f5cdd81
sprouts+: simplify coefficients
Jan 30, 2018
bb52ea5
sprouts+: update port to 30308
Jan 31, 2018
6d6774c
sprouts+: fix default port everywhere
Jan 31, 2018
7a5e0f9
sprouts+: update bootnode
Jan 31, 2018
01bbd20
update domain for binary upload
yorugac Feb 6, 2018
7f3106c
add value of coinage to header.Extra
yorugac Feb 11, 2018
a17ce43
Merge branch 'sprouts-plus' into coin-unit-adjustment
yorugac Feb 11, 2018
655c40d
Merge pull request #1 from Applicature/coin-unit-adjustment
yorugac Feb 11, 2018
f246e33
rename to Auxilium
yorugac Feb 11, 2018
39f09d0
update bootnode
yorugac Feb 11, 2018
ecb6aaf
aepos: block difficulty must be >= 1
Feb 18, 2018
e576fb1
aepos: revert target spacing to previous 10 min
Feb 18, 2018
9ddfc4d
increase coinage by x1000 to allow smaller stakes; refactor
Feb 26, 2018
93f8cad
adjust coin age formula to allow staking from 100 AUX
Mar 9, 2018
daf94d3
blockPeriod cannot be less 15s
Mar 9, 2018
0aea578
update bootnode
Mar 10, 2018
9c6ccf6
fix incorrect coinage from distribution account
Mar 10, 2018
5c9bfac
add debug info
Mar 15, 2018
f3083ce
limit max coin value that can be used as a stake
Mar 22, 2018
64d851f
alter chances of successful target in kernel
Mar 26, 2018
2ce167f
fix handling of holdingPeriod
yorugac Apr 7, 2018
09e4aef
subtract value along with the stake
yorugac Apr 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,13 @@ geth-windows-amd64:
build/env.sh go run build/ci.go xgo -- --go=$(GO) --targets=windows/amd64 -v ./cmd/geth
@echo "Windows amd64 cross compilation done:"
@ls -ld $(GOBIN)/geth-windows-* | grep amd64

geth-sprouts: geth-linux-386 geth-windows-386 geth-linux-amd64 geth-windows-amd64 geth-darwin-amd64
@echo "Cross compilation for Auxilium done:"
@ls -ld $(GOBIN)/geth-*
build/env.sh go run build/ci.go archive -arch windows-4.0-amd64
build/env.sh go run build/ci.go archive -arch windows-4.0-386
build/env.sh go run build/ci.go archive -arch linux-amd64 -type tar
build/env.sh go run build/ci.go archive -arch linux-386 -type tar
build/env.sh go run build/ci.go archive -arch darwin-10.6-amd64 -type tar
build/env.sh go run build/ci.go mistconfig -url http://grow.auxilium.global
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
0.1
4 changes: 2 additions & 2 deletions accounts/abi/abi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/crypto"
)

const jsondata = `
Expand Down
8 changes: 4 additions & 4 deletions accounts/abi/bind/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"io"
"io/ioutil"

"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/accounts/keystore"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/crypto"
)

// NewTransactor is a utility method to easily create a transaction signer from
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"errors"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/applicature/sprouts-plus"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
)

var (
Expand Down
22 changes: 11 additions & 11 deletions accounts/abi/bind/backends/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ import (
"sync"
"time"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/params"
"github.com/applicature/sprouts-plus"
"github.com/applicature/sprouts-plus/accounts/abi/bind"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/common/math"
"github.com/applicature/sprouts-plus/consensus/ethash"
"github.com/applicature/sprouts-plus/core"
"github.com/applicature/sprouts-plus/core/state"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/core/vm"
"github.com/applicature/sprouts-plus/ethdb"
"github.com/applicature/sprouts-plus/params"
)

// This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend.
Expand Down
10 changes: 5 additions & 5 deletions accounts/abi/bind/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"fmt"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus"
"github.com/applicature/sprouts-plus/accounts/abi"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/crypto"
)

// SignerFn is a signer function callback when a contract requires a method to
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/bind.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"text/template"
"unicode"

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/applicature/sprouts-plus/accounts/abi"
"golang.org/x/tools/imports"
)

Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
"golang.org/x/tools/imports"
)

Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package bind

import "github.com/ethereum/go-ethereum/accounts/abi"
import "github.com/applicature/sprouts-plus/accounts/abi"

// tmplData is the data structure required to fill the binding template.
type tmplData struct {
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"fmt"
"time"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/log"
)

// WaitMined waits for tx to be mined on the blockchain.
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"testing"
"time"

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/accounts/abi/bind"
"github.com/applicature/sprouts-plus/accounts/abi/bind/backends"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/crypto"
)

var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"strings"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/crypto"
)

// Event is an event potentially triggered by the EVM's LOG mechanism. The Event
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/crypto"
)

func TestEventId(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/method.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"strings"

"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/crypto"
)

// Callable method given a `Name` and whether the method is a constant.
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/numbers.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/big"
"reflect"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/common/math"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/big"
"reflect"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/common/math"
)

// packBytesSlice packs the given bytes as [L, V] as the canonical representation
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

func TestPack(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/type_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"

"github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

// typeWithoutStringer is a alias for the Type type which simply doesn't implement
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"math/big"
"reflect"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

// unpacker is a utility interface that enables us to have
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

type unpackTest struct {
Expand Down
8 changes: 4 additions & 4 deletions accounts/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ package accounts
import (
"math/big"

ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
ethereum "github.com/applicature/sprouts-plus"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/event"
)

// Account represents an Ethereum account located at a specific location defined
Expand Down
6 changes: 3 additions & 3 deletions accounts/keystore/account_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"sync"
"time"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/log"
"gopkg.in/fatih/set.v0"
)

Expand Down
4 changes: 2 additions & 2 deletions accounts/keystore/account_cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (

"github.com/cespare/cp"
"github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/common"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion accounts/keystore/file_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"github.com/ethereum/go-ethereum/log"
"github.com/applicature/sprouts-plus/log"
set "gopkg.in/fatih/set.v0"
)

Expand Down
6 changes: 3 additions & 3 deletions accounts/keystore/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"strings"
"time"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/crypto"
"github.com/pborman/uuid"
)

Expand Down
10 changes: 5 additions & 5 deletions accounts/keystore/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import (
"sync"
"time"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/core/types"
"github.com/applicature/sprouts-plus/crypto"
"github.com/applicature/sprouts-plus/event"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions accounts/keystore/keystore_passphrase.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"io/ioutil"
"path/filepath"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto/randentropy"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/common/math"
"github.com/applicature/sprouts-plus/crypto"
"github.com/applicature/sprouts-plus/crypto/randentropy"
"github.com/pborman/uuid"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/scrypt"
Expand Down
2 changes: 1 addition & 1 deletion accounts/keystore/keystore_passphrase_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"io/ioutil"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion accounts/keystore/keystore_plain.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"path/filepath"

"github.com/ethereum/go-ethereum/common"
"github.com/applicature/sprouts-plus/common"
)

type keyStorePlain struct {
Expand Down
4 changes: 2 additions & 2 deletions accounts/keystore/keystore_plain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/crypto"
)

func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
Expand Down
6 changes: 3 additions & 3 deletions accounts/keystore/keystore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"testing"
"time"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/common"
"github.com/applicature/sprouts-plus/event"
)

var testSigData = make([]byte, 32)
Expand Down
6 changes: 3 additions & 3 deletions accounts/keystore/keystore_wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package keystore
import (
"math/big"

ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/core/types"
ethereum "github.com/applicature/sprouts-plus"
"github.com/applicature/sprouts-plus/accounts"
"github.com/applicature/sprouts-plus/core/types"
)

// keystoreWallet implements the accounts.Wallet interface for the original
Expand Down
Loading