Skip to content

Commit 2d1bdf5

Browse files
actions-useractions-user
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3b23ab2 + f66f9fc commit 2d1bdf5

27 files changed

Lines changed: 253 additions & 288 deletions

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 160 deletions
This file was deleted.

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
BIN_IMAGE = blockbook-build
22
DEB_IMAGE = blockbook-build-deb
33
PACKAGER = $(shell id -u):$(shell id -g)
4-
DOCKER_VERSION = $(shell docker version --format '{{.Client.Version}}')
4+
DOCKER_VERSION = 29.4.3
5+
DOCKER_SHA256 = bc9734a89d3edd15eeca8620961f6499ba69948814c85d7ac3488e34b3e16d01
56
BASE_IMAGE = $$(awk -F= '$$1=="ID" { print $$2 ;}' /etc/os-release):$$(awk -F= '$$1=="VERSION_ID" { print $$2 ;}' /etc/os-release | tr -d '"')
67
NO_CACHE = false
78
TCMALLOC =
@@ -81,7 +82,7 @@ build-images: clean-images
8182
.deb-image: .bin-image
8283
@if [ $$(build/tools/image_status.sh $(DEB_IMAGE):latest build/docker) != "ok" ]; then \
8384
echo "Building image $(DEB_IMAGE)..."; \
84-
docker build --no-cache=$(NO_CACHE) --build-arg DOCKER_VERSION=$(DOCKER_VERSION) -t $(DEB_IMAGE) build/docker/deb; \
85+
docker build --no-cache=$(NO_CACHE) --build-arg DOCKER_VERSION=$(DOCKER_VERSION) --build-arg DOCKER_SHA256=$(DOCKER_SHA256) -t $(DEB_IMAGE) build/docker/deb; \
8586
else \
8687
echo "Image $(DEB_IMAGE) is up to date"; \
8788
fi

‎bchain/coins/btc/bitcoinlikeparser.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ var (
442442

443443
func init() {
444444
var err error
445-
xpubDesriptorRegex, err = regexp.Compile(`^(?P<type>(sh\(wpkh|wpkh|pk|pkh|wpkh|wsh|tr))\((\[\w+/(?P<bip>\d+)['h]/\d+['h]?/\d+['h]?\])?(?P<xpub>\w+)(/(({(?P<changelist1>\d+(,\d+)*)})|(<(?P<changelist2>\d+(;\d+)*)>)|(?P<change>\d+))/\*)?\)+`)
445+
xpubDesriptorRegex, err = regexp.Compile(`^(?P<type>(sh\(wpkh|wpkh|pk|pkh|wpkh|wsh|tr))\((\[\w+/(?P<bip>\d+)['h]/\d+['h]?/\d+['h]?\])?(?P<xpub>\w+)(/(({(?P<changelist1>\d+(,\d+)*)})|(<(?P<changelist2>\d+(;\d+)*)>)|(?P<change>\d+))/\*)?\)+(#[a-z0-9]{8})?$`)
446446
if err != nil {
447447
panic(errors.Annotate(err, "Invalid bitcoinparser xpubDesriptorRegex"))
448448
}

‎bchain/coins/btc/bitcoinparser_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,12 @@ func TestParseXpubDescriptors(t *testing.T) {
10001000
ChangeIndexes: []uint32{0, 1},
10011001
},
10021002
},
1003+
{
1004+
name: "wpkh(xpub) error - trailing JS suffix",
1005+
xpub: `wpkh(xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ)"});alert(1);//`,
1006+
parser: btcMainParser,
1007+
wantErr: true,
1008+
},
10031009
{
10041010
name: "xxx(xpub) error - unknown output script",
10051011
xpub: "xxx(xpub6BgBgsespWvERF3LHQu6CnqdvfEvtMcQjYrcRzx53QJjSxarj2afYWcLteoGVky7D3UKDP9QyrLprQ3VCECoY49yfdDEHGCtMMj92pReUsQ)",

‎bchain/coins/tron/tronhttp_endpoints.go‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ type tronGetTransactionListFromPendingResponse struct {
2424
}
2525

2626
type tronGetAccountResourceResponse struct {
27-
FreeNetLimit int64 `json:"freeNetLimit"`
28-
FreeNetUsed int64 `json:"freeNetUsed"`
29-
NetLimit int64 `json:"NetLimit"`
30-
NetUsed int64 `json:"NetUsed"`
31-
EnergyLimit int64 `json:"EnergyLimit"`
32-
EnergyUsed int64 `json:"EnergyUsed"`
33-
TronPowerUsed int64 `json:"tronPowerUsed"`
34-
TronPowerLimit int64 `json:"tronPowerLimit"`
27+
FreeNetLimit int64 `json:"freeNetLimit"`
28+
FreeNetUsed int64 `json:"freeNetUsed"`
29+
NetLimit int64 `json:"NetLimit"`
30+
NetUsed int64 `json:"NetUsed"`
31+
TotalNetLimit int64 `json:"TotalNetLimit"`
32+
TotalNetWeight int64 `json:"TotalNetWeight"`
33+
EnergyLimit int64 `json:"EnergyLimit"`
34+
EnergyUsed int64 `json:"EnergyUsed"`
35+
TotalEnergyLimit int64 `json:"TotalEnergyLimit"`
36+
TotalEnergyWeight int64 `json:"TotalEnergyWeight"`
37+
TronPowerUsed int64 `json:"tronPowerUsed"`
38+
TronPowerLimit int64 `json:"tronPowerLimit"`
3539
}
3640

3741
type tronFrozenV2Entry struct {
@@ -172,6 +176,10 @@ func (b *TronRPC) GetAddressChainExtraData(addrDesc bchain.AddressDescriptor) (j
172176
TotalFreeBandwidth: resourceRes.resp.FreeNetLimit,
173177
AvailableEnergy: tronAvailableResource(resourceRes.resp.EnergyLimit, resourceRes.resp.EnergyUsed),
174178
TotalEnergy: resourceRes.resp.EnergyLimit,
179+
TotalEnergyLimit: resourceRes.resp.TotalEnergyLimit,
180+
TotalEnergyWeight: resourceRes.resp.TotalEnergyWeight,
181+
TotalBandwidthLimit: resourceRes.resp.TotalNetLimit,
182+
TotalBandwidthWeight: resourceRes.resp.TotalNetWeight,
175183
StakingInfo: stakingInfo,
176184
})
177185
if err != nil {

‎bchain/coins/tron/tronrpc_test.go‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,14 +541,18 @@ func TestTronRPC_GetAddressChainExtraData(t *testing.T) {
541541
mockHTTP := &MockTronHTTPClient{
542542
RespByPath: map[string]interface{}{
543543
"/wallet/getaccountresource": tronGetAccountResourceResponse{
544-
FreeNetLimit: 600,
545-
FreeNetUsed: 100,
546-
NetLimit: 400,
547-
NetUsed: 250,
548-
EnergyLimit: 9000,
549-
EnergyUsed: 1234,
550-
TronPowerUsed: 3,
551-
TronPowerLimit: 10,
544+
FreeNetLimit: 600,
545+
FreeNetUsed: 100,
546+
NetLimit: 400,
547+
NetUsed: 250,
548+
TotalNetLimit: 43200000000,
549+
TotalNetWeight: 68292467803,
550+
EnergyLimit: 9000,
551+
EnergyUsed: 1234,
552+
TotalEnergyLimit: 180000000000,
553+
TotalEnergyWeight: 2363311832,
554+
TronPowerUsed: 3,
555+
TronPowerLimit: 10,
552556
},
553557
"/wallet/getaccount": map[string]any{
554558
"address": "TLUqyV9rGYXZ2E8kXe6J3P1rvYV1Au1Goe",
@@ -600,6 +604,10 @@ func TestTronRPC_GetAddressChainExtraData(t *testing.T) {
600604
"totalFreeBandwidth":600,
601605
"availableEnergy":7766,
602606
"totalEnergy":9000,
607+
"totalEnergyLimit":180000000000,
608+
"totalEnergyWeight":2363311832,
609+
"totalBandwidthLimit":43200000000,
610+
"totalBandwidthWeight":68292467803,
603611
"stakingInfo":{
604612
"stakedBalance":"7000000",
605613
"stakedBalanceEnergy":"5000000",

‎bchain/types_tron_chainextradata.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,9 @@ type TronAccountExtraData struct {
6363
TotalFreeBandwidth int64 `json:"totalFreeBandwidth"`
6464
AvailableEnergy int64 `json:"availableEnergy"`
6565
TotalEnergy int64 `json:"totalEnergy"`
66+
TotalEnergyLimit int64 `json:"totalEnergyLimit"`
67+
TotalEnergyWeight int64 `json:"totalEnergyWeight"`
68+
TotalBandwidthLimit int64 `json:"totalBandwidthLimit"`
69+
TotalBandwidthWeight int64 `json:"totalBandwidthWeight"`
6670
StakingInfo *TronStakingInfo `json:"stakingInfo,omitempty"`
6771
}

‎blockbook-api.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export interface TronAccountExtraData {
5757
totalFreeBandwidth: number;
5858
availableEnergy: number;
5959
totalEnergy: number;
60+
totalEnergyLimit: number;
61+
totalEnergyWeight: number;
62+
totalBandwidthLimit: number;
63+
totalBandwidthWeight: number;
6064
stakingInfo?: TronStakingInfo;
6165
}
6266
export type TxChainExtraData = { payloadType: 'tron'; payload?: TronChainExtraData } | { payloadType: string; payload?: any };

‎build/docker/bin/Dockerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,21 @@ fi
2929

3030
# install and configure go
3131
ARG TARGETPLATFORM
32-
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; elif [ "$TARGETPLATFORM" = "linux/aarch64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi \
33-
&& cd /opt && wget https://dl.google.com/go/$GOLANG_VERSION.linux-$ARCHITECTURE.tar.gz && \
34-
tar xf $GOLANG_VERSION.linux-$ARCHITECTURE.tar.gz
32+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; GO_SHA256=9fa5ffeda4170de60f67f3aa0f824e426421ba724c21e133c1e35d6159ca1bec; \
33+
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; GO_SHA256=a68e86d4b72c2c2fecf7dfed667680b6c2a071221bbdb6913cf83ce3f80d9ff0; \
34+
elif [ "$TARGETPLATFORM" = "linux/aarch64" ]; then ARCHITECTURE=arm64; GO_SHA256=a68e86d4b72c2c2fecf7dfed667680b6c2a071221bbdb6913cf83ce3f80d9ff0; \
35+
else ARCHITECTURE=amd64; GO_SHA256=9fa5ffeda4170de60f67f3aa0f824e426421ba724c21e133c1e35d6159ca1bec; fi \
36+
&& cd /opt && wget https://dl.google.com/go/$GOLANG_VERSION.linux-$ARCHITECTURE.tar.gz \
37+
&& echo "$GO_SHA256 $GOLANG_VERSION.linux-$ARCHITECTURE.tar.gz" | sha256sum -c - \
38+
&& tar xf $GOLANG_VERSION.linux-$ARCHITECTURE.tar.gz
3539
RUN ln -s /opt/go/bin/go /usr/bin/go
3640
RUN mkdir -p $GOPATH
3741
RUN echo -n "GO version: " && go version
3842
RUN echo -n "GOPATH: " && echo $GOPATH
3943

4044
# install rocksdb
41-
RUN cd /opt && git clone -b $ROCKSDB_VERSION --depth 1 https://github.com/facebook/rocksdb.git
45+
RUN cd /opt && git clone -b $ROCKSDB_VERSION --depth 1 https://github.com/facebook/rocksdb.git \
46+
&& test "$(git -C /opt/rocksdb rev-parse HEAD)" = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff"
4247
RUN cd /opt/rocksdb && CFLAGS=-fPIC CXXFLAGS=-fPIC PORTABLE=$PORTABLE_ROCKSDB DISABLE_WARNING_AS_ERROR=1 make -j 4 release
4348
RUN strip /opt/rocksdb/ldb /opt/rocksdb/sst_dump && \
4449
cp /opt/rocksdb/ldb /opt/rocksdb/sst_dump /build

‎build/docker/deb/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ RUN apt-get update && \
1111

1212
# install docker cli
1313
ARG DOCKER_VERSION
14+
ARG DOCKER_SHA256
1415

1516
RUN if [ -z "$DOCKER_VERSION" ]; then echo "DOCKER_VERSION is a required build arg" && exit 1; fi
17+
RUN if [ -z "$DOCKER_SHA256" ]; then echo "DOCKER_SHA256 is a required build arg" && exit 1; fi
1618

1719
RUN wget -O docker.tgz "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" && \
20+
echo "${DOCKER_SHA256} docker.tgz" | sha256sum -c - && \
1821
tar -xzf docker.tgz --strip 1 -C /usr/local/bin/ && \
1922
rm docker.tgz && \
2023
docker --version

0 commit comments

Comments
 (0)