Skip to content
Permalink
Browse files

Merge pull request #325 from airswap/mapping-interface-view

Mapping interface view
  • Loading branch information
alicevhenshaw committed Nov 25, 2019
2 parents d339abf + 80a27af commit 6ae3e6f900f791562d4f893086702b87bd484902
@@ -1,6 +1,6 @@
{
"name": "@airswap/delegate-factory",
"version": "0.3.3",
"version": "0.3.4",
"description": "Deploys Delegate contracts for use in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -21,12 +21,12 @@
"verify": "truffle run verify"
},
"devDependencies": {
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"solidity-coverage": "^0.6.3"
},
"dependencies": {
"@airswap/delegate": "0.5.2",
"@airswap/delegate": "0.5.3",
"openzeppelin-solidity": "2.3"
}
}
@@ -52,8 +52,6 @@ interface IDelegate {
uint256 priceExp
);

function rules(address, address) external returns (Rule memory);

function setRule(
address senderToken,
address signerToken,
@@ -71,6 +69,8 @@ interface IDelegate {
Types.Order calldata order
) external;

function rules(address, address) external view returns (Rule memory);

function getSignerSideQuote(
uint256 senderParam,
address senderToken,
@@ -1,6 +1,6 @@
{
"name": "@airswap/delegate",
"version": "0.5.2",
"version": "0.5.3",
"description": "Manages delegated trading rules for use in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -21,13 +21,13 @@
"verify": "truffle run verify"
},
"devDependencies": {
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"solidity-coverage": "^0.6.3"
},
"dependencies": {
"@airswap/indexer": "0.4.3",
"@airswap/swap": "2.3.3",
"@airswap/indexer": "0.4.4",
"@airswap/swap": "2.3.4",
"openzeppelin-solidity": "2.3"
}
}
@@ -21,7 +21,7 @@
"verify": "truffle run verify"
},
"devDependencies": {
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"@airswap/tokens": "0.1.3",
"bignumber.js": "^9.0.0",
@@ -46,10 +46,6 @@ interface IIndexer {
address token
);

function stakingToken() external returns (address);
function indexes(address, address) external returns (address);
function tokenBlacklist(address) external returns (bool);

function setLocatorWhitelist(
address newLocatorWhitelist
) external;
@@ -79,6 +75,10 @@ interface IIndexer {
address senderToken
) external;

function stakingToken() external view returns (address);
function indexes(address, address) external view returns (address);
function tokenBlacklist(address) external view returns (bool);

function getStakedAmount(
address user,
address signerToken,
@@ -1,6 +1,6 @@
{
"name": "@airswap/indexer",
"version": "0.4.3",
"version": "0.4.4",
"description": "Manages markets that store intents to trade in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -22,7 +22,7 @@
},
"devDependencies": {
"@airswap/index": "0.3.2",
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"@airswap/types": "0.4.3",
"bignumber.js": "^9.0.0",
@@ -65,12 +65,6 @@ interface ISwap {
address indexed revokedSigner
);

function senderAuthorizations(address, address) external returns (bool);
function signerAuthorizations(address, address) external returns (bool);

function signerNonceStatus(address, uint256) external returns (byte);
function signerMinimumNonce(address) external returns (uint256);

/**
* @notice Atomic Token Swap
* @param order Types.Order
@@ -129,4 +123,10 @@ interface ISwap {
address authorizedSigner
) external;

function senderAuthorizations(address, address) external view returns (bool);
function signerAuthorizations(address, address) external view returns (bool);

function signerNonceStatus(address, uint256) external view returns (byte);
function signerMinimumNonce(address) external view returns (uint256);

}
@@ -1,6 +1,6 @@
{
"name": "@airswap/swap",
"version": "2.3.3",
"version": "2.3.4",
"description": "The atomic swap used to trustlessly transfer tokens in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -22,7 +22,7 @@
},
"devDependencies": {
"@airswap/tokens": "0.1.3",
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"truffle": "^5.0.32",
"@gnosis.pm/mock-contract": "^3.0.7",
@@ -22,7 +22,7 @@
},
"devDependencies": {
"@airswap/tokens": "0.1.3",
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"solidity-coverage": "^0.6.3"
},
"dependencies": {
@@ -1,6 +1,6 @@
{
"name": "@airswap/wrapper",
"version": "0.4.2",
"version": "0.4.3",
"description": "Wraps and unwraps ether for WETH trades in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -22,12 +22,12 @@
"verify": "truffle run verify"
},
"devDependencies": {
"@airswap/order-utils": "0.3.10",
"@airswap/order-utils": "0.3.11",
"@airswap/test-utils": "0.1.1",
"solidity-coverage": "^0.6.3"
},
"dependencies": {
"@airswap/swap": "2.3.3",
"@airswap/swap": "2.3.4",
"@airswap/tokens": "0.1.3"
}
}
@@ -1,6 +1,6 @@
{
"name": "@airswap/order-utils",
"version": "0.3.10",
"version": "0.3.11",
"description": "JavaScript utilities for orders, hashes, and signatures in the Swap Protocol",
"license": "Apache-2.0",
"repository": {
@@ -16,7 +16,7 @@
"mocha": "^6.2.0"
},
"dependencies": {
"@airswap/swap": "2.3.3",
"@airswap/swap": "2.3.4",
"@airswap/tokens": "0.1.3",
"eth-sig-util": "^2.2.0",
"ethereumjs-util": "^6.1.0",
@@ -48,7 +48,7 @@ module.exports = {
const orderHashBuff = ethUtil.toBuffer(orderHash)
const { v, r, s } = ethUtil.ecsign(orderHashBuff, privateKey)
return {
signatory: ethUtil.privateToAddress(privateKey).toString('hex'),
signatory: `0x${ethUtil.privateToAddress(privateKey).toString('hex')}`,
validator: verifyingContract,
version: signatures.SIGN_TYPED_DATA,
v,

0 comments on commit 6ae3e6f

Please sign in to comment.
You can’t perform that action at this time.