Skip to content

Commit

Permalink
Merge branch 'main' into fix-multikey
Browse files Browse the repository at this point in the history
  • Loading branch information
gregnazario authored Jan 14, 2025

Verified

This commit was signed with the committer’s verified signature.
renovate-bot Mend Renovate
2 parents 3100188 + 923b598 commit d6ac28d
Showing 19 changed files with 235 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ assignees: ''

## Motivation

**Is your feature request related to a problem? Please describe you use case.**
**Is your feature request related to a problem? Please describe your use case.**
<!-- A clear description of what the problem is. Ex. I'm always frustrated when I try to do [...] -->

<!-- Please link to any relevant issues or other pull requests! -->
4 changes: 1 addition & 3 deletions .github/actions/run-build/action.yaml
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Run package install and build
- run: pnpm install --frozen-lockfile && pnpm build
4 changes: 1 addition & 3 deletions .github/actions/run-check-version/action.yaml
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Run version check
- run: pnpm check-version
4 changes: 1 addition & 3 deletions .github/actions/run-examples/action.yaml
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Run package install. If install fails, it probably means the updated lockfile was
# not included in the commit.
4 changes: 1 addition & 3 deletions .github/actions/run-fmt/action.yaml
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Verify that the format is correct
- run: pnpm install --frozen-lockfile && pnpm _fmt --check
4 changes: 1 addition & 3 deletions .github/actions/run-lint/action.yaml
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Run eslint
- run: pnpm install --frozen-lockfile && pnpm lint
4 changes: 1 addition & 3 deletions .github/actions/run-tests/action.yaml
Original file line number Diff line number Diff line change
@@ -9,13 +9,11 @@ runs:
using: composite
steps:
# Install node and pnpm.
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
registry-url: "https://registry.npmjs.org"
- uses: pnpm/action-setup@v4
with:
version: 8.9.0

# Run package install. If install fails, it probably means the updated lockfile was
# not included in the commit.
2 changes: 1 addition & 1 deletion .github/workflows/run-build.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-build
2 changes: 1 addition & 1 deletion .github/workflows/run-check-version.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-check-version
2 changes: 1 addition & 1 deletion .github/workflows/run-examples.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-examples
2 changes: 1 addition & 1 deletion .github/workflows/run-fmt.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-fmt
2 changes: 1 addition & 1 deletion .github/workflows/run-lint.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-lint
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
run-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ env.GIT_SHA }}
- uses: ./.github/actions/run-tests
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.11.0
v22.12.0
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pnpm 8.15.1
nodejs 22.12.0
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@ All notable changes to the Aptos TypeScript SDK will be captured in this file. T
# Unreleased

- [`fix`] Allow variable length bitmaps in Multikey accounts, allowing for compatibility between SDKs properly
- node now no longer supports older than v20
- overriding cross spawn for patch
- Add `AccountUtils` class to help with account serialization and deserialization
- Add `SingleKeySigner` interface which adds the ability to get the `AnyPublicKey` from a `SingleKeyAccount`
- We now throw an error earlier when you try to use the faucet with testnet or mainnet, rather than letting the call happen and then fail later.
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@aptos-labs/ts-sdk",
"description": "Aptos TypeScript SDK",
"packageManager": "pnpm@8.9.0",
"packageManager": "pnpm@8.15.1",
"license": "Apache-2.0",
"engines": {
"node": ">=11.0.0"
"node": ">=20.0.0"
},
"bugs": {
"url": "https://github.com/aptos-labs/aptos-ts-sdk/issues/new/choose"
@@ -96,5 +96,10 @@
"typedoc-plugin-missing-exports": "^3.0.0",
"typescript": "^5.6.2"
},
"pnpm": {
"overrides": {
"cross-spawn": ">=7.0.5"
}
},
"version": "1.33.1"
}
}
Loading

0 comments on commit d6ac28d

Please sign in to comment.