Skip to content

Commit

Permalink
Merge PR #583 and remove offer type
Browse files Browse the repository at this point in the history
  • Loading branch information
@anajuliabit
anajuliabit committed Mar 30, 2023
2 parents 3278154 + 30c5384 commit 2c58ca6
Show file tree
Hide file tree
Showing 39 changed files with 915 additions and 980 deletions.
8 changes: 4 additions & 4 deletions .husky/pre-commit
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

find . -name '*.js' -not -path '*/node_modules/*' | xargs git diff --cached --name-only | xargs npx eslint --fix
find . -name '*.js' -not -path '*/node_modules/*' | xargs git diff --cached --name-only | xargs npx prettier --write
git diff --cached --name-only | grep contracts | xargs npx solhint --fix
git diff --cached --name-only | grep contracts | xargs npx prettier --write
find . -name '*.js' -not -path '*/node_modules/*' | xargs git diff --cached --name-only | xargs -r npx eslint --fix
find . -name '*.js' -not -path '*/node_modules/*' | xargs git diff --cached --name-only | xargs -r npx prettier --write
git diff --cached --name-only | grep contracts -e *.txt | xargs -r npx solhint --fix
git diff --cached --name-only | grep contracts -e *.txt | xargs -r npx prettier --write
npm run natspec-interface-id:fix
78 changes: 41 additions & 37 deletions addresses/80001-mumbai-test.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chainId": 80001,
"network": "mumbai",
"env": "test",
"protocolVersion": "2.2.0-rc.1",
"protocolVersion": "2.2.0-rc.4",
"contracts": [
{
"name": "AccessController",
Expand Down Expand Up @@ -72,11 +72,6 @@
"address": "0x5980CE2C787B9033Ff578c4A60676d35C09887a6",
"args": []
},
{
"name": "GroupHandlerFacet",
"address": "0x3D05697E821A91c38AF1ed145B6f667E68d5aC8b",
"args": []
},
{
"name": "PauseHandlerFacet",
"address": "0x8528d132331Ec469A2d7CE412A7089Feb54392EC",
Expand Down Expand Up @@ -107,81 +102,90 @@
"args": [],
"interfaceId": "0x1f891681"
},
{
"name": "BosonVoucher Logic",
"address": "0x85B3Ae514fF85E9931314C3fD26f498a28841b39",
"args": [],
"interfaceId": ""
},
{
"name": "ProtocolInitializationHandlerFacet",
"address": "0xAA7D28Bcc8127E706B0630208D53652F8BA306BD",
"args": [],
"interfaceId": "0x0d8e6e2c"
},
{
"name": "OrchestrationHandlerFacet1",
"address": "0x0A0C68dD3f844d32BC7497c5e33714852A4C313A",
"args": []
},
{
"name": "OrchestrationHandlerFacet2",
"address": "0x6286d3d8E5ceCB5F17f4255957A5926450d37C21",
"args": []
},
{
"name": "BundleHandlerFacet",
"address": "0x173adA3Bb27aC711CD07669785c558ccaEab5BE3",
"args": [],
"interfaceId": "0x7b53dece"
},
{
"name": "ConfigHandlerFacet",
"address": "0x9A0ce59548e485B57bC88207659116883Bf50a29",
"args": [],
"interfaceId": "0xe393ad01"
},
{
"name": "MetaTransactionsHandlerFacet",
"address": "0x7156930e1c08fFB1D6e7DB22C3cc48eB405fb268",
"args": [],
"interfaceId": "0xb3e4e803"
},
{
"name": "BundleHandlerFacet",
"address": "0x1900CC5d6Ef138ac659eA06907af28793c3563F3",
"args": [],
"interfaceId": "0x7b53dece"
},
{
"name": "DisputeHandlerFacet",
"address": "0x137312CE9641C8627915BE4f080dDDBa63cD2E8A",
"address": "0xE62D307086A16cabe67580b18F38e1a079736B97",
"args": [],
"interfaceId": "0xd9ea8317"
},
{
"name": "DisputeResolverHandlerFacet",
"address": "0xd737766891D40ceE4E27b07B7A4D4cF678234DD3",
"address": "0xFFf432C546DcB78f047f7119498745AB382dEc91",
"args": [],
"interfaceId": "0x1f891681"
},
{
"name": "ExchangeHandlerFacet",
"address": "0xbd95A57897AF8A18D7389768fAC3Ca672a5AC4ea",
"address": "0x953D7b35cBC150e4E2a63c07F02f6c3e2D32d3c3",
"args": [],
"interfaceId": "0xe300dfc1"
},
{
"name": "MetaTransactionsHandlerFacet",
"address": "0x7156930e1c08fFB1D6e7DB22C3cc48eB405fb268",
"args": [],
"interfaceId": "0xb3e4e803"
},
{
"name": "OfferHandlerFacet",
"address": "0x7707fCe9eFD69f25d35cA817A6936374c8DFD52f",
"name": "GroupHandlerFacet",
"address": "0x26a3a5B73E1f8f4CC86b5C65d8500acB1e0a082c",
"args": [],
"interfaceId": "0xdd282b34"
"interfaceId": "0xe2bf2256"
},
{
"name": "SellerHandlerFacet",
"address": "0xB6778C2F131eFf794b7379337FD888475E4213bb",
"address": "0xd371032da579e1EAb45AD03ec83Ca4485Bda51a4",
"args": [],
"interfaceId": "0x1f891681"
},
{
"name": "TwinHandlerFacet",
"address": "0x234485F4A7D8d9CB5f45c25d670b519CdbFbF9b9",
"address": "0xadBE44E0f41F291934e0937FF7B646EE0a965488",
"args": [],
"interfaceId": "0x60b30e70"
},
{
"name": "OfferHandlerFacet",
"address": "0x4b94267Aa5Ca691429D4da3d29C36C9e8888487D",
"args": [],
"interfaceId": "0xa1598d02"
},
{
"name": "OrchestrationHandlerFacet1",
"address": "0x2354D6CBC8Ff222898ea1D22eF3d28043A6d710b",
"args": [],
"interfaceId": "0xa38bc2e7"
},
{
"name": "BosonVoucher Logic",
"address": "0x2e784BeA2e2AEC0eefF14Fe0D9dC9219DD74B167",
"args": [
"0x69015912AA33720b842dCD6aC059Ed623F28d9f7"
],
"interfaceId": ""
}
]
}
70 changes: 70 additions & 0 deletions addresses/abis/mumbai/test/interfaces/DAIAliases.sol/DAIAliases.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"_format": "hh-sol-artifact-1",
"contractName": "DAIAliases",
"sourceName": "contracts/interfaces/DAIAliases.sol",
"abi": [
{
"inputs": [
{
"internalType": "address",
"name": "src",
"type": "address"
},
{
"internalType": "address",
"name": "dst",
"type": "address"
},
{
"internalType": "uint256",
"name": "wad",
"type": "uint256"
}
],
"name": "move",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "usr",
"type": "address"
},
{
"internalType": "uint256",
"name": "wad",
"type": "uint256"
}
],
"name": "pull",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "usr",
"type": "address"
},
{
"internalType": "uint256",
"name": "wad",
"type": "uint256"
}
],
"name": "push",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
],
"bytecode": "0x",
"deployedBytecode": "0x",
"linkReferences": {},
"deployedLinkReferences": {}
}
107 changes: 97 additions & 10 deletions addresses/abis/mumbai/test/interfaces/clients/IBosonVoucher.sol/IBosonVoucher.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@
},
{
"components": [
{
"internalType": "uint256",
"name": "offerId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "start",
Expand All @@ -101,6 +96,11 @@
"internalType": "uint256",
"name": "lastBurnedTokenId",
"type": "uint256"
},
{
"internalType": "address",
"name": "owner",
"type": "address"
}
],
"indexed": false,
Expand Down Expand Up @@ -238,6 +238,24 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_to",
"type": "address"
},
{
"internalType": "bytes",
"name": "_data",
"type": "bytes"
}
],
"name": "callExternalContract",
"outputs": [],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [],
"name": "contractURI",
Expand Down Expand Up @@ -301,11 +319,6 @@
"outputs": [
{
"components": [
{
"internalType": "uint256",
"name": "offerId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "start",
Expand All @@ -325,6 +338,11 @@
"internalType": "uint256",
"name": "lastBurnedTokenId",
"type": "uint256"
},
{
"internalType": "address",
"name": "owner",
"type": "address"
}
],
"internalType": "struct IBosonVoucher.Range",
Expand Down Expand Up @@ -469,6 +487,11 @@
"internalType": "uint256",
"name": "_length",
"type": "uint256"
},
{
"internalType": "address",
"name": "_to",
"type": "address"
}
],
"name": "reserveRange",
Expand Down Expand Up @@ -574,6 +597,24 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_operator",
"type": "address"
},
{
"internalType": "bool",
"name": "_approved",
"type": "bool"
}
],
"name": "setApprovalForAllToContract",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
Expand Down Expand Up @@ -686,6 +727,52 @@
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_from",
"type": "address"
},
{
"internalType": "address",
"name": "_to",
"type": "address"
},
{
"internalType": "uint256",
"name": "_offerId",
"type": "uint256"
},
{
"internalType": "uint256",
"name": "_tokenId",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "_data",
"type": "bytes"
}
],
"name": "transferPremintedFrom",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "address[]",
"name": "_tokenList",
"type": "address[]"
}
],
"name": "withdrawToProtocol",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
],
"bytecode": "0x",
Expand Down
Loading

0 comments on commit 2c58ca6

Please sign in to comment.