Skip to content

chore: backmerge main into develop post v1.1016.0 #12166

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

Closed
gomesalexandre wants to merge 10 commits into from
+538 −571
Closed

chore: backmerge main into develop post v1.1016.0 #12166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2f58786
chore: prerelease v1.1016.0 (#12127)
0xApotheosis Mar 10, 2026
3832a01
fix: bebop solana signing + thorchain solana lp compute budget (#12132)
gomesalexandre Mar 10, 2026
ceeb5d1
fix: bebop solana signing + reject amm-routed quotes (#12147)
gomesalexandre Mar 11, 2026
002df7d
fix: cherry-pick #12148 - bebop solana ghost tx + malformed amm route…
gomesalexandre Mar 12, 2026
1b2f6b9
chore: release v1.1016.0 (#12128)
0xApotheosis Mar 12, 2026
f251d6b
chore: sync private to v1.1016.0 (#12155)
0xApotheosis Mar 12, 2026
67e97ba
chore: sync private to v1.1017.0 (#12157)
gomesalexandre Mar 13, 2026
b7488b1
Merge branch 'private' into main
gomesalexandre Mar 13, 2026
d74d93f
Merge branch 'release' into main
gomesalexandre Mar 13, 2026
5ab8fbd
Merge remote-tracking branch 'origin/main' into chore/backmerge-main-…
gomesalexandre Mar 13, 2026
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
16 changes: 12 additions & 4 deletions packages/public-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,28 @@ COPY packages/types/package.json ./packages/types/
COPY packages/unchained-client/package.json ./packages/unchained-client/
COPY packages/utils/package.json ./packages/utils/

# pnpm uses copy instead of hard links, which Docker's overlay filesystem doesn't support
# Copy import method avoids hard-link failures from the pnpm store on Docker overlay FS
ENV NPM_CONFIG_PACKAGE_IMPORT_METHOD=copy

# Install dependencies, skipping lifecycle scripts (controlled by onlyBuiltDependencies in package.json)
# Retry loop: pnpm's hoisted linker intermittently fails with ENOENT on Docker overlay FS (known issue).
RUN --mount=type=cache,id=s/ff1bcf56-d6d3-403a-b41e-2c92b7233f01-/root/.local/share/pnpm/store,target=/root/.local/share/pnpm/store \
corepack enable && pnpm install --frozen-lockfile --ignore-scripts
corepack enable && \
for i in 1 2 3; do \
pnpm install --frozen-lockfile --ignore-scripts && break || \
rm -rf node_modules; \
done

# Run postinstall for openapi-generator-cli to download the JAR (skipped by --ignore-scripts above)
RUN --mount=type=cache,id=s/ff1bcf56-d6d3-403a-b41e-2c92b7233f01-/root/.openapi-generator-cli,target=/root/.openapi-generator-cli \
pnpm rebuild @openapitools/openapi-generator-cli

# Copy unchained-client config and generator files FIRST (rarely changes, enables layer caching)
COPY packages/unchained-client/openapitools.json ./packages/unchained-client/
COPY packages/unchained-client/generator/ ./packages/unchained-client/generator/

# Generate unchained-client code (required by tsc --build for workspace packages)
RUN --mount=type=cache,id=s/ff1bcf56-d6d3-403a-b41e-2c92b7233f01-/root/.openapitools,target=/root/.openapitools \
pnpm --filter @shapeshiftoss/unchained-client generate
RUN pnpm --filter @shapeshiftoss/unchained-client generate

# Copy remaining source files
COPY packages/ ./packages/
Expand Down
13 changes: 11 additions & 2 deletions packages/swap-widget/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,21 @@ COPY packages/types/package.json ./packages/types/
COPY packages/unchained-client/package.json ./packages/unchained-client/
COPY packages/utils/package.json ./packages/utils/

# pnpm uses copy instead of hard links, which Docker's overlay filesystem doesn't support
# Copy import method avoids hard-link failures from the pnpm store on Docker overlay FS
ENV NPM_CONFIG_PACKAGE_IMPORT_METHOD=copy

# Install dependencies, skipping lifecycle scripts (controlled by onlyBuiltDependencies in package.json)
# Retry loop: pnpm's hoisted linker intermittently fails with ENOENT on Docker overlay FS (known issue).
RUN --mount=type=cache,id=s/4cafb297-3349-46e2-bfef-8210504e0583-/root/.local/share/pnpm/store,target=/root/.local/share/pnpm/store \
corepack enable && pnpm install --frozen-lockfile --ignore-scripts
corepack enable && \
for i in 1 2 3; do \
pnpm install --frozen-lockfile --ignore-scripts && break || \
rm -rf node_modules; \
done

# Run postinstall for openapi-generator-cli to download the JAR (skipped by --ignore-scripts above)
RUN --mount=type=cache,id=s/4cafb297-3349-46e2-bfef-8210504e0583-/root/.openapi-generator-cli,target=/root/.openapi-generator-cli \
pnpm rebuild @openapitools/openapi-generator-cli

# Copy unchained-client config and generator files FIRST (rarely changes, enables layer caching)
COPY packages/unchained-client/openapitools.json ./packages/unchained-client/
Expand Down
9 changes: 9 additions & 0 deletions packages/swapper/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,15 @@ export type SolanaMessageExecutionProps = {
signSerializedTransaction: (serializedTx: string) => Promise<string[]>
}

export type SolanaMessageToSign = {
serializedTx: string
quoteId: string
}

export type SolanaMessageExecutionProps = {
signSerializedTransaction: (serializedTx: string) => Promise<string[]>
}

export type TronTransactionExecutionProps = {
signAndBroadcastTransaction: (txToSign: tron.TronSignTx) => Promise<string>
}
Expand Down
Loading
Loading