From e23d144c9522c11c005ea69c2ba7e9d5607fb5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Mon, 31 Jan 2022 12:09:56 +0100 Subject: [PATCH 1/2] Update docs --- packages/guides/integrating-the-safe-core-sdk.md | 8 ++++---- packages/safe-core-sdk/README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/guides/integrating-the-safe-core-sdk.md b/packages/guides/integrating-the-safe-core-sdk.md index 52b892180..963e445fe 100644 --- a/packages/guides/integrating-the-safe-core-sdk.md +++ b/packages/guides/integrating-the-safe-core-sdk.md @@ -41,10 +41,10 @@ The [Safe Core SDK](https://github.com/gnosis/safe-core-sdk/tree/main/packages/s * **Using ethers.js** - We can use the class `EthersAdapter` from `@gnosis.pm/safe-core-sdk` as the wrapper for `ethers.js`. + We can use the class `EthersAdapter` from `@gnosis.pm/safe-ethers-lib` as the wrapper for `ethers.js`. ```js - import { EthersAdapter } from '@gnosis.pm/safe-core-sdk' + import EthersAdapter from '@gnosis.pm/safe-ethers-lib' import { ethers } from 'ethers' const web3Provider = // ... @@ -59,10 +59,10 @@ The [Safe Core SDK](https://github.com/gnosis/safe-core-sdk/tree/main/packages/s * **Using web3.js** - We can use the class `Web3Adapter` from `@gnosis.pm/safe-core-sdk` as the wrapper for `web3.js`. + We can use the class `Web3Adapter` from `@gnosis.pm/safe-web3-lib` as the wrapper for `web3.js`. ```js - import { Web3Adapter } from '@gnosis.pm/safe-core-sdk' + import Web3Adapter from '@gnosis.pm/safe-web3-lib' import Web3 from 'web3' const ethAdapter = new Web3Adapter({ diff --git a/packages/safe-core-sdk/README.md b/packages/safe-core-sdk/README.md index 783753afd..7eef2426c 100644 --- a/packages/safe-core-sdk/README.md +++ b/packages/safe-core-sdk/README.md @@ -43,7 +43,7 @@ The following steps show how to set up the Safe Core SDK, deploy a new Safe, cre ```js import { ethers } from 'ethers' - import { EthersAdapter } from '@gnosis.pm/safe-core-sdk' + import EthersAdapter from '@gnosis.pm/safe-ethers-lib' const web3Provider = // ... const provider = new ethers.providers.Web3Provider(web3Provider) @@ -61,7 +61,7 @@ The following steps show how to set up the Safe Core SDK, deploy a new Safe, cre ```js import Web3 from 'web3' - import { Web3Adapter } from '@gnosis.pm/safe-core-sdk' + import Web3Adapter from '@gnosis.pm/safe-web3-lib' const ethAdapterOwner1 = new Web3Adapter({ web3, From 92318064c4ba0e193fbab892921588940faa9b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Mon, 31 Jan 2022 12:11:07 +0100 Subject: [PATCH 2/2] Update ethAdapters imports --- packages/safe-core-sdk/tests/utils/setupEthAdapter.ts | 4 ++-- packages/safe-ethers-adapters/examples/creation.ts | 3 ++- packages/safe-ethers-adapters/examples/interaction.ts | 3 ++- .../src/contracts/MultiSend/MultiSendContract.ts | 6 ------ .../src/contracts/MultiSend/MultiSendEthersContract.ts | 2 +- packages/safe-ethers-lib/src/index.ts | 2 +- packages/safe-service-client/tests/endpoint.test.ts | 2 +- packages/safe-web3-lib/src/index.ts | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendContract.ts diff --git a/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts b/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts index 93f75f704..78d82ce2e 100644 --- a/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts +++ b/packages/safe-core-sdk/tests/utils/setupEthAdapter.ts @@ -1,7 +1,7 @@ import { Signer } from '@ethersproject/abstract-signer' import { EthAdapter } from '@gnosis.pm/safe-core-sdk-types' -import { EthersAdapter, EthersAdapterConfig } from '@gnosis.pm/safe-ethers-lib' -import { Web3Adapter, Web3AdapterConfig } from '@gnosis.pm/safe-web3-lib' +import EthersAdapter, { EthersAdapterConfig } from '@gnosis.pm/safe-ethers-lib' +import Web3Adapter, { Web3AdapterConfig } from '@gnosis.pm/safe-web3-lib' import { ethers, web3 } from 'hardhat' export async function getEthAdapter(signer: Signer): Promise { diff --git a/packages/safe-ethers-adapters/examples/creation.ts b/packages/safe-ethers-adapters/examples/creation.ts index 085b46adf..b4cd050f5 100644 --- a/packages/safe-ethers-adapters/examples/creation.ts +++ b/packages/safe-ethers-adapters/examples/creation.ts @@ -1,6 +1,7 @@ import { JsonRpcProvider } from '@ethersproject/providers' import { Wallet } from '@ethersproject/wallet' -import Safe, { EthersAdapter } from '@gnosis.pm/safe-core-sdk' +import Safe from '@gnosis.pm/safe-core-sdk' +import EthersAdapter from '@gnosis.pm/safe-ethers-lib' import dotenv from 'dotenv' import { ethers } from 'ethers' import { SafeEthersSigner, SafeService } from '../src' diff --git a/packages/safe-ethers-adapters/examples/interaction.ts b/packages/safe-ethers-adapters/examples/interaction.ts index fc4e66111..4817c33a0 100644 --- a/packages/safe-ethers-adapters/examples/interaction.ts +++ b/packages/safe-ethers-adapters/examples/interaction.ts @@ -1,7 +1,8 @@ import { Contract } from '@ethersproject/contracts' import { JsonRpcProvider } from '@ethersproject/providers' import { Wallet } from '@ethersproject/wallet' -import Safe, { EthersAdapter } from '@gnosis.pm/safe-core-sdk' +import Safe from '@gnosis.pm/safe-core-sdk' +import EthersAdapter from '@gnosis.pm/safe-ethers-lib' import dotenv from 'dotenv' import { ethers } from 'ethers' import { SafeEthersSigner, SafeService } from '../src' diff --git a/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendContract.ts b/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendContract.ts deleted file mode 100644 index 2a242261e..000000000 --- a/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendContract.ts +++ /dev/null @@ -1,6 +0,0 @@ -interface MultiSendContract { - getAddress(): string - encode(methodName: any, params: any): string -} - -export default MultiSendContract diff --git a/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendEthersContract.ts b/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendEthersContract.ts index ac5542919..ece195878 100644 --- a/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendEthersContract.ts +++ b/packages/safe-ethers-lib/src/contracts/MultiSend/MultiSendEthersContract.ts @@ -1,9 +1,9 @@ +import { MultiSendContract } from '@gnosis.pm/safe-core-sdk-types' import { MultiSend as MultiSend_V1_1_1 } from '../../../typechain/src/ethers-v5/v1.1.1/MultiSend' import { MultiSend as MultiSend_V1_3_0, MultiSendInterface } from '../../../typechain/src/ethers-v5/v1.3.0/MultiSend' -import MultiSendContract from './MultiSendContract' abstract class MultiSendEthersContract implements MultiSendContract { constructor(public contract: MultiSend_V1_1_1 | MultiSend_V1_3_0) {} diff --git a/packages/safe-ethers-lib/src/index.ts b/packages/safe-ethers-lib/src/index.ts index c0ba357b4..cb044fea6 100644 --- a/packages/safe-ethers-lib/src/index.ts +++ b/packages/safe-ethers-lib/src/index.ts @@ -1,4 +1,4 @@ import EthersAdapter, { EthersAdapterConfig } from './EthersAdapter' export default EthersAdapter -export { EthersAdapterConfig, EthersAdapter } +export { EthersAdapterConfig } diff --git a/packages/safe-service-client/tests/endpoint.test.ts b/packages/safe-service-client/tests/endpoint.test.ts index 6a3e61093..e4cca13a2 100644 --- a/packages/safe-service-client/tests/endpoint.test.ts +++ b/packages/safe-service-client/tests/endpoint.test.ts @@ -2,7 +2,7 @@ import { getDefaultProvider } from '@ethersproject/providers' import { Wallet } from '@ethersproject/wallet' import Safe from '@gnosis.pm/safe-core-sdk' import { SafeTransactionDataPartial } from '@gnosis.pm/safe-core-sdk-types' -import { EthersAdapter } from '@gnosis.pm/safe-ethers-lib' +import EthersAdapter from '@gnosis.pm/safe-ethers-lib' import chai from 'chai' import chaiAsPromised from 'chai-as-promised' import { ethers } from 'hardhat' diff --git a/packages/safe-web3-lib/src/index.ts b/packages/safe-web3-lib/src/index.ts index d1f131b64..25583be7b 100644 --- a/packages/safe-web3-lib/src/index.ts +++ b/packages/safe-web3-lib/src/index.ts @@ -1,4 +1,4 @@ import Web3Adapter, { Web3AdapterConfig } from './Web3Adapter' export default Web3Adapter -export { Web3AdapterConfig, Web3Adapter } +export { Web3AdapterConfig }