From 017fbba629303cbffed15f65eb8ef4ed75eae8d4 Mon Sep 17 00:00:00 2001 From: katspaugh <381895+katspaugh@users.noreply.github.com> Date: Thu, 23 Feb 2023 16:31:01 +0100 Subject: [PATCH] Fix: update safe-deployments (#340) * Fix: update safe-deployments * 1.20.2 * Add base-gor to config * Add other missing chains * Fix leftover imports --- packages/safe-core-sdk-types/package.json | 2 +- .../src/ethereumLibs/EthAdapter.ts | 2 +- packages/safe-core-sdk-utils/package.json | 2 +- .../scripts/checkSafeDeployments.ts | 2 +- .../safe-core-sdk-utils/src/eip-3770/config.ts | 10 ++++++++-- packages/safe-core-sdk/package.json | 6 +++--- .../src/contracts/safeDeploymentContracts.ts | 2 +- packages/safe-ethers-adapters/package.json | 2 +- packages/safe-ethers-adapters/src/utils.ts | 2 +- packages/safe-ethers-adapters/tests/signer.test.ts | 2 +- .../scripts/generateTypechainFiles.ts | 2 +- .../scripts/generateTypechainFiles.ts | 2 +- yarn.lock | 14 +++++++------- 13 files changed, 28 insertions(+), 22 deletions(-) diff --git a/packages/safe-core-sdk-types/package.json b/packages/safe-core-sdk-types/package.json index b95347caf..004259e41 100644 --- a/packages/safe-core-sdk-types/package.json +++ b/packages/safe-core-sdk-types/package.json @@ -41,7 +41,7 @@ "dependencies": { "@ethersproject/bignumber": "^5.7.0", "@ethersproject/contracts": "^5.7.0", - "@gnosis.pm/safe-deployments": "1.19.0", + "@safe-global/safe-deployments": "^1.20.2", "web3-core": "^1.8.1", "web3-utils": "^1.8.1" } diff --git a/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts b/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts index 1f77385e6..4d6eaeece 100644 --- a/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts +++ b/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts @@ -1,5 +1,5 @@ import { BigNumber } from '@ethersproject/bignumber' -import { SingletonDeployment } from '@gnosis.pm/safe-deployments' +import { SingletonDeployment } from '@safe-global/safe-deployments' import { AbiItem } from 'web3-utils' import { CompatibilityFallbackHandlerContract } from '../contracts/CompatibilityFallbackHandlerContract' import { CreateCallContract } from '../contracts/CreateCallContract' diff --git a/packages/safe-core-sdk-utils/package.json b/packages/safe-core-sdk-utils/package.json index 91302f3b5..c928f389e 100644 --- a/packages/safe-core-sdk-utils/package.json +++ b/packages/safe-core-sdk-utils/package.json @@ -31,7 +31,7 @@ ], "homepage": "https://github.com/safe-global/safe-core-sdk#readme", "devDependencies": { - "@gnosis.pm/safe-deployments": "1.19.0", + "@safe-global/safe-deployments": "^1.20.2", "@types/chai": "^4.3.4", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^10.0.1", diff --git a/packages/safe-core-sdk-utils/scripts/checkSafeDeployments.ts b/packages/safe-core-sdk-utils/scripts/checkSafeDeployments.ts index 0c0afbd42..d39e462f6 100644 --- a/packages/safe-core-sdk-utils/scripts/checkSafeDeployments.ts +++ b/packages/safe-core-sdk-utils/scripts/checkSafeDeployments.ts @@ -1,4 +1,4 @@ -import { DeploymentFilter, getSafeSingletonDeployment } from '@gnosis.pm/safe-deployments' +import { DeploymentFilter, getSafeSingletonDeployment } from '@safe-global/safe-deployments' import { SafeVersion } from '@safe-global/safe-core-sdk-types' import { networks } from '../src/eip-3770/config' diff --git a/packages/safe-core-sdk-utils/src/eip-3770/config.ts b/packages/safe-core-sdk-utils/src/eip-3770/config.ts index 31035d2a2..41095a7c2 100644 --- a/packages/safe-core-sdk-utils/src/eip-3770/config.ts +++ b/packages/safe-core-sdk-utils/src/eip-3770/config.ts @@ -28,6 +28,7 @@ export const networks: NetworkShortName[] = [ { chainId: 97, shortName: 'bnbt' }, { chainId: 100, shortName: 'gno' }, { chainId: 106, shortName: 'vlx' }, + { chainId: 108, shortName: 'tt' }, { chainId: 111, shortName: 'etl' }, { chainId: 122, shortName: 'fuse' }, { chainId: 123, shortName: 'spark' }, @@ -60,10 +61,11 @@ export const networks: NetworkShortName[] = [ { chainId: 2002, shortName: 'milkalgo' }, { chainId: 2008, shortName: 'cloudwalk_testnet' }, { chainId: 2019, shortName: 'pmint_test' }, - { chainId: 4002, shortName: 'tftm' }, { chainId: 2020, shortName: 'pmint' }, { chainId: 2221, shortName: 'tkava' }, { chainId: 2222, shortName: 'kava' }, + { chainId: 4002, shortName: 'tftm' }, + { chainId: 4689, shortName: 'iotex-mainnet' }, { chainId: 4918, shortName: 'txvm' }, { chainId: 4919, shortName: 'xvm' }, { chainId: 7341, shortName: 'shyft' }, @@ -71,6 +73,7 @@ export const networks: NetworkShortName[] = [ { chainId: 8217, shortName: 'cypress' }, { chainId: 9000, shortName: 'evmos-testnet' }, { chainId: 9001, shortName: 'evmos' }, + { chainId: 9728, shortName: 'boba-testnet' }, { chainId: 10000, shortName: 'smartbch' }, { chainId: 10001, shortName: 'smartbchtest' }, { chainId: 10200, shortName: 'chi' }, @@ -82,14 +85,17 @@ export const networks: NetworkShortName[] = [ { chainId: 42220, shortName: 'celo' }, { chainId: 43113, shortName: 'fuji' }, { chainId: 43114, shortName: 'avax' }, + { chainId: 43288, shortName: 'boba-avax' }, { chainId: 44787, shortName: 'alfa' }, { chainId: 45000, shortName: 'autobahnnetwork' }, { chainId: 47805, shortName: 'rei' }, { chainId: 54211, shortName: 'islmt' }, + { chainId: 56288, shortName: 'boba-bnb' }, { chainId: 71401, shortName: 'gw-testnet-v1' }, { chainId: 71402, shortName: 'gw-mainnet-v1' }, { chainId: 73799, shortName: 'vt' }, { chainId: 80001, shortName: 'maticmum' }, + { chainId: 84531, shortName: 'base-gor' }, { chainId: 200101, shortName: 'milktada' }, { chainId: 200202, shortName: 'milktalgo' }, { chainId: 333999, shortName: 'olympus' }, @@ -101,7 +107,7 @@ export const networks: NetworkShortName[] = [ { chainId: 1666600000, shortName: 'hmy-s0' }, { chainId: 1666700000, shortName: 'hmy-b-s0' }, { chainId: 11297108099, shortName: 'tpalm' }, - { chainId: 11297108109, shortName: 'palm' } + { chainId: 11297108109, shortName: 'palm' }, ] if (process.env.TEST_NETWORK === 'hardhat') { diff --git a/packages/safe-core-sdk/package.json b/packages/safe-core-sdk/package.json index de796f3f1..d3cd669ae 100644 --- a/packages/safe-core-sdk/package.json +++ b/packages/safe-core-sdk/package.json @@ -48,11 +48,11 @@ "devDependencies": { "@gnosis.pm/safe-contracts-v1.2.0": "npm:@gnosis.pm/safe-contracts@1.2.0", "@gnosis.pm/safe-contracts-v1.3.0": "npm:@gnosis.pm/safe-contracts@1.3.0", - "@safe-global/safe-ethers-lib": "^1.9.0", - "@safe-global/safe-web3-lib": "^1.9.0", "@nomiclabs/hardhat-ethers": "^2.2.2", "@nomiclabs/hardhat-waffle": "^2.0.3", "@nomiclabs/hardhat-web3": "^2.0.0", + "@safe-global/safe-ethers-lib": "^1.9.0", + "@safe-global/safe-web3-lib": "^1.9.0", "@types/chai": "^4.3.4", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^10.0.1", @@ -86,7 +86,7 @@ "@ethersproject/solidity": "^5.7.0", "@safe-global/safe-core-sdk-types": "^1.9.0", "@safe-global/safe-core-sdk-utils": "^1.7.1", - "@gnosis.pm/safe-deployments": "1.19.0", + "@safe-global/safe-deployments": "^1.20.2", "ethereumjs-util": "^7.1.5", "semver": "^7.3.8", "web3-utils": "^1.8.1" diff --git a/packages/safe-core-sdk/src/contracts/safeDeploymentContracts.ts b/packages/safe-core-sdk/src/contracts/safeDeploymentContracts.ts index 3e90f45aa..fd0d6292b 100644 --- a/packages/safe-core-sdk/src/contracts/safeDeploymentContracts.ts +++ b/packages/safe-core-sdk/src/contracts/safeDeploymentContracts.ts @@ -9,7 +9,7 @@ import { getSafeSingletonDeployment, getSignMessageLibDeployment, SingletonDeployment -} from '@gnosis.pm/safe-deployments' +} from '@safe-global/safe-deployments' import { CompatibilityFallbackHandlerContract, CreateCallContract, diff --git a/packages/safe-ethers-adapters/package.json b/packages/safe-ethers-adapters/package.json index 0a9f0f950..f40ea0d30 100644 --- a/packages/safe-ethers-adapters/package.json +++ b/packages/safe-ethers-adapters/package.json @@ -65,9 +65,9 @@ "@ethersproject/properties": "^5.7.0" }, "dependencies": { - "@gnosis.pm/safe-deployments": "1.19.0", "@safe-global/safe-core-sdk": "^3.3.0", "@safe-global/safe-core-sdk-types": "^1.9.0", + "@safe-global/safe-deployments": "^1.20.2", "axios": "^0.27.2" }, "lint-staged": { diff --git a/packages/safe-ethers-adapters/src/utils.ts b/packages/safe-ethers-adapters/src/utils.ts index 5946e70b2..c896e18e9 100644 --- a/packages/safe-ethers-adapters/src/utils.ts +++ b/packages/safe-ethers-adapters/src/utils.ts @@ -1,7 +1,7 @@ import { Interface } from '@ethersproject/abi' import { TransactionReceipt } from '@ethersproject/abstract-provider' import { getAddress } from '@ethersproject/address' -import { getCreateCallDeployment } from '@gnosis.pm/safe-deployments' +import { getCreateCallDeployment } from '@safe-global/safe-deployments' import { SafeTransactionData } from '@safe-global/safe-core-sdk-types' export const createLibDeployment = getCreateCallDeployment() diff --git a/packages/safe-ethers-adapters/tests/signer.test.ts b/packages/safe-ethers-adapters/tests/signer.test.ts index cf72d2ca3..d8d7e80d2 100644 --- a/packages/safe-ethers-adapters/tests/signer.test.ts +++ b/packages/safe-ethers-adapters/tests/signer.test.ts @@ -1,5 +1,5 @@ import { BigNumber } from '@ethersproject/bignumber' -import { getCreateCallDeployment } from '@gnosis.pm/safe-deployments' +import { getCreateCallDeployment } from '@safe-global/safe-deployments' import chai from 'chai' import chaiAsPromised from 'chai-as-promised' import sinon from 'sinon' diff --git a/packages/safe-ethers-lib/scripts/generateTypechainFiles.ts b/packages/safe-ethers-lib/scripts/generateTypechainFiles.ts index 23334fbfb..e526231bd 100644 --- a/packages/safe-ethers-lib/scripts/generateTypechainFiles.ts +++ b/packages/safe-ethers-lib/scripts/generateTypechainFiles.ts @@ -13,7 +13,7 @@ const outDirTests = 'typechain/tests/' // Contract list for which the Typechain files will be generated // Will be included in dist/ folder -const safeContractsPath = '../../node_modules/@gnosis.pm/safe-deployments/dist/assets' +const safeContractsPath = '../../node_modules/@safe-global/safe-deployments/dist/assets' const safeContracts_V1_3_0 = [ `${safeContractsPath}/v1.3.0/gnosis_safe.json`, diff --git a/packages/safe-web3-lib/scripts/generateTypechainFiles.ts b/packages/safe-web3-lib/scripts/generateTypechainFiles.ts index 798b421cd..4b855e790 100644 --- a/packages/safe-web3-lib/scripts/generateTypechainFiles.ts +++ b/packages/safe-web3-lib/scripts/generateTypechainFiles.ts @@ -13,7 +13,7 @@ const outDirTests = 'typechain/tests/' // Contract list for which the Typechain files will be generated // Will be included in dist/ folder -const safeContractsPath = '../../node_modules/@gnosis.pm/safe-deployments/dist/assets' +const safeContractsPath = '../../node_modules/@safe-global/safe-deployments/dist/assets' const safeContracts_V1_3_0 = [ `${safeContractsPath}/v1.3.0/gnosis_safe.json`, diff --git a/yarn.lock b/yarn.lock index 129e419b3..78c57bfa0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -835,13 +835,6 @@ resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-contracts/-/safe-contracts-1.3.0.tgz#316741a7690d8751a1f701538cfc9ec80866eedc" integrity sha512-1p+1HwGvxGUVzVkFjNzglwHrLNA67U/axP0Ct85FzzH8yhGJb4t9jDjPYocVMzLorDoWAfKicGy1akPY9jXRVw== -"@gnosis.pm/safe-deployments@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-deployments/-/safe-deployments-1.19.0.tgz#f4ba8cf92cd6fdff4241ac50e410b4a6ff89babe" - integrity sha512-EvHR/LjMwJm0QKXyTscRXqR9vnJwCUDiMnRNKRyXe1akW+udiYXjJTAiGuleFS4DOUSqs6DpAjYlLnXMzUsVMw== - dependencies: - semver "^7.3.7" - "@graphql-tools/batch-execute@8.5.1": version "8.5.1" resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" @@ -2386,6 +2379,13 @@ path-browserify "^1.0.0" url "^0.11.0" +"@safe-global/safe-deployments@^1.20.2": + version "1.20.2" + resolved "https://registry.yarnpkg.com/@safe-global/safe-deployments/-/safe-deployments-1.20.2.tgz#a005493c584909bba82bb7f06fef40a1e69d8fa8" + integrity sha512-4uPNpC5RUl2muGKfWUMMduG5+vKDHZOdPmFPmBkdyG+JL3jDzihgdZzdbKERQClg5xrwPhJY38hJezUFCGPR/w== + dependencies: + semver "^7.3.7" + "@scure/base@~1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"