From 6bcf545b15d6e37b9f8aa2a555f19f349b259c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Sat, 17 Dec 2022 00:18:34 +0100 Subject: [PATCH 1/2] feat: celestia DA: support fees --- da/celestia/celestia.go | 3 ++- go.mod | 4 ++-- go.sum | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/da/celestia/celestia.go b/da/celestia/celestia.go index f50d37da27..33c0e1aabe 100644 --- a/da/celestia/celestia.go +++ b/da/celestia/celestia.go @@ -32,6 +32,7 @@ var _ da.BlockRetriever = &DataAvailabilityLayerClient{} type Config struct { BaseURL string `json:"base_url"` Timeout time.Duration `json:"timeout"` + Fee int64 `json:"fee"` GasLimit uint64 `json:"gas_limit"` } @@ -73,7 +74,7 @@ func (c *DataAvailabilityLayerClient) SubmitBlock(ctx context.Context, block *ty } } - txResponse, err := c.client.SubmitPFD(ctx, c.namespaceID, blob, c.config.GasLimit) + txResponse, err := c.client.SubmitPFD(ctx, c.namespaceID, blob, c.config.Fee, c.config.GasLimit) if err != nil { return da.ResultSubmitBlock{ diff --git a/go.mod b/go.mod index 876b4a3c43..ced2ec52ef 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/celestiaorg/rollmint go 1.18 require ( - github.com/celestiaorg/go-cnc v0.1.0 + github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4 github.com/dgraph-io/badger/v3 v3.2103.4 github.com/go-kit/kit v0.12.0 github.com/gogo/protobuf v1.3.2 @@ -45,7 +45,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.2 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/flynn/noise v1.0.0 // indirect diff --git a/go.sum b/go.sum index 90645c4446..c1f07e9f22 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/i github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/celestiaorg/go-cnc v0.1.0 h1:u986OnTc7AtbUZ4reY+zRCiar4fDdR1KehyP78uwsXg= -github.com/celestiaorg/go-cnc v0.1.0/go.mod h1:Zf03bWWq6aldv5cYEaWvJ+I+z34bT/exrS0tO0y/jN8= +github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4 h1:PtWA3nD+Q1BsChb13yByvhAeb7FD9qRx4GAAbruH2DM= +github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4/go.mod h1:CZBVUhQnJnAVcfQnnEAqREF+PNWr97m/BhJ5fp1K44Q= github.com/celestiaorg/tendermint v0.34.22-0.20221013213714-8be9b54c8c21 h1:M1fprJ+U7Z3SZzDBeiuJ/vx21QgguOu+Ld9ALVDyLuY= github.com/celestiaorg/tendermint v0.34.22-0.20221013213714-8be9b54c8c21/go.mod h1:zoyyiiihvTW8DnOr63YLxhYn/WK/QmE74CeIpS++hBE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -124,8 +124,9 @@ github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkz github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= From e3c22c6d2949c2f4864dc3a8a8be7817fb527985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zdyba=C5=82?= Date: Mon, 19 Dec 2022 22:18:28 +0100 Subject: [PATCH 2/2] deps: use go-cnc v0.2.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ced2ec52ef..a3abce2654 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/celestiaorg/rollmint go 1.18 require ( - github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4 + github.com/celestiaorg/go-cnc v0.2.0 github.com/dgraph-io/badger/v3 v3.2103.4 github.com/go-kit/kit v0.12.0 github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index c1f07e9f22..dba80bc89a 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/i github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4 h1:PtWA3nD+Q1BsChb13yByvhAeb7FD9qRx4GAAbruH2DM= -github.com/celestiaorg/go-cnc v0.1.1-0.20221216225622-2e6cb04251a4/go.mod h1:CZBVUhQnJnAVcfQnnEAqREF+PNWr97m/BhJ5fp1K44Q= +github.com/celestiaorg/go-cnc v0.2.0 h1:QBcWz1v6341r+5Urbr/eaCm9S8D2wwEwielKcwBc1Z4= +github.com/celestiaorg/go-cnc v0.2.0/go.mod h1:CZBVUhQnJnAVcfQnnEAqREF+PNWr97m/BhJ5fp1K44Q= github.com/celestiaorg/tendermint v0.34.22-0.20221013213714-8be9b54c8c21 h1:M1fprJ+U7Z3SZzDBeiuJ/vx21QgguOu+Ld9ALVDyLuY= github.com/celestiaorg/tendermint v0.34.22-0.20221013213714-8be9b54c8c21/go.mod h1:zoyyiiihvTW8DnOr63YLxhYn/WK/QmE74CeIpS++hBE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=