diff --git a/api/bills.go b/api/bills.go index dcd9dcf..82012ef 100644 --- a/api/bills.go +++ b/api/bills.go @@ -51,7 +51,6 @@ func (c *Controller) getBillsByPubKey(w http.ResponseWriter, r *http.Request) { PartitionID: bill.PartitionID, ID: bill.ID, Value: bill.Value, - LockStatus: bill.LockStatus, Counter: bill.Counter, }) } diff --git a/docker-compose.yml b/docker-compose.yml index a27dcec..cf0fa4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,9 @@ services: condition: service_healthy environment: - BLOCK_EXPLORER_NODES_0_URL=dev-ab-money-archive.abdev1.guardtime.com/rpc - - BLOCK_EXPLORER_NODES_0_BLOCK_NUMBER=100 + - BLOCK_EXPLORER_NODES_0_BLOCK_NUMBER=1 - BLOCK_EXPLORER_NODES_1_URL=dev-ab-tokens-archive.abdev1.guardtime.com/rpc - - BLOCK_EXPLORER_NODES_1_BLOCK_NUMBER=100 + - BLOCK_EXPLORER_NODES_1_BLOCK_NUMBER=1 - BLOCK_EXPLORER_DB_URL=mongodb://root:pass@mongo:27017/ - BLOCK_EXPLORER_SERVER_ADDRESS=:9666 - BLOCK_EXPLORER_LOG_LEVEL=INFO diff --git a/domain/bill.go b/domain/bill.go index bc7a0cf..95c089b 100644 --- a/domain/bill.go +++ b/domain/bill.go @@ -7,6 +7,5 @@ type Bill struct { PartitionID types.PartitionID ID types.UnitID Value uint64 - LockStatus uint64 Counter uint64 } diff --git a/go.mod b/go.mod index 592688e..f45f7ae 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ go 1.24 require ( github.com/ainvaltin/httpsrv v0.3.1 - github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250131151333-dfd181a9e5e8 - github.com/alphabill-org/alphabill-wallet v1.0.0-rc1.0.20250110065811-a7889974f3dc + github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250411174237-b13f7ce8ec86 + github.com/alphabill-org/alphabill-wallet v1.0.0-rc2.0.20250411211608-76bd485e39cb github.com/fxamacker/cbor/v2 v2.7.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 diff --git a/go.sum b/go.sum index 99eb0fc..6ce1aa9 100644 --- a/go.sum +++ b/go.sum @@ -17,10 +17,10 @@ github.com/ainvaltin/httpsrv v0.3.1 h1:E7Oq7hpmYUDFh7olry6MFQTQwXEdaqMMOrzrgGZxi github.com/ainvaltin/httpsrv v0.3.1/go.mod h1:hsvXrOXgWiWfGSYUCRRBlBYKPwLM1WWzGuqhp8dEcDY= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250131151333-dfd181a9e5e8 h1:4+XtqtW/MNtPK4Q67VwUC1db6tL2ZYLDAGYtjKJR/pY= -github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250131151333-dfd181a9e5e8/go.mod h1:EcYLxScEReeaxjpS1YG/LRrqTVdttCQsUsSvj4WI58Y= -github.com/alphabill-org/alphabill-wallet v1.0.0-rc1.0.20250110065811-a7889974f3dc h1:TSNEUD3X6MntGbomfhM+luNd/tuWyFyEESBKvV6ZiRA= -github.com/alphabill-org/alphabill-wallet v1.0.0-rc1.0.20250110065811-a7889974f3dc/go.mod h1:OB9uJ+8B9NnntNqByBIcr99YS6GmJErm4rXBkX7jUA4= +github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250411174237-b13f7ce8ec86 h1:z4a5Rdk+g2lwZimJd5vilAeMI/fP8rzjh3Q/mf3ADnk= +github.com/alphabill-org/alphabill-go-base v1.0.0-rc2.0.20250411174237-b13f7ce8ec86/go.mod h1:EcYLxScEReeaxjpS1YG/LRrqTVdttCQsUsSvj4WI58Y= +github.com/alphabill-org/alphabill-wallet v1.0.0-rc2.0.20250411211608-76bd485e39cb h1:lgCfUFw7E+ap2Mt1gN5jSZrrUDqCG/iJdcUAZmDvXrg= +github.com/alphabill-org/alphabill-wallet v1.0.0-rc2.0.20250411211608-76bd485e39cb/go.mod h1:+Lf3xrBA14jV1fdFdJsDCbSoewi/4/Bz0YU/+gbsDQs= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bits-and-blooms/bitset v1.15.0 h1:DiCRMscZsGyYePE9AR3sVhKqUXCt5IZvkX5AfAc5xLQ= diff --git a/service/partition/partition.go b/service/partition/partition.go index 0be71cf..b81b5f9 100644 --- a/service/partition/partition.go +++ b/service/partition/partition.go @@ -59,7 +59,7 @@ func (p *Service) GetRoundNumber(ctx context.Context) ([]RoundInfo, error) { PartitionID: client.partitionID, PartitionTypeID: client.partitionTypeID, RoundNumber: info.RoundNumber, - EpochNumber: info.Epoch, + EpochNumber: info.EpochNumber, }) } return result, nil