Skip to content

Commit

Permalink
Merge pull request #12 from rsksmart/fix/ci-errors
Browse files Browse the repository at this point in the history
fix: CI errors
  • Loading branch information
JuanAgudeloRSL authored Sep 26, 2024
2 parents 97e2cfb + 70b947c commit b7edcb4
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 74 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/build.yml

This file was deleted.

85 changes: 38 additions & 47 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,55 @@
name: Deploy library on NPM
name: CI Workflow

on:
release:
types: [published]
push:
branches:
- main

jobs:
publish:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: "Check file existence"
id: check_files
uses: andstor/file-existence-action@v3
- name: Use Node.js
uses: actions/setup-node@v4
with:
files: "package.json, README.md"
node-version: '20.x'

- name: File exists
if: steps.check_files.outputs.files_exists != 'true'
# Only runs if all of the files exists
run: exit 1
- name: Install pnpm
run: npm install -g pnpm

- name: Install dependencies
run: pnpm install

- name: Get package.json package name and match with repository name
- name: Build project
run: pnpm build

- name: Verify dist folder exists
run: |
if [ ! -d "dist" ]; then
echo "Error: dist folder not found!"
exit 1
fi
publish:
runs-on: ubuntu-latest
needs: build # This ensures publish runs only after build succeeds

steps:
- name: Checkout
uses: actions/checkout@v4
run: |
echo PACKAGE_NAME=$(cat package.json | jq .name | cut -f2 -d"\"" | cut -f2 -d"@") >> $GITHUB_OUTPUT
echo PACKAGE_VERSION="refs/tags/v"$(cat package.json | jq .version | cut -f2 -d"\"") >> $GITHUB_OUTPUT
echo PACKAGE_REPOSITORY=$(cat package.json | jq .repository | cut -f2 -d"\"" | sed 's/:/\//' | sed 's/@/:\/\//') >> $GITHUB_OUTPUT
id: get_package_info

- name: Check if package_name matches with repository name
if: github.repository != steps.get_package_info.outputs.PACKAGE_NAME
# Fail if package name not properly configured
run: exit 1

- name: Check if package version matches with tag
if: github.ref != steps.get_package_info.outputs.PACKAGE_VERSION
# Fail if package version not properly setted
run: exit 1

- name: Check if package repository matches with repository
if: github.repositoryUrl != steps.get_package_info.outputs.PACKAGE_REPOSITORY
# Fail if package repository doesn't match with repository
run: exit 1

- name: Push package to npmjs.com
- name: Set up Node.js for npm publishing
uses: actions/setup-node@v4
with:
node-version: 20
Expand All @@ -54,36 +58,23 @@ jobs:
- name: Install dependencies
run: npm ci

- name: Build the project
run: npm run build
env:
CI: false

- name: Verify dist folder exists
run: |
if [ ! -d "dist" ]; then
echo "Error: dist folder not found!"
exit 1
fi
- name: Pre upload validation
- name: Pre-upload validation
id: pack
run: |
npm pack --dry-run >> output 2>&1
echo PRE_UPLOAD_HASH=$(cat output| grep shasum | cut -f4 -d" ") >> $GITHUB_OUTPUT
echo PRE_UPLOAD_HASH=$(cat output | grep shasum | cut -f4 -d" ") >> $GITHUB_OUTPUT
- name: Upload package
- name: Publish package
run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Post upload validation
- name: Post-upload validation
id: unpack
run: |
PACKAGE_NAME=$(cat package.json | jq .name | cut -f2 -d"\"")@$(cat package.json | jq .version | cut -f2 -d"\"")
echo POST_UPLOAD_HASH=$(npm view $PACKAGE_NAME) >> $GITHUB_OUTPUT
echo POST_UPLOAD_HASH=$(npm view $PACKAGE_NAME | grep shasum | cut -f4 -d" ") >> $GITHUB_OUTPUT
- name: Pre and Post Upload validation
- name: Pre and post upload validation
if: steps.pack.outputs.PRE_UPLOAD_HASH != steps.unpack.outputs.POST_UPLOAD_HASH
# Fail if package hashes doesn't match
run: exit 1
8 changes: 4 additions & 4 deletions src/commands/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ export async function walletCommand() {
);

const iv = crypto.randomBytes(16);
const key = crypto.scryptSync(password!, iv, 32);
const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
const key = crypto.scryptSync(password!, Uint8Array.from(iv), 32);
const cipher = crypto.createCipheriv("aes-256-cbc", Uint8Array.from(key), Uint8Array.from(iv));

let encryptedPrivateKey = cipher.update(
prefixedPrivateKey,
Expand Down Expand Up @@ -161,8 +161,8 @@ export async function walletCommand() {
);

const iv = crypto.randomBytes(16);
const key = crypto.scryptSync(password!, iv, 32);
const cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
const key = crypto.scryptSync(password!, Uint8Array.from(iv), 32);
const cipher = crypto.createCipheriv("aes-256-cbc", Uint8Array.from(key), Uint8Array.from(iv));

let encryptedPrivateKey = cipher.update(
prefixedPrivateKey,
Expand Down
4 changes: 2 additions & 2 deletions src/utils/viemProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ class ViemProvider {
const { password } = await inquirer.prompt(passwordQuestion);

try {
const decipherIv = Buffer.from(iv, "hex");
const decipherIv = Uint8Array.from(Buffer.from(iv, "hex"));
const key = crypto.scryptSync(password, decipherIv, 32);
const decipher = crypto.createDecipheriv("aes-256-cbc", key, decipherIv);
const decipher = crypto.createDecipheriv("aes-256-cbc", Uint8Array.from(key), decipherIv);

let decryptedPrivateKey = decipher.update(
encryptedPrivateKey,
Expand Down

0 comments on commit b7edcb4

Please sign in to comment.