From e0c3d923fd589f074d5273601b18dffbfa9ba720 Mon Sep 17 00:00:00 2001 From: bluecco Date: Wed, 3 Jul 2024 19:26:34 +0200 Subject: [PATCH 1/2] fix: argent mobile invoke transaction backward compatible --- pnpm-lock.yaml | 36 +++++++++---------- .../argentMobile/modal/starknet/adapter.ts | 19 +++++----- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b0b445e..fbc06d9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -116,7 +116,7 @@ importers: version: 8.4.39 postcss-load-config: specifier: ^4.0.1 - version: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)) + version: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)) prettier: specifier: ^3.0.3 version: 3.3.2 @@ -137,10 +137,10 @@ importers: version: 4.2.18 svelte-check: specifier: ^3.5.1 - version: 3.8.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18) + version: 3.8.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18) svelte-preprocess: specifier: ^5.0.4 - version: 5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3) + version: 5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3) tailwindcss: specifier: ^3.1.6 version: 3.4.4(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)) @@ -161,7 +161,7 @@ importers: version: 1.6.0(@types/node@20.14.9) ws: specifier: ^8.8.1 - version: 8.17.1 + version: 8.18.0 zod: specifier: ^3.20.6 version: 3.23.8 @@ -4861,8 +4861,8 @@ packages: utf-8-validate: optional: true - ws@8.17.1: - resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==} + ws@8.18.0: + resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 @@ -5151,7 +5151,7 @@ snapshots: lodash.merge: 4.6.2 lodash.uniq: 4.5.0 resolve-from: 5.0.0 - ts-node: 10.9.2(@types/node@20.14.9)(typescript@5.5.3) + ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.5.3) typescript: 5.5.3 transitivePeerDependencies: - '@swc/core' @@ -7046,7 +7046,7 @@ snapshots: dependencies: '@types/node': 20.5.1 cosmiconfig: 8.3.6(typescript@5.5.3) - ts-node: 10.9.2(@types/node@20.14.9)(typescript@5.5.3) + ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.5.3) typescript: 5.5.3 cosmiconfig@5.2.1: @@ -9036,13 +9036,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.39 - postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)): + postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)): dependencies: lilconfig: 3.1.2 yaml: 2.4.5 optionalDependencies: postcss: 8.4.39 - ts-node: 10.9.2(@types/node@20.14.9)(typescript@5.5.3) + ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.5.3) postcss-nested@6.0.1(postcss@8.4.39): dependencies: @@ -9678,14 +9678,14 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - svelte-check@3.8.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18): + svelte-check@3.8.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18): dependencies: '@jridgewell/trace-mapping': 0.3.25 chokidar: 3.6.0 picocolors: 1.0.1 sade: 1.8.1 svelte: 4.2.18 - svelte-preprocess: 5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3) + svelte-preprocess: 5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3) typescript: 5.5.3 transitivePeerDependencies: - '@babel/core' @@ -9706,7 +9706,7 @@ snapshots: dependencies: svelte: 4.2.18 - svelte-preprocess@5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3): + svelte-preprocess@5.1.4(@babel/core@7.24.7)(postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)))(postcss@8.4.39)(svelte@4.2.18)(typescript@5.5.3): dependencies: '@types/pug': 2.0.10 detect-indent: 6.1.0 @@ -9717,7 +9717,7 @@ snapshots: optionalDependencies: '@babel/core': 7.24.7 postcss: 8.4.39 - postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)) + postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)) typescript: 5.5.3 svelte@4.2.18: @@ -9758,7 +9758,7 @@ snapshots: postcss: 8.4.39 postcss-import: 15.1.0(postcss@8.4.39) postcss-js: 4.0.1(postcss@8.4.39) - postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3)) + postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3)) postcss-nested: 6.0.1(postcss@8.4.39) postcss-selector-parser: 6.1.0 resolve: 1.22.8 @@ -9846,14 +9846,14 @@ snapshots: ts-mixer@6.0.4: {} - ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.3): + ts-node@10.9.2(@types/node@20.5.1)(typescript@5.5.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.9 + '@types/node': 20.5.1 acorn: 8.12.1 acorn-walk: 8.3.3 arg: 4.1.3 @@ -10232,7 +10232,7 @@ snapshots: ws@7.5.10: {} - ws@8.17.1: {} + ws@8.18.0: {} xtend@4.0.2: {} diff --git a/src/connectors/argentMobile/modal/starknet/adapter.ts b/src/connectors/argentMobile/modal/starknet/adapter.ts index 99a237c..ec2df94 100644 --- a/src/connectors/argentMobile/modal/starknet/adapter.ts +++ b/src/connectors/argentMobile/modal/starknet/adapter.ts @@ -1,3 +1,9 @@ +import { + AddInvokeTransactionParameters, + RequestFn, + TypedData, +} from "@starknet-io/get-starknet-core" +import type { StarknetWindowObject } from "@starknet-io/types-js" import { JsonRpcProvider } from "@walletconnect/jsonrpc-provider" import type SignClient from "@walletconnect/sign-client" import type { SignerConnection } from "@walletconnect/signer-connection" @@ -8,13 +14,6 @@ import type { SignerInterface, } from "starknet" import { RpcProvider, constants } from "starknet" - -import { - AddInvokeTransactionParameters, - RequestFn, - TypedData, -} from "@starknet-io/get-starknet-core" -import type { StarknetWindowObject } from "@starknet-io/types-js" import type { NamespaceAdapterOptions } from "../adapter" import { NamespaceAdapter } from "../adapter" import { argentModal } from "../argentModal" @@ -55,7 +54,7 @@ export class StarknetAdapter "starknet_requestAddInvokeTransaction", "wallet_supportedSpecs", "wallet_signTypedData", - "wallet_requestAddInvokeTransaction", + "wallet_addInvokeTransaction", ] public events = ["chainChanged", "accountsChanged"] @@ -274,9 +273,11 @@ export class StarknetAdapter params: { accountAddress: this.account.address, executionRequest: { - calls: calls?.map(({ contract_address, ...rest }) => ({ + // will be removed when argent mobile will support entry_point and contract_address + calls: calls?.map(({ contract_address, entry_point, ...rest }) => ({ ...rest, contractAddress: contract_address, + entrypoint: entry_point, })), }, }, From edc0cb1dd3e83825757781a345fc509cf5be7b36 Mon Sep 17 00:00:00 2001 From: bluecco Date: Wed, 3 Jul 2024 19:53:51 +0200 Subject: [PATCH 2/2] chore: update action-setup --- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 50bd027..7f7c760 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -14,7 +14,7 @@ jobs: with: persist-credentials: false - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: install-pnpm id: pnpm-install with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5f4054..46615dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: with: persist-credentials: false - - uses: pnpm/action-setup@v2 + - uses: pnpm/action-setup@v4 name: install-pnpm id: pnpm-install with: