Skip to content

Commit

Permalink
update conflux constructor (#328)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hcote
hcote committed Jun 29, 2022
1 parent 3762640 commit 0532e09
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 45 deletions.
5 changes: 1 addition & 4 deletions packages/@magic-ext/conflux/src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ export class ConfluxExtension extends Extension.Internal<'conflux', any> {
chainType: 'CONFLUX',
options: {
rpcUrl: confluxConfig.rpcUrl,
chainId: confluxConfig.chainId,
defaultGasPrice: confluxConfig.defaultGasPrice,
defaultGasRatio: confluxConfig.defaultGasRatio,
defaultStorageRatio: confluxConfig.defaultStorageRatio,
networkId: confluxConfig.networkId,
},
};
}
Expand Down
5 changes: 1 addition & 4 deletions packages/@magic-ext/conflux/src/types.ts
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
export interface ConfluxConfig {
rpcUrl: string;
chainId: number;
defaultGasPrice?: number;
defaultGasRatio?: number;
defaultStorageRatio?: number;
networkId?: number;
}

export enum ConfluxPayloadMethod {
Expand Down
74 changes: 37 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3162,47 +3162,47 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche":
version: 0.0.0-use.local
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin":
version: 0.0.0-use.local
resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/conflux@workspace:packages/@magic-ext/conflux":
version: 0.0.0-use.local
resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos":
version: 0.0.0-use.local
resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/flow@workspace:packages/@magic-ext/flow":
version: 0.0.0-use.local
resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
"@onflow/fcl": 0.0.41
"@onflow/types": 0.0.3
peerDependencies:
Expand All @@ -3215,51 +3215,51 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/icon@workspace:packages/@magic-ext/icon":
version: 0.0.0-use.local
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/near@workspace:packages/@magic-ext/near":
version: 0.0.0-use.local
resolution: "@magic-ext/near@workspace:packages/@magic-ext/near"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/oauth@^2.1.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
"@magic-ext/oauth@^2.1.1, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth"
dependencies:
"@magic-sdk/types": ^7.1.0
"@magic-sdk/types": ^7.1.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
magic-sdk: ^8.1.0
magic-sdk: ^8.1.1
languageName: unknown
linkType: soft

"@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot":
version: 0.0.0-use.local
resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/react-native-oauth@workspace:packages/@magic-ext/react-native-oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/react-native-oauth@workspace:packages/@magic-ext/react-native-oauth"
dependencies:
"@magic-sdk/react-native": ^8.2.0
"@magic-sdk/types": ^7.1.0
"@magic-sdk/react-native": ^8.2.1
"@magic-sdk/types": ^7.1.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
expo-web-browser: ^8.3.1
Expand All @@ -3270,56 +3270,56 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/taquito@workspace:packages/@magic-ext/taquito":
version: 0.0.0-use.local
resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/terra@workspace:packages/@magic-ext/terra":
version: 0.0.0-use.local
resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/tezos@workspace:packages/@magic-ext/tezos":
version: 0.0.0-use.local
resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn":
version: 0.0.0-use.local
resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa":
version: 0.0.0-use.local
resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa"
dependencies:
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/commons": ^4.1.1
languageName: unknown
linkType: soft

"@magic-sdk/commons@^4.1.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^4.1.1, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
version: 0.0.0-use.local
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
dependencies:
"@magic-sdk/provider": ^8.1.0
"@magic-sdk/types": ^7.1.0
"@magic-sdk/provider": ^8.1.1
"@magic-sdk/types": ^7.1.1
peerDependencies:
"@magic-sdk/provider": ">=4.3.0"
"@magic-sdk/types": ">=3.1.1"
Expand All @@ -3333,17 +3333,17 @@ __metadata:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-ext/oauth": ^2.1.0
magic-sdk: ^8.1.0
"@magic-ext/oauth": ^2.1.1
magic-sdk: ^8.1.1
languageName: unknown
linkType: soft

"@magic-sdk/provider@^8.1.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
"@magic-sdk/provider@^8.1.1, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
version: 0.0.0-use.local
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
dependencies:
"@babel/plugin-transform-modules-commonjs": ^7.9.6
"@magic-sdk/types": ^7.1.0
"@magic-sdk/types": ^7.1.1
"@peculiar/webcrypto": ^1.1.7
eventemitter3: ^4.0.4
localforage: ^1.7.4
Expand All @@ -3355,17 +3355,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native@^8.2.0, @magic-sdk/react-native@workspace:packages/@magic-sdk/react-native":
"@magic-sdk/react-native@^8.2.1, @magic-sdk/react-native@workspace:packages/@magic-sdk/react-native":
version: 0.0.0-use.local
resolution: "@magic-sdk/react-native@workspace:packages/@magic-sdk/react-native"
dependencies:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/provider": ^8.1.0
"@magic-sdk/types": ^7.1.0
"@magic-sdk/commons": ^4.1.1
"@magic-sdk/provider": ^8.1.1
"@magic-sdk/types": ^7.1.1
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
buffer: ~5.6.0
Expand All @@ -3386,7 +3386,7 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/types@^7.1.0, @magic-sdk/types@workspace:packages/@magic-sdk/types":
"@magic-sdk/types@^7.1.1, @magic-sdk/types@workspace:packages/@magic-sdk/types":
version: 0.0.0-use.local
resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types"
languageName: unknown
Expand Down Expand Up @@ -12598,16 +12598,16 @@ fsevents@^2.3.2:
languageName: unknown
linkType: soft

"magic-sdk@^8.1.0, magic-sdk@workspace:packages/magic-sdk":
"magic-sdk@^8.1.1, magic-sdk@workspace:packages/magic-sdk":
version: 0.0.0-use.local
resolution: "magic-sdk@workspace:packages/magic-sdk"
dependencies:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-sdk/commons": ^4.1.0
"@magic-sdk/provider": ^8.1.0
"@magic-sdk/types": ^7.1.0
"@magic-sdk/commons": ^4.1.1
"@magic-sdk/provider": ^8.1.1
"@magic-sdk/types": ^7.1.1
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
languageName: unknown
Expand Down

0 comments on commit 0532e09

Please sign in to comment.