Skip to content

Commit

Permalink
Merge pull request #524 from shapeshift/bump-proto-tx-builder
Browse files Browse the repository at this point in the history 
chore: bump proto-tx-builder
  • Loading branch information
@mrnerdhair
mrnerdhair authored Apr 26, 2022
2 parents 0c489b9 + 3e25be1 commit ae5e2ce
Show file tree
Hide file tree
Showing 25 changed files with 207 additions and 179 deletions.
26 changes: 13 additions & 13 deletions examples/sandbox/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hdwallet-sandbox",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"private": true,
"browserslist": "> 0.5%, last 2 versions, not dead",
Expand All @@ -10,18 +10,18 @@
"clean": "rm -rf public .parcel-cache"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.21.0",
"@shapeshiftoss/hdwallet-ledger": "1.21.0",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.21.0",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.21.0",
"@shapeshiftoss/hdwallet-metamask": "1.21.0",
"@shapeshiftoss/hdwallet-native": "1.21.0",
"@shapeshiftoss/hdwallet-portis": "1.21.0",
"@shapeshiftoss/hdwallet-trezor": "1.21.0",
"@shapeshiftoss/hdwallet-trezor-connect": "1.21.0",
"@shapeshiftoss/hdwallet-xdefi": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.21.1",
"@shapeshiftoss/hdwallet-ledger": "1.21.1",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.21.1",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.21.1",
"@shapeshiftoss/hdwallet-metamask": "1.21.1",
"@shapeshiftoss/hdwallet-native": "1.21.1",
"@shapeshiftoss/hdwallet-portis": "1.21.1",
"@shapeshiftoss/hdwallet-trezor": "1.21.1",
"@shapeshiftoss/hdwallet-trezor-connect": "1.21.1",
"@shapeshiftoss/hdwallet-xdefi": "1.21.1",
"bip32": "^2.0.4",
"jquery": "^3.4.1",
"json": "^9.0.6",
Expand Down
20 changes: 10 additions & 10 deletions integration/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/integration",
"version": "1.21.0",
"version": "1.21.1",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -10,15 +10,15 @@
"dev": "lerna run test --scope integration --parallel --include-filtered-dependencies"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.21.0",
"@shapeshiftoss/hdwallet-ledger": "1.21.0",
"@shapeshiftoss/hdwallet-native": "1.21.0",
"@shapeshiftoss/hdwallet-portis": "1.21.0",
"@shapeshiftoss/hdwallet-trezor": "1.21.0",
"@shapeshiftoss/hdwallet-xdefi": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.21.1",
"@shapeshiftoss/hdwallet-ledger": "1.21.1",
"@shapeshiftoss/hdwallet-native": "1.21.1",
"@shapeshiftoss/hdwallet-portis": "1.21.1",
"@shapeshiftoss/hdwallet-trezor": "1.21.1",
"@shapeshiftoss/hdwallet-xdefi": "1.21.1",
"@types/jest": "^26.0.23",
"fast-json-stable-stringify": "^2.1.0",
"jest": "^26.6.3",
Expand Down
10 changes: 6 additions & 4 deletions integration/src/cosmos/cosmos.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import tx_unsigned_rewards_cosmos from "./tx01.mainnet.cosmos.rewards.json";
import tx_signed_rewards_cosmos from "./tx01.mainnet.cosmos.rewards.signed.json";
import tx_unsigned_transfer_cosmos from "./tx01.mainnet.cosmos.transfer.json";
import tx_signed_transfer_cosmos from "./tx01.mainnet.cosmos.transfer.signed.json";
import tx_unsigned_undelegate_cosmos from "./tx01.mainnet.cosmos.undelegate.json";
import tx_signed_undelegate_cosmos from "./tx01.mainnet.cosmos.undelegate.signed.json";
// import tx_unsigned_undelegate_cosmos from "./tx01.mainnet.cosmos.undelegate.json";
// import tx_signed_undelegate_cosmos from "./tx01.mainnet.cosmos.undelegate.signed.json";

const MNEMONIC12_NOPIN_NOPASSPHRASE = "alcohol woman abuse must during monitor noble actual mixed trade anger aisle";

Expand Down Expand Up @@ -100,9 +100,11 @@ export function cosmosTests(get: () => { wallet: core.HDWallet; info: core.HDWal
[
"should correctly sign a undelegate tx",
tx_unsigned_undelegate_cosmos_amino,
tx_unsigned_undelegate_cosmos,
// tx_unsigned_undelegate_cosmos,
undefined,
tx_signed_undelegate_cosmos_amino,
tx_signed_undelegate_cosmos,
// tx_signed_undelegate_cosmos,
undefined,
],
[
"should correctly sign a redelegate tx",
Expand Down
27 changes: 14 additions & 13 deletions integration/src/osmosis/osmosis.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable jest/no-disabled-tests */
import * as core from "@shapeshiftoss/hdwallet-core";

import tx_unsigned_delegation from "./tx01.mainnet.osmosis.delegate.json";
Expand Down Expand Up @@ -85,7 +86,7 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_transfer.signatures[0]);
expect(res).toEqual(tx_signed_transfer);
},
TIMEOUT
);
Expand All @@ -104,13 +105,13 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_delegation.signatures[0]);
expect(res).toEqual(tx_signed_delegation);
},
TIMEOUT
);

//undelegate
test(
test.skip(
"(undelegate) osmosisSignTx()",
async () => {
if (!wallet) return;
Expand All @@ -123,7 +124,7 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_undelegate_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_undelegate_osmosis);
},
TIMEOUT
);
Expand All @@ -142,7 +143,7 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_redelegate_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_redelegate_osmosis);
},
TIMEOUT
);
Expand All @@ -161,13 +162,13 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_rewards_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_rewards_osmosis);
},
TIMEOUT
);

//lp add
test(
test.skip(
"(lp add) osmosisSignTx()",
async () => {
if (!wallet) return;
Expand All @@ -180,7 +181,7 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_lp_add_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_lp_add_osmosis);
},
TIMEOUT
);
Expand All @@ -198,13 +199,13 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_lp_remove_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_lp_remove_osmosis);
},
TIMEOUT
);

//lp stake
test(
test.skip(
"(lp stake) osmosisSignTx()",
async () => {
if (!wallet) return;
Expand All @@ -217,13 +218,13 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_lp_stake_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_lp_stake_osmosis);
},
TIMEOUT
);

//lp unstake
test(
test.skip(
"(lp unstake) osmosisSignTx()",
async () => {
if (!wallet) return;
Expand All @@ -236,7 +237,7 @@ export function osmosisTests(get: () => { wallet: core.HDWallet; info: core.HDWa
};

const res = await wallet.osmosisSignTx(input);
expect(res?.signatures?.[0]).toEqual(tx_signed_lp_unstake_osmosis.signatures[0]);
expect(res).toEqual(tx_signed_lp_unstake_osmosis);
},
TIMEOUT
);
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "3.22.1",
"version": "1.21.0",
"version": "1.21.1",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-core",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-chromeusb/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.0"
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1"
},
"devDependencies": {
"typescript": "^4.3.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-electron/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-electron",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-nodehid/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.21.0"
"@shapeshiftoss/hdwallet-keepkey": "1.21.1"
},
"peerDependencies": {
"node-hid": "^2.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-nodewebusb/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.0"
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1"
},
"peerDependencies": {
"usb": "^2.3.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-tcp/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-tcp",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1",
"axios": "^0.21.1"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-webusb/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-webusb",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-keepkey": "1.21.0"
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-keepkey": "1.21.1"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4",
Expand Down
5 changes: 3 additions & 2 deletions packages/hdwallet-keepkey/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,7 +19,8 @@
"@ethereumjs/tx": "^3.3.0",
"@keepkey/device-protocol": "^7.8.1",
"@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/proto-tx-builder": "^0.2.1",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "^2.16.14",
"crypto-js": "^4.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webhid/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webhid",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,8 +19,8 @@
"@ledgerhq/hw-transport": "^6.7.0",
"@ledgerhq/hw-transport-webhid": "^6.7.0",
"@ledgerhq/live-common": "^21.8.2",
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-ledger": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-ledger": "1.21.1",
"@types/w3c-web-hid": "^1.0.2",
"typescript": "^4.3.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webusb/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webusb",
"version": "1.21.0",
"version": "1.21.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,8 +19,8 @@
"@ledgerhq/hw-transport": "^6.7.0",
"@ledgerhq/hw-transport-webusb": "^6.7.0",
"@ledgerhq/live-common": "^21.8.2",
"@shapeshiftoss/hdwallet-core": "1.21.0",
"@shapeshiftoss/hdwallet-ledger": "1.21.0",
"@shapeshiftoss/hdwallet-core": "1.21.1",
"@shapeshiftoss/hdwallet-ledger": "1.21.1",
"@types/w3c-web-usb": "^1.0.4",
"typescript": "^4.3.2"
},
Expand Down
Loading

1 comment on commit ae5e2ce

@vercel
Copy link

@vercel vercel bot commented on ae5e2ce Apr 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

hdwallet – ./

hdwallet-git-master-shapeshift.vercel.app
hdwallet-shapeshift.vercel.app

Please sign in to comment.