Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(storageincentives): phase4 #4378

Closed
wants to merge 25 commits into from
Closed

refactor(storageincentives): phase4 #4378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
19e029c
feat(storageincentives): storage incentives phase 4 (#4345)
zelig Sep 28, 2023
d92945e
fix: include the reason when the redistribution contract call fails (…
Sep 29, 2023
9b0da30
fix(transaction): swallow estimate gas error (#4366)
istae Oct 2, 2023
b041fb2
fix(postage): added postage stamps json marshaling (#4369)
istae Oct 3, 2023
3f388c5
chore: update si (#4370)
istae Oct 3, 2023
d6b34ce
feat: unwrap smart contract custom abi errors (#4367)
Oct 3, 2023
6e3acab
chore: increase max commit length
istae Oct 3, 2023
2d16af2
refactor(storageincentives): extensive rewrite
zelig Oct 4, 2023
c6038b9
test: abi path
nugaon Oct 5, 2023
02806ee
fix: updated contract abi version and docker setup versions
istae Oct 5, 2023
8b58d9f
fix: claim proof params
nugaon Oct 5, 2023
7d1d6aa
chore: add license header
nugaon Oct 5, 2023
84798a3
feat: include abi custom error params in the returned error (#4376)
Oct 5, 2023
f8e7ea9
feat: json definitions
nugaon Oct 5, 2023
31d5ec5
test: correct data types
nugaon Oct 5, 2023
ed8d7f6
fix: uint32 to uint64 on Commit
nugaon Oct 5, 2023
e9b4def
chore: bump storage-incentives abi to v0.6.0-rc8 (#4381)
Oct 5, 2023
4afe1b4
refactor: proofSegments and proveSegment
nugaon Oct 5, 2023
92fe19a
refactor: batch id to postage id
nugaon Oct 5, 2023
cab809e
fix: batchstore valueKeyToValue
nugaon Oct 5, 2023
3c50960
refactor: remove json tags
nugaon Oct 5, 2023
68e23ba
refactor: uint64 to uint32
nugaon Oct 5, 2023
bcbd4e6
fix: channel close if not nil
nugaon Oct 5, 2023
9903915
fix: redistribution contract abi type change (#4382)
Oct 9, 2023
d253043
Merge branch 'ph4' into ph4-refactor-testing
nugaon Oct 10, 2023
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: 1 addition & 1 deletion .github/workflows/beekeeper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
K3S_VERSION: "v1.22.17+k3s1"
REPLICA: 3
RUN_TYPE: "PR RUN"
SETUP_CONTRACT_IMAGE_TAG: "0.9.9"
SETUP_CONTRACT_IMAGE_TAG: "1.0.4"
BEELOCAL_BRANCH: "main"
BEEKEEPER_BRANCH: "master"
BEEKEEPER_METRICS_ENABLED: false
Expand Down
2 changes: 1 addition & 1 deletion commitlint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
'body-case': [0, 'never'],
'footer-leading-blank': [1, 'always'],
'footer-max-line-length': [2, 'always', 72],
'header-max-length': [2, 'always', 72],
'header-max-length': [2, 'always', 100],
'subject-case': [
2,
'never',
Expand Down
34 changes: 21 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/btcsuite/btcd v0.22.3
github.com/casbin/casbin/v2 v2.35.0
github.com/coreos/go-semver v0.3.0
github.com/ethereum/go-ethereum v1.12.2
github.com/ethereum/go-ethereum v1.13.2
github.com/ethersphere/go-price-oracle-abi v0.1.0
github.com/ethersphere/go-storage-incentives-abi v0.5.0
github.com/ethersphere/go-storage-incentives-abi v0.6.0-rc8
github.com/ethersphere/go-sw3-abi v0.4.0
github.com/ethersphere/langos v1.0.0
github.com/go-playground/validator/v10 v10.11.1
Expand All @@ -32,7 +32,7 @@ require (
github.com/opentracing/opentracing-go v1.2.0
github.com/prometheus/client_golang v1.14.0
github.com/spf13/afero v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.8.1
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
Expand All @@ -42,12 +42,12 @@ require (
gitlab.com/nolash/go-mockbytes v0.0.7
go.uber.org/atomic v1.10.0
go.uber.org/goleak v1.1.12
golang.org/x/crypto v0.9.0
golang.org/x/crypto v0.12.0
golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
golang.org/x/net v0.10.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.9.0
golang.org/x/term v0.8.0
golang.org/x/sys v0.11.0
golang.org/x/term v0.11.0
golang.org/x/time v0.3.0
gopkg.in/yaml.v2 v2.4.0
resenje.org/multex v0.1.0
Expand All @@ -56,14 +56,23 @@ require (
)

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/bits-and-blooms/bitset v1.5.0 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.10.0 // indirect
github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

require (
github.com/BurntSushi/toml v1.1.0 // indirect
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
Expand Down Expand Up @@ -97,7 +106,7 @@ require (
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.4
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huin/goupnp v1.0.3 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/ipfs/go-log/v2 v2.5.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
Expand Down Expand Up @@ -154,10 +163,10 @@ require (
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.6 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/wealdtech/go-multicodec v1.4.0 // indirect
Expand All @@ -167,11 +176,10 @@ require (
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.9.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.57.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
nhooyr.io/websocket v1.8.7 // indirect
Expand Down
Loading
Loading