Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/cowprotocol/cow-sdk into fe…
Browse files Browse the repository at this point in the history
…at/swap-for-people

# Conflicts:
#	src/cow-shed/CoWShedHooks.ts
#	src/cow-shed/contracts.ts
  • Loading branch information
shoom3301 committed Nov 8, 2024
2 parents 99a1cad + 5ad85a1 commit 5698598
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cowprotocol/cow-sdk",
"version": "5.7.0-RC.0",
"version": "5.7.1",
"license": "(MIT OR Apache-2.0)",
"files": [
"/dist"
Expand Down
22 changes: 11 additions & 11 deletions src/cow-shed/CoWShedHooks.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
import {
EcdsaSigningScheme,
hashTypedData,
isTypedDataSigner,
SigningScheme,
TypedDataTypes,
} from '@cowprotocol/contracts'
import type { Signer } from '@ethersproject/abstract-signer'
import { TypedDataDomain } from 'ethers'
import {
arrayify,
defaultAbiCoder,
Expand All @@ -7,18 +16,9 @@ import {
splitSignature,
} from 'ethers/lib/utils'
import { COW_SHED_FACTORY, COW_SHED_IMPLEMENTATION, SupportedChainId } from '../common'
import { COW_SHED_712_TYPES, ICoWShedCall, ICoWShedOptions } from './types'
import { COW_SHED_PROXY_INIT_CODE } from './proxyInitCode'
import type { Signer } from '@ethersproject/abstract-signer'
import { getCoWShedFactoryInterface } from './contracts'
import { TypedDataDomain } from 'ethers'
import {
EcdsaSigningScheme,
hashTypedData,
isTypedDataSigner,
SigningScheme,
TypedDataTypes,
} from '@cowprotocol/contracts'
import { COW_SHED_PROXY_INIT_CODE } from './proxyInitCode'
import { COW_SHED_712_TYPES, ICoWShedCall, ICoWShedOptions } from './types'

export class CowShedHooks {
constructor(private chainId: SupportedChainId, private customOptions?: ICoWShedOptions) {}
Expand Down
2 changes: 1 addition & 1 deletion src/cow-shed/contracts.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CoWShedInterface } from '../common/generated/CoWShed'
import { CoWShed__factory, CoWShedFactory__factory } from '../common/generated'
import { CoWShedInterface } from '../common/generated/CoWShed'
import { CoWShedFactoryInterface } from '../common/generated/CoWShedFactory'

let cowShedInterfaceCache: CoWShedInterface | undefined
Expand Down

0 comments on commit 5698598

Please sign in to comment.