Skip to content

Commit

Permalink
Merge branch 'master' of github.com:calimero-network/core into 368-ad…
Browse files Browse the repository at this point in the history
…d-a-fetch-function-inside-the-runtime-host-environment
  • Loading branch information
saeed-zil committed Jun 17, 2024
2 parents 031f9cb + 203e146 commit 3896915
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 31 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/calimero_node_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ jobs:
if: ${{ github.ref == 'refs/heads/master' || (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'master') }}

steps:
- name: Setup gh CLI
uses: actions/setup-gh@v2

- name: Restore build artifact
uses: actions/cache@v4
with:
Expand All @@ -106,6 +103,7 @@ jobs:
-H "Accept: application/vnd.github.v3+json" | jq -r '.url')
if [[ "$RELEASE_URL" != "null" ]]; then
echo "exists=true" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT
else
echo "exists=false" >> $GITHUB_OUTPUT
fi
Expand All @@ -116,7 +114,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
VERSION=$(grep '^version' Cargo.toml | head -1 | awk -F\" '{print $2}')
gh release create "v$VERSION" --title "Release v$VERSION" --notes "Release for version $VERSION"
gh release create "v${{ steps.check_release.outputs.version }}" --title "Release v${{ steps.check_release.outputs.version }}" --notes "Release for version ${{ steps.check_release.outputs.version }}"
- name: Upload artifact to release
if: steps.check_release.outputs.exists == 'false'
Expand Down
5 changes: 5 additions & 0 deletions packages/calimero-sdk/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pnpm test

pnpm prettier

pnpm lint:fix
3 changes: 2 additions & 1 deletion packages/calimero-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"husky": "^9.0.11",
"jest": "^26.0.1",
"prettier": "3.3.2",
"rimraf": "^3.0.0",
Expand All @@ -68,7 +69,7 @@
"prefuzz": "pnpm build",
"fuzz": "jsfuzz test/fuzz/borsh-roundtrip.js test/fuzz/corpus/",
"clean": "pnpm rimraf lib node_modules",
"prepare": "pnpm build",
"prepare": "husky",
"bundlewatch": "bundlewatch",
"prettier": "exec prettier . --write"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/calimero-sdk/src/api/nodeApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ interface NEARWalletType extends WalletTypeBase<'NEAR'> {}
export type WalletType = ETHWalletType | NEARWalletType;

export namespace WalletType {
export let NEAR: WalletType = <NEARWalletType>{ type: 'NEAR' };
export let NEAR: WalletType = { type: 'NEAR' } as NEARWalletType;

export function ETH({ chainId = 1 }: { chainId?: number }): WalletType {
return <ETHWalletType>{ type: 'ETH', chainId };
return { type: 'ETH', chainId } as ETHWalletType;
}
}

Expand Down
58 changes: 34 additions & 24 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3896915

Please sign in to comment.