Skip to content

Commit 855ed74

Browse files
rem1niscencerem1niscence
authored
Merge pull request #463 from canopy-network/feat/general-performance-optimizations
Feat/general performance optimizations
2 parents 685780e + c79c38f commit 855ed74

93 files changed

Lines changed: 2888 additions & 985 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-alpine AS builder
1+
FROM golang:1.26-alpine AS builder
22

33
RUN apk update && apk add --no-cache make bash nodejs npm
44

‎.docker/auto-update/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24-alpine AS builder
1+
FROM node:24-alpine AS builder
22

33
ARG BRANCH='latest'
44
ARG CLI_DIR
@@ -21,13 +21,13 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2121
echo "Cloning branch $BRANCH" && \
2222
git clone -b "$BRANCH" https://github.com/canopy-network/canopy.git .; \
2323
fi
24-
# copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
24+
# copy golang
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version
29-
# Builds
30-
RUN apk update && apk add --no-cache make bash nodejs npm
29+
# Builds
30+
RUN apk update && apk add --no-cache make bash nodejs npm
3131
RUN make build/wallet
3232
RUN make build/explorer
3333

‎.docker/auto-update/Dockerfile.csharp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2222
fi
2323

2424
# Copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version

‎.docker/auto-update/Dockerfile.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2222
fi
2323

2424
# Copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version

‎.docker/auto-update/Dockerfile.kotlin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2222
fi
2323

2424
# Copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version

‎.docker/auto-update/Dockerfile.python‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2222
fi
2323

2424
# Copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version

‎.docker/auto-update/Dockerfile.typescript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN echo "Building from BRANCH=${BRANCH}" && \
2222
fi
2323

2424
# Copy golang
25-
COPY --from=golang:1.24-alpine /usr/local/go/ /usr/local/go/
25+
COPY --from=golang:1.26-alpine /usr/local/go/ /usr/local/go/
2626
ENV PATH="/usr/local/go/bin:${PATH}"
2727

2828
RUN go version

‎.docker/compose.yaml‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,35 @@ services:
4141
command: ["start"]
4242
volumes:
4343
- ./volumes/node_2:/root/.canopy
44-
# deploy:
45-
# resources:
46-
# limits:
47-
# memory: 2G
48-
# cpus: "1.0"
49-
# node-3:
50-
# container_name: node-3
51-
# build:
52-
# context: ..
53-
# dockerfile: .docker/Dockerfile
54-
# args:
55-
# BUILD_PATH: cmd/cli
56-
# ports:
57-
# - 30000:30000 # Wallet
58-
# - 30001:30001 # Explorer
59-
# - 30002:30002 # RPC
60-
# - 30003:30003 # Admin RPC
61-
# - 9003:9003 # TCP P2P
62-
# networks:
63-
# - canopy
64-
# command: ["start"]
65-
# volumes:
66-
# - ./volumes/node_3:/root/.canopy
67-
# deploy:
68-
# resources:
69-
# limits:
70-
# memory: 2G
71-
# cpus: "1.0"
44+
deploy:
45+
resources:
46+
limits:
47+
memory: 2G
48+
cpus: "1.0"
49+
50+
# node-3:
51+
# container_name: node-3
52+
# build:
53+
# context: ..
54+
# dockerfile: .docker/Dockerfile
55+
# args:
56+
# BUILD_PATH: cmd/cli
57+
# ports:
58+
# - 30000:30000 # Wallet
59+
# - 30001:30001 # Explorer
60+
# - 30002:30002 # RPC
61+
# - 30003:30003 # Admin RPC
62+
# - 9003:9003 # TCP P2P
63+
# networks:
64+
# - canopy
65+
# command: ["start"]
66+
# volumes:
67+
# - ./volumes/node_3:/root/.canopy
68+
# deploy:
69+
# resources:
70+
# limits:
71+
# memory: 2G
72+
# cpus: "1.0"
7273

7374
networks:
7475
canopy:

‎.docker/volumes/node_1/config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"externalAddress": "node-1",
2626
"maxInbound": 21,
2727
"maxOutbound": 7,
28+
"autoUpdate": true,
2829
"trustedPeerIDs": null,
2930
"dialPeers": [],
3031
"bannedPeerIDs": null,

‎.docker/volumes/node_1/genesis.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,15 @@
1919
{
2020
"address": "851e90eaef1fa27debaee2c2591503bdeec1d123",
2121
"publicKey": "b88a5928e54cbf0a36e0b98f5bcf02de9a9a1deba6994739f9160181a609f516eb702936a0cbf4c1f2e7e6be5b8272f2",
22-
"committees": [
23-
1
24-
],
22+
"committees": [1],
2523
"netAddress": "tcp://node-1",
2624
"stakedAmount": 1000000000,
2725
"output": "851e90eaef1fa27debaee2c2591503bdeec1d123"
2826
},
2927
{
3028
"address": "02cd4e5eb53ea665702042a6ed6d31d616054dc5",
3129
"publicKey": "98d45087a99bcbfde91993502e77dde869d4485c3778fe46513958320da560823d56a0108f4cf3513393f4d561bc489b",
32-
"committees": [
33-
1
34-
],
30+
"committees": [1, 2],
3531
"netAddress": "tcp://node-2",
3632
"stakedAmount": 1000000000,
3733
"output": "02cd4e5eb53ea665702042a6ed6d31d616054dc5"

0 commit comments

Comments
 (0)