Skip to content

Commit

Permalink
fix: dependency issues
Browse files Browse the repository at this point in the history
  • Loading branch information
amessbee committed Aug 7, 2024
1 parent ee9c6d1 commit 0ad93df
Show file tree
Hide file tree
Showing 5 changed files with 17,609 additions and 12,847 deletions.
7 changes: 3 additions & 4 deletions contract/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"build": "agoric run scripts/build-contract-deployer.js",
"test": "ava --verbose",
"lint": "eslint '**/*.js'",
"lint:fix": "eslint --fix '**/*.js'",
"make:waitForBlocks": "make wait-for-blocks"
"lint:fix": "eslint --fix '**/*.js'"
},
"devDependencies": {
"@agoric/deploy-script-support": "^0.10.4-u12.0",
Expand Down Expand Up @@ -46,10 +45,10 @@
"typescript": "~5.2.2"
},
"dependencies": {
"@agoric/vat-data": "^0.1.0",
"@agoric/zone": "^0.1.0",
"@agoric/ertp": "^0.16.3-u12.0",
"@agoric/vat-data": "0.5.3-u16.1",
"@agoric/zoe": "^0.26.3-u12.0",
"@agoric/zone": "^0.3.0-u16.1",
"@endo/far": "^0.2.22",
"@endo/marshal": "^0.8.9",
"@endo/patterns": "^0.2.5"
Expand Down
21 changes: 9 additions & 12 deletions contract/src/offer-up.contract.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,19 @@
*/
// @ts-check

// import { Far } from '@endo/far';
// import { Far } from '@endo/far';
import { M, getCopyBagEntries } from '@endo/patterns';
import { AssetKind } from '@agoric/ertp/src/amountMath.js';
import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
import { atomicRearrange } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
import '@agoric/zoe/exported.js';
const { Fail, quote: q } = assert;
import { makeScalarBigMapStore } from '@agoric/vat-data';
import { makeDurableZone } from '@agoric/zone/durable.js';

/**
* @import { Baggage } from '@agoric/swingset-liveslots';
*/


// #region bag utilities
/** @type { (xs: bigint[]) => bigint } */
Expand Down Expand Up @@ -69,18 +73,11 @@ export const customTermsShape = meta.customTermsShape;
* - handles offers to buy up to `maxItems` items at a time.
*
* @param {ZCF<OfferUpTerms>} zcf
* @param {*} _privateArgs
* @param {Baggage} baggage
*/
export const start = async (zcf, _privateArgs, baggage) => {
const zone = makeDurableZone(baggage);

/**
* TODO: below is somewhat fake way of generating a zone. This should be fixed by passing it as a parameter.
* RN I don't know how to do it.
*/
const baggage = makeScalarBigMapStore('baggage', {
keyShape: M.string(),
durable: true,
});
const { tradePrice, maxItems = 3n } = zcf.getTerms();
const zone = makeDurableZone(baggage);

/**
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"lint": "yarn workspaces run lint",
"test": "yarn workspaces run test",
"test:e2e": "yarn workspace offer-up-ui test:e2e",
"build": "yarn workspaces run build",
"runWaitForBlocks": "cd contract && yarn make:waitForBlocks"
"build": "yarn workspaces run build"
},
"devDependencies": {
"@agoric/synpress": "^3.8.1",
Expand All @@ -57,6 +56,5 @@
"eslint-plugin-testing-library": "^6.2.0",
"eslint-plugin-ui-testing": "^2.0.1",
"serve": "^14.2.1"
},
"dependencies": {}
}
}
4 changes: 0 additions & 4 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
"vitest": "^1.2.1",
"zustand": "^4.4.1"
},
"resolutions": {
"**/ses": "^1.3.0",
"**/@agoric/xsnap": "0.14.3-dev-9f085d3.0"
},
"prettier": {
"trailingComma": "all",
"arrowParens": "avoid",
Expand Down
Loading

0 comments on commit 0ad93df

Please sign in to comment.