Merge pull request #2025 from aeternity/prerelease-fixes

Prere-lease fixes
aeternity · Oct 20, 2024 · 568c291 · 568c291
2 parents 700205f + b19cc93
commit 568c291
Show file tree

Hide file tree

Showing 108 changed files with 758 additions and 758 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,19 +15,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.x
+          cache: pip
       - uses: actions/setup-node@v4
         with:
           node-version: 20.x
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip3
-          key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.autorest
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: npm
       - run: pip3 install -r docs/requirements.txt
       - run: git config --global user.email "[email protected]"
       - run: git config --global user.name "GitHub Action"

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,12 +14,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20.x
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.autorest
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          cache: npm
       - run: npm ci
       - name: Run Commitlint
         if: github.event_name == 'pull_request'

diff --git a/babel.esm.config.js b/babel.esm.config.js
@@ -4,15 +4,12 @@ config.presets
   .filter((plugin) => Array.isArray(plugin))
   .find(([name]) => name === '@babel/preset-env')[1].modules = false;
 
-config.plugins.push(
-  ['add-import-extension', { extension: 'js' }],
-  [
-    'import-globals',
-    {
-      Buffer: { moduleName: 'buffer', exportName: 'Buffer' },
-    },
-  ],
-);
+config.plugins.push([
+  'import-globals',
+  {
+    Buffer: { moduleName: 'buffer', exportName: 'Buffer' },
+  },
+]);
 config.plugins = config.plugins.filter((p) => p !== 'babel-plugin-transform-import-meta');
 
 export default config;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,8 @@
     "build:es": "babel src --config-file ./babel.esm.config.js --out-dir es --extensions .ts --source-maps true",
     "build:api:node": "autorest tooling/autorest/node.yaml && node tooling/autorest/postprocessing.js node",
     "build:api:compiler": "node tooling/autorest/compiler-prepare.js && autorest tooling/autorest/compiler.yaml && node tooling/autorest/postprocessing.js compiler",
-    "build:api:middleware": "node tooling/autorest/middleware-prepare.js && autorest tooling/autorest/middleware.yaml && node tooling/autorest/postprocessing.js middleware",
+    "rem:build:api:middleware": "node tooling/autorest/middleware-prepare.js",
+    "build:api:middleware": "autorest tooling/autorest/middleware.yaml && node tooling/autorest/postprocessing.js middleware",
     "build:generate": "tsx tooling/generate-schema.ts",
     "build": "run-p build:api:* build:assets build:generate && run-p build:dist build:es build:types",
     "docs:examples": "node tooling/docs/examples-to-md.js examples/node/*.js",
@@ -87,6 +88,7 @@
     "tweetnacl": "^1.0.3",
     "tweetnacl-auth": "^1.0.1",
     "varuint-bitcoin": "^2.0.0",
+    "webextension-polyfill": "^0.12.0",
     "websocket": "^1.0.35",
     "ws": "^8.18.0"
   },
@@ -116,7 +118,6 @@
     "@typescript-eslint/parser": "^7.15.0",
     "autorest": "^3.7.1",
     "babel-loader": "^9.2.1",
-    "babel-plugin-add-import-extension": "^1.6.0",
     "babel-plugin-import-globals": "^2.0.0",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "chai": "^5.1.1",

diff --git a/src/AeSdk.ts b/src/AeSdk.ts
@@ -1,8 +1,8 @@
-import AeSdkBase from './AeSdkBase';
-import { OnAccount } from './AeSdkMethods';
-import AccountBase from './account/Base';
-import { decode, Encoded } from './utils/encoder';
-import { UnavailableAccountError } from './utils/errors';
+import AeSdkBase from './AeSdkBase.js';
+import { OnAccount } from './AeSdkMethods.js';
+import AccountBase from './account/Base.js';
+import { decode, Encoded } from './utils/encoder.js';
+import { UnavailableAccountError } from './utils/errors.js';
 
 export default class AeSdk extends AeSdkBase {
   accounts: { [key: Encoded.AccountAddress]: AccountBase } = {};

diff --git a/src/AeSdkAepp.ts b/src/AeSdkAepp.ts
@@ -1,8 +1,8 @@
-import AeSdkBase from './AeSdkBase';
-import { OnAccount } from './AeSdkMethods';
-import AccountBase from './account/Base';
-import AccountRpc from './account/Rpc';
-import { decode, Encoded } from './utils/encoder';
+import AeSdkBase from './AeSdkBase.js';
+import { OnAccount } from './AeSdkMethods.js';
+import AccountBase from './account/Base.js';
+import AccountRpc from './account/Rpc.js';
+import { decode, Encoded } from './utils/encoder.js';
 import {
   Accounts,
   RPC_VERSION,
@@ -12,18 +12,18 @@ import {
   AeppApi,
   Node as NodeRpc,
   NetworkToSelect,
-} from './aepp-wallet-communication/rpc/types';
-import RpcClient from './aepp-wallet-communication/rpc/RpcClient';
-import { METHODS, SUBSCRIPTION_TYPES } from './aepp-wallet-communication/schema';
+} from './aepp-wallet-communication/rpc/types.js';
+import RpcClient from './aepp-wallet-communication/rpc/RpcClient.js';
+import { METHODS, SUBSCRIPTION_TYPES } from './aepp-wallet-communication/schema.js';
 import {
   AlreadyConnectedError,
   NoWalletConnectedError,
   UnsubscribedAccountError,
   UnAuthorizedAccountError,
   RpcConnectionError,
-} from './utils/errors';
-import Node from './Node';
-import BrowserConnection from './aepp-wallet-communication/connection/Browser';
+} from './utils/errors.js';
+import Node from './Node.js';
+import BrowserConnection from './aepp-wallet-communication/connection/Browser.js';
 
 /**
  * RPC handler for AEPP side

diff --git a/src/AeSdkBase.ts b/src/AeSdkBase.ts
@@ -1,16 +1,16 @@
-import Node from './Node';
-import AccountBase from './account/Base';
+import Node from './Node.js';
+import AccountBase from './account/Base.js';
 import {
   CompilerError,
   DuplicateNodeError,
   NodeNotFoundError,
   NotImplementedError,
   TypeError,
-} from './utils/errors';
-import { Encoded } from './utils/encoder';
-import { wrapWithProxy } from './utils/wrap-proxy';
-import CompilerBase from './contract/compiler/Base';
-import AeSdkMethods, { OnAccount, AeSdkMethodsOptions, WrappedOptions } from './AeSdkMethods';
+} from './utils/errors.js';
+import { Encoded } from './utils/encoder.js';
+import { wrapWithProxy } from './utils/wrap-proxy.js';
+import CompilerBase from './contract/compiler/Base.js';
+import AeSdkMethods, { OnAccount, AeSdkMethodsOptions, WrappedOptions } from './AeSdkMethods.js';
 
 type NodeInfo = Awaited<ReturnType<Node['getNodeInfo']>> & { name: string };
 

diff --git a/src/AeSdkMethods.ts b/src/AeSdkMethods.ts
@@ -1,15 +1,15 @@
-import * as chainMethods from './chain';
-import { sendTransaction } from './send-transaction';
-import * as spendMethods from './spend';
-import * as contractGaMethods from './contract/ga';
-import { buildTxAsync } from './tx/builder';
-import { mapObject, UnionToIntersection } from './utils/other';
-import { wrapWithProxy } from './utils/wrap-proxy';
-import Node from './Node';
-import { TxParamsAsync } from './tx/builder/schema.generated';
-import AccountBase from './account/Base';
-import { Encoded } from './utils/encoder';
-import CompilerBase from './contract/compiler/Base';
+import * as chainMethods from './chain.js';
+import { sendTransaction } from './send-transaction.js';
+import * as spendMethods from './spend.js';
+import * as contractGaMethods from './contract/ga.js';
+import { buildTxAsync } from './tx/builder/index.js';
+import { mapObject, UnionToIntersection } from './utils/other.js';
+import { wrapWithProxy } from './utils/wrap-proxy.js';
+import Node from './Node.js';
+import { TxParamsAsync } from './tx/builder/schema.generated.js';
+import AccountBase from './account/Base.js';
+import { Encoded } from './utils/encoder.js';
+import CompilerBase from './contract/compiler/Base.js';
 
 export type OnAccount = Encoded.AccountAddress | AccountBase | undefined;
 

diff --git a/src/AeSdkWallet.ts b/src/AeSdkWallet.ts
@@ -1,7 +1,7 @@
 import nacl from 'tweetnacl';
-import AeSdk from './AeSdk';
-import verifyTransaction from './tx/validator';
-import RpcClient from './aepp-wallet-communication/rpc/RpcClient';
+import AeSdk from './AeSdk.js';
+import verifyTransaction from './tx/validator.js';
+import RpcClient from './aepp-wallet-communication/rpc/RpcClient.js';
 import {
   METHODS,
   RPC_STATUS,
@@ -11,10 +11,10 @@ import {
   RpcNotAuthorizeError,
   RpcPermissionDenyError,
   RpcUnsupportedProtocolError,
-} from './aepp-wallet-communication/schema';
-import { InternalError, UnknownRpcClientError } from './utils/errors';
-import AccountBase from './account/Base';
-import BrowserConnection from './aepp-wallet-communication/connection/Browser';
+} from './aepp-wallet-communication/schema.js';
+import { InternalError, UnknownRpcClientError } from './utils/errors.js';
+import AccountBase from './account/Base.js';
+import BrowserConnection from './aepp-wallet-communication/connection/Browser.js';
 import {
   Accounts,
   AeppApi,
@@ -23,9 +23,9 @@ import {
   RPC_VERSION,
   WalletApi,
   WalletInfo,
-} from './aepp-wallet-communication/rpc/types';
-import { Encoded, Encoding, encode, decode } from './utils/encoder';
-import jsonBig from './utils/json-big';
+} from './aepp-wallet-communication/rpc/types.js';
+import { Encoded, Encoding, encode, decode } from './utils/encoder.js';
+import jsonBig from './utils/json-big.js';
 
 type RpcClientWallet = RpcClient<AeppApi, WalletApi>;
 

diff --git a/src/Middleware.ts b/src/Middleware.ts
@@ -7,15 +7,15 @@ import {
   parseBigIntPolicy,
   genVersionCheckPolicy,
   genRetryOnFailurePolicy,
-} from './utils/autorest';
+} from './utils/autorest.js';
 import {
   Middleware as MiddlewareApi,
   MiddlewareOptionalParams,
   ErrorResponse,
-} from './apis/middleware';
-import { operationSpecs } from './apis/middleware/middleware';
-import { IllegalArgumentError, InternalError } from './utils/errors';
-import { MiddlewarePage, isMiddlewareRawPage } from './utils/MiddlewarePage';
+} from './apis/middleware/index.js';
+import { operationSpecs } from './apis/middleware/middleware.js';
+import { IllegalArgumentError, InternalError } from './utils/errors.js';
+import { MiddlewarePage, isMiddlewareRawPage } from './utils/MiddlewarePage.js';
 
 export default class Middleware extends MiddlewareApi {
   /**

diff --git a/src/MiddlewareSubscriber.ts b/src/MiddlewareSubscriber.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import WebSocket from 'isomorphic-ws';
-import { BaseError, UnexpectedTsError, InternalError } from './utils/errors';
-import { Encoded } from './utils/encoder';
+import { BaseError, UnexpectedTsError, InternalError } from './utils/errors.js';
+import { Encoded } from './utils/encoder.js';
 
 interface Message {
   payload: Object;

diff --git a/src/Node.ts b/src/Node.ts
@@ -8,10 +8,10 @@ import {
   parseBigIntPolicy,
   genVersionCheckPolicy,
   genRetryOnFailurePolicy,
-} from './utils/autorest';
-import { Node as NodeApi, NodeOptionalParams, ErrorModel } from './apis/node';
-import { UnsupportedVersionError } from './utils/errors';
-import { ConsensusProtocolVersion } from './tx/builder/constants';
+} from './utils/autorest.js';
+import { Node as NodeApi, NodeOptionalParams, ErrorModel } from './apis/node/index.js';
+import { UnsupportedVersionError } from './utils/errors.js';
+import { ConsensusProtocolVersion } from './tx/builder/constants.js';
 
 interface NodeInfo {
   url: string;

diff --git a/src/account/Base.ts b/src/account/Base.ts
@@ -1,8 +1,8 @@
-import { Encoded } from '../utils/encoder';
-import Node from '../Node';
-import CompilerBase from '../contract/compiler/Base';
-import { Int } from '../tx/builder/constants';
-import { AciValue, Domain } from '../utils/typed-data';
+import { Encoded } from '../utils/encoder.js';
+import Node from '../Node.js';
+import CompilerBase from '../contract/compiler/Base.js';
+import { Int } from '../tx/builder/constants.js';
+import { AciValue, Domain } from '../utils/typed-data.js';
 
 interface AuthData {
   fee?: Int;

diff --git a/src/account/BaseFactory.ts b/src/account/BaseFactory.ts
@@ -1,5 +1,5 @@
-import Node from '../Node';
-import AccountBase from './Base';
+import Node from '../Node.js';
+import AccountBase from './Base.js';
 
 /**
  * A factory class that generates instances of AccountBase by index.

diff --git a/src/account/Generalized.ts b/src/account/Generalized.ts
@@ -1,15 +1,15 @@
-import AccountBase from './Base';
+import AccountBase from './Base.js';
 import {
   ArgumentError,
   InternalError,
   InvalidAuthDataError,
   NotImplementedError,
-} from '../utils/errors';
-import { decode, Encoded } from '../utils/encoder';
-import { getAccount } from '../chain';
-import Contract from '../contract/Contract';
-import { buildTxAsync, buildTx } from '../tx/builder';
-import { Tag } from '../tx/builder/constants';
+} from '../utils/errors.js';
+import { decode, Encoded } from '../utils/encoder.js';
+import { getAccount } from '../chain.js';
+import Contract from '../contract/Contract.js';
+import { buildTxAsync, buildTx } from '../tx/builder/index.js';
+import { Tag } from '../tx/builder/constants.js';
 
 /**
  * Generalized account class

diff --git a/src/account/Ledger.ts b/src/account/Ledger.ts
@@ -1,9 +1,9 @@
 import type Transport from '@ledgerhq/hw-transport';
-import AccountBase from './Base';
-import { ArgumentError, NotImplementedError } from '../utils/errors';
-import { decode, Encoded } from '../utils/encoder';
-import { buildTx } from '../tx/builder';
-import { Tag } from '../tx/builder/constants';
+import AccountBase from './Base.js';
+import { ArgumentError, NotImplementedError } from '../utils/errors.js';
+import { decode, Encoded } from '../utils/encoder.js';
+import { buildTx } from '../tx/builder/index.js';
+import { Tag } from '../tx/builder/constants.js';
 
 export const CLA = 0xe0;
 export const GET_ADDRESS = 0x02;

diff --git a/src/account/LedgerFactory.ts b/src/account/LedgerFactory.ts
@@ -1,9 +1,9 @@
 import type Transport from '@ledgerhq/hw-transport';
-import AccountLedger, { CLA, GET_ADDRESS, GET_APP_CONFIGURATION } from './Ledger';
-import { UnsupportedVersionError } from '../utils/errors';
-import { Encoded } from '../utils/encoder';
-import semverSatisfies from '../utils/semver-satisfies';
-import AccountBaseFactory from './BaseFactory';
+import AccountLedger, { CLA, GET_ADDRESS, GET_APP_CONFIGURATION } from './Ledger.js';
+import { UnsupportedVersionError } from '../utils/errors.js';
+import { Encoded } from '../utils/encoder.js';
+import semverSatisfies from '../utils/semver-satisfies.js';
+import AccountBaseFactory from './BaseFactory.js';
 
 interface AppConfiguration {
   version: string;