Skip to content

Commit

Permalink
BalancesHelperV2, Fuse, Diamond contract. (#82)
Browse files Browse the repository at this point in the history
* Resolved merge conflicts

* add diamond contract (#71)

* add diamond contract

* update compiler version in .solhint

* typo

* fix typo

* Update package.json (#76)

- Changed version to 1.8.0

* Fuse support to etherspot (#79)

* PRO-295 setup constants and update package.json

* PRO-295 Fuse Sparknet deployments

* update version and add network details

* update compiled code

* FUSE mainnet deployments

* Updated deployments

Co-authored-by: zincoshine <[email protected]>

* Update package release (#80)

* update release

* change release number

* Support for SuperTokens in BalancesHelperV2 contract (#68) (#81)

* Mainnet deployments

* 1.7.0

* Resolved merge conflicts

Co-authored-by: Luke Wickens <[email protected]>
Co-authored-by: Luke Wickens <[email protected]>

Co-authored-by: Parthasarathy Ramanujam <[email protected]>
Co-authored-by: Luke Wickens <[email protected]>
Co-authored-by: Luke Wickens <[email protected]>

Co-authored-by: zincoshine <[email protected]>
Co-authored-by: Utkir S <[email protected]>
Co-authored-by: Luke Wickens <[email protected]>
Co-authored-by: Parthasarathy Ramanujam <[email protected]>
Co-authored-by: Luke Wickens <[email protected]>
  • Loading branch information
6 people authored Jul 1, 2022
1 parent d03e29c commit 9258236
Show file tree
Hide file tree
Showing 250 changed files with 42,475 additions and 244 deletions.
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"rules": {
"compiler-version": [
"error",
"^0.6.0"
"^0.6.0 || 0.8.4"
],
"no-empty-blocks": "off",
"mark-callable-contracts": "off",
Expand Down
48 changes: 48 additions & 0 deletions DEPLOYMENTS.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
| `testnets` | Arbitrum Testnet | `ARBITRUM_TEST` | `arbitrumTest` |
| `mainnets` | Optimism | `OPTIMISM` | `optimism` |
| `testnets` | Optimism Kovan | `OPTIMISM_KOVAN` | `optimismKovan` |
| `mainnets` | Fuse | `FUSE` | `fuse` |
| `testnets` | Fuse Sparknet | `FUSE_SPARKNET` | `fuseSparknet` |
| `testnets` | Etherspot | `ETHERSPOT` | `etherspot` |
| `localnets` | Localnet (instance A) | `LOCAL_A` | `localA` |
| `localnets` | Localnet (instance B) | `LOCAL_B` | `localB` |
Expand Down
35 changes: 35 additions & 0 deletions artifacts/Diamond.json

Large diffs are not rendered by default.

93 changes: 93 additions & 0 deletions artifacts/DiamondCutFacet.json

Large diffs are not rendered by default.

106 changes: 106 additions & 0 deletions artifacts/DiamondLoupeFacet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
"_format": "hh-sol-artifact-1",
"contractName": "DiamondLoupeFacet",
"sourceName": "src/bridges/facets/DiamondLoupeFacet.sol",
"abi": [
{
"inputs": [
{
"internalType": "bytes4",
"name": "_functionSelector",
"type": "bytes4"
}
],
"name": "facetAddress",
"outputs": [
{
"internalType": "address",
"name": "facetAddress_",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "facetAddresses",
"outputs": [
{
"internalType": "address[]",
"name": "facetAddresses_",
"type": "address[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_facet",
"type": "address"
}
],
"name": "facetFunctionSelectors",
"outputs": [
{
"internalType": "bytes4[]",
"name": "facetFunctionSelectors_",
"type": "bytes4[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "facets",
"outputs": [
{
"components": [
{
"internalType": "address",
"name": "facetAddress",
"type": "address"
},
{
"internalType": "bytes4[]",
"name": "functionSelectors",
"type": "bytes4[]"
}
],
"internalType": "struct IDiamondLoupe.Facet[]",
"name": "facets_",
"type": "tuple[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes4",
"name": "_interfaceId",
"type": "bytes4"
}
],
"name": "supportsInterface",
"outputs": [
{
"internalType": "bool",
"name": "",
"type": "bool"
}
],
"stateMutability": "view",
"type": "function"
}
],
"bytecode": "0x608060405234801561001057600080fd5b50610c11806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c806301ffc9a71461005c57806352ef6b2c1461008c5780637a0ed627146100aa578063adfca15e146100c8578063cdffacc6146100f8575b600080fd5b6100766004803603810190610071919061071d565b610128565b6040516100839190610a13565b60405180910390f35b61009461019e565b6040516100a191906109ad565b60405180910390f35b6100b261023b565b6040516100bf91906109f1565b60405180910390f35b6100e260048036038101906100dd91906106f4565b6104f6565b6040516100ef91906109cf565b60405180910390f35b610112600480360381019061010d919061071d565b6105e1565b60405161011f9190610992565b60405180910390f35b60008061013361066d565b9050806003016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060009054906101000a900460ff16915050919050565b606060006101aa61066d565b90508060020180548060200260200160405190810160405280929190818152602001828054801561023057602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116101e6575b505050505091505090565b6060600061024761066d565b90506000816002018054905090508067ffffffffffffffff811115610295577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040519080825280602002602001820160405280156102ce57816020015b6102bb61069a565b8152602001906001900390816102b35790505b50925060005b818110156104f057600083600201828154811061031a577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080858381518110610381577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60200260200101516000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180548060200260200160405190810160405280929190818152602001828054801561048f57602002820191906000526020600020906000905b82829054906101000a900460e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001906004019060208260030104928301926001038202915080841161043c5790505b50505050508583815181106104cd577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6020026020010151602001819052505080806104e890610b5e565b9150506102d4565b50505090565b6060600061050261066d565b90508060010160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054806020026020016040519081016040528092919081815260200182805480156105d457602002820191906000526020600020906000905b82829054906101000a900460e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190600401906020826003010492830192600103820291508084116105815790505b5050505050915050919050565b6000806105ec61066d565b9050806000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16915050919050565b6000807fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c90508091505090565b6040518060400160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001606081525090565b6000813590506106d981610bd6565b92915050565b6000813590506106ee81610bed565b92915050565b60006020828403121561070657600080fd5b6000610714848285016106ca565b91505092915050565b60006020828403121561072f57600080fd5b600061073d848285016106df565b91505092915050565b6000610752838361078a565b60208301905092915050565b600061076a8383610946565b60208301905092915050565b60006107828383610955565b905092915050565b61079381610aea565b82525050565b6107a281610aea565b82525050565b60006107b382610a5e565b6107bd8185610aa6565b93506107c883610a2e565b8060005b838110156107f95781516107e08882610746565b97506107eb83610a7f565b9250506001810190506107cc565b5085935050505092915050565b600061081182610a69565b61081b8185610ab7565b935061082683610a3e565b8060005b8381101561085757815161083e888261075e565b975061084983610a8c565b92505060018101905061082a565b5085935050505092915050565b600061086f82610a69565b6108798185610ac8565b935061088483610a3e565b8060005b838110156108b557815161089c888261075e565b97506108a783610a8c565b925050600181019050610888565b5085935050505092915050565b60006108cd82610a74565b6108d78185610ad9565b9350836020820285016108e985610a4e565b8060005b8581101561092557848403895281516109068582610776565b945061091183610a99565b925060208a019950506001810190506108ed565b50829750879550505050505092915050565b61094081610afc565b82525050565b61094f81610b08565b82525050565b600060408301600083015161096d600086018261078a565b50602083015184820360208601526109858282610806565b9150508091505092915050565b60006020820190506109a76000830184610799565b92915050565b600060208201905081810360008301526109c781846107a8565b905092915050565b600060208201905081810360008301526109e98184610864565b905092915050565b60006020820190508181036000830152610a0b81846108c2565b905092915050565b6000602082019050610a286000830184610937565b92915050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b6000610af582610b34565b9050919050565b60008115159050919050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000610b6982610b54565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610b9c57610b9b610ba7565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b610bdf81610aea565b8114610bea57600080fd5b50565b610bf681610b08565b8114610c0157600080fd5b5056fea164736f6c6343000804000a",
"deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c806301ffc9a71461005c57806352ef6b2c1461008c5780637a0ed627146100aa578063adfca15e146100c8578063cdffacc6146100f8575b600080fd5b6100766004803603810190610071919061071d565b610128565b6040516100839190610a13565b60405180910390f35b61009461019e565b6040516100a191906109ad565b60405180910390f35b6100b261023b565b6040516100bf91906109f1565b60405180910390f35b6100e260048036038101906100dd91906106f4565b6104f6565b6040516100ef91906109cf565b60405180910390f35b610112600480360381019061010d919061071d565b6105e1565b60405161011f9190610992565b60405180910390f35b60008061013361066d565b9050806003016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060009054906101000a900460ff16915050919050565b606060006101aa61066d565b90508060020180548060200260200160405190810160405280929190818152602001828054801561023057602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116101e6575b505050505091505090565b6060600061024761066d565b90506000816002018054905090508067ffffffffffffffff811115610295577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040519080825280602002602001820160405280156102ce57816020015b6102bb61069a565b8152602001906001900390816102b35790505b50925060005b818110156104f057600083600201828154811061031a577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905080858381518110610381577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60200260200101516000019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180548060200260200160405190810160405280929190818152602001828054801561048f57602002820191906000526020600020906000905b82829054906101000a900460e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001906004019060208260030104928301926001038202915080841161043c5790505b50505050508583815181106104cd577f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6020026020010151602001819052505080806104e890610b5e565b9150506102d4565b50505090565b6060600061050261066d565b90508060010160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054806020026020016040519081016040528092919081815260200182805480156105d457602002820191906000526020600020906000905b82829054906101000a900460e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190600401906020826003010492830192600103820291508084116105815790505b5050505050915050919050565b6000806105ec61066d565b9050806000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16915050919050565b6000807fc8fcad8db84d3cc18b4c41d551ea0ee66dd599cde068d998e57d5e09332c131c90508091505090565b6040518060400160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001606081525090565b6000813590506106d981610bd6565b92915050565b6000813590506106ee81610bed565b92915050565b60006020828403121561070657600080fd5b6000610714848285016106ca565b91505092915050565b60006020828403121561072f57600080fd5b600061073d848285016106df565b91505092915050565b6000610752838361078a565b60208301905092915050565b600061076a8383610946565b60208301905092915050565b60006107828383610955565b905092915050565b61079381610aea565b82525050565b6107a281610aea565b82525050565b60006107b382610a5e565b6107bd8185610aa6565b93506107c883610a2e565b8060005b838110156107f95781516107e08882610746565b97506107eb83610a7f565b9250506001810190506107cc565b5085935050505092915050565b600061081182610a69565b61081b8185610ab7565b935061082683610a3e565b8060005b8381101561085757815161083e888261075e565b975061084983610a8c565b92505060018101905061082a565b5085935050505092915050565b600061086f82610a69565b6108798185610ac8565b935061088483610a3e565b8060005b838110156108b557815161089c888261075e565b97506108a783610a8c565b925050600181019050610888565b5085935050505092915050565b60006108cd82610a74565b6108d78185610ad9565b9350836020820285016108e985610a4e565b8060005b8581101561092557848403895281516109068582610776565b945061091183610a99565b925060208a019950506001810190506108ed565b50829750879550505050505092915050565b61094081610afc565b82525050565b61094f81610b08565b82525050565b600060408301600083015161096d600086018261078a565b50602083015184820360208601526109858282610806565b9150508091505092915050565b60006020820190506109a76000830184610799565b92915050565b600060208201905081810360008301526109c781846107a8565b905092915050565b600060208201905081810360008301526109e98184610864565b905092915050565b60006020820190508181036000830152610a0b81846108c2565b905092915050565b6000602082019050610a286000830184610937565b92915050565b6000819050602082019050919050565b6000819050602082019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b6000610af582610b34565b9050919050565b60008115159050919050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b6000610b6982610b54565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415610b9c57610b9b610ba7565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b610bdf81610aea565b8114610bea57600080fd5b50565b610bf681610b08565b8114610c0157600080fd5b5056fea164736f6c6343000804000a",
"linkReferences": {},
"deployedLinkReferences": {}
}
93 changes: 93 additions & 0 deletions artifacts/IDiamondCut.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"_format": "hh-sol-artifact-1",
"contractName": "IDiamondCut",
"sourceName": "src/bridges/interfaces/IDiamondCut.sol",
"abi": [
{
"anonymous": false,
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "facetAddress",
"type": "address"
},
{
"internalType": "enum IDiamondCut.FacetCutAction",
"name": "action",
"type": "uint8"
},
{
"internalType": "bytes4[]",
"name": "functionSelectors",
"type": "bytes4[]"
}
],
"indexed": false,
"internalType": "struct IDiamondCut.FacetCut[]",
"name": "_diamondCut",
"type": "tuple[]"
},
{
"indexed": false,
"internalType": "address",
"name": "_init",
"type": "address"
},
{
"indexed": false,
"internalType": "bytes",
"name": "_calldata",
"type": "bytes"
}
],
"name": "DiamondCut",
"type": "event"
},
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "facetAddress",
"type": "address"
},
{
"internalType": "enum IDiamondCut.FacetCutAction",
"name": "action",
"type": "uint8"
},
{
"internalType": "bytes4[]",
"name": "functionSelectors",
"type": "bytes4[]"
}
],
"internalType": "struct IDiamondCut.FacetCut[]",
"name": "_diamondCut",
"type": "tuple[]"
},
{
"internalType": "address",
"name": "_init",
"type": "address"
},
{
"internalType": "bytes",
"name": "_calldata",
"type": "bytes"
}
],
"name": "diamondCut",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
}
],
"bytecode": "0x",
"deployedBytecode": "0x",
"linkReferences": {},
"deployedLinkReferences": {}
}
87 changes: 87 additions & 0 deletions artifacts/IDiamondLoupe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"_format": "hh-sol-artifact-1",
"contractName": "IDiamondLoupe",
"sourceName": "src/bridges/interfaces/IDiamondLoupe.sol",
"abi": [
{
"inputs": [
{
"internalType": "bytes4",
"name": "_functionSelector",
"type": "bytes4"
}
],
"name": "facetAddress",
"outputs": [
{
"internalType": "address",
"name": "facetAddress_",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "facetAddresses",
"outputs": [
{
"internalType": "address[]",
"name": "facetAddresses_",
"type": "address[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "_facet",
"type": "address"
}
],
"name": "facetFunctionSelectors",
"outputs": [
{
"internalType": "bytes4[]",
"name": "facetFunctionSelectors_",
"type": "bytes4[]"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "facets",
"outputs": [
{
"components": [
{
"internalType": "address",
"name": "facetAddress",
"type": "address"
},
{
"internalType": "bytes4[]",
"name": "functionSelectors",
"type": "bytes4[]"
}
],
"internalType": "struct IDiamondLoupe.Facet[]",
"name": "facets_",
"type": "tuple[]"
}
],
"stateMutability": "view",
"type": "function"
}
],
"bytecode": "0x",
"deployedBytecode": "0x",
"linkReferences": {},
"deployedLinkReferences": {}
}
Loading

0 comments on commit 9258236

Please sign in to comment.