Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thunnini
Thunnini committed Feb 4, 2025
2 parents 8760ee5 + 4e4f641 commit e27317c
Show file tree
Hide file tree
Showing 43 changed files with 412 additions and 363 deletions.
52 changes: 26 additions & 26 deletions apps/extension/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/extension",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"author": "chainapsis",
"license": "Apache-2.0",
"private": true,
Expand All @@ -26,31 +26,31 @@
"@ethersproject/transactions": "^5.7.0",
"@floating-ui/react": "^0.23.0",
"@floating-ui/react-dom": "^1.3.0",
"@keplr-wallet/analytics": "0.12.179",
"@keplr-wallet/background": "0.12.179",
"@keplr-wallet/chain-validator": "0.12.179",
"@keplr-wallet/common": "0.12.179",
"@keplr-wallet/cosmos": "0.12.179",
"@keplr-wallet/crypto": "0.12.179",
"@keplr-wallet/hooks": "0.12.179",
"@keplr-wallet/hooks-internal": "0.12.179",
"@keplr-wallet/hooks-starknet": "0.12.179",
"@keplr-wallet/ledger-cosmos": "0.12.179",
"@keplr-wallet/popup": "0.12.179",
"@keplr-wallet/proto-types": "0.12.179",
"@keplr-wallet/provider": "0.12.179",
"@keplr-wallet/router": "0.12.179",
"@keplr-wallet/router-extension": "0.12.179",
"@keplr-wallet/simple-fetch": "0.12.179",
"@keplr-wallet/stores": "0.12.179",
"@keplr-wallet/stores-core": "0.12.179",
"@keplr-wallet/stores-etc": "0.12.179",
"@keplr-wallet/stores-eth": "0.12.179",
"@keplr-wallet/stores-ibc": "0.12.179",
"@keplr-wallet/stores-internal": "0.12.179",
"@keplr-wallet/stores-starknet": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/unit": "0.12.179",
"@keplr-wallet/analytics": "0.12.180-rc.0",
"@keplr-wallet/background": "0.12.180-rc.0",
"@keplr-wallet/chain-validator": "0.12.180-rc.0",
"@keplr-wallet/common": "0.12.180-rc.0",
"@keplr-wallet/cosmos": "0.12.180-rc.0",
"@keplr-wallet/crypto": "0.12.180-rc.0",
"@keplr-wallet/hooks": "0.12.180-rc.0",
"@keplr-wallet/hooks-internal": "0.12.180-rc.0",
"@keplr-wallet/hooks-starknet": "0.12.180-rc.0",
"@keplr-wallet/ledger-cosmos": "0.12.180-rc.0",
"@keplr-wallet/popup": "0.12.180-rc.0",
"@keplr-wallet/proto-types": "0.12.180-rc.0",
"@keplr-wallet/provider": "0.12.180-rc.0",
"@keplr-wallet/router": "0.12.180-rc.0",
"@keplr-wallet/router-extension": "0.12.180-rc.0",
"@keplr-wallet/simple-fetch": "0.12.180-rc.0",
"@keplr-wallet/stores": "0.12.180-rc.0",
"@keplr-wallet/stores-core": "0.12.180-rc.0",
"@keplr-wallet/stores-etc": "0.12.180-rc.0",
"@keplr-wallet/stores-eth": "0.12.180-rc.0",
"@keplr-wallet/stores-ibc": "0.12.180-rc.0",
"@keplr-wallet/stores-internal": "0.12.180-rc.0",
"@keplr-wallet/stores-starknet": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"@keplr-wallet/unit": "0.12.180-rc.0",
"@keystonehq/animated-qr": "^0.8.6",
"@keystonehq/hw-app-base": "0.1.1",
"@keystonehq/hw-transport-webusb": "0.4.0",
Expand Down
46 changes: 46 additions & 0 deletions apps/extension/src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3005,6 +3005,52 @@ export const EmbedChainInfos: (ChainInfo | ModularChainInfo)[] = [
},
features: [],
},
{
rpc: "https://rpc.derive.xyz/",
rest: "https://rpc.derive.xyz/",
evm: {
chainId: 957,
rpc: "https://rpc.derive.xyz/",
websocket: "wss://rpc.derive.xyz/",
},
chainId: "eip155:957",
chainName: "Derive",
bip44: {
coinType: 60,
},
currencies: [
{
coinDenom: "ETH",
coinMinimalDenom: "derive-ethereum",
coinDecimals: 18,
coinGeckoId: "ethereum",
},
{
type: "erc20",
contractAddress: "0xb1d1eae60eea9525032a6dcb4c1ce336a1de71be",
coinDenom: "DRV",
coinMinimalDenom: "erc20:0xb1d1eae60eea9525032a6dcb4c1ce336a1de71be",
coinDecimals: 18,
coinGeckoId: "derive",
},
{
type: "erc20",
contractAddress: "0x7499d654422023a407d92e1D83D387d81BC68De1",
coinDenom: "stDRV",
coinMinimalDenom: "erc20:0x7499d654422023a407d92e1D83D387d81BC68De1",
coinDecimals: 18,
},
],
feeCurrencies: [
{
coinDenom: "ETH",
coinMinimalDenom: "derive-ethereum",
coinDecimals: 18,
coinGeckoId: "ethereum",
},
],
features: ["op-stack-l1-data-fee"],
},
];

// The origins that are able to pass any permission that external webpages can have.
Expand Down
2 changes: 1 addition & 1 deletion apps/extension/src/manifest.v2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

"name": "Keplr",
"description": "Keplr is a browser extension wallet for the Inter blockchain ecosystem.",
"version": "0.12.179",
"version": "0.12.180",
"icons": {
"16": "assets/icon-16.png",
"48": "assets/icon-48.png",
Expand Down
2 changes: 1 addition & 1 deletion apps/extension/src/manifest.v3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

"name": "Keplr",
"description": "Keplr is a browser extension wallet for the Inter blockchain ecosystem.",
"version": "0.12.179",
"version": "0.12.180",
"icons": {
"16": "assets/icon-16.png",
"48": "assets/icon-48.png",
Expand Down
15 changes: 8 additions & 7 deletions apps/extension/src/pages/sign/ethereum/view.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export const EthereumSigningView: FunctionComponent<{
case EthSignType.MESSAGE:
// If the message is 32 bytes, it's probably a hash.
if (signingDataBuff.length === 32) {
return signingDataBuff.toString("hex");
return "0x" + signingDataBuff.toString("hex");
} else {
const text = (() => {
const string = signingDataBuff.toString("utf8");
Expand All @@ -294,7 +294,8 @@ export const EthereumSigningView: FunctionComponent<{
const decoder = new TextDecoder("utf-8", { fatal: true });
decoder.decode(new Uint8Array(buf)); // UTF-8 변환 시도
} catch {
return buf.toString("hex");
// 정상적인 utf-8 문자열이 아니면 hex로 변환
return "0x" + buf.toString("hex");
}

return buf.toString("utf8");
Expand All @@ -315,7 +316,7 @@ export const EthereumSigningView: FunctionComponent<{
case EthSignType.EIP712:
return JSON.stringify(JSON.parse(signingDataBuff.toString()), null, 2);
default:
return signingDataBuff.toString("hex");
return "0x" + signingDataBuff.toString("hex");
}
}, [signingDataBuff, signType]);

Expand Down Expand Up @@ -369,7 +370,7 @@ export const EthereumSigningView: FunctionComponent<{
isLedgerInteracting ||
isKeystoneInteracting;

const buttonDisabled = txConfigsValidate.interactionBlocked;
const buttonDisabled = isTxSigning && txConfigsValidate.interactionBlocked;

return (
<HeaderLayout
Expand Down Expand Up @@ -438,7 +439,7 @@ export const EthereumSigningView: FunctionComponent<{
setLedgerInteractingError(undefined);
signature = await handleEthereumPreSignByLedger(
interactionData,
Buffer.from(signingDataText),
signingDataBuff,
{
useWebHID: uiConfigStore.useWebHIDLedger,
}
Expand All @@ -448,7 +449,7 @@ export const EthereumSigningView: FunctionComponent<{
setKeystoneInteractingError(undefined);
signature = await handleEthereumPreSignByKeystone(
interactionData,
Buffer.from(signingDataText),
signingDataBuff,
{
displayQRCode: async (ur: KeystoneUR) => {
setKeystoneUR(ur);
Expand All @@ -463,7 +464,7 @@ export const EthereumSigningView: FunctionComponent<{

await signEthereumInteractionStore.approveWithProceedNext(
interactionData.id,
Buffer.from(signingDataText),
signingDataBuff,
signature,
async (proceedNext) => {
if (!proceedNext) {
Expand Down
14 changes: 7 additions & 7 deletions apps/hooks-internal/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/hooks-internal",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -14,12 +14,12 @@
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
},
"dependencies": {
"@keplr-wallet/hooks": "0.12.179",
"@keplr-wallet/stores": "0.12.179",
"@keplr-wallet/stores-eth": "0.12.179",
"@keplr-wallet/stores-internal": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/unit": "0.12.179"
"@keplr-wallet/hooks": "0.12.180-rc.0",
"@keplr-wallet/stores": "0.12.180-rc.0",
"@keplr-wallet/stores-eth": "0.12.180-rc.0",
"@keplr-wallet/stores-internal": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"@keplr-wallet/unit": "0.12.180-rc.0"
},
"peerDependencies": {
"mobx": "^6",
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/mobile",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"private": true,
"installConfig": {
"hoistingLimits": "workspaces"
Expand Down
14 changes: 7 additions & 7 deletions apps/stores-internal/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/stores-internal",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -14,12 +14,12 @@
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
},
"dependencies": {
"@keplr-wallet/common": "0.12.179",
"@keplr-wallet/cosmos": "0.12.179",
"@keplr-wallet/simple-fetch": "0.12.179",
"@keplr-wallet/stores": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/unit": "0.12.179",
"@keplr-wallet/common": "0.12.180-rc.0",
"@keplr-wallet/cosmos": "0.12.180-rc.0",
"@keplr-wallet/simple-fetch": "0.12.180-rc.0",
"@keplr-wallet/stores": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"@keplr-wallet/unit": "0.12.180-rc.0",
"joi": "^17.5.0",
"utility-types": "^3.10.0"
},
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.12.179",
"version": "0.12.180-rc.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/analytics",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand Down
24 changes: 12 additions & 12 deletions packages/background/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/background",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand Down Expand Up @@ -28,17 +28,17 @@
"@ethersproject/hash": "^5.7.0",
"@ethersproject/transactions": "^5.7.0",
"@ethersproject/wallet": "^5.7.0",
"@keplr-wallet/chain-validator": "0.12.179",
"@keplr-wallet/common": "0.12.179",
"@keplr-wallet/cosmos": "0.12.179",
"@keplr-wallet/crypto": "0.12.179",
"@keplr-wallet/ledger-cosmos": "0.12.179",
"@keplr-wallet/popup": "0.12.179",
"@keplr-wallet/proto-types": "0.12.179",
"@keplr-wallet/router": "0.12.179",
"@keplr-wallet/simple-fetch": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/unit": "0.12.179",
"@keplr-wallet/chain-validator": "0.12.180-rc.0",
"@keplr-wallet/common": "0.12.180-rc.0",
"@keplr-wallet/cosmos": "0.12.180-rc.0",
"@keplr-wallet/crypto": "0.12.180-rc.0",
"@keplr-wallet/ledger-cosmos": "0.12.180-rc.0",
"@keplr-wallet/popup": "0.12.180-rc.0",
"@keplr-wallet/proto-types": "0.12.180-rc.0",
"@keplr-wallet/router": "0.12.180-rc.0",
"@keplr-wallet/simple-fetch": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"@keplr-wallet/unit": "0.12.180-rc.0",
"@ledgerhq/hw-app-eth": "^6.40.3",
"@ledgerhq/hw-app-starknet": "^2.4.0",
"@ledgerhq/hw-transport": "^6.31.4",
Expand Down
6 changes: 4 additions & 2 deletions packages/background/src/keyring-ethereum/service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export class KeyRingEthereumService {
signature.s,
// The metamask doesn't seem to consider the chain id in this case... (maybe bug on metamask?)
signature.v
? Buffer.from("1c", "hex")
? Buffer.from(signature.v.toString(16), "hex")
: Buffer.from("1b", "hex"),
]),
};
Expand Down Expand Up @@ -600,7 +600,9 @@ export class KeyRingEthereumService {
origin,
currentChainId,
signer,
Buffer.from(message),
message.startsWith("0x")
? Buffer.from(message.slice(2), "hex")
: Buffer.from(message, "utf8"),
EthSignType.MESSAGE
);

Expand Down
8 changes: 4 additions & 4 deletions packages/chain-validator/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/chain-validator",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -17,9 +17,9 @@
},
"dependencies": {
"@ethersproject/abi": "^5.7.0",
"@keplr-wallet/cosmos": "0.12.179",
"@keplr-wallet/simple-fetch": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/cosmos": "0.12.180-rc.0",
"@keplr-wallet/simple-fetch": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"joi": "^17.5.0",
"utility-types": "^3.10.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/common/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keplr-wallet/common",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"main": "build/index.js",
"author": "chainapsis",
"license": "Apache-2.0",
Expand All @@ -16,8 +16,8 @@
"lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
},
"dependencies": {
"@keplr-wallet/crypto": "0.12.179",
"@keplr-wallet/types": "0.12.179",
"@keplr-wallet/crypto": "0.12.180-rc.0",
"@keplr-wallet/types": "0.12.180-rc.0",
"buffer": "^6.0.3",
"delay": "^4.4.0"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cosmjs-test/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cosmjs-test",
"version": "0.12.179",
"version": "0.12.180-rc.0",
"author": "chainapsis",
"license": "Apache-2.0",
"private": true,
Expand All @@ -12,7 +12,7 @@
},
"devDependencies": {
"@cosmjs/stargate": "^0.29.3",
"@keplr-wallet/provider-mock": "0.12.179",
"@keplr-wallet/provider-mock": "0.12.180-rc.0",
"secretjs": "^1.6.0"
}
}
Loading

0 comments on commit e27317c

Please sign in to comment.