release

Author: sokunsamnang

.github/workflows/push-master.yml .github/workflows/push-main.yml.github/workflows/push-master.yml renamed to .github/workflows/push-main.yml

@@ -1,11 +1,11 @@
-name: Master
+name: Main
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
-  master:
+  main:
     if: "! startsWith(github.event.head_commit.message, '[CI Skip]')"
     strategy:
       matrix:
@@ -23,7 +23,7 @@ jobs:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         GH_PAT: ${{ secrets.GH_PAT }}
         GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
-        GH_RELEASE_FILES: master-build.zip,master-build-firefox.zip,master-src.zip
+        GH_RELEASE_FILES: main-build.zip,main-build-firefox.zip,main-src.zip
         DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         TRANSAK_API_KEY: ${{ secrets.TRANSAK_API_KEY }}
@@ -57,8 +57,8 @@ jobs:
       id: nextcloud_upload
       uses: trympet/nextcloud-artifacts-action@v2
       with:
-        name: 'master-build.zip'
-        path: 'master-build.zip'
+        name: 'main-build.zip'
+        path: 'main-build.zip'
         nextcloud-url: 'https://file.cdmteck.com'
         nextcloud-username: ${{ secrets.NEXTCLOUD_USERNAME }}
         nextcloud-password: ${{ secrets.NEXTCLOUD_PASSWORD }}
@@ -67,8 +67,8 @@ jobs:
       id: nextcloud_upload_firefox
       uses: trympet/nextcloud-artifacts-action@v2
       with:
-        name: 'master-build-firefox.zip'
-        path: 'master-build-firefox.zip'
+        name: 'main-build-firefox.zip'
+        path: 'main-build-firefox.zip'
         nextcloud-url: 'https://file.cdmteck.com'
         nextcloud-username: ${{ secrets.NEXTCLOUD_USERNAME }}
         nextcloud-password: ${{ secrets.NEXTCLOUD_PASSWORD }}
@@ -78,7 +78,7 @@ jobs:
       uses: nwtgck/actions-netlify@v2.0
       with:
         publish-dir: './packages/web-runner/build'
-        production-branch: master
+        production-branch: main
         github-token: ${{ secrets.GH_PAT }}
         deploy-message: ${{ github.event.head_commit.message }}
         enable-pull-request-comment: true
@@ -97,7 +97,7 @@ jobs:
         username: Extension Worker
         title: ${{ github.workflow }}
         description: |
-          Master is completed.
+          Main is completed.
           - Extension: ${{ steps.nextcloud_upload.outputs.SHAREABLE_URL }}
           - Extension (Firefox): ${{ steps.nextcloud_upload_firefox.outputs.SHAREABLE_URL }}
           - Web-runner: ${{ steps.netlify_deployment.outputs.deploy-url }}

DEPLOYMENT.md

@@ -0,0 +1,171 @@
+# BitrielWallet-Extension Deployment Guide
+
+This guide explains how to deploy and publish all packages in the BitrielWallet-Extension project.
+
+## Prerequisites
+
+Before deploying, ensure you have:
+
+1. **NPM Account**: You must be logged into npm with publishing rights
+   ```bash
+   npm login
+   ```
+
+2. **Git Configuration**: Properly configured git user (for release commits)
+   ```bash
+   git config user.name "Your Name"
+   git config user.email "your.email@example.com"
+   ```
+
+3. **Environment Variables** (optional, for GitHub releases):
+   - `GH_RELEASE_GITHUB_API_TOKEN` or `GITHUB_TOKEN`
+
+## Deployment Commands
+
+### 1. Full Deployment (Recommended)
+
+Deploy everything at once - builds, tests, publishes to NPM, deploys webapp, and creates GitHub release:
+
+```bash
+yarn deploy
+# or
+npm run deploy
+# or directly
+./scripts/koni-deploy-all.mjs
+```
+
+**What it does:**
+- ✅ Checks prerequisites (npm login, git config, etc.)
+- 🧹 Cleans previous builds
+- 🔍 Runs linting
+- 🧪 Runs tests (continues on failure)
+- 🏗️ Builds all packages
+- 📦 Publishes all packages to NPM
+- 🌐 Deploys webapp to GitHub Pages
+- 🚀 Deploys web runner to GitHub Pages
+- 📋 Creates GitHub release (if configured)
+
+### 2. Quick NPM-Only Deployment
+
+If you just want to build and publish NPM packages (faster, no webapp deployment):
+
+```bash
+yarn deploy:quick
+# or
+npm run deploy:quick
+# or directly
+./scripts/koni-quick-deploy.mjs
+```
+
+**What it does:**
+- ✅ Checks NPM login
+- 🧹 Cleans previous builds
+- 🏗️ Builds all packages
+- 📦 Publishes all packages to NPM
+
+### 3. Manual NPM Publishing Only
+
+If packages are already built and you just want to publish them:
+
+```bash
+./publish-npm.sh
+```
+
+## Package Publishing Order
+
+Packages are published in dependency order to ensure proper installation:
+
+1. `bitriel-api-sdk`
+2. `extension-mocks`
+3. `extension-inject`
+4. `extension-chains`
+5. `extension-dapp`
+6. `extension-compat-metamask`
+7. `extension-base`
+8. `extension-koni`
+9. `extension-koni-ui`
+10. `extension-web-ui`
+11. `webapp`
+12. `web-runner`
+
+## Individual Build Commands
+
+For development and testing purposes:
+
+```bash
+# Build everything
+yarn build
+
+# Build with extra steps (i18n, ui)
+yarn build:extra
+
+# Build specific components
+yarn build:i18n
+yarn build:ui
+yarn web-runner:build-zip
+yarn webapp:build
+
+# Clean builds
+yarn clean
+```
+
+## Troubleshooting
+
+### NPM Publishing Issues
+
+1. **Not logged in**: Run `npm login` first
+2. **Package already exists**: Version might need to be bumped
+3. **Permission denied**: Ensure you have publishing rights to @bitriel scope
+
+### Build Issues
+
+1. **Linting errors**: Run `yarn lint` to check issues
+2. **Type errors**: Run `yarn build` to see TypeScript errors
+3. **Missing dependencies**: Run `yarn install`
+
+### Git Issues
+
+1. **No git config**: Set up git user name and email
+2. **No GitHub token**: Set `GITHUB_TOKEN` environment variable for releases
+
+## Version Management
+
+The deployment scripts automatically handle version bumping based on the current version and build type. Beta versions (with `-` in version) are published with the `beta` tag.
+
+## Deployment Summary
+
+After running the full deployment, you'll see a summary showing the status of each step:
+
+```
+🎯 DEPLOYMENT SUMMARY
+==================================================
+✅ PASSED Prerequisites
+✅ PASSED Clean Build
+✅ PASSED Linting
+✅ PASSED Tests
+✅ PASSED Build All
+✅ PASSED NPM Publish
+✅ PASSED Webapp Deploy
+✅ PASSED Web Runner Deploy
+✅ PASSED GitHub Release
+==================================================
+🎉 ALL DEPLOYMENTS COMPLETED SUCCESSFULLY!
+
+📦 Your packages have been published to NPM
+🌐 Your webapp has been deployed to GitHub Pages
+🚀 Web runner has been deployed
+📋 GitHub release has been created (if configured)
+```
+
+## CI/CD Integration
+
+These scripts can be easily integrated into CI/CD pipelines:
+
+```yaml
+# GitHub Actions example
+- name: Deploy all packages
+  run: yarn deploy
+  env:
+    NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+``` 

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/bitriel/BitrielWallet-Extension.git"
   },
   "sideEffects": false,
-  "version": "1.3.36",
+  "version": "1.0.0",
   "workspaces": [
     "packages/*"
   ],
@@ -21,7 +21,9 @@
     "koni-ci-ghact-build": "./scripts/koni-ci-ghact-build.mjs",
     "koni-ci-mv3-firefox": "./scripts/koni-ci-mv3-firefox.mjs",
     "koni-ci-webapp-update-build-number": "./scripts/koni-ci-webapp-update-build-number.mjs",
-    "koni-dev-build-ts": "./scripts/koni-dev-build-ts.mjs"
+    "koni-deploy-all": "./scripts/koni-deploy-all.mjs",
+    "koni-dev-build-ts": "./scripts/koni-dev-build-ts.mjs",
+    "koni-quick-deploy": "./scripts/koni-quick-deploy.mjs"
   },
   "scripts": {
     "build": "koni-dev-build-ts && yarn build:zip && yarn build:rollup",
@@ -37,6 +39,8 @@
     "build:zip:dst-ff": "rm -rf ./master-build-firefox.zip && cd packages/extension-koni/build-firefox && zip -r -FS ../../../master-build-firefox.zip .",
     "build:zip:src": "rm -rf ./master-src.zip && zip -r -x '*build/*' -x '*build-firefox/*' -x '*node_modules*' -FS ./master-src.zip packages .editorconfig .eslintignore .eslintrc.js babel.config.cjs CHANGELOG.md CONTRIBUTING.md i18next-scanner.config.js jest.config.cjs LICENSE package.json README.md tsconfig.json yarn.lock",
     "clean": "polkadot-dev-clean-build && rm -rf packages/extension-koni/build-firefox",
+    "deploy": "koni-deploy-all",
+    "deploy:quick": "koni-quick-deploy",
     "dev": "yarn watch-dev",
     "dev:firefox": "cd packages/extension-koni && yarn polkadot-exec-webpack --config webpack.config-firefox.cjs --mode development --watch -d inline-source-map",
     "lint": "polkadot-dev-run-lint",

packages/bitriel-api-sdk/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "index.js",
   "dependencies": {
     "@bitriel/chain-list": "1.0.0",

packages/extension-base/package.json

@@ -23,7 +23,7 @@
     "@acala-network/api": "^5.0.2",
     "@apollo/client": "^3.7.14",
     "@azns/resolver-core": "^1.4.0",
-    "@bitriel/bitriel-api-sdk": "^1.0.0",
+    "@bitriel/bitriel-api-sdk": "^1.0.1",
     "@bitriel/chain-list": "1.0.0",
     "@bitriel/extension-base": "^1.0.0",
     "@bitriel/extension-chains": "^1.0.0",

packages/extension-base/src/core/logic-validation/request.ts

@@ -1,7 +1,6 @@
 // Copyright 2019-2022 @bitriel/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { TypedDataV1Field, typedSignatureHash } from '@metamask/eth-sig-util';
 import { CardanoProviderError } from '@bitriel/extension-base/background/errors/CardanoProviderError';
 import { EvmProviderError } from '@bitriel/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@bitriel/extension-base/background/errors/TransactionError';
@@ -13,6 +12,7 @@ import { BasicTxErrorType, EvmFeeInfo } from '@bitriel/extension-base/types';
 import { BN_ZERO, combineEthFee, createPromiseHandler, isSameAddress, stripUrl, wait } from '@bitriel/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@bitriel/extension-base/utils/eth/parseTransaction';
 import { getId } from '@bitriel/extension-base/utils/getId';
+import { TypedDataV1Field, typedSignatureHash } from '@metamask/eth-sig-util';
 import { isCardanoAddress, isSubstrateAddress } from '@subwallet/keyring';
 import { KeyringPair } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @bitriel/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Common } from '@ethereumjs/common';
-import { LegacyTransaction } from '@ethereumjs/tx';
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@bitriel/chain-list/types';
 import { TransactionError } from '@bitriel/extension-base/background/errors/TransactionError';
 import { withErrorLog } from '@bitriel/extension-base/background/handlers/helpers';
@@ -65,6 +63,8 @@ import { _analyzeAddress, CalculateMaxTransferable, calculateMaxTransferable, co
 import { parseContractInput, parseEvmRlp } from '@bitriel/extension-base/utils/eth/parseTransaction';
 import { getId } from '@bitriel/extension-base/utils/getId';
 import { MetadataDef } from '@bitriel/extension-inject/types';
+import { Common } from '@ethereumjs/common';
+import { LegacyTransaction } from '@ethereumjs/tx';
 import { getKeypairTypeByAddress, isAddress, isCardanoAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
 import { CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';

packages/extension-base/src/koni/background/handlers/State.ts

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @bitriel/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import * as CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
+import subwalletApiSdk from '@bitriel/bitriel-api-sdk';
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@bitriel/chain-list/types';
 import { CardanoProviderError } from '@bitriel/extension-base/background/errors/CardanoProviderError';
 import { EvmProviderError } from '@bitriel/extension-base/background/errors/EvmProviderError';
@@ -50,7 +50,7 @@ import { addLazy, isManifestV3, isSameAddress, reformatAddress, stripUrl, target
 import { convertCardanoHexToBech32 } from '@bitriel/extension-base/utils/cardano';
 import { createPromiseHandler } from '@bitriel/extension-base/utils/promise';
 import { MetadataDef, ProviderMeta } from '@bitriel/extension-inject/types';
-import subwalletApiSdk from '@bitriel/bitriel-api-sdk';
+import * as CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
 import { keyring } from '@subwallet/ui-keyring';
 import BN from 'bn.js';
 import { t } from 'i18next';

packages/extension-base/src/koni/background/handlers/Tabs.ts

@@ -3,7 +3,6 @@
 
 import type { InjectedAccount } from '@bitriel/extension-inject/types';
 
-import * as CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
 import { _AssetType } from '@bitriel/chain-list/types';
 import { CardanoProviderError } from '@bitriel/extension-base/background/errors/CardanoProviderError';
 import { EvmProviderError } from '@bitriel/extension-base/background/errors/EvmProviderError';
@@ -25,6 +24,7 @@ import { AuthUrlInfo, AuthUrls } from '@bitriel/extension-base/services/request-
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@bitriel/extension-base/services/setting-service/constants';
 import { convertCardanoAddressToHex, getEVMChainInfo, reformatAddress, stripUrl } from '@bitriel/extension-base/utils';
 import { InjectedMetadataKnown, MetadataDef, ProviderMeta } from '@bitriel/extension-inject/types';
+import * as CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
 import { CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
 import { keyring } from '@subwallet/ui-keyring';
 import { SingleAddress, SubjectInfo } from '@subwallet/ui-keyring/observable/types';

packages/extension-base/src/page/evm/index.ts

@@ -3,9 +3,9 @@
 
 import type { EvmProvider } from '@bitriel/extension-inject/types';
 
-import SafeEventEmitter from '@metamask/safe-event-emitter';
 import { EvmProviderError } from '@bitriel/extension-base/background/errors/EvmProviderError';
 import { SendRequest } from '@bitriel/extension-base/page/types';
+import SafeEventEmitter from '@metamask/safe-event-emitter';
 import { JsonRpcRequest, JsonRpcResponse, JsonRpcSuccess } from 'json-rpc-engine';
 import { RequestArguments } from 'web3-core';