PIE-1698: Fix account ingress logic when no rules contract has been s…

…et (#84) * Fix account ingress logic when no rules contract has been set * Updating genesis file
Consensys · Jun 20, 2019 · 577fa19 · 577fa19
1 parent e3f829a
commit 577fa19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/contracts/AccountIngress.sol b/contracts/AccountIngress.sol
@@ -30,7 +30,7 @@ contract AccountIngress is Ingress {
         bytes memory payload
     ) public view returns (bool) {
         if(getContractAddress(RULES_CONTRACT) == address(0)) {
-            return false;
+            return true;
         }
 
         return AccountRulesProxy(registry[RULES_CONTRACT].contractAddress).transactionAllowed(

diff --git a/genesis.json b/genesis.json
@@ -34,7 +34,7 @@
     "0x0000000000000000000000000000000000008888": {
       "comment": "Account Ingress smart contract",
       "balance": "0",
-      "code": "60806040526004361061009e576000357c0100000000000000000000000000000000000000000000000000000000900480630d2020dd146100a357806310d9042e1461011e578063116013061461018a5780631e7c27cb146101b55780634dc3fefc146101e05780638aa104351461021d578063936421d514610248578063a43e04d814610386578063e001f841146103d9578063fe9fbb801461044c575b600080fd5b3480156100af57600080fd5b506100dc600480360360208110156100c657600080fd5b81019080803590602001909291905050506104b5565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561012a57600080fd5b5061013361056f565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561017657808201518184015260208101905061015b565b505050509050019250505060405180910390f35b34801561019657600080fd5b5061019f6105c7565b6040518082815260200191505060405180910390f35b3480156101c157600080fd5b506101ca6105cd565b6040518082815260200191505060405180910390f35b3480156101ec57600080fd5b5061021b6004803603602081101561020357600080fd5b810190808035151590602001909291905050506105d3565b005b34801561022957600080fd5b50610232610711565b6040518082815260200191505060405180910390f35b34801561025457600080fd5b5061036c600480360360c081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291908035906020019092919080359060200190929190803590602001906401000000008111156102e657600080fd5b8201836020820111156102f857600080fd5b8035906020019184600183028401116401000000008311171561031a57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929050505061071b565b604051808215151515815260200191505060405180910390f35b34801561039257600080fd5b506103bf600480360360208110156103a957600080fd5b8101908080359060200190929190505050610935565b604051808215151515815260200191505060405180910390f35b3480156103e557600080fd5b50610432600480360360408110156103fc57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610cd6565b604051808215151515815260200191505060405180910390f35b34801561045857600080fd5b5061049b6004803603602081101561046f57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506110ca565b604051808215151515815260200191505060405180910390f35b60008060010282111515610531576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b6003600083815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b606060028054806020026020016040519081016040528092919081815260200182805480156105bd57602002820191906000526020600020905b8154815260200190600101908083116105a9575b5050505050905090565b60005481565b60015481565b3373ffffffffffffffffffffffffffffffffffffffff16600360008054815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415156106d3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260338152602001807f4f6e6c792052756c657320636f6e74726163742063616e20747269676765722081526020017f52756c6573206368616e6765206576656e74730000000000000000000000000081525060400191505060405180910390fd5b7f9a90898411a81dd648299737f986c95672bedd792b2c45a5c158d8365d54575f81604051808215151515815260200191505060405180910390a150565b6000600454905090565b60008073ffffffffffffffffffffffffffffffffffffffff1661073f6000546104b5565b73ffffffffffffffffffffffffffffffffffffffff161415610764576000905061092b565b600360008054815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663936421d58888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200185815260200184815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561089e578082015181840152602081019050610883565b50505050905090810190601f1680156108cb5780820380516001836020036101000a031916815260200191505b5097505050505050505060206040518083038186803b1580156108ed57600080fd5b505afa158015610901573d6000803e3d6000fd5b505050506040513d602081101561091757600080fd5b810190808051906020019092919050505090505b9695505050505050565b600080600102821115156109b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b6000600280549050111515610a7a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260478152602001807f4d7573742068617665206174206c65617374206f6e652072656769737465726581526020017f6420636f6e747261637420746f20657865637574652064656c657465206f706581526020017f726174696f6e2e0000000000000000000000000000000000000000000000000081525060600191505060405180910390fd5b610a83336110ca565b1515610b1d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602b8152602001807f4e6f7420617574686f72697a656420746f2075706461746520636f6e7472616381526020017f742072656769737472792e00000000000000000000000000000000000000000081525060400191505060405180910390fd5b60008090505b600280549050811015610ccb5782600282815481101515610b4057fe5b90600052602060002001541415610cbe5760036000600283815481101515610b6457fe5b90600052602060002001548152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905550506002600160028054905003815481101515610be557fe5b9060005260206000200154600282815481101515610bff57fe5b90600052602060002001819055506002600160028054905003815481101515610c2457fe5b90600052602060002001600090556002805480919060019003610c479190611227565b507fe3d908a1f6d2467f8e7c8198f30125843211345eedb763beb4cdfb7fe728a5af600084604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a16001915050610cd1565b8080600101915050610b23565b50600090505b919050565b60008060010283111515610d52576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b610d5b336110ca565b1515610df5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602b8152602001807f4e6f7420617574686f72697a656420746f2075706461746520636f6e7472616381526020017f742072656769737472792e00000000000000000000000000000000000000000081525060400191505060405180910390fd5b610dfd611253565b600360008581526020019081526020016000206040805190810160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815250509050600073ffffffffffffffffffffffffffffffffffffffff16816020015173ffffffffffffffffffffffffffffffffffffffff161415610f765760408051908101604052803373ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1681525090506002849080600181540180825580915050906001820390600052602060002001600090919290919091505550610faf565b82816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b806003600086815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509050507fe3d908a1f6d2467f8e7c8198f30125843211345eedb763beb4cdfb7fe728a5af8385604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1600191505092915050565b60008073ffffffffffffffffffffffffffffffffffffffff166110ee6001546104b5565b73ffffffffffffffffffffffffffffffffffffffff1614156111135760019050611222565b60036000600154815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663fe9fbb80836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060206040518083038186803b1580156111e457600080fd5b505afa1580156111f8573d6000803e3d6000fd5b505050506040513d602081101561120e57600080fd5b810190808051906020019092919050505090505b919050565b81548183558181111561124e5781836000526020600020918201910161124d9190611299565b5b505050565b6040805190810160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b6112bb91905b808211156112b757600081600090555060010161129f565b5090565b9056fea165627a7a723058207ed4aa14a36d7c5664619e3bc898e36b8545c7dda9fbd23f33833686976cbf520029",
+      "code": "608060405234801561001057600080fd5b50600436106100bb576000357c0100000000000000000000000000000000000000000000000000000000900480638aa10435116100835780638aa10435146101f9578063936421d514610217578063a43e04d814610348578063e001f8411461038e578063fe9fbb80146103f4576100bb565b80630d2020dd146100c057806310d9042e1461012e578063116013061461018d5780631e7c27cb146101ab5780634dc3fefc146101c9575b600080fd5b6100ec600480360360208110156100d657600080fd5b8101908080359060200190929190505050610450565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610136610508565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b8381101561017957808201518184015260208101905061015e565b505050509050019250505060405180910390f35b610195610560565b6040518082815260200191505060405180910390f35b6101b3610566565b6040518082815260200191505060405180910390f35b6101f7600480360360208110156101df57600080fd5b8101908080351515906020019092919050505061056c565b005b610201610665565b6040518082815260200191505060405180910390f35b61032e600480360360c081101561022d57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291908035906020019092919080359060200190929190803590602001906401000000008111156102a857600080fd5b8201836020820111156102ba57600080fd5b803590602001918460018302840111640100000000831117156102dc57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050919291929050505061066f565b604051808215151515815260200191505060405180910390f35b6103746004803603602081101561035e57600080fd5b8101908080359060200190929190505050610889565b604051808215151515815260200191505060405180910390f35b6103da600480360360408110156103a457600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610b6e565b604051808215151515815260200191505060405180910390f35b6104366004803603602081101561040a57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610f1b565b604051808215151515815260200191505060405180910390f35b60008060010282116104ca576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b6003600083815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6060600280548060200260200160405190810160405280929190818152602001828054801561055657602002820191906000526020600020905b815481526020019060010190808311610542575b5050505050905090565b60005481565b60015481565b3373ffffffffffffffffffffffffffffffffffffffff16600360008054815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610627576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260338152602001806111106033913960400191505060405180910390fd5b7f9a90898411a81dd648299737f986c95672bedd792b2c45a5c158d8365d54575f81604051808215151515815260200191505060405180910390a150565b6000600454905090565b60008073ffffffffffffffffffffffffffffffffffffffff16610693600054610450565b73ffffffffffffffffffffffffffffffffffffffff1614156106b8576001905061087f565b600360008054815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663936421d58888888888886040518763ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200185815260200184815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b838110156107f25780820151818401526020810190506107d7565b50505050905090810190601f16801561081f5780820380516001836020036101000a031916815260200191505b5097505050505050505060206040518083038186803b15801561084157600080fd5b505afa158015610855573d6000803e3d6000fd5b505050506040513d602081101561086b57600080fd5b810190808051906020019092919050505090505b9695505050505050565b6000806001028211610903576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b600060028054905011610961576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252604781526020018061116e6047913960600191505060405180910390fd5b61096a33610f1b565b6109bf576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602b815260200180611143602b913960400191505060405180910390fd5b60008090505b600280549050811015610b635782600282815481106109e057fe5b90600052602060002001541415610b56576003600060028381548110610a0257fe5b90600052602060002001548152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690555050600260016002805490500381548110610a8157fe5b906000526020600020015460028281548110610a9957fe5b9060005260206000200181905550600260016002805490500381548110610abc57fe5b90600052602060002001600090556002805480919060019003610adf9190611078565b507fe3d908a1f6d2467f8e7c8198f30125843211345eedb763beb4cdfb7fe728a5af600084604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a16001915050610b69565b80806001019150506109c5565b50600090505b919050565b6000806001028311610be8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260208152602001807f436f6e7472616374206e616d65206d757374206e6f7420626520656d7074792e81525060200191505060405180910390fd5b610bf133610f1b565b610c46576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602b815260200180611143602b913960400191505060405180910390fd5b610c4e6110a4565b600360008581526020019081526020016000206040518060400160405290816000820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020016001820160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815250509050600073ffffffffffffffffffffffffffffffffffffffff16816020015173ffffffffffffffffffffffffffffffffffffffff161415610dc75760405180604001604052803373ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1681525090506002849080600181540180825580915050906001820390600052602060002001600090919290919091505550610e00565b82816020019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff16815250505b806003600086815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055509050507fe3d908a1f6d2467f8e7c8198f30125843211345eedb763beb4cdfb7fe728a5af8385604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1600191505092915050565b60008073ffffffffffffffffffffffffffffffffffffffff16610f3f600154610450565b73ffffffffffffffffffffffffffffffffffffffff161415610f645760019050611073565b60036000600154815260200190815260200160002060010160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663fe9fbb80836040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060206040518083038186803b15801561103557600080fd5b505afa158015611049573d6000803e3d6000fd5b505050506040513d602081101561105f57600080fd5b810190808051906020019092919050505090505b919050565b81548183558181111561109f5781836000526020600020918201910161109e91906110ea565b5b505050565b6040518060400160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b61110c91905b808211156111085760008160009055506001016110f0565b5090565b9056fe4f6e6c792052756c657320636f6e74726163742063616e20747269676765722052756c6573206368616e6765206576656e74734e6f7420617574686f72697a656420746f2075706461746520636f6e74726163742072656769737472792e4d7573742068617665206174206c65617374206f6e65207265676973746572656420636f6e747261637420746f20657865637574652064656c657465206f7065726174696f6e2ea165627a7a72305820084ef97932e13971f11fe752caa186aa7e7bb7cefe2b2382b528200d1213fcbf0029",
       "storage": {
         "0x0000000000000000000000000000000000000000000000000000000000000000": "0x72756c6573000000000000000000000000000000000000000000000000000000",
         "0x0000000000000000000000000000000000000000000000000000000000000001": "0x61646d696e697374726174696f6e000000000000000000000000000000000000",