Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix web3js upgrade changes #31

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Fix web3js upgrade changes #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7881597
[web3js] fix for web3js upgrade to 1.98.0
ochaloup Jan 24, 2025
be4807c
[chore] bump version to 2.4.11
ochaloup Jan 24, 2025
fab8d25
[pnpm-lock] update for 2.4.11
ochaloup Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/lib/anchor-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/anchor-common",
"version": "2.4.10",
"version": "2.4.11",
"description": "Solana Anchor JS utilities",
"repository": {
"type": "git",
Expand Down Expand Up @@ -29,15 +29,15 @@
"@solana/web3.js": "^1.98.0",
"bn.js": "^5.2.1",
"@coral-xyz/anchor": "^0.29.0",
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.10"
"@marinade.finance/ts-common": "2.4.11",
"@marinade.finance/web3js-common": "2.4.11"
},
"peerDependencies": {
"@solana/web3.js": "^1.98.0",
"bn.js": "^5.2.1",
"@coral-xyz/anchor": "^0.29.0",
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/ts-common": "2.4.11",
"@marinade.finance/web3js-common": "2.4.11",
"@anza-xyz/solana-rpc-get-stake-activation": "1.0.1"
},
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/bankrun-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/bankrun-utils",
"version": "2.4.10",
"version": "2.4.11",
"description": "Bankrun library utilities",
"repository": {
"type": "git",
Expand All @@ -26,14 +26,14 @@
],
"devDependencies": {
"@solana/web3.js": "^1.98.0",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.11",
"solana-bankrun": "^0.2.0",
"anchor-bankrun": "^0.2.0",
"class-transformer": "^0.5.1"
},
"peerDependencies": {
"@solana/web3.js": "^1.98.0",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.11",
"solana-bankrun": "^0.2.0",
"anchor-bankrun": "^0.2.0",
"class-transformer": "^0.5.1"
Expand Down
10 changes: 5 additions & 5 deletions packages/lib/cli-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/cli-common",
"version": "2.4.10",
"version": "2.4.11",
"description": "CLI tooling",
"repository": {
"type": "git",
Expand All @@ -26,8 +26,8 @@
],
"devDependencies": {
"@solana/web3.js": "^1.98.0",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.11",
"@marinade.finance/ts-common": "2.4.11",
"@marinade.finance/ledger-utils": "^3.0.1",
"bn.js": "^5.2.1",
"borsh": "^0.7.0",
Expand All @@ -37,8 +37,8 @@
},
"peerDependencies": {
"@solana/web3.js": "^1.98.0",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.11",
"@marinade.finance/ts-common": "2.4.11",
"@marinade.finance/ledger-utils": "^3.0.1",
"bn.js": "^5.2.1",
"borsh": "^0.7.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/lib/cli-common/src/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export class CliCommandError extends ExecutionError {
} else {
errorMessage = format('%s: %s', commandName, msg)
}
super({ msg: errorMessage, cause, logs, transaction })
const config = { msg: errorMessage, cause, logs, transaction }
super(config)
}

static fromMsg(msg: string): CliCommandError {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/jest-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/jest-utils",
"version": "2.4.10",
"version": "2.4.11",
"description": "Utility functions for setting up Jest",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/spl-gov-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/spl-gov-utils",
"version": "2.4.10",
"version": "2.4.11",
"description": "SPL Governance Marinade constants",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/ts-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/ts-common",
"version": "2.4.10",
"version": "2.4.11",
"description": "TS common utilities",
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/umi-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/umi-utils",
"version": "2.4.10",
"version": "2.4.11",
"description": "Umi library utilities",
"repository": {
"type": "git",
Expand Down Expand Up @@ -28,13 +28,13 @@
"@solana/web3.js": "^1.98.0",
"@metaplex-foundation/umi-bundle-defaults": "1.0.0",
"@metaplex-foundation/umi": "1.0.0",
"@marinade.finance/web3js-common": "2.4.10"
"@marinade.finance/web3js-common": "2.4.11"
},
"peerDependencies": {
"@solana/web3.js": "^1.98.0",
"@metaplex-foundation/umi-bundle-defaults": "1.0.0",
"@metaplex-foundation/umi": "1.0.0",
"@marinade.finance/web3js-common": "2.4.10"
"@marinade.finance/web3js-common": "2.4.11"
},
"engines": {
"node": ">=16.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/web3js-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@marinade.finance/web3js-common",
"version": "2.4.10",
"version": "2.4.11",
"description": "Web3 JS reusable utilities",
"repository": {
"type": "git",
Expand All @@ -24,15 +24,15 @@
"src"
],
"devDependencies": {
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/ts-common": "2.4.11",
"@solana/web3.js": "^1.98.0",
"@solana/buffer-layout": "^4.0.1",
"bn.js": "^5.2.1",
"borsh": "^0.7.0",
"bs58": "^6.0.0"
},
"peerDependencies": {
"@marinade.finance/ts-common": "2.4.10",
"@marinade.finance/ts-common": "2.4.11",
"@solana/web3.js": "^1.98.0",
"@solana/buffer-layout": "^4.0.1",
"bn.js": "^5.2.1",
Expand Down
10 changes: 6 additions & 4 deletions packages/lib/web3js-common/src/tx.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,20 +593,22 @@ export type TransactionData<T extends Transaction | VersionedTransaction> = {
*/
export class TransactionInstructionSplitMarkerStart extends TransactionInstruction {
constructor() {
super({
const config = {
keys: [],
programId: PublicKey.default,
data: Buffer.alloc(0),
})
}
super(config)
}
}
export class TransactionInstructionSplitMarkerEnd extends TransactionInstruction {
constructor() {
super({
const config = {
keys: [],
programId: PublicKey.default,
data: Buffer.alloc(0),
})
}
super(config)
}
}
export const SPLIT_MARKER_START_INSTANCE =
Expand Down
6 changes: 3 additions & 3 deletions packages/marinade-ts-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"pino": "^9.6.0",
"pino-pretty": "^11.2.1",
"@marinade.finance/ledger-utils": "^3.0.1",
"@marinade.finance/cli-common": "2.4.10",
"@marinade.finance/web3js-common": "2.4.10",
"@marinade.finance/cli-common": "2.4.11",
"@marinade.finance/web3js-common": "2.4.11",
"@marinade.finance/marinade-ts-sdk": "5.0.7",
"@anza-xyz/solana-rpc-get-stake-activation": "1.0.1"
},
"devDependencies": {
"@marinade.finance/jest-utils": "2.4.10",
"@marinade.finance/jest-utils": "2.4.11",
"@types/bn.js": "^5.1.5",
"@solana/spl-token-3.x": "npm:@solana/spl-token@^0.3.11"
},
Expand Down
Loading
Loading