Skip to content

Commit

Permalink
pull in latest contracts and update marketplace.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
nolanjacobson committed Mar 11, 2024
1 parent 8d80921 commit 3d06ba6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -44,7 +44,7 @@
"@layerzerolabs/lz-definitions": "^2.0.25",
"@layerzerolabs/lz-v2-utilities": "^2.0.25",
"@masa-finance/masa-contracts-identity": "^1.12.0",
"@masa-finance/masa-contracts-marketplace": "^1.12.3",
"@masa-finance/masa-contracts-marketplace": "^1.13.0",
"@masa-finance/masa-token": "^2.0.8",
"arweave": "1.11.8",
"axios": "^1.6.7",
Expand Down
16 changes: 7 additions & 9 deletions src/contracts/contract-modules/marketplace.ts
Expand Up @@ -9,17 +9,15 @@ export class Marketplace extends MasaModuleBase {
const result: BaseResult = { success: false };

const {
estimateGas: { stake: estimateGas },
stake,
estimateGas: { stakeAll: estimateGas },
stakeAll,
} = this.masa.contracts.instances.DataStakingDynamic;

try {
// estimate gas
const gasLimit = await this.estimateGasWithSlippage(estimateGas, [
tokenId,
]);
const gasLimit = await this.estimateGasWithSlippage(estimateGas, []);

const { wait, hash } = await stake(tokenId, { gasLimit });
const { wait, hash } = await stakeAll({ gasLimit });

console.log(
Messages.WaitingToFinalize(
Expand All @@ -44,8 +42,8 @@ export class Marketplace extends MasaModuleBase {
const result: BaseResult = { success: false };

const {
estimateGas: { stake: estimateGas },
claimRewards,
estimateGas: { claimAllRewards: estimateGas },
claimAllRewards,
} = this.masa.contracts.instances.DataStakingDynamic;

try {
Expand All @@ -54,7 +52,7 @@ export class Marketplace extends MasaModuleBase {
tokenId,
]);

const { wait, hash } = await claimRewards(tokenId, { gasLimit });
const { wait, hash } = await claimAllRewards({ gasLimit });

console.log(
Messages.WaitingToFinalize(
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -496,10 +496,10 @@
dependencies:
ethers "~5.7.2"

"@masa-finance/masa-contracts-marketplace@^1.12.3":
version "1.12.3"
resolved "https://registry.yarnpkg.com/@masa-finance/masa-contracts-marketplace/-/masa-contracts-marketplace-1.12.3.tgz#24f77239b09f7d18faa8f33baecde4b5d3477807"
integrity sha512-d7y/K69f9S7OQbMn8w6XnMmEGpGNyhjJHtN3NjQy2szm3EO7xm/zG7HQaYgVYwDWU619PSL+5h1wDFvA3t2DoQ==
"@masa-finance/masa-contracts-marketplace@^1.13.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@masa-finance/masa-contracts-marketplace/-/masa-contracts-marketplace-1.13.0.tgz#2eaf1ccbb8f9607e45b86724633384dbcebd05af"
integrity sha512-8sKT/JbS5xmH+f9ZsVCgUVstjxaEH3pSP2gNrEOzTrtJkzh4ZxjZtWO0aMosjg0xgZWtFlTKmV/D/tGoBrAwDA==
dependencies:
ethers "~5.7.2"

Expand Down

0 comments on commit 3d06ba6

Please sign in to comment.